Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[fix] load taxes_and_charges only if field present

Browse Source
This commit is contained in:
Rushabh Mehta 2015-05-21 12:51:07 +05:30
parent 815cb8959a
commit 4984bccbc6
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -66,11 +66,14 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
apply_default_taxes: function() { apply_default_taxes: function() {
var me = this; var me = this;
return frappe.call({ var taxes_and_charges_field = frappe.meta.get_docfield(me.frm.doc.doctype, "taxes_and_charges",
me.frm.doc.name);
if(taxes_and_charges_field) {
frappe.call({
method: "erpnext.controllers.accounts_controller.get_default_taxes_and_charges", method: "erpnext.controllers.accounts_controller.get_default_taxes_and_charges",
args: { args: {
"master_doctype": frappe.meta.get_docfield(me.frm.doc.doctype, "taxes_and_charges", "master_doctype": taxes_and_charges_field.options
me.frm.doc.name).options
}, },
callback: function(r) { callback: function(r) {
if(!r.exc) { if(!r.exc) {
@ -78,6 +81,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
} }
} }
}); });
}
}, },
setup_sms: function() { setup_sms: function() {