nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-02 03:39:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolved merge conflict

Browse Source
This commit is contained in:
Saurabh
2018-06-20 15:23:25 +05:30
parent c1030a3958 e6498996fa
commit 59798b4e88
11 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/public/js/controllers/taxes_and_totals.js
View File

@@ -341,11 +341,7 @@ erpnext.taxes_and_totals = erpnext.payments.extend({
set_item_wise_tax: function(item, tax, tax_rate, current_tax_amount) {
// store tax breakup for each item
let tax_detail = tax.item_wise_tax_detail;
let key = item.item_code;
if(item.item_name && !Object.keys(tax_detail).includes(item.item_name)) {
key = item.item_name;
}
let key = item.item_code || item.item_name;
let item_wise_tax_amount = current_tax_amount * this.frm.doc.conversion_rate;
if (tax_detail && tax_detail[key])