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

Merge pull request #23960 from rohitwaghchaure/incorrect-delink-serial-no-and-batch-v13-beta

Browse Source 
fix: incorrect delink serial no and batch
This commit is contained in:
rohitwaghchaure 2020-11-19 18:42:13 +05:30 committed by GitHub
commit 896b9ef495
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
erpnext/controllers/stock_controller.py
View File

@ -229,8 +229,10 @@ class StockController(AccountsController):
def check_expense_account(self, item): def check_expense_account(self, item):
if not item.get("expense_account"): if not item.get("expense_account"):
frappe.throw(_("Row #{0}: Expense Account not set for Item {1}. Please set an Expense Account in the Items table") msg = _("Please set an Expense Account in the Items table")
.format(item.idx, frappe.bold(item.item_code)), title=_("Expense Account Missing")) frappe.throw(_("Row #{0}: Expense Account not set for the Item {1}. {2}")
.format(item.idx, frappe.bold(item.item_code), msg), title=_("Expense Account Missing"))
else: else:
is_expense_account = frappe.db.get_value("Account", is_expense_account = frappe.db.get_value("Account",
item.get("expense_account"), "report_type")=="Profit and Loss" item.get("expense_account"), "report_type")=="Profit and Loss"
@ -245,15 +247,16 @@ class StockController(AccountsController):
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})]
if serial_nos:
frappe.db.set_value("Serial No", { 'name': ['in', serial_nos] }, "batch_no", None)
d.batch_no = None d.batch_no = None
d.db_set("batch_no", None) d.db_set("batch_no", None)
for data in frappe.get_all("Batch", for data in frappe.get_all("Batch",
{'reference_name': self.name, 'reference_doctype': self.doctype}): {'reference_name': self.name, 'reference_doctype': self.doctype}):
serial_nos = [sr.name for sr in frappe.get_all("Serial No", {'batch_no': data.name})]
if serial_nos:
frappe.db.set_value("Serial No", { 'name': ['in', serial_nos] }, "batch_no", None)
frappe.delete_doc("Batch", data.name) frappe.delete_doc("Batch", data.name)
def get_sl_entries(self, d, args): def get_sl_entries(self, d, args):