From 44cb62824dc170b0346ed3f6ecd360d6c3de6cd4 Mon Sep 17 00:00:00 2001 From: s-aga-r Date: Mon, 29 May 2023 15:15:51 +0530 Subject: [PATCH] chore: `conflicts` --- erpnext/controllers/stock_controller.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/erpnext/controllers/stock_controller.py b/erpnext/controllers/stock_controller.py index 8f698b679f2..cd947a8a564 100644 --- a/erpnext/controllers/stock_controller.py +++ b/erpnext/controllers/stock_controller.py @@ -678,7 +678,7 @@ class StockController(AccountsController): message += _("Please adjust the qty or edit {0} to proceed.").format(rule_link) return message - def repost_future_sle_and_gle(self): + def repost_future_sle_and_gle(self, force=False): args = frappe._dict( { "posting_date": self.posting_date, @@ -689,14 +689,10 @@ class StockController(AccountsController): } ) -<<<<<<< HEAD - if future_sle_exists(args) or repost_required_for_queue(self): -======= if self.docstatus == 2: force = True if force or future_sle_exists(args) or repost_required_for_queue(self): ->>>>>>> 6e661e7c0e (fix: force to do reposting for cancelled document) item_based_reposting = cint( frappe.db.get_single_value("Stock Reposting Settings", "item_based_reposting") )