Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into add-fb-to-je

Browse Source
This commit is contained in:
Mohammad Hasnain Mohsin Rajan 2020-12-11 09:35:36 +05:30 committed by GitHub
commit f60e303ac7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -408,7 +408,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
show_description(row_to_modify.idx, row_to_modify.item_code); show_description(row_to_modify.idx, row_to_modify.item_code);
this.frm.from_barcode = true; this.frm.from_barcode = this.frm.from_barcode ? this.frm.from_barcode + 1 : 1;
frappe.model.set_value(row_to_modify.doctype, row_to_modify.name, { frappe.model.set_value(row_to_modify.doctype, row_to_modify.name, {
item_code: data.item_code, item_code: data.item_code,
qty: (row_to_modify.qty || 0) + 1 qty: (row_to_modify.qty || 0) + 1
@ -492,7 +492,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
d.item_code = ""; d.item_code = "";
} }
this.frm.from_barcode = true; this.frm.from_barcode = this.frm.from_barcode ? this.frm.from_barcode + 1 : 1;
this.item_code(doc, cdt, cdn); this.item_code(doc, cdt, cdn);
}, },
@ -509,11 +509,12 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
show_batch_dialog = 1; show_batch_dialog = 1;
} }
// clear barcode if setting item (else barcode will take priority) // clear barcode if setting item (else barcode will take priority)
if(!this.frm.from_barcode) { if (this.frm.from_barcode == 0) {
item.barcode = null; item.barcode = null;
} }
this.frm.from_barcode = this.frm.from_barcode - 1 >= 0 ? this.frm.from_barcode - 1 : 0;
this.frm.from_barcode = false;
if(item.item_code || item.barcode || item.serial_no) { if(item.item_code || item.barcode || item.serial_no) {
if(!this.validate_company_and_party()) { if(!this.validate_company_and_party()) {
this.frm.fields_dict["items"].grid.grid_rows[item.idx - 1].remove(); this.frm.fields_dict["items"].grid.grid_rows[item.idx - 1].remove();