nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-15 11:09:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Party filter and total row for opening and closing in trial balance for party report

Browse Source
This commit is contained in:
Nabin Hait
2016-11-21 16:57:10 +05:30
parent 8d161ef2e1
commit 542bf8f7d4
2 changed files with 36 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.js
View File

@@ -50,6 +50,19 @@ frappe.query_reports["Trial Balance for Party"] = {
"options": ["Customer", "Supplier"], "options": ["Customer", "Supplier"],
"default": "Customer" "default": "Customer"
}, },
{
"fieldname":"party",
"label": __("Party"),
"fieldtype": "Dynamic Link",
"get_options": function() {
var party_type = frappe.query_report_filters_by_name.party_type.get_value();
var party = frappe.query_report_filters_by_name.party.get_value();
if(party && !party_type) {
frappe.throw(__("Please select Party Type first"));
}
return party_type;
}
},
{ {
"fieldname": "show_zero_values", "fieldname": "show_zero_values",
"label": __("Show zero values"), "label": __("Show zero values"),

35
erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py
View File

@@ -20,13 +20,23 @@ def execute(filters=None):
def get_data(filters, show_party_name): def get_data(filters, show_party_name):
party_name_field = "customer_name" if filters.get("party_type")=="Customer" else "supplier_name" party_name_field = "customer_name" if filters.get("party_type")=="Customer" else "supplier_name"
parties = frappe.get_all(filters.get("party_type"), fields = ["name", party_name_field], order_by="name") party_filters = {"name": filters.get("party")} if filters.get("party") else {}
parties = frappe.get_all(filters.get("party_type"), fields = ["name", party_name_field],
filters = party_filters, order_by="name")
company_currency = frappe.db.get_value("Company", filters.company, "default_currency") company_currency = frappe.db.get_value("Company", filters.company, "default_currency")
opening_balances = get_opening_balances(filters) opening_balances = get_opening_balances(filters)
balances_within_period = get_balances_within_period(filters) balances_within_period = get_balances_within_period(filters)
data = [] data = []
total_debit, total_credit = 0, 0 # total_debit, total_credit = 0, 0
total_row = frappe._dict({
"opening_debit": 0,
"opening_credit": 0,
"debit": 0,
"credit": 0,
"closing_debit": 0,
"closing_credit": 0
})
for party in parties: for party in parties:
row = { "party": party.name } row = { "party": party.name }
if show_party_name: if show_party_name:
@@ -46,10 +56,6 @@ def get_data(filters, show_party_name):
"credit": credit "credit": credit
}) })
# totals
total_debit += debit
total_credit += credit
# closing # closing
closing_debit, closing_credit = toggle_debit_credit(opening_debit + debit, opening_credit + credit) closing_debit, closing_credit = toggle_debit_credit(opening_debit + debit, opening_credit + credit)
row.update({ row.update({
@@ -57,6 +63,10 @@ def get_data(filters, show_party_name):
"closing_credit": closing_credit "closing_credit": closing_credit
}) })
# totals
for col in total_row:
total_row[col] += row.get(col)
row.update({ row.update({
"currency": company_currency "currency": company_currency
}) })
@@ -69,13 +79,12 @@ def get_data(filters, show_party_name):
data.append(row) data.append(row)
# Add total row # Add total row
if total_debit or total_credit:
data.append({ total_row.update({
"party": "'" + _("Totals") + "'", "party": "'" + _("Totals") + "'",
"debit": total_debit, "currency": company_currency
"credit": total_credit, })
"currency": company_currency data.append(total_row)
})
return data return data