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

Merge pull request #47870 from frappe/mergify/bp/version-15-hotfix/pr-47612

Browse Source 
fix: GL entries for rejected returned materials (backport #47612)
This commit is contained in:
ruthra kumar
2025-06-03 16:45:02 +05:30
committed by GitHub
parent 3582b32f03 5bac652b5f
commit d5163ed502
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/controllers/buying_controller.py
View File

@@ -670,7 +670,8 @@ class BuyingController(SubcontractingController):
"actual_qty": flt(
flt(d.rejected_qty) * flt(d.conversion_factor), d.precision("stock_qty")
),
"incoming_rate": valuation_rate_for_rejected_item,
"incoming_rate": valuation_rate_for_rejected_item if not self.is_return else 0.0,
"outgoing_rate": valuation_rate_for_rejected_item if self.is_return else 0.0,
"serial_and_batch_bundle": d.rejected_serial_and_batch_bundle,
},
)

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

@@ -499,9 +499,7 @@ class PurchaseReceipt(BuyingController):
if item.get("rejected_qty") and frappe.db.get_single_value(
"Buying Settings", "set_valuation_rate_for_rejected_materials"
):
outgoing_amount += abs(
get_stock_value_difference(self.name, item.name, item.rejected_warehouse)
)
outgoing_amount += get_stock_value_difference(self.name, item.name, item.rejected_warehouse)
credit_amount = outgoing_amount
if credit_amount:
@@ -640,9 +638,7 @@ class PurchaseReceipt(BuyingController):
if item.get("rejected_qty") and frappe.db.get_single_value(
"Buying Settings", "set_valuation_rate_for_rejected_materials"
):
rejected_item_cost = abs(
get_stock_value_difference(self.name, item.name, item.rejected_warehouse)
)
rejected_item_cost = get_stock_value_difference(self.name, item.name, item.rejected_warehouse)
divisional_loss -= rejected_item_cost
if divisional_loss: