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

fix: Unlink and delete batch created from stock reco on cancel

Browse Source
This commit is contained in:
marination
2020-08-27 20:34:51 +05:30
parent 3bae6328c5
commit eab2d25c6a
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/controllers/stock_controller.py
View File

@@ -242,10 +242,11 @@ class StockController(AccountsController):
_(self.doctype), self.name, item.get("item_code"))) _(self.doctype), self.name, item.get("item_code")))
def delete_auto_created_batches(self): def delete_auto_created_batches(self):
from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos
for d in self.items: for d in self.items:
if not d.batch_no: continue if not d.batch_no: continue
serial_nos = [sr.name for sr in frappe.get_all("Serial No", {'batch_no': d.batch_no})] serial_nos = get_serial_nos(d.serial_no)
if serial_nos: if serial_nos:
frappe.db.set_value("Serial No", { 'name': ['in', serial_nos] }, "batch_no", None) frappe.db.set_value("Serial No", { 'name': ['in', serial_nos] }, "batch_no", None)

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

@@ -45,6 +45,7 @@ class StockReconciliation(StockController):
def on_cancel(self): def on_cancel(self):
self.delete_and_repost_sle() self.delete_and_repost_sle()
self.make_gl_entries_on_cancel() self.make_gl_entries_on_cancel()
self.delete_auto_created_batches()
def remove_items_with_no_change(self): def remove_items_with_no_change(self):
"""Remove items if qty or rate is not changed""" """Remove items if qty or rate is not changed"""