Added new option group by voucher(consolidated) in the general ledger report (#15957)
diff --git a/erpnext/accounts/report/general_ledger/general_ledger.js b/erpnext/accounts/report/general_ledger/general_ledger.js
index 602e671..2826760 100644
--- a/erpnext/accounts/report/general_ledger/general_ledger.js
+++ b/erpnext/accounts/report/general_ledger/general_ledger.js
@@ -196,8 +196,9 @@
"fieldname":"group_by",
"label": __("Group by"),
"fieldtype": "Select",
- "options": ["", "Group by Voucher", "Group by Account", "Group by Party"],
- "default": "Group by Voucher"
+ "options": ["", __("Group by Voucher"), __("Group by Voucher (Consolidated)"),
+ __("Group by Account"), __("Group by Party")],
+ "default": __("Group by Voucher (Consolidated)")
},
{
"fieldname":"tax_id",
diff --git a/erpnext/accounts/report/general_ledger/general_ledger.py b/erpnext/accounts/report/general_ledger/general_ledger.py
index 56663d3..524f5f7 100644
--- a/erpnext/accounts/report/general_ledger/general_ledger.py
+++ b/erpnext/accounts/report/general_ledger/general_ledger.py
@@ -16,6 +16,8 @@
return [], []
account_details = {}
+ if not filters.get("group_by"):
+ filters['group_by'] = _('Group by Voucher (Consolidated)')
if filters and filters.get('print_in_account_currency') and \
not filters.get('account'):
@@ -48,11 +50,12 @@
if filters.get("account") and not account_details.get(filters.account):
frappe.throw(_("Account {0} does not exists").format(filters.account))
- if (filters.get("account") and filters.get("group_by") == 'Group by Account'
+ if (filters.get("account") and filters.get("group_by") == _('Group by Account')
and account_details[filters.account].is_group == 0):
frappe.throw(_("Can not filter based on Account, if grouped by Account"))
- if (filters.get("voucher_no") and filters.get("group_by") == 'Group by Voucher'):
+ if (filters.get("voucher_no")
+ and filters.get("group_by") in [_('Group by Voucher'), _('Group by Voucher (Consolidated)')]):
frappe.throw(_("Can not filter based on Voucher No, if grouped by Voucher"))
if filters.from_date > filters.to_date:
@@ -114,30 +117,37 @@
return result
-
def get_gl_entries(filters):
currency_map = get_currency(filters)
- select_fields = """, debit_in_account_currency,
- credit_in_account_currency""" \
+ select_fields = """, debit, credit, debit_in_account_currency,
+ credit_in_account_currency """
- order_by_fields = "posting_date, account"
- if filters.get("group_by") == "Group by Voucher":
- order_by_fields = "posting_date, voucher_type, voucher_no"
+ group_by_statement = ''
+ order_by_statement = "order by posting_date, account"
+
+ if filters.get("group_by") == _("Group by Voucher"):
+ order_by_statement = "order by posting_date, voucher_type, voucher_no"
+
+ if filters.get("group_by") == _("Group by Voucher (Consolidated)"):
+ group_by_statement = "group by voucher_type, voucher_no, account, cost_center"
+ select_fields = """, sum(debit) as debit, sum(credit) as credit,
+ sum(debit_in_account_currency) as debit_in_account_currency,
+ sum(credit_in_account_currency) as credit_in_account_currency"""
gl_entries = frappe.db.sql(
"""
select
posting_date, account, party_type, party,
- debit, credit,
voucher_type, voucher_no, cost_center, project,
against_voucher_type, against_voucher, account_currency,
remarks, against, is_opening {select_fields}
from `tabGL Entry`
- where company=%(company)s {conditions}
- order by {order_by_fields}
+ where company=%(company)s {conditions} {group_by_statement}
+ {order_by_statement}
""".format(
select_fields=select_fields, conditions=get_conditions(filters),
- order_by_fields=order_by_fields
+ group_by_statement=group_by_statement,
+ order_by_statement=order_by_statement
),
filters, as_dict=1)
@@ -204,13 +214,13 @@
# Opening for filtered account
data.append(totals.opening)
- if filters.get("group_by"):
+ if filters.get("group_by") != _('Group by Voucher (Consolidated)'):
for acc, acc_dict in iteritems(gle_map):
# acc
if acc_dict.entries:
# opening
data.append({})
- if filters.get("group_by") != "Group by Voucher":
+ if filters.get("group_by") != _("Group by Voucher"):
data.append(acc_dict.totals.opening)
data += acc_dict.entries
@@ -219,10 +229,9 @@
data.append(acc_dict.totals.total)
# closing
- if filters.get("group_by") != "Group by Voucher":
+ if filters.get("group_by") != _("Group by Voucher"):
data.append(acc_dict.totals.closing)
data.append({})
-
else:
data += entries
@@ -234,7 +243,6 @@
return data
-
def get_totals_dict():
def _get_debit_credit_dict(label):
return _dict(
@@ -251,12 +259,12 @@
)
def group_by_field(group_by):
- if group_by == 'Group by Party':
+ if group_by == _('Group by Party'):
return 'party'
- elif group_by == 'Group by Voucher':
- return 'voucher_no'
- else:
+ elif group_by in [_('Group by Voucher (Consolidated)'), _('Group by Account')]:
return 'account'
+ else:
+ return 'voucher_no'
def initialize_gle_map(gl_entries, filters):
gle_map = frappe._dict()
@@ -291,7 +299,7 @@
elif gle.posting_date <= to_date:
update_value_in_dict(gle_map[gle.get(group_by)].totals, 'total', gle)
update_value_in_dict(totals, 'total', gle)
- if filters.get("group_by"):
+ if filters.get("group_by") != _('Group by Voucher (Consolidated)'):
gle_map[gle.get(group_by)].entries.append(gle)
else:
entries.append(gle)
@@ -301,7 +309,6 @@
return totals, entries
-
def get_result_as_list(data, filters):
balance, balance_in_account_currency = 0, 0
inv_details = get_supplier_invoice_details()