nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-15 09:53:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Minor Fix] Force toggle display Net Total field when default taxes are fetched (#15532)

Browse Source 
* Minor fix for the problem that Net Total, Net Rate, Net Amount field would not be shown when default taxes were fetched

* Prevent net_rate from becoming NaN

* -Fixed problem that party_account_currency was not set in mapped document
-Fixed problem that discount amount was not recalculated (in mapped document)
-Fixed problem that set_dynamic_fields would work only on certain condition that led to showing Total (Company Currency) field even when using company currency
This commit is contained in:
Saif
2018-10-18 17:27:56 +05:00
committed by Nabin Hait
parent 25edac451d
commit 3c9155e406
5 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -161,7 +161,7 @@ erpnext.taxes_and_totals = erpnext.payments.extend({
if(cumulated_tax_fraction && !me.discount_amount_applied) {
item.net_amount = flt(item.amount / (1 + cumulated_tax_fraction));
item.net_rate = flt(item.net_amount / item.qty, precision("net_rate", item));
item.net_rate = item.qty ? flt(item.net_amount / item.qty, precision("net_rate", item)) : 0;
me.set_in_company_currency(item, ["net_rate", "net_amount"]);
}
@@ -521,7 +521,7 @@ erpnext.taxes_and_totals = erpnext.payments.extend({
item.net_amount = flt(item.net_amount + discount_amount_loss,
precision("net_amount", item));
}
item.net_rate = flt(item.net_amount / item.qty, precision("net_rate", item));
item.net_rate = item.qty ? flt(item.net_amount / item.qty, precision("net_rate", item)) : 0;
me.set_in_company_currency(item, ["net_rate", "net_amount"]);
});

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

@@ -286,6 +286,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
me.frm.set_value("taxes", r.message.taxes);
}
},
() => me.set_dynamic_labels(),
() => me.calculate_taxes_and_totals()
]);
}
@@ -845,16 +846,10 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
this.frm.toggle_reqd("plc_conversion_rate",
!!(this.frm.doc.price_list_name && this.frm.doc.price_list_currency));
if(this.frm.doc_currency!==this.frm.doc.currency
|| this.frm.doc_currency!==this.frm.doc.price_list_currency) {
// reset names only when the currency is different
var company_currency = this.get_company_currency();
this.change_form_labels(company_currency);
this.change_grid_labels(company_currency);
this.frm.refresh_fields();
this.frm.doc_currency = this.frm.doc.currency;
}
var company_currency = this.get_company_currency();
this.change_form_labels(company_currency);
this.change_grid_labels(company_currency);
this.frm.refresh_fields();
},
change_form_labels: function(company_currency) {