Shiloh/brotherton-erpnext
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Minor] Company default currency in Salary Slip and Structure

Browse Source
This commit is contained in:
Kanchan Chauhan 2017-02-22 16:43:04 +05:30
parent 97b3be6f9d
commit 951e31667b
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
erpnext/hr/doctype/salary_slip/salary_slip.json
View File

@ -812,6 +812,7 @@
"label": "Hour Rate",
"length": 0,
"no_copy": 0,
"options": "Company:company:default_currency",
"permlevel": 0,
"precision": "2",
"print_hide": 0,
@ -1195,6 +1196,8 @@
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"length": 0,
@ -1252,6 +1255,8 @@
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Loan repayment",
@ -1309,6 +1314,8 @@
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Interest Amount",
@ -1456,6 +1463,8 @@
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"length": 0,
@ -1511,6 +1520,8 @@
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"length": 0,
@ -1570,7 +1581,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
"modified": "2017-02-17 16:53:35.034304",
"modified": "2017-02-22 06:11:01.882797",
"modified_by": "Administrator",
"module": "HR",
"name": "Salary Slip",

3
erpnext/hr/doctype/salary_structure/salary_structure.json
View File

@ -417,6 +417,7 @@
"label": "Hour Rate",
"length": 0,
"no_copy": 0,
"options": "Company:company:default_currency",
"permlevel": 0,
"precision": "2",
"print_hide": 0,
@ -864,7 +865,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
"modified": "2017-02-17 17:09:55.444529",
"modified": "2017-02-22 06:09:55.491748",
"modified_by": "Administrator",
"module": "HR",
"name": "Salary Structure",

2
erpnext/hr/doctype/salary_structure_employee/salary_structure_employee.json
View File

@ -145,6 +145,7 @@
"label": "Base",
"length": 0,
"no_copy": 0,
"options": "Company:company:default_currency",
"permlevel": 0,
"precision": "",
"print_hide": 0,
@ -174,6 +175,7 @@
"label": "Variable",
"length": 0,
"no_copy": 0,
"options": "Company:company:default_currency",
"permlevel": 0,
"precision": "",
"print_hide": 0,