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

[Fix] General Ledger Report (#13374)

Browse Source 
* error fix if party_type = student or shareholder

* clear party filter when party_type changes to avoid error throw

* dict with values of party_name in utils.js

* fetch party_name from erpnext.utils.get_party_name

* Update general_ledger.py
This commit is contained in:
Shreya Shah
2018-03-27 11:29:25 +05:30
committed by Nabin Hait
parent c9a1eb1081
commit 149f7ee875
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/accounts/report/general_ledger/general_ledger.js
View File

@@ -61,7 +61,10 @@ frappe.query_reports["General Ledger"] = {
"label": __("Party Type"), "label": __("Party Type"),
"fieldtype": "Link", "fieldtype": "Link",
"options": "Party Type", "options": "Party Type",
"default": "" "default": "",
on_change: function() {
frappe.query_report_filters_by_name.party.set_value("");
}
}, },
{ {
"fieldname":"party", "fieldname":"party",
@@ -82,8 +85,7 @@ frappe.query_reports["General Ledger"] = {
frappe.query_report_filters_by_name.party_name.set_value(""); frappe.query_report_filters_by_name.party_name.set_value("");
return; return;
} }
var fieldname = erpnext.utils.get_party_name(party_type) || "name";
var fieldname = frappe.scrub(party_type) + "_name";
frappe.db.get_value(party_type, party, fieldname, function(value) { frappe.db.get_value(party_type, party, fieldname, function(value) {
frappe.query_report_filters_by_name.party_name.set_value(value[fieldname]); frappe.query_report_filters_by_name.party_name.set_value(value[fieldname]);
}); });

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

@@ -71,7 +71,7 @@ def set_account_currency(filters):
if gle_currency: if gle_currency:
account_currency = gle_currency account_currency = gle_currency
else: else:
account_currency = None if filters.party_type == "Employee" else \ account_currency = None if filters.party_type in ["Employee", "Student", "Shareholder"] else \
frappe.db.get_value(filters.party_type, filters.party, "default_currency") frappe.db.get_value(filters.party_type, filters.party, "default_currency")
filters["account_currency"] = account_currency or filters.company_currency filters["account_currency"] = account_currency or filters.company_currency

6
erpnext/public/js/utils.js
View File

@@ -105,6 +105,12 @@ $.extend(erpnext.utils, {
} }
}, },
get_party_name: function(party_type) {
var dict = {'Customer': 'customer_name', 'Supplier': 'supplier_name', 'Employee': 'employee_name',
'Member': 'member_name'};
return dict[party_type];
},
copy_value_in_all_row: function(doc, dt, dn, table_fieldname, fieldname) { copy_value_in_all_row: function(doc, dt, dn, table_fieldname, fieldname) {
var d = locals[dt][dn]; var d = locals[dt][dn];
if(d[fieldname]){ if(d[fieldname]){