nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-25 07:54:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Enhancement] Time log wages and multiple active salary structure

Browse Source
This commit is contained in:
Rohit Waghchaure
2016-06-03 14:44:35 +05:30
parent 18357664cb
commit d6c986da8f
97 changed files with 3112 additions and 2670 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/config/manufacturing.py
View File

@@ -23,8 +23,8 @@ def get_data():
},
{
"type": "doctype",
"name": "Time Log",
"description": _("Time Logs for manufacturing."),
"name": "Time Sheet",
"description": _("Time Sheet for manufacturing."),
},
]

13
erpnext/config/projects.py
View File

@@ -31,13 +31,8 @@ def get_data():
"items": [
{
"type": "doctype",
"name": "Time Log",
"description": _("Time Log for tasks."),
},
{
"type": "doctype",
"name": "Time Log Batch",
"description": _("Batch Time Logs for billing."),
"name": "Time Sheet",
"description": _("Time Sheet for tasks."),
},
{
"type": "doctype",
@@ -58,8 +53,8 @@ def get_data():
{
"type": "report",
"is_query_report": True,
"name": "Daily Time Log Summary",
"doctype": "Time Log"
"name": "Daily Time Sheet Summary",
"doctype": "Time Sheet"
},
{
"type": "report",