nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-24 23:49:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'hotfix' into wrong_Casual_Leave_opening

Browse Source
This commit is contained in:
Anurag Mishra
2019-06-27 13:48:57 +05:30
committed by GitHub
parent 76640cbad6 25eff13d35
commit 804b80ac7b
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__init__.py
View File

@@ -5,7 +5,7 @@ import frappe
from erpnext.hooks import regional_overrides from erpnext.hooks import regional_overrides
from frappe.utils import getdate from frappe.utils import getdate
__version__ = '11.1.41' __version__ = '11.1.42'
def get_default_company(user=None): def get_default_company(user=None):
'''Get default company for user''' '''Get default company for user'''

9
erpnext/public/js/controllers/transaction.js
View File

@@ -1290,10 +1290,13 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
}, },
callback: function(r) { callback: function(r) {
if(!r.exc) { if(!r.exc) {
for (let tax of r.message) { me.frm.set_value("taxes", r.message);
me.frm.add_child("taxes", tax);
if(me.frm.doc.shipping_rule) {
me.frm.script_manager.trigger("shipping_rule");
} else {
me.calculate_taxes_and_totals();
} }
me.calculate_taxes_and_totals();
} }
} }
}); });