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

fix: Merge conflicts

Browse Source
This commit is contained in:
marination
2025-05-13 13:35:19 +02:00
parent f94a14c06a
commit 3deb11e5b2
12 changed files with 19 additions and 328 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
erpnext/controllers/accounts_controller.py
View File

@@ -1259,17 +1259,8 @@ class AccountsController(TransactionBase):
)
def validate_qty_is_not_zero(self):
<<<<<<< HEAD
if self.doctype == "Purchase Receipt":
if self.doctype == "Purchase Receipt" or self.flags.allow_zero_qty:
return
=======
if self.flags.allow_zero_qty:
return
for item in self.items:
if self.doctype == "Purchase Receipt" and item.rejected_qty:
continue
>>>>>>> c1e4e7af28 (feat: Unit Price Contract)
for item in self.items:
if not flt(item.qty):