Merge branch 'develop'

revant · Jun 11, 2016 · 7c86bda · 7c86bda
2 parents a8e5140 + 9a71fca
commit 7c86bda
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git 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/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);

diff --git 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 <head>

diff --git 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',