From 578010569ba00093055a3164f2ec03e51daeb9ec Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Sat, 11 Jun 2016 12:48:45 +0530 Subject: [PATCH 1/2] fix wage slip journal entry --- .../civil_contracting/doctype/wage_slip/wage_slip.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/civil_contracting/civil_contracting/doctype/wage_slip/wage_slip.js b/civil_contracting/civil_contracting/doctype/wage_slip/wage_slip.js index 86801a9..100c1de 100644 --- a/civil_contracting/civil_contracting/doctype/wage_slip/wage_slip.js +++ b/civil_contracting/civil_contracting/doctype/wage_slip/wage_slip.js @@ -67,7 +67,7 @@ calculate_totals = function(doc) { cur_frm.cscript.refresh = function(doc, dt, dn) { if(!doc.__islocal) { if(doc.docstatus==1 && frappe.model.can_create("Journal Entry")){ - cur_frm.add_custom_button(__("Make Journal Entry"), make_journal_entry, frappe.boot.doctype_icons["Journal Entry"]); + cur_frm.add_custom_button(__("Make Journal Entry"), make_journal_entry); } } calculate_totals(doc); From 9a71fcadda4123d221f24427973ecd084a9bef0d Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Sat, 11 Jun 2016 13:31:21 +0600 Subject: [PATCH 2/2] bumped to version 1.4.0 --- civil_contracting/__version__.py | 2 +- civil_contracting/hooks.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/civil_contracting/__version__.py b/civil_contracting/__version__.py index 0bffc30..db93900 100644 --- a/civil_contracting/__version__.py +++ b/civil_contracting/__version__.py @@ -1,2 +1,2 @@ from __future__ import unicode_literals -__version__ = "1.3.0" +__version__ = "1.4.0" diff --git a/civil_contracting/hooks.py b/civil_contracting/hooks.py index 32e2e89..9af4b8b 100644 --- a/civil_contracting/hooks.py +++ b/civil_contracting/hooks.py @@ -5,7 +5,7 @@ app_icon = "octicon octicon-zap" app_color = "grey" app_email = "revant.one@gmail.com" -app_version = "1.3.0" +app_version = "1.4.0" app_license = "GPL v2" # Includes in diff --git a/setup.py b/setup.py index 8db61d1..9ea300a 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ from setuptools import setup, find_packages import os -version = '1.3.0' +version = '1.4.0' setup( name='civil_contracting',