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

fix(patch): avoid checking for return field if it doesnt exits (backport #30995) (#30997)

Browse Source 
(cherry picked from commit b08180092e)

Co-authored-by: Ankush Menat <me@ankush.dev>
This commit is contained in:
mergify[bot]
2022-05-13 13:07:51 +05:30
committed by Ankush Menat
parent bed1a218a2
commit 752bda5d84
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
erpnext/stock/doctype/bin/bin.py
View File

@@ -70,11 +70,15 @@ class Bin(Document):
(self.item_code, self.warehouse), (self.item_code, self.warehouse),
)[0][0] )[0][0]
if frappe.db.field_exists("Stock Entry", "is_return"):
qty_field = "CASE WHEN se.is_return = 1 THEN (transfer_qty * -1) ELSE transfer_qty END"
else:
qty_field = "transfer_qty"
# Get Transferred Entries # Get Transferred Entries
materials_transferred = frappe.db.sql( materials_transferred = (
""" frappe.db.sql(
select f"""select sum({qty_field})
ifnull(sum(CASE WHEN se.is_return = 1 THEN (transfer_qty * -1) ELSE transfer_qty END),0)
from from
`tabStock Entry` se, `tabStock Entry Detail` sed, `tabPurchase Order` po `tabStock Entry` se, `tabStock Entry Detail` sed, `tabPurchase Order` po
where where
@@ -89,8 +93,10 @@ class Bin(Document):
and po.status != 'Closed' and po.status != 'Closed'
and po.per_received < 100 and po.per_received < 100
""", """,
{"item": self.item_code}, {"item": self.item_code},
)[0][0] )[0][0]
or 0.0
)
if reserved_qty_for_sub_contract > materials_transferred: if reserved_qty_for_sub_contract > materials_transferred:
reserved_qty_for_sub_contract = reserved_qty_for_sub_contract - materials_transferred reserved_qty_for_sub_contract = reserved_qty_for_sub_contract - materials_transferred