Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: divide offsetting amount for multiple dimensions

Browse Source
This commit is contained in:
Gursheen Anand 2023-07-18 12:12:24 +05:30
parent ed3bef1840
commit 1e1e4b93c1
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
erpnext/accounts/general_ledger.py
View File

@ -57,7 +57,8 @@ def make_gl_entries(
def make_acc_dimensions_offsetting_entry(gl_map): def make_acc_dimensions_offsetting_entry(gl_map):
accounting_dimensions_to_offset = get_accounting_dimensions_for_offsetting_entry(gl_map) accounting_dimensions_to_offset = get_accounting_dimensions_for_offsetting_entry(gl_map)
if len(accounting_dimensions_to_offset) == 0: no_of_dimensions = len(accounting_dimensions_to_offset)
if no_of_dimensions == 0:
return return
offsetting_entries = [] offsetting_entries = []
@ -75,10 +76,10 @@ def make_acc_dimensions_offsetting_entry(gl_map):
offsetting_entry.update( offsetting_entry.update(
{ {
"account": offsetting_account, "account": offsetting_account,
"debit": flt(gle.credit), "debit": flt(gle.credit) / no_of_dimensions if gle.credit != 0 else 0,
"credit": flt(gle.debit), "credit": flt(gle.debit) / no_of_dimensions if gle.debit != 0 else 0,
"debit_in_account_currency": flt(gle.credit_in_account_currency), "debit_in_account_currency": flt(gle.credit) / no_of_dimensions if gle.credit != 0 else 0,
"credit_in_account_currency": flt(gle.debit_in_account_currency), "credit_in_account_currency": flt(gle.debit) / no_of_dimensions if gle.debit != 0 else 0,
"remarks": _("Offsetting for Accounting Dimension") + " - {0}".format(dimension), "remarks": _("Offsetting for Accounting Dimension") + " - {0}".format(dimension),
"against_voucher": None, "against_voucher": None,
} }

2
erpnext/accounts/report/trial_balance/trial_balance.py
View File

@ -241,7 +241,7 @@ def get_opening_balance(
lft, rgt = frappe.db.get_value("Cost Center", filters.cost_center, ["lft", "rgt"]) lft, rgt = frappe.db.get_value("Cost Center", filters.cost_center, ["lft", "rgt"])
cost_center = frappe.qb.DocType("Cost Center") cost_center = frappe.qb.DocType("Cost Center")
opening_balance = opening_balance.where( opening_balance = opening_balance.where(
closing_balance.cost_center.in_( closing_balance.cost_center.isin(
frappe.qb.from_(cost_center) frappe.qb.from_(cost_center)
.select("name") .select("name")
.where((cost_center.lft >= lft) & (cost_center.rgt <= rgt)) .where((cost_center.lft >= lft) & (cost_center.rgt <= rgt))