diff --git a/erpnext/accounts/general_ledger.py b/erpnext/accounts/general_ledger.py index e4f30160dfd..a26812c7a6e 100644 --- a/erpnext/accounts/general_ledger.py +++ b/erpnext/accounts/general_ledger.py @@ -57,7 +57,8 @@ def make_gl_entries( def make_acc_dimensions_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 offsetting_entries = [] @@ -75,10 +76,10 @@ def make_acc_dimensions_offsetting_entry(gl_map): offsetting_entry.update( { "account": offsetting_account, - "debit": flt(gle.credit), - "credit": flt(gle.debit), - "debit_in_account_currency": flt(gle.credit_in_account_currency), - "credit_in_account_currency": flt(gle.debit_in_account_currency), + "debit": flt(gle.credit) / no_of_dimensions if gle.credit != 0 else 0, + "credit": flt(gle.debit) / no_of_dimensions if gle.debit != 0 else 0, + "debit_in_account_currency": flt(gle.credit) / no_of_dimensions if gle.credit != 0 else 0, + "credit_in_account_currency": flt(gle.debit) / no_of_dimensions if gle.debit != 0 else 0, "remarks": _("Offsetting for Accounting Dimension") + " - {0}".format(dimension), "against_voucher": None, } diff --git a/erpnext/accounts/report/trial_balance/trial_balance.py b/erpnext/accounts/report/trial_balance/trial_balance.py index d51c4c4acba..5a9b51b080a 100644 --- a/erpnext/accounts/report/trial_balance/trial_balance.py +++ b/erpnext/accounts/report/trial_balance/trial_balance.py @@ -241,7 +241,7 @@ def get_opening_balance( lft, rgt = frappe.db.get_value("Cost Center", filters.cost_center, ["lft", "rgt"]) cost_center = frappe.qb.DocType("Cost Center") opening_balance = opening_balance.where( - closing_balance.cost_center.in_( + closing_balance.cost_center.isin( frappe.qb.from_(cost_center) .select("name") .where((cost_center.lft >= lft) & (cost_center.rgt <= rgt))