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

Merge pull request #16781 from deepeshgarg007/summary

Browse Source 
fix: Make company filter mandatory in sales person wise transaction summary
This commit is contained in:
Nabin Hait
2019-02-26 16:00:51 +05:30
committed by GitHub
parent be5124fe10 d2d84e3c9d
commit 39c489bfdc
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js
View File

@@ -33,7 +33,8 @@ frappe.query_reports["Sales Person-wise Transaction Summary"] = {
label: __("Company"), label: __("Company"),
fieldtype: "Link", fieldtype: "Link",
options: "Company", options: "Company",
default: frappe.defaults.get_user_default("Company") default: frappe.defaults.get_user_default("Company"),
reqd: 1
}, },
{ {
fieldname:"item_group", fieldname:"item_group",

2
erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py
View File

@@ -15,7 +15,7 @@ def execute(filters=None):
item_details = get_item_details() item_details = get_item_details()
data = [] data = []
company_currency = get_company_currency(filters["company"]) company_currency = get_company_currency(filters.get("company"))
for d in entries: for d in entries:
if d.stock_qty > 0 or filters.get('show_return_entries', 0): if d.stock_qty > 0 or filters.get('show_return_entries', 0):