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

Merge pull request #38530 from bosue/duplicate_zero_quantity_check2

Browse Source 
refactor: Consolidate duplicate zero-quantity Items checks for transactions.
This commit is contained in:
Nabin Hait
2024-01-09 13:12:25 +05:30
committed by GitHub
parent 3b861798e6 3688d9412e
commit ec07b42ea2
84 changed files with 253 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
erpnext/controllers/accounts_controller.py
View File

@@ -975,13 +975,15 @@ class AccountsController(TransactionBase):
return flt(args.get(field, 0) / (args.get("conversion_rate") or self.get("conversion_rate", 1)))
def validate_qty_is_not_zero(self):
if self.doctype == "Purchase Receipt":
return
for item in self.items:
if self.doctype == "Purchase Receipt" and item.rejected_qty:
continue
if not flt(item.qty):
frappe.throw(
msg=_("Row #{0}: Item quantity cannot be zero").format(item.idx),
msg=_("Row #{0}: Quantity for Item {1} cannot be zero.").format(
item.idx, frappe.bold(item.item_code)
),
title=_("Invalid Quantity"),
exc=InvalidQtyError,
)
@@ -3097,7 +3099,7 @@ def update_child_qty_rate(parent_doctype, trans_items, parent_doctype_name, chil
def validate_quantity(child_item, new_data):
if not flt(new_data.get("qty")):
frappe.throw(
_("Row # {0}: Quantity for Item {1} cannot be zero").format(
_("Row #{0}: Quantity for Item {1} cannot be zero.").format(
new_data.get("idx"), frappe.bold(new_data.get("item_code"))
),
title=_("Invalid Qty"),

3
erpnext/controllers/selling_controller.py
View File

@@ -295,9 +295,6 @@ class SellingController(StockController):
def get_item_list(self):
il = []
for d in self.get("items"):
if d.qty is None:
frappe.throw(_("Row {0}: Qty is mandatory").format(d.idx))
if self.has_product_bundle(d.item_code):
for p in self.get("packed_items"):
if p.parent_detail_docname == d.name and p.parent_item == d.item_code: