nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-25 16:04:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into subcontracting

Browse Source
This commit is contained in:
s-aga-r
2022-06-03 13:25:49 +05:30
parent 61296a0658 12edddbfd4
commit 992ba974e2
73 changed files with 1847 additions and 2152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -423,7 +423,7 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
item.barcode = null;
if(item.item_code || item.barcode || item.serial_no) {
if(item.item_code || item.serial_no) {
if(!this.validate_company_and_party()) {
this.frm.fields_dict["items"].grid.grid_rows[item.idx - 1].remove();
} else {
@@ -463,6 +463,7 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
stock_qty: item.stock_qty,
conversion_factor: item.conversion_factor,
weight_per_unit: item.weight_per_unit,
uom: item.uom,
weight_uom: item.weight_uom,
manufacturer: item.manufacturer,
stock_uom: item.stock_uom,
@@ -526,12 +527,6 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
if(!d[k]) d[k] = v;
});
if (d.__disable_batch_serial_selector) {
// reset for future use.
d.__disable_batch_serial_selector = false;
return;
}
if (d.has_batch_no && d.has_serial_no) {
d.batch_no = undefined;
}
@@ -944,7 +939,11 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
} else {
// company currency and doc currency is same
// this will prevent unnecessary conversion rate triggers
this.frm.set_value("conversion_rate", 1.0);
if(this.frm.doc.currency === this.get_company_currency()) {
this.frm.set_value("conversion_rate", 1.0);
} else {
this.conversion_rate();
}
}
}