schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: pos, serial no popup comin two times (#22268)

Browse Source
This commit is contained in:
rohitwaghchaure
2020-06-17 09:36:23 +05:30
committed by GitHub
parent fd5c577b40
commit 03f688acd9
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,7 +4,6 @@
erpnext.TransactionController = erpnext.taxes_and_totals.extend({ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
setup: function() { setup: function() {
this._super(); this._super();
frappe.flags.hide_serial_batch_dialog = true;
frappe.ui.form.on(this.frm.doctype + " Item", "rate", function(frm, cdt, cdn) { frappe.ui.form.on(this.frm.doctype + " Item", "rate", function(frm, cdt, cdn) {
var item = frappe.get_doc(cdt, cdn); var item = frappe.get_doc(cdt, cdn);
var has_margin_field = frappe.meta.has_field(cdt, 'margin_type'); var has_margin_field = frappe.meta.has_field(cdt, 'margin_type');
@@ -539,7 +538,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
if (show_batch_dialog) if (show_batch_dialog)
return frappe.db.get_value("Item", item.item_code, ["has_batch_no", "has_serial_no"]) return frappe.db.get_value("Item", item.item_code, ["has_batch_no", "has_serial_no"])
.then((r) => { .then((r) => {
if(r.message && if(r.message && !frappe.flags.hide_serial_batch_dialog &&
(r.message.has_batch_no || r.message.has_serial_no)) { (r.message.has_batch_no || r.message.has_serial_no)) {
frappe.flags.hide_serial_batch_dialog = false; frappe.flags.hide_serial_batch_dialog = false;
} }

5
erpnext/selling/sales_common.js
View File

@@ -229,7 +229,10 @@ erpnext.selling.SellingController = erpnext.TransactionController.extend({
var me = this; var me = this;
var item = frappe.get_doc(cdt, cdn); var item = frappe.get_doc(cdt, cdn);
if (item.serial_no && item.qty === item.serial_no.split(`\n`).length) { let serial_no_count = item.serial_no
? item.serial_no.split(`\n`).filter(d => d).length : 0;
if (item.serial_no && item.qty === serial_no_count) {
return; return;
} }