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

Merge pull request #5538 from rohitwaghchaure/time_sheet_wages

Browse Source 
[Enhancement] Time log wages and multiple active salary structure
This commit is contained in:
Rushabh Mehta
2016-06-27 17:13:48 +05:30
committed by GitHub
parent 3be51643cc d6c986da8f
commit 822209cb03
97 changed files with 3112 additions and 2670 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/setup/setup_wizard/domainify.py
View File

@@ -43,7 +43,7 @@ domains = {
},
'Services': {
'desktop_icons': ['Project', 'Time Log', 'Customer', 'Sales Order', 'Sales Invoice', 'Lead', 'Opportunity',
'desktop_icons': ['Project', 'Time Sheet', 'Customer', 'Sales Order', 'Sales Invoice', 'Lead', 'Opportunity',
'Expense Claim', 'Employee', 'HR', 'ToDo'],
'remove_roles': ['Manufacturing User', 'Manufacturing Manager'],
'properties': [