Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: Run _validate_over_transfer only if excess transfer is blocked in settings

Browse Source
This commit is contained in:
marination 2022-05-23 11:05:55 +05:30
parent 1a58b788e5
commit 9f6e10663b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/manufacturing/doctype/job_card/job_card.py
View File

@ -531,11 +531,9 @@ class JobCard(Document):
def _validate_over_transfer(row, transferred_qty): def _validate_over_transfer(row, transferred_qty):
"Block over transfer of items if not allowed in settings." "Block over transfer of items if not allowed in settings."
allow_excess = frappe.db.get_single_value("Manufacturing Settings", "job_card_excess_transfer")
required_qty = frappe.db.get_value("Job Card Item", row.job_card_item, "required_qty") required_qty = frappe.db.get_value("Job Card Item", row.job_card_item, "required_qty")
is_excess = flt(transferred_qty) > flt(required_qty) is_excess = flt(transferred_qty) > flt(required_qty)
if is_excess:
if is_excess and not allow_excess:
frappe.throw( frappe.throw(
_( _(
"Row #{0}: Cannot transfer more than Required Qty {1} for Item {2} against Job Card {3}" "Row #{0}: Cannot transfer more than Required Qty {1} for Item {2} against Job Card {3}"
@ -564,7 +562,9 @@ class JobCard(Document):
) )
).run()[0][0] ).run()[0][0]
_validate_over_transfer(row, transferred_qty) allow_excess = frappe.db.get_single_value("Manufacturing Settings", "job_card_excess_transfer")
if not allow_excess:
_validate_over_transfer(row, transferred_qty)
frappe.db.set_value("Job Card Item", row.job_card_item, "transferred_qty", flt(transferred_qty)) frappe.db.set_value("Job Card Item", row.job_card_item, "transferred_qty", flt(transferred_qty))