nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-27 02:28:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(accounting-dimension): System-generated round-off GL entries fail to set the accounting dimension (#51167)

Browse Source 
* chore: remove disabled condition statement

* fix: add default dimension for round off gle

* fix: validate report type to handle opening entries roundoff

(cherry picked from commit bc63c85daf)
This commit is contained in:
Logesh Periyasamy
2026-01-08 12:05:36 +05:30
committed by Mergify
parent 7aee6bdaf8
commit 1179514118
3 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/doctype/gl_entry/gl_entry.py
View File

@@ -187,7 +187,6 @@ class GLEntry(Document):
account_type == "Profit and Loss" account_type == "Profit and Loss"
and self.company == dimension.company and self.company == dimension.company
and dimension.mandatory_for_pl and dimension.mandatory_for_pl
and not dimension.disabled
and not self.is_cancelled and not self.is_cancelled
): ):
if not self.get(dimension.fieldname): if not self.get(dimension.fieldname):
@@ -201,7 +200,6 @@ class GLEntry(Document):
account_type == "Balance Sheet" account_type == "Balance Sheet"
and self.company == dimension.company and self.company == dimension.company
and dimension.mandatory_for_bs and dimension.mandatory_for_bs
and not dimension.disabled
and not self.is_cancelled and not self.is_cancelled
): ):
if not self.get(dimension.fieldname): if not self.get(dimension.fieldname):

2
erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py
View File

@@ -133,7 +133,6 @@ class PaymentLedgerEntry(Document):
account_type == "Profit and Loss" account_type == "Profit and Loss"
and self.company == dimension.company and self.company == dimension.company
and dimension.mandatory_for_pl and dimension.mandatory_for_pl
and not dimension.disabled
): ):
if not self.get(dimension.fieldname): if not self.get(dimension.fieldname):
frappe.throw( frappe.throw(
@@ -146,7 +145,6 @@ class PaymentLedgerEntry(Document):
account_type == "Balance Sheet" account_type == "Balance Sheet"
and self.company == dimension.company and self.company == dimension.company
and dimension.mandatory_for_bs and dimension.mandatory_for_bs
and not dimension.disabled
): ):
if not self.get(dimension.fieldname): if not self.get(dimension.fieldname):
frappe.throw( frappe.throw(

13
erpnext/accounts/general_ledger.py
View File

@@ -12,6 +12,7 @@ from frappe.utils import cint, flt, formatdate, get_link_to_form, getdate, now
import erpnext import erpnext
from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import ( from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import (
get_accounting_dimensions, get_accounting_dimensions,
get_checks_for_pl_and_bs_accounts,
) )
from erpnext.accounts.doctype.accounting_dimension_filter.accounting_dimension_filter import ( from erpnext.accounts.doctype.accounting_dimension_filter.accounting_dimension_filter import (
get_dimension_filter_map, get_dimension_filter_map,
@@ -612,6 +613,18 @@ def update_accounting_dimensions(round_off_gle):
for dimension in dimensions: for dimension in dimensions:
round_off_gle[dimension] = dimension_values.get(dimension) round_off_gle[dimension] = dimension_values.get(dimension)
else:
report_type = frappe.get_cached_value("Account", round_off_gle.account, "report_type")
for dimension in get_checks_for_pl_and_bs_accounts():
if (
round_off_gle.company == dimension.company
and (
(report_type == "Profit and Loss" and dimension.mandatory_for_pl)
or (report_type == "Balance Sheet" and dimension.mandatory_for_bs)
)
and dimension.default_dimension
):
round_off_gle[dimension.fieldname] = dimension.default_dimension
def get_round_off_account_and_cost_center(company, voucher_type, voucher_no, use_company_default=False): def get_round_off_account_and_cost_center(company, voucher_type, voucher_no, use_company_default=False):