nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-07 15:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added Project in GL Entry and General Ledger report

Browse Source
This commit is contained in:
Nabin Hait
2016-05-26 17:41:39 +05:30
parent 37b5e0c99f
commit 591a5aba56
12 changed files with 156 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
erpnext/accounts/report/general_ledger/general_ledger.py
View File

@@ -87,7 +87,8 @@ def get_columns(filters):
columns += [
_("Voucher Type") + "::120", _("Voucher No") + ":Dynamic Link/"+_("Voucher Type")+":160",
_("Against Account") + "::120", _("Party Type") + "::80", _("Party") + "::150",
_("Cost Center") + ":Link/Cost Center:100", _("Remarks") + "::400"
_("Project") + ":Link/Project:100", _("Cost Center") + ":Link/Cost Center:100",
_("Remarks") + "::400"
]
return columns
@@ -109,9 +110,12 @@ def get_gl_entries(filters):
group_by_condition = "group by voucher_type, voucher_no, account, cost_center" \
if filters.get("group_by_voucher") else "group by name"
gl_entries = frappe.db.sql("""select posting_date, account, party_type, party,
gl_entries = frappe.db.sql("""
select
posting_date, account, party_type, party,
sum(debit) as debit, sum(credit) as credit,
voucher_type, voucher_no, cost_center, remarks, against, is_opening {select_fields}
voucher_type, voucher_no, cost_center, project,
remarks, against, is_opening {select_fields}
from `tabGL Entry`
where company=%(company)s {conditions}
{group_by_condition}
@@ -283,7 +287,7 @@ def get_result_as_list(data, filters):
row += [d.get("debit_in_account_currency"), d.get("credit_in_account_currency")]
row += [d.get("voucher_type"), d.get("voucher_no"), d.get("against"),
d.get("party_type"), d.get("party"), d.get("cost_center"), d.get("remarks")
d.get("party_type"), d.get("party"), d.get("project"), d.get("cost_center"), d.get("remarks")
]
result.append(row)