schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: validate uom is integer for PR item

Browse Source
This commit is contained in:
s-aga-r
2024-04-17 21:45:27 +05:30
parent 34fd290edb
commit 9a290fdfc9
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/controllers/subcontracting_controller.py
View File

@@ -539,9 +539,6 @@ class SubcontractingController(StockController):
return serial_nos return serial_nos
def __add_supplied_item(self, item_row, bom_item, qty): def __add_supplied_item(self, item_row, bom_item, qty):
if bom_item.get("qty"):
bom_item.pop("qty")
bom_item.conversion_factor = item_row.conversion_factor bom_item.conversion_factor = item_row.conversion_factor
rm_obj = self.append(self.raw_material_table, bom_item) rm_obj = self.append(self.raw_material_table, bom_item)
if rm_obj.get("qty"): if rm_obj.get("qty"):

7
erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
View File

@@ -239,8 +239,7 @@ class PurchaseReceipt(BuyingController):
self.po_required() self.po_required()
self.validate_items_quality_inspection() self.validate_items_quality_inspection()
self.validate_with_previous_doc() self.validate_with_previous_doc()
self.validate_uom_is_integer("uom", ["qty", "received_qty"]) self.validate_uom_is_integer()
self.validate_uom_is_integer("stock_uom", "stock_qty")
self.validate_cwip_accounts() self.validate_cwip_accounts()
self.validate_provisional_expense_account() self.validate_provisional_expense_account()
@@ -254,6 +253,10 @@ class PurchaseReceipt(BuyingController):
self.reset_default_field_value("rejected_warehouse", "items", "rejected_warehouse") self.reset_default_field_value("rejected_warehouse", "items", "rejected_warehouse")
self.reset_default_field_value("set_from_warehouse", "items", "from_warehouse") self.reset_default_field_value("set_from_warehouse", "items", "from_warehouse")
def validate_uom_is_integer(self):
super().validate_uom_is_integer("uom", ["qty", "received_qty"], "Purchase Receipt Item")
super().validate_uom_is_integer("stock_uom", "stock_qty", "Purchase Receipt Item")
def validate_cwip_accounts(self): def validate_cwip_accounts(self):
for item in self.get("items"): for item in self.get("items"):
if item.is_fixed_asset and is_cwip_accounting_enabled(item.asset_category): if item.is_fixed_asset and is_cwip_accounting_enabled(item.asset_category):

9
erpnext/utilities/transaction_base.py
View File

@@ -30,8 +30,8 @@ class TransactionBase(StatusUpdater):
except ValueError: except ValueError:
frappe.throw(_("Invalid Posting Time")) frappe.throw(_("Invalid Posting Time"))
def validate_uom_is_integer(self, uom_field, qty_fields): def validate_uom_is_integer(self, uom_field, qty_fields, child_dt=None):
validate_uom_is_integer(self, uom_field, qty_fields) validate_uom_is_integer(self, uom_field, qty_fields, child_dt)
def validate_with_previous_doc(self, ref): def validate_with_previous_doc(self, ref):
self.exclude_fields = ["conversion_factor", "uom"] if self.get("is_return") else [] self.exclude_fields = ["conversion_factor", "uom"] if self.get("is_return") else []
@@ -210,12 +210,13 @@ def validate_uom_is_integer(doc, uom_field, qty_fields, child_dt=None):
for f in qty_fields: for f in qty_fields:
qty = d.get(f) qty = d.get(f)
if qty: if qty:
if abs(cint(qty) - flt(qty, d.precision(f))) > 0.0000001: precision = d.precision(f)
if abs(cint(qty) - flt(qty, precision)) > 0.0000001:
frappe.throw( frappe.throw(
_( _(
"Row {1}: Quantity ({0}) cannot be a fraction. To allow this, disable '{2}' in UOM {3}." "Row {1}: Quantity ({0}) cannot be a fraction. To allow this, disable '{2}' in UOM {3}."
).format( ).format(
flt(qty, d.precision(f)), flt(qty, precision),
d.idx, d.idx,
frappe.bold(_("Must be Whole Number")), frappe.bold(_("Must be Whole Number")),
frappe.bold(d.get(uom_field)), frappe.bold(d.get(uom_field)),