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

feat: add date filter in the fixed asset register (#19799)

Browse Source 
* feat: add date filter in the fixed asset register

* fix: remove function from keyword argument
This commit is contained in:
Mangesh-Khairnar 2019-12-04 13:32:31 +05:30 committed by Nabin Hait
parent eb9c3e1c5b
commit a830f89a59
2 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,5 +26,11 @@ frappe.query_reports["Fixed Asset Register"] = {
fieldtype: "Link", fieldtype: "Link",
options: "Finance Book" options: "Finance Book"
}, },
{
fieldname:"date",
label: __("Date"),
fieldtype: "Date",
default: frappe.datetime.get_today()
},
] ]
}; };

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

@ -4,7 +4,7 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe import frappe
from frappe import _ from frappe import _
from frappe.utils import cstr from frappe.utils import cstr, today, flt
def execute(filters=None): def execute(filters=None):
filters = frappe._dict(filters or {}) filters = frappe._dict(filters or {})
@ -86,8 +86,8 @@ def get_columns(filters):
"width": 90 "width": 90
}, },
{ {
"label": _("Current Value"), "label": _("Asset Value"),
"fieldname": "current_value", "fieldname": "asset_value",
"options": "Currency", "options": "Currency",
"width": 90 "width": 90
}, },
@ -114,7 +114,7 @@ def get_data(filters):
data = [] data = []
conditions = get_conditions(filters) conditions = get_conditions(filters)
current_value_map = get_finance_book_value_map(filters.finance_book) depreciation_amount_map = get_finance_book_value_map(filters.date, filters.finance_book)
pr_supplier_map = get_purchase_receipt_supplier_map() pr_supplier_map = get_purchase_receipt_supplier_map()
pi_supplier_map = get_purchase_invoice_supplier_map() pi_supplier_map = get_purchase_invoice_supplier_map()
@ -125,7 +125,9 @@ def get_data(filters):
"available_for_use_date", "status", "purchase_invoice"]) "available_for_use_date", "status", "purchase_invoice"])
for asset in assets_record: for asset in assets_record:
if current_value_map.get(asset.name) is not None: asset_value = asset.gross_purchase_amount - flt(asset.opening_accumulated_depreciation) \
- flt(depreciation_amount_map.get(asset.name))
if asset_value:
row = { row = {
"asset_id": asset.name, "asset_id": asset.name,
"asset_name": asset.asset_name, "asset_name": asset.asset_name,
@ -138,19 +140,24 @@ def get_data(filters):
"location": asset.location, "location": asset.location,
"asset_category": asset.asset_category, "asset_category": asset.asset_category,
"purchase_date": asset.purchase_date, "purchase_date": asset.purchase_date,
"current_value": current_value_map.get(asset.name) "asset_value": asset_value
} }
data.append(row) data.append(row)
return data return data
def get_finance_book_value_map(finance_book=''): def get_finance_book_value_map(date, finance_book=''):
if not date:
date = today()
return frappe._dict(frappe.db.sql(''' Select return frappe._dict(frappe.db.sql(''' Select
parent, value_after_depreciation parent, SUM(depreciation_amount)
FROM `tabAsset Finance Book` FROM `tabDepreciation Schedule`
WHERE WHERE
parentfield='finance_books' parentfield='schedules'
AND ifnull(finance_book, '')=%s''', cstr(finance_book))) AND schedule_date<=%s
AND journal_entry IS NOT NULL
AND ifnull(finance_book, '')=%s
GROUP BY parent''', (date, cstr(finance_book))))
def get_purchase_receipt_supplier_map(): def get_purchase_receipt_supplier_map():
return frappe._dict(frappe.db.sql(''' Select return frappe._dict(frappe.db.sql(''' Select