nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-19 13:09:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'enterprise_sprint' into supplier-group

Browse Source
This commit is contained in:
rohitwaghchaure
2018-05-14 20:39:01 +05:30
committed by GitHub
parent 513f13df27 8137f0402a
commit 7c6bef4905
124 changed files with 8236 additions and 808 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/config/assets.py
View File

@@ -10,6 +10,10 @@ def get_data():
"type": "doctype",
"name": "Asset",
},
{
"type": "doctype",
"name": "Location",
},
{
"type": "doctype",
"name": "Asset Category",
@@ -39,6 +43,10 @@ def get_data():
"type": "doctype",
"name": "Asset Maintenance Log",
},
{
"type": "doctype",
"name": "Asset Adjustment",
},
{
"type": "doctype",
"name": "Asset Repair",

4
erpnext/config/hr.py
View File

@@ -123,6 +123,10 @@ def get_data():
"type": "doctype",
"name": "Salary Component",
},
{
"type": "doctype",
"name": "Additional Salary Component",
},
{
"type": "doctype",
"name": "Salary Structure",