CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-13 01:34:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2026-01-15 19:28:44 +05:30
committed by GitHub
parent 6e03d45034
commit ad5181c52f
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py
View File

@@ -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",
)