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

Merge pull request #3313 from rmehta/material-request-fix

Browse Source 
[fix] load taxes_and_charges only if field present
This commit is contained in:
Nabin Hait 2015-05-21 13:22:21 +05:30
commit f3ae85cc9a
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -66,18 +66,22 @@ 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",
method: "erpnext.controllers.accounts_controller.get_default_taxes_and_charges", me.frm.doc.name);
args: {
"master_doctype": frappe.meta.get_docfield(me.frm.doc.doctype, "taxes_and_charges", if(taxes_and_charges_field) {
me.frm.doc.name).options frappe.call({
}, method: "erpnext.controllers.accounts_controller.get_default_taxes_and_charges",
callback: function(r) { args: {
if(!r.exc) { "master_doctype": taxes_and_charges_field.options
me.frm.set_value("taxes", r.message); },
callback: function(r) {
if(!r.exc) {
me.frm.set_value("taxes", r.message);
}
} }
} });
}); }
}, },
setup_sms: function() { setup_sms: function() {