From ad5181c52ffd754033fdeb8b8d9f1ad11fe54ded Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Thu, 15 Jan 2026 19:28:44 +0530 Subject: [PATCH] chore: fix conflicts --- .../stock_and_account_value_comparison.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py b/erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py index 641275a57c5..6f94f40aefd 100644 --- a/erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py +++ b/erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py @@ -115,15 +115,8 @@ def get_gl_data(report_filters, filters): "name", "voucher_type", "voucher_no", -<<<<<<< HEAD "sum(debit_in_account_currency) - sum(credit_in_account_currency) as account_value", -======= "posting_date", - { - "SUB": [{"SUM": "debit_in_account_currency"}, {"SUM": "credit_in_account_currency"}], - "as": "account_value", - }, ->>>>>>> 1db9ce205f (fix: Show non-SLE vouchers with GL entries in Stock vs Account Value Comparison report) ], group_by="voucher_type, voucher_no", )