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

chore: conflicts

Browse Source
This commit is contained in:
s-aga-r
2023-05-29 15:15:51 +05:30
parent 022893391b
commit 44cb62824d
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/controllers/stock_controller.py
View File

@@ -678,7 +678,7 @@ class StockController(AccountsController):
message += _("Please adjust the qty or edit {0} to proceed.").format(rule_link) message += _("Please adjust the qty or edit {0} to proceed.").format(rule_link)
return message return message
def repost_future_sle_and_gle(self): def repost_future_sle_and_gle(self, force=False):
args = frappe._dict( args = frappe._dict(
{ {
"posting_date": self.posting_date, "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: if self.docstatus == 2:
force = True force = True
if force or future_sle_exists(args) or repost_required_for_queue(self): 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( item_based_reposting = cint(
frappe.db.get_single_value("Stock Reposting Settings", "item_based_reposting") frappe.db.get_single_value("Stock Reposting Settings", "item_based_reposting")
) )