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

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2025-07-08 10:45:49 +05:30
committed by GitHub
parent 9207d79ce6
commit b15d7e573e
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
View File

@@ -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):