CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-23 21:22:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: GL entries for rejected returned materials (#47612)

Browse Source 
(cherry picked from commit 3e098da01f)
This commit is contained in:
rohitwaghchaure
2025-05-19 22:53:03 +05:30
committed by Mergify
parent 3582b32f03
commit 5bac652b5f
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( "actual_qty": flt(
flt(d.rejected_qty) * flt(d.conversion_factor), d.precision("stock_qty") 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, "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( if item.get("rejected_qty") and frappe.db.get_single_value(
"Buying Settings", "set_valuation_rate_for_rejected_materials" "Buying Settings", "set_valuation_rate_for_rejected_materials"
): ):
outgoing_amount += abs( outgoing_amount += get_stock_value_difference(self.name, item.name, item.rejected_warehouse)
get_stock_value_difference(self.name, item.name, item.rejected_warehouse)
)
credit_amount = outgoing_amount credit_amount = outgoing_amount
if credit_amount: if credit_amount:
@@ -640,9 +638,7 @@ class PurchaseReceipt(BuyingController):
if item.get("rejected_qty") and frappe.db.get_single_value( if item.get("rejected_qty") and frappe.db.get_single_value(
"Buying Settings", "set_valuation_rate_for_rejected_materials" "Buying Settings", "set_valuation_rate_for_rejected_materials"
): ):
rejected_item_cost = abs( rejected_item_cost = get_stock_value_difference(self.name, item.name, item.rejected_warehouse)
get_stock_value_difference(self.name, item.name, item.rejected_warehouse)
)
divisional_loss -= rejected_item_cost divisional_loss -= rejected_item_cost
if divisional_loss: if divisional_loss: