fix: circular dependency during reposting causing timeout error
diff --git a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
index 07d6e86..8a38614 100644
--- a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
+++ b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
@@ -1956,6 +1956,32 @@
ste5.reload()
self.assertEqual(ste5.items[0].valuation_rate, 275.00)
+ ste6 = make_stock_entry(
+ purpose="Material Transfer",
+ posting_date=add_days(today(), -3),
+ source=warehouse1,
+ target=warehouse,
+ item_code=item_code,
+ qty=20,
+ company=pr.company,
+ )
+
+ ste6.reload()
+ self.assertEqual(ste6.items[0].valuation_rate, 275.00)
+
+ ste7 = make_stock_entry(
+ purpose="Material Transfer",
+ posting_date=add_days(today(), -3),
+ source=warehouse,
+ target=warehouse1,
+ item_code=item_code,
+ qty=20,
+ company=pr.company,
+ )
+
+ ste7.reload()
+ self.assertEqual(ste7.items[0].valuation_rate, 275.00)
+
create_landed_cost_voucher("Purchase Receipt", pr.name, pr.company, charges=2500 * -1)
pr.reload()
@@ -1976,6 +2002,12 @@
ste5.reload()
self.assertEqual(ste5.items[0].valuation_rate, valuation_rate)
+ ste6.reload()
+ self.assertEqual(ste6.items[0].valuation_rate, valuation_rate)
+
+ ste7.reload()
+ self.assertEqual(ste7.items[0].valuation_rate, valuation_rate)
+
def prepare_data_for_internal_transfer():
from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_internal_supplier
diff --git a/erpnext/stock/stock_ledger.py b/erpnext/stock/stock_ledger.py
index 7b1eae5..5abb8e8 100644
--- a/erpnext/stock/stock_ledger.py
+++ b/erpnext/stock/stock_ledger.py
@@ -645,7 +645,7 @@
def update_distinct_item_warehouses(self, dependant_sle):
key = (dependant_sle.item_code, dependant_sle.warehouse)
- val = frappe._dict({"sle": dependant_sle})
+ val = frappe._dict({"sle": dependant_sle, "dependent_voucher_detail_nos": []})
if key not in self.distinct_item_warehouses:
self.distinct_item_warehouses[key] = val
@@ -654,13 +654,26 @@
existing_sle_posting_date = (
self.distinct_item_warehouses[key].get("sle", {}).get("posting_date")
)
+
+ dependent_voucher_detail_nos = self.get_dependent_voucher_detail_nos(key)
+
if getdate(dependant_sle.posting_date) < getdate(existing_sle_posting_date):
val.sle_changed = True
self.distinct_item_warehouses[key] = val
self.new_items_found = True
- elif self.distinct_item_warehouses[key].get("reposting_status"):
- self.distinct_item_warehouses[key] = val
+ elif dependant_sle.voucher_detail_no not in set(dependent_voucher_detail_nos):
+ # Future dependent voucher needs to be repost to get the correct stock value
+ # If dependent voucher has not reposted, then add it to the list
+ dependent_voucher_detail_nos.append(dependant_sle.voucher_detail_no)
self.new_items_found = True
+ val.dependent_voucher_detail_nos = dependent_voucher_detail_nos
+ self.distinct_item_warehouses[key] = val
+
+ def get_dependent_voucher_detail_nos(self, key):
+ if "dependent_voucher_detail_nos" not in self.distinct_item_warehouses[key]:
+ self.distinct_item_warehouses[key].dependent_voucher_detail_nos = []
+
+ return self.distinct_item_warehouses[key].dependent_voucher_detail_nos
def process_sle(self, sle):
# previous sle data for this warehouse
@@ -1370,6 +1383,7 @@
"qty_after_transaction",
"posting_date",
"posting_time",
+ "voucher_detail_no",
"timestamp(posting_date, posting_time) as timestamp",
],
as_dict=1,