Skip to content

Fix incorrect enforcement of Quantity Resolved in WorkBench validation #7670

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CarolineDenis merged 1 commit into from
Jan 27, 2026
+7 −4
Merged

Fix incorrect enforcement of Quantity Resolved in WorkBench validation #7670

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions specifyweb/backend/businessrules/rules/interaction_rules.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,14 @@ def get_availability(prep, iprepid, iprepid_fld):

@orm_signal_handler('pre_save', 'Loanpreparation')
def loanprep_quantity_must_be_lte_availability(ipreparation):
if ipreparation.id is None:
return

if ipreparation.preparation is not None:
available = get_availability(
ipreparation.preparation, ipreparation.id, "loanpreparationid") or 0
quantity = int(ipreparation.quantity) or 0
quantityresolved = int(ipreparation.quantityresolved) or 0
quantity = int(ipreparation.quantity or 0)
quantityresolved = int(ipreparation.quantityresolved or 0)
if available < (quantity - quantityresolved):
raise BusinessRuleException(
f"loan preparation quantity exceeds availability ({ipreparation.id}: {quantity - quantityresolved} {available})",
Expand All @@ -50,7 +53,7 @@ def giftprep_quantity_must_be_lte_availability(ipreparation):
if ipreparation.preparation is not None:
available = get_availability(
ipreparation.preparation, ipreparation.id, "giftpreparationid") or 0
quantity = int(ipreparation.quantity) or 0
quantity = int(ipreparation.quantity or 0)
if available < quantity:
raise BusinessRuleException(
f"gift preparation quantity exceeds availability ({ipreparation.id}: {quantity} {available})",
Expand All @@ -66,7 +69,7 @@ def exchangeoutprep_quantity_must_be_lte_availability(ipreparation):
if ipreparation.preparation is not None:
available = get_availability(
ipreparation.preparation, ipreparation.id, "exchangeoutprepid") or 0
quantity = int(ipreparation.quantity) or 0
quantity = int(ipreparation.quantity or 0)
if available < quantity:
raise BusinessRuleException(
"exchangeout preparation quantity exceeds availability ({ipreparation.id}: {quantity} {available})",
Expand Down