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

fix: manually set serial nos override with current available serial nos

Browse Source
This commit is contained in:
Rohit Waghchaure
2020-10-15 19:00:02 +05:30
parent 8ba4201c7b
commit a2ab227240
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js
View File

@@ -110,7 +110,7 @@ frappe.ui.form.on("Stock Reconciliation", {
frappe.model.set_value(cdt, cdn, "amount", r.message.rate * r.message.qty); frappe.model.set_value(cdt, cdn, "amount", r.message.rate * r.message.qty);
frappe.model.set_value(cdt, cdn, "current_serial_no", r.message.serial_nos); frappe.model.set_value(cdt, cdn, "current_serial_no", r.message.serial_nos);
if (frm.doc.purpose == "Stock Reconciliation") { if (frm.doc.purpose == "Stock Reconciliation" && !d.serial_no) {
frappe.model.set_value(cdt, cdn, "serial_no", r.message.serial_nos); frappe.model.set_value(cdt, cdn, "serial_no", r.message.serial_nos);
} }
} }
@@ -187,6 +187,11 @@ frappe.ui.form.on("Stock Reconciliation Item", {
frappe.model.set_value(cdt, cdn, "batch_no", ""); frappe.model.set_value(cdt, cdn, "batch_no", "");
} }
if (child.serial_no) {
frappe.model.set_value(cdt, cdn, "serial_no", "");
frappe.model.set_value(cdt, cdn, "current_serial_no", "");
}
frm.events.set_valuation_rate_and_qty(frm, cdt, cdn); frm.events.set_valuation_rate_and_qty(frm, cdt, cdn);
}, },

2
erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
View File

@@ -68,7 +68,7 @@ class StockReconciliation(StockController):
if item_dict.get("serial_nos"): if item_dict.get("serial_nos"):
item.current_serial_no = item_dict.get("serial_nos") item.current_serial_no = item_dict.get("serial_nos")
if self.purpose == "Stock Reconciliation": if self.purpose == "Stock Reconciliation" and not item.serial_no:
item.serial_no = item.current_serial_no item.serial_no = item.current_serial_no
item.current_qty = item_dict.get("qty") item.current_qty = item_dict.get("qty")