From 9cf818d3475f32931dc65ad0040386a998a4e53b Mon Sep 17 00:00:00 2001 From: Mangesh-Khairnar Date: Thu, 10 Oct 2019 14:28:52 +0530 Subject: [PATCH] fix: change category name from in store to in location --- .../report/fixed_asset_register/fixed_asset_register.js | 4 ++-- .../report/fixed_asset_register/fixed_asset_register.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/erpnext/assets/report/fixed_asset_register/fixed_asset_register.js b/erpnext/assets/report/fixed_asset_register/fixed_asset_register.js index 5e994b5c9c..426caaad92 100644 --- a/erpnext/assets/report/fixed_asset_register/fixed_asset_register.js +++ b/erpnext/assets/report/fixed_asset_register/fixed_asset_register.js @@ -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 }, { diff --git a/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py b/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py index eac0e2a0bf..2c9e48a06c 100644 --- a/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py +++ b/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py @@ -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'])