From 9207d79ce65b7af7849379ac4544a0040939564c Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Tue, 8 Jul 2025 09:56:56 +0530 Subject: [PATCH 1/2] Revert "fix: stock reco qty with inventory dimension (#47918)" This reverts commit 342cebc778ac02cf51870f24a13d667d5f1f9db3. (cherry picked from commit 8ba66c98332a8d23db94d7d9c05dff19e4b9be07) # Conflicts: # erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py --- .../stock/doctype/stock_reconciliation/stock_reconciliation.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py index 79bbf0b502c..c5779d01e7b 100644 --- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py @@ -489,10 +489,13 @@ class StockReconciliation(StockController): self.update_inventory_dimensions(row, data) +<<<<<<< HEAD if self.docstatus == 1 and has_dimensions and not row.batch_no: data.qty_after_transaction = data.actual_qty data.actual_qty = 0.0 +======= +>>>>>>> 8ba66c9833 (Revert "fix: stock reco qty with inventory dimension (#47918)") return data def make_sle_on_cancel(self): From b15d7e573e3f6b26bd623d7a1f7286f03254a45f Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Tue, 8 Jul 2025 10:45:49 +0530 Subject: [PATCH 2/2] chore: fix conflicts --- .../doctype/stock_reconciliation/stock_reconciliation.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py index c5779d01e7b..d1b81aa2ebe 100644 --- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py @@ -489,13 +489,6 @@ class StockReconciliation(StockController): self.update_inventory_dimensions(row, data) -<<<<<<< HEAD - if self.docstatus == 1 and has_dimensions and not row.batch_no: - data.qty_after_transaction = data.actual_qty - data.actual_qty = 0.0 - -======= ->>>>>>> 8ba66c9833 (Revert "fix: stock reco qty with inventory dimension (#47918)") return data def make_sle_on_cancel(self):