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

Fixed merge conflict

Browse Source
This commit is contained in:
Nabin Hait
2016-11-08 15:26:27 +05:30
parent 090931e667 cefcf165c4
commit a469e659c5
12 changed files with 143 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -133,7 +133,7 @@
"collapsible": 0,
"columns": 0,
"fieldname": "department",
"fieldtype": "Link",
"fieldtype": "Read Only",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
@@ -145,11 +145,11 @@
"no_copy": 0,
"oldfieldname": "department",
"oldfieldtype": "Link",
"options": "Department",
"options": "employee.department",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 1,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
@@ -162,8 +162,9 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
"depends_on": "eval:doc.designation",
"fieldname": "designation",
"fieldtype": "Link",
"fieldtype": "Read Only",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
@@ -175,11 +176,11 @@
"no_copy": 0,
"oldfieldname": "designation",
"oldfieldtype": "Link",
"options": "Designation",
"options": "employee.designation",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 1,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
@@ -193,7 +194,7 @@
"collapsible": 0,
"columns": 0,
"fieldname": "branch",
"fieldtype": "Link",
"fieldtype": "Read Only",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
@@ -205,11 +206,11 @@
"no_copy": 0,
"oldfieldname": "branch",
"oldfieldtype": "Link",
"options": "Branch",
"options": "employee.branch",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 1,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,