mirror of
https://github.com/frappe/erpnext.git
synced 2026-02-26 08:05:53 +00:00
fix: only show net gl balance as opening in general ledger
(cherry picked from commit b7c7e0746e)
This commit is contained in:
@@ -482,7 +482,7 @@ def get_accountwise_gle(filters, accounting_dimensions, gl_entries, gle_map, tot
|
|||||||
|
|
||||||
immutable_ledger = frappe.db.get_single_value("Accounts Settings", "enable_immutable_ledger")
|
immutable_ledger = frappe.db.get_single_value("Accounts Settings", "enable_immutable_ledger")
|
||||||
|
|
||||||
def update_value_in_dict(data, key, gle):
|
def update_value_in_dict(data, key, gle, show_net_values=False):
|
||||||
data[key].debit += gle.debit
|
data[key].debit += gle.debit
|
||||||
data[key].credit += gle.credit
|
data[key].credit += gle.credit
|
||||||
|
|
||||||
@@ -493,10 +493,14 @@ def get_accountwise_gle(filters, accounting_dimensions, gl_entries, gle_map, tot
|
|||||||
data[key].debit_in_transaction_currency += gle.debit_in_transaction_currency
|
data[key].debit_in_transaction_currency += gle.debit_in_transaction_currency
|
||||||
data[key].credit_in_transaction_currency += gle.credit_in_transaction_currency
|
data[key].credit_in_transaction_currency += gle.credit_in_transaction_currency
|
||||||
|
|
||||||
if filters.get("show_net_values_in_party_account") and account_type_map.get(data[key].account) in (
|
if (
|
||||||
"Receivable",
|
filters.get("show_net_values_in_party_account")
|
||||||
"Payable",
|
and account_type_map.get(data[key].account)
|
||||||
):
|
in (
|
||||||
|
"Receivable",
|
||||||
|
"Payable",
|
||||||
|
)
|
||||||
|
) or show_net_values:
|
||||||
net_value = data[key].debit - data[key].credit
|
net_value = data[key].debit - data[key].credit
|
||||||
net_value_in_account_currency = (
|
net_value_in_account_currency = (
|
||||||
data[key].debit_in_account_currency - data[key].credit_in_account_currency
|
data[key].debit_in_account_currency - data[key].credit_in_account_currency
|
||||||
@@ -526,11 +530,11 @@ def get_accountwise_gle(filters, accounting_dimensions, gl_entries, gle_map, tot
|
|||||||
|
|
||||||
if gle.posting_date < from_date or (cstr(gle.is_opening) == "Yes" and not show_opening_entries):
|
if gle.posting_date < from_date or (cstr(gle.is_opening) == "Yes" and not show_opening_entries):
|
||||||
if not group_by_voucher_consolidated:
|
if not group_by_voucher_consolidated:
|
||||||
update_value_in_dict(gle_map[group_by_value].totals, "opening", gle)
|
update_value_in_dict(gle_map[group_by_value].totals, "opening", gle, True)
|
||||||
update_value_in_dict(gle_map[group_by_value].totals, "closing", gle)
|
update_value_in_dict(gle_map[group_by_value].totals, "closing", gle, True)
|
||||||
|
|
||||||
update_value_in_dict(totals, "opening", gle)
|
update_value_in_dict(totals, "opening", gle, True)
|
||||||
update_value_in_dict(totals, "closing", gle)
|
update_value_in_dict(totals, "closing", gle, True)
|
||||||
|
|
||||||
elif gle.posting_date <= to_date or (cstr(gle.is_opening) == "Yes" and show_opening_entries):
|
elif gle.posting_date <= to_date or (cstr(gle.is_opening) == "Yes" and show_opening_entries):
|
||||||
if not group_by_voucher_consolidated:
|
if not group_by_voucher_consolidated:
|
||||||
|
|||||||
Reference in New Issue
Block a user