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

fix: fetch acc dimensions correctly when fieldname is different from name

Browse Source 
(cherry picked from commit e19a6f5dcb)
This commit is contained in:
Gursheen Anand
2023-07-19 12:26:57 +05:30
committed by Mergify
parent cdb66bf198
commit 7ac35b496a
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/accounts/general_ledger.py
View File

@@ -88,7 +88,7 @@ def get_accounting_dimensions_for_offsetting_entry(gl_map, company):
frappe.qb.from_(acc_dimension) frappe.qb.from_(acc_dimension)
.inner_join(dimension_detail) .inner_join(dimension_detail)
.on(acc_dimension.name == dimension_detail.parent) .on(acc_dimension.name == dimension_detail.parent)
.select(acc_dimension.name, dimension_detail.offsetting_account) .select(acc_dimension.fieldname, dimension_detail.offsetting_account)
.where( .where(
(acc_dimension.disabled == 0) (acc_dimension.disabled == 0)
& (dimension_detail.company == company) & (dimension_detail.company == company)
@@ -97,8 +97,7 @@ def get_accounting_dimensions_for_offsetting_entry(gl_map, company):
).run(as_dict=True) ).run(as_dict=True)
accounting_dimensions_to_offset = [] accounting_dimensions_to_offset = []
for acc_dimension in acc_dimensions: for acc_dimension in acc_dimensions:
fieldname = acc_dimension.name.lower().replace(" ", "_") values = set([entry.get(acc_dimension.fieldname) for entry in gl_map])
values = set([entry.get(fieldname) for entry in gl_map])
if len(values) > 1: if len(values) > 1:
accounting_dimensions_to_offset.append(acc_dimension) accounting_dimensions_to_offset.append(acc_dimension)
return accounting_dimensions_to_offset return accounting_dimensions_to_offset