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

Merge pull request #19278 from Mangesh-Khairnar/fix-fixed-asset-register-name

Browse Source 
fix: change category name from in store to in location
This commit is contained in:
Deepesh Garg 2019-10-11 09:14:46 +05:30 committed by GitHub
commit 0fde204074
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -101,7 +101,7 @@ def get_conditions(filters):
# In Store assets are those that are not sold or scrapped # In Store assets are those that are not sold or scrapped
operand = 'not in' operand = 'not in'
if status not in 'In Store': if status not in 'In Location':
operand = 'in' operand = 'in'
conditions['status'] = (operand, ['Sold', 'Scrapped']) conditions['status'] = (operand, ['Sold', 'Scrapped'])