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

Merge branch 'enterprise_sprint' into tax_exemption

Browse Source
This commit is contained in:
rohitwaghchaure
2018-05-14 20:47:35 +05:30
committed by GitHub
parent ded636097e 2b8fc49205
commit 3f0c735e53
192 changed files with 9815 additions and 1131 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/buying.py
View File

@@ -39,8 +39,8 @@ def get_data():
},
{
"type": "doctype",
"name": "Supplier Type",
"description": _("Supplier Type master.")
"name": "Supplier Group",
"description": _("Supplier Group master.")
},
{
"type": "doctype",

4
erpnext/config/hr.py
View File

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