nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-31 18:59:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into esbuild

Browse Source
This commit is contained in:
Suraj Shetty
2021-05-18 14:48:28 +05:30
committed by GitHub
parent f97cc0367b 8b2fef11b1
commit a83d2aacd9
155 changed files with 2039 additions and 1003 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1329,7 +1329,7 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
this.toggle_item_grid_columns(company_currency);
if(this.frm.fields_dict["operations"]) {
if (this.frm.doc.operations && this.frm.doc.operations.length > 0) {
this.frm.set_currency_labels(["operating_cost", "hour_rate"], this.frm.doc.currency, "operations");
this.frm.set_currency_labels(["base_operating_cost", "base_hour_rate"], company_currency, "operations");
@@ -1340,7 +1340,7 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
});
}
if(this.frm.fields_dict["scrap_items"]) {
if (this.frm.doc.scrap_items && this.frm.doc.scrap_items.length > 0) {
this.frm.set_currency_labels(["rate", "amount"], this.frm.doc.currency, "scrap_items");
this.frm.set_currency_labels(["base_rate", "base_amount"], company_currency, "scrap_items");
@@ -1351,13 +1351,13 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
});
}
if(this.frm.fields_dict["taxes"]) {
if (this.frm.doc.taxes && this.frm.doc.taxes.length > 0) {
this.frm.set_currency_labels(["tax_amount", "total", "tax_amount_after_discount"], this.frm.doc.currency, "taxes");
this.frm.set_currency_labels(["base_tax_amount", "base_total", "base_tax_amount_after_discount"], company_currency, "taxes");
}
if(this.frm.fields_dict["advances"]) {
if (this.frm.doc.advances && this.frm.doc.advances.length > 0) {
this.frm.set_currency_labels(["advance_amount", "allocated_amount"],
this.frm.doc.party_account_currency, "advances");
}