Merge pull request #34912 from s-aga-r/FIX-INTERNAL-PR-GL-ENTRIES
fix: internal Purchase Receipt GL Entries
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
index d268cc1..5304273 100644
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
@@ -380,7 +380,19 @@
outgoing_amount = d.base_net_amount
if self.is_internal_supplier and d.valuation_rate:
- outgoing_amount = d.valuation_rate * d.stock_qty
+ outgoing_amount = abs(
+ frappe.db.get_value(
+ "Stock Ledger Entry",
+ {
+ "voucher_type": "Purchase Receipt",
+ "voucher_no": self.name,
+ "voucher_detail_no": d.name,
+ "warehouse": d.from_warehouse,
+ "is_cancelled": 0,
+ },
+ "stock_value_difference",
+ )
+ )
credit_amount = outgoing_amount
if credit_amount:
diff --git a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
index 7567cfe..8af279a 100644
--- a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
+++ b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
@@ -1610,6 +1610,89 @@
frappe.db.set_single_value("Stock Settings", "over_delivery_receipt_allowance", 0)
+ def test_internal_pr_gl_entries(self):
+ from erpnext.stock import get_warehouse_account_map
+ from erpnext.stock.doctype.delivery_note.delivery_note import make_inter_company_purchase_receipt
+ from erpnext.stock.doctype.delivery_note.test_delivery_note import create_delivery_note
+ from erpnext.stock.doctype.stock_entry.test_stock_entry import make_stock_entry
+ from erpnext.stock.doctype.stock_reconciliation.test_stock_reconciliation import (
+ create_stock_reconciliation,
+ )
+
+ prepare_data_for_internal_transfer()
+ customer = "_Test Internal Customer 2"
+ company = "_Test Company with perpetual inventory"
+ from_warehouse = create_warehouse("_Test Internal From Warehouse New", company=company)
+ target_warehouse = create_warehouse("_Test Internal GIT Warehouse New", company=company)
+ to_warehouse = create_warehouse("_Test Internal To Warehouse New", company=company)
+
+ item = make_item(properties={"is_stock_item": 1, "valuation_rate": 100})
+ make_stock_entry(
+ purpose="Material Receipt",
+ item_code=item.name,
+ qty=10,
+ company=company,
+ to_warehouse=from_warehouse,
+ posting_date=add_days(today(), -3),
+ )
+
+ # Step - 1: Create Delivery Note with Internal Customer
+ dn = create_delivery_note(
+ item_code=item.name,
+ company=company,
+ customer=customer,
+ cost_center="Main - TCP1",
+ expense_account="Cost of Goods Sold - TCP1",
+ qty=10,
+ rate=100,
+ warehouse=from_warehouse,
+ target_warehouse=target_warehouse,
+ posting_date=add_days(today(), -2),
+ )
+
+ # Step - 2: Create Internal Purchase Receipt
+ pr = make_inter_company_purchase_receipt(dn.name)
+ pr.items[0].qty = 10
+ pr.items[0].from_warehouse = target_warehouse
+ pr.items[0].warehouse = to_warehouse
+ pr.items[0].rejected_warehouse = from_warehouse
+ pr.save()
+ pr.submit()
+
+ # Step - 3: Create back-date Stock Reconciliation [After DN and Before PR]
+ create_stock_reconciliation(
+ item_code=item,
+ warehouse=target_warehouse,
+ qty=10,
+ rate=50,
+ company=company,
+ posting_date=add_days(today(), -1),
+ )
+
+ warehouse_account = get_warehouse_account_map(company)
+ stock_account_value = frappe.db.get_value(
+ "GL Entry",
+ {
+ "account": warehouse_account[target_warehouse]["account"],
+ "voucher_type": "Purchase Receipt",
+ "voucher_no": pr.name,
+ "is_cancelled": 0,
+ },
+ fieldname=["credit"],
+ )
+ stock_diff = frappe.db.get_value(
+ "Stock Ledger Entry",
+ {
+ "voucher_type": "Purchase Receipt",
+ "voucher_no": pr.name,
+ "is_cancelled": 0,
+ },
+ fieldname=["sum(stock_value_difference)"],
+ )
+
+ # Value of Stock Account should be equal to the sum of Stock Value Difference
+ self.assertEqual(stock_account_value, stock_diff)
+
def prepare_data_for_internal_transfer():
from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_internal_supplier
diff --git a/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py b/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py
index 7d59441..2e5d2c3 100644
--- a/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py
+++ b/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py
@@ -530,7 +530,9 @@
# check if cancellation of stock reco is blocked
self.assertRaises(NegativeStockError, sr.cancel)
- repost_exists = bool(frappe.db.exists("Repost Item Valuation", {"voucher_no": sr.name}))
+ repost_exists = bool(
+ frappe.db.exists("Repost Item Valuation", {"voucher_no": sr.name, "status": "Queued"})
+ )
self.assertFalse(repost_exists, msg="Negative stock validation not working on reco cancellation")
def test_intermediate_sr_bin_update(self):