schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: merge conflict

Browse Source
This commit is contained in:
Nabin Hait
2021-07-22 17:11:20 +05:30
parent ce3e877c40 338f436a1c
commit 595c7a6e61
3 changed files with 54 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -846,9 +846,9 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
frappe.run_serially([
() => me.frm.script_manager.trigger("currency"),
() => me.update_item_tax_map(),
() => me.apply_default_taxes(),
() => me.apply_pricing_rule(),
() => me.calculate_taxes_and_totals()
() => me.apply_pricing_rule()
]);
}
}
@@ -1807,6 +1807,46 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
]);
}
update_item_tax_map() {
let me = this;
let item_codes = [];
let item_rates = {};
let item_tax_templates = {};
$.each(this.frm.doc.items || [], function(i, item) {
if (item.item_code) {
// Use combination of name and item code in case same item is added multiple times
item_codes.push([item.item_code, item.name]);
item_rates[item.name] = item.net_rate;
item_tax_templates[item.name] = item.item_tax_template;
}
});
if (item_codes.length) {
return this.frm.call({
method: "erpnext.stock.get_item_details.get_item_tax_info",
args: {
company: me.frm.doc.company,
tax_category: cstr(me.frm.doc.tax_category),
item_codes: item_codes,
item_rates: item_rates,
item_tax_templates: item_tax_templates
},
callback: function(r) {
if (!r.exc) {
$.each(me.frm.doc.items || [], function(i, item) {
if (item.name && r.message.hasOwnProperty(item.name) && r.message[item.name].item_tax_template) {
item.item_tax_template = r.message[item.name].item_tax_template;
item.item_tax_rate = r.message[item.name].item_tax_rate;
me.add_taxes_from_item_tax_template(item.item_tax_rate);
}
});
}
}
});
}
}
item_tax_template(doc, cdt, cdn) {
var me = this;
if(me.frm.updating_party_details) return;