Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Make status filter optional (#28126)

Browse Source
This commit is contained in:
Ganga Manoj 2021-10-29 18:07:11 +05:30 committed by GitHub
parent eb720d18c3
commit 15e9b5170d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/assets/report/fixed_asset_register/fixed_asset_register.js
View File

@ -16,9 +16,8 @@ frappe.query_reports["Fixed Asset Register"] = {
fieldname:"status", fieldname:"status",
label: __("Status"), label: __("Status"),
fieldtype: "Select", fieldtype: "Select",
options: "In Location\nDisposed", options: "\nIn Location\nDisposed",
default: 'In Location', default: 'In Location'
reqd: 1
}, },
{ {
"fieldname":"filter_based_on", "fieldname":"filter_based_on",

11
erpnext/assets/report/fixed_asset_register/fixed_asset_register.py
View File

@ -45,12 +45,13 @@ def get_conditions(filters):
if filters.get('cost_center'): if filters.get('cost_center'):
conditions["cost_center"] = filters.get('cost_center') conditions["cost_center"] = filters.get('cost_center')
# In Store assets are those that are not sold or scrapped if status:
operand = 'not in' # In Store assets are those that are not sold or scrapped
if status not in 'In Location': operand = 'not in'
operand = 'in' if status not in 'In Location':
operand = 'in'
conditions['status'] = (operand, ['Sold', 'Scrapped']) conditions['status'] = (operand, ['Sold', 'Scrapped'])
return conditions return conditions