Saif Ur Rehman 2d9da22721 Merge branch 'develop' of https://github.com/frappe/erpnext into asset-capitalization ... # Conflicts: # erpnext/accounts/doctype/sales_invoice/sales_invoice.py # erpnext/assets/doctype/asset/test_asset.py # erpnext/assets/workspace/assets/assets.json		2021-11-04 12:48:33 +05:00
..
assets_dashboard/asset	fix: asset dashboard report changes (#22759)	2020-07-23 19:12:38 +05:30
dashboard_chart	fix: make asset dashboard charts public (#23751)	2020-10-29 12:02:48 +05:30
doctype	Merge branch 'develop' of https://github.com/frappe/erpnext into asset-capitalization	2021-11-04 12:48:33 +05:00
form_tour	feat: Accounts, Selling & Assets Onboarding cleanup (#27112)	2021-08-27 15:47:11 +05:30
module_onboarding/assets	feat: Accounts, Selling & Assets Onboarding cleanup (#27112)	2021-08-27 15:47:11 +05:30
number_card	fix: asset dashboard report changes (#22759)	2020-07-23 19:12:38 +05:30
onboarding_step	feat: Accounts, Selling & Assets Onboarding cleanup (#27112)	2021-08-27 15:47:11 +05:30
report	fix: Make status filter optional (#28126)	2021-10-29 18:07:11 +05:30
workspace/assets	Merge branch 'develop' of https://github.com/frappe/erpnext into asset-capitalization	2021-11-04 12:48:33 +05:00
__init__.py	Added maintenance to Asset and enhanced maintenance for Asset Maintenance	2017-11-28 15:14:56 +05:30
dashboard_fixtures.py	chore: Clean up imports (#27302)	2021-09-02 16:44:59 +05:30