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

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

View File

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

View File

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