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

chore: resolve conflicts

Browse Source
This commit is contained in:
Mihir Kandoi
2026-01-31 20:25:00 +05:30
committed by GitHub
parent c3b92075f0
commit 7ab59aa094
1 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
erpnext/controllers/status_updater.py
View File

@@ -341,12 +341,6 @@ class StatusUpdater(Document):
): ):
return return
<<<<<<< HEAD
if qty_or_amount == "qty":
action_msg = _(
'To allow over receipt / delivery, update "Over Receipt/Delivery Allowance" in Stock Settings or the Item.'
)
=======
if args["source_dt"] != "Pick List Item" and args["target_dt"] != "Quotation Item": if args["source_dt"] != "Pick List Item" and args["target_dt"] != "Quotation Item":
if qty_or_amount == "qty": if qty_or_amount == "qty":
action_msg = _( action_msg = _(
@@ -356,11 +350,8 @@ class StatusUpdater(Document):
action_msg = _( action_msg = _(
'To allow over billing, update "Over Billing Allowance" in Accounts Settings or the Item.' 'To allow over billing, update "Over Billing Allowance" in Accounts Settings or the Item.'
) )
>>>>>>> 4cc306d2d8 (fix: validate over ordering of quotation)
else: else:
action_msg = _( action_msg = None
'To allow over billing, update "Over Billing Allowance" in Accounts Settings or the Item.'
)
frappe.throw( frappe.throw(
_( _(