mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-13 02:01:21 +00:00
feat: Unit Price Contract
(cherry picked from commit c1e4e7af28)
# Conflicts:
# erpnext/controllers/accounts_controller.py
# erpnext/selling/doctype/quotation/quotation.json
# erpnext/selling/doctype/sales_order/sales_order.py
# erpnext/selling/doctype/selling_settings/selling_settings.json
This commit is contained in:
@@ -1259,8 +1259,17 @@ class AccountsController(TransactionBase):
|
||||
)
|
||||
|
||||
def validate_qty_is_not_zero(self):
|
||||
<<<<<<< HEAD
|
||||
if self.doctype == "Purchase Receipt":
|
||||
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):
|
||||
|
||||
Reference in New Issue
Block a user