Added new fixtures (Fixes #1540). Removed Employee Grade from HR.
diff --git a/erpnext/config/hr.py b/erpnext/config/hr.py
index 6739893..d944b94 100644
--- a/erpnext/config/hr.py
+++ b/erpnext/config/hr.py
@@ -104,11 +104,6 @@
},
{
"type": "doctype",
- "name": "Grade",
- "description": _("Employee grade.")
- },
- {
- "type": "doctype",
"name": "Designation",
"description": _("Employee designation (e.g. CEO, Director etc.).")
},
@@ -199,4 +194,4 @@
},
]
},
-]
\ No newline at end of file
+]
diff --git a/erpnext/config/selling.py b/erpnext/config/selling.py
index 65cec9e..04e6244 100644
--- a/erpnext/config/selling.py
+++ b/erpnext/config/selling.py
@@ -150,6 +150,11 @@
"name": "Sales Email Settings",
"description": _("Setup incoming server for sales email id. (e.g. sales@example.com)")
},
+ {
+ "type": "doctype",
+ "name": "Industry Type",
+ "description": _("Track Leads by Industry Type.")
+ },
]
},
{
@@ -257,4 +262,4 @@
},
]
},
-]
\ No newline at end of file
+]
diff --git a/erpnext/hr/doctype/department/department.json b/erpnext/hr/doctype/department/department.json
index 927f564..cef4ffa 100644
--- a/erpnext/hr/doctype/department/department.json
+++ b/erpnext/hr/doctype/department/department.json
@@ -1,58 +1,49 @@
{
- "allow_import": 1,
- "autoname": "field:department_name",
- "creation": "2013-02-05 11:48:26.000000",
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "Master",
+ "allow_import": 1,
+ "autoname": "field:department_name",
+ "creation": "2013-02-05 11:48:26.000000",
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "Master",
"fields": [
{
- "fieldname": "trash_reason",
- "fieldtype": "Small Text",
- "label": "Trash Reason",
- "oldfieldname": "trash_reason",
- "oldfieldtype": "Small Text",
- "permlevel": 0,
- "read_only": 1
- },
- {
- "fieldname": "department_name",
- "fieldtype": "Data",
- "label": "Department",
- "oldfieldname": "department_name",
- "oldfieldtype": "Data",
- "permlevel": 0,
+ "fieldname": "department_name",
+ "fieldtype": "Data",
+ "label": "Department",
+ "oldfieldname": "department_name",
+ "oldfieldtype": "Data",
+ "permlevel": 0,
"reqd": 1
- },
+ },
{
- "description": "Days for which Holidays are blocked for this department.",
- "fieldname": "leave_block_list",
- "fieldtype": "Link",
- "label": "Leave Block List",
- "options": "Leave Block List",
+ "description": "Days for which Holidays are blocked for this department.",
+ "fieldname": "leave_block_list",
+ "fieldtype": "Link",
+ "label": "Leave Block List",
+ "options": "Leave Block List",
"permlevel": 0
}
- ],
- "icon": "icon-sitemap",
- "idx": 1,
- "modified": "2014-01-20 17:48:38.000000",
- "modified_by": "Administrator",
- "module": "HR",
- "name": "Department",
- "owner": "Administrator",
+ ],
+ "icon": "icon-sitemap",
+ "idx": 1,
+ "modified": "2014-01-20 17:48:38.000000",
+ "modified_by": "Administrator",
+ "module": "HR",
+ "name": "Department",
+ "owner": "Administrator",
"permissions": [
{
- "cancel": 0,
- "create": 1,
- "delete": 1,
- "email": 1,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "HR User",
- "submit": 0,
+ "cancel": 0,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "HR User",
+ "submit": 0,
"write": 1
}
]
-}
\ No newline at end of file
+}
diff --git a/erpnext/hr/doctype/designation/designation.json b/erpnext/hr/doctype/designation/designation.json
index 39a4eee..fad1357 100644
--- a/erpnext/hr/doctype/designation/designation.json
+++ b/erpnext/hr/doctype/designation/designation.json
@@ -1,51 +1,42 @@
{
- "allow_import": 1,
- "allow_rename": 1,
- "autoname": "field:designation_name",
- "creation": "2013-01-10 16:34:13.000000",
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "Master",
+ "allow_import": 1,
+ "allow_rename": 1,
+ "autoname": "field:designation_name",
+ "creation": "2013-01-10 16:34:13.000000",
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "Master",
"fields": [
{
- "fieldname": "trash_reason",
- "fieldtype": "Small Text",
- "label": "Trash Reason",
- "oldfieldname": "trash_reason",
- "oldfieldtype": "Small Text",
- "permlevel": 0,
- "read_only": 1
- },
- {
- "fieldname": "designation_name",
- "fieldtype": "Data",
- "label": "Designation",
- "oldfieldname": "designation_name",
- "oldfieldtype": "Data",
- "permlevel": 0,
+ "fieldname": "designation_name",
+ "fieldtype": "Data",
+ "label": "Designation",
+ "oldfieldname": "designation_name",
+ "oldfieldtype": "Data",
+ "permlevel": 0,
"reqd": 1
}
- ],
- "icon": "icon-bookmark",
- "idx": 1,
- "modified": "2014-01-20 17:48:38.000000",
- "modified_by": "Administrator",
- "module": "HR",
- "name": "Designation",
- "owner": "Administrator",
+ ],
+ "icon": "icon-bookmark",
+ "idx": 1,
+ "modified": "2014-01-20 17:48:38.000000",
+ "modified_by": "Administrator",
+ "module": "HR",
+ "name": "Designation",
+ "owner": "Administrator",
"permissions": [
{
- "cancel": 0,
- "create": 1,
- "delete": 1,
- "email": 1,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "HR User",
- "submit": 0,
+ "cancel": 0,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "HR User",
+ "submit": 0,
"write": 1
}
]
-}
\ No newline at end of file
+}
diff --git a/erpnext/hr/doctype/employee/employee.json b/erpnext/hr/doctype/employee/employee.json
index 7606032..2d90afa 100644
--- a/erpnext/hr/doctype/employee/employee.json
+++ b/erpnext/hr/doctype/employee/employee.json
@@ -1,783 +1,772 @@
{
- "allow_attach": 1,
- "allow_import": 1,
- "allow_rename": 1,
- "autoname": "naming_series:",
- "creation": "2013-03-07 09:04:18",
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "Master",
+ "allow_attach": 1,
+ "allow_import": 1,
+ "allow_rename": 1,
+ "autoname": "naming_series:",
+ "creation": "2013-03-07 09:04:18",
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "Master",
"fields": [
{
- "fieldname": "basic_information",
- "fieldtype": "Section Break",
- "label": "Basic Information",
- "oldfieldtype": "Section Break",
+ "fieldname": "basic_information",
+ "fieldtype": "Section Break",
+ "label": "Basic Information",
+ "oldfieldtype": "Section Break",
"permlevel": 0
- },
+ },
{
- "fieldname": "column_break0",
- "fieldtype": "Column Break",
- "permlevel": 0,
+ "fieldname": "column_break0",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
"width": "50%"
- },
+ },
{
- "fieldname": "image_view",
- "fieldtype": "Image",
- "in_list_view": 0,
- "label": "Image View",
- "options": "image",
+ "fieldname": "image_view",
+ "fieldtype": "Image",
+ "in_list_view": 0,
+ "label": "Image View",
+ "options": "image",
"permlevel": 0
- },
+ },
{
- "fieldname": "employee",
- "fieldtype": "Data",
- "hidden": 1,
- "label": "Employee",
- "no_copy": 1,
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "employee",
+ "fieldtype": "Data",
+ "hidden": 1,
+ "label": "Employee",
+ "no_copy": 1,
+ "permlevel": 0,
+ "print_hide": 1,
"report_hide": 1
- },
+ },
{
- "fieldname": "naming_series",
- "fieldtype": "Select",
- "label": "Series",
- "no_copy": 1,
- "oldfieldname": "naming_series",
- "oldfieldtype": "Select",
- "options": "EMP/",
- "permlevel": 0,
+ "fieldname": "naming_series",
+ "fieldtype": "Select",
+ "label": "Series",
+ "no_copy": 1,
+ "oldfieldname": "naming_series",
+ "oldfieldtype": "Select",
+ "options": "EMP/",
+ "permlevel": 0,
"reqd": 0
- },
+ },
{
- "fieldname": "salutation",
- "fieldtype": "Select",
- "label": "Salutation",
- "oldfieldname": "salutation",
- "oldfieldtype": "Select",
- "options": "\nMr\nMs",
- "permlevel": 0,
+ "fieldname": "salutation",
+ "fieldtype": "Select",
+ "label": "Salutation",
+ "oldfieldname": "salutation",
+ "oldfieldtype": "Select",
+ "options": "\nMr\nMs",
+ "permlevel": 0,
"search_index": 0
- },
+ },
{
- "fieldname": "employee_name",
- "fieldtype": "Data",
- "in_list_view": 1,
- "label": "Full Name",
- "oldfieldname": "employee_name",
- "oldfieldtype": "Data",
- "permlevel": 0,
+ "fieldname": "employee_name",
+ "fieldtype": "Data",
+ "in_list_view": 1,
+ "label": "Full Name",
+ "oldfieldname": "employee_name",
+ "oldfieldtype": "Data",
+ "permlevel": 0,
"reqd": 1
- },
+ },
{
- "fieldname": "image",
- "fieldtype": "Select",
- "label": "Image",
- "options": "attach_files:",
+ "fieldname": "image",
+ "fieldtype": "Select",
+ "label": "Image",
+ "options": "attach_files:",
"permlevel": 0
- },
+ },
{
- "fieldname": "column_break1",
- "fieldtype": "Column Break",
- "permlevel": 0,
+ "fieldname": "column_break1",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
"width": "50%"
- },
+ },
{
- "description": "System User (login) ID. If set, it will become default for all HR forms.",
- "fieldname": "user_id",
- "fieldtype": "Link",
- "label": "User ID",
- "options": "User",
+ "description": "System User (login) ID. If set, it will become default for all HR forms.",
+ "fieldname": "user_id",
+ "fieldtype": "Link",
+ "label": "User ID",
+ "options": "User",
"permlevel": 0
- },
+ },
{
- "fieldname": "employee_number",
- "fieldtype": "Data",
- "in_filter": 1,
- "label": "Employee Number",
- "oldfieldname": "employee_number",
- "oldfieldtype": "Data",
- "permlevel": 0,
+ "fieldname": "employee_number",
+ "fieldtype": "Data",
+ "in_filter": 1,
+ "label": "Employee Number",
+ "oldfieldname": "employee_number",
+ "oldfieldtype": "Data",
+ "permlevel": 0,
"search_index": 0
- },
+ },
{
- "fieldname": "date_of_joining",
- "fieldtype": "Date",
- "label": "Date of Joining",
- "oldfieldname": "date_of_joining",
- "oldfieldtype": "Date",
- "permlevel": 0,
+ "fieldname": "date_of_joining",
+ "fieldtype": "Date",
+ "label": "Date of Joining",
+ "oldfieldname": "date_of_joining",
+ "oldfieldtype": "Date",
+ "permlevel": 0,
"reqd": 1
- },
+ },
{
- "description": "You can enter any date manually",
- "fieldname": "date_of_birth",
- "fieldtype": "Date",
- "in_filter": 1,
- "label": "Date of Birth",
- "oldfieldname": "date_of_birth",
- "oldfieldtype": "Date",
- "permlevel": 0,
- "reqd": 1,
+ "description": "You can enter any date manually",
+ "fieldname": "date_of_birth",
+ "fieldtype": "Date",
+ "in_filter": 1,
+ "label": "Date of Birth",
+ "oldfieldname": "date_of_birth",
+ "oldfieldtype": "Date",
+ "permlevel": 0,
+ "reqd": 1,
"search_index": 0
- },
+ },
{
- "fieldname": "gender",
- "fieldtype": "Select",
- "in_filter": 1,
- "label": "Gender",
- "oldfieldname": "gender",
- "oldfieldtype": "Select",
- "options": "\nMale\nFemale",
- "permlevel": 0,
- "reqd": 1,
+ "fieldname": "gender",
+ "fieldtype": "Select",
+ "in_filter": 1,
+ "label": "Gender",
+ "oldfieldname": "gender",
+ "oldfieldtype": "Select",
+ "options": "\nMale\nFemale",
+ "permlevel": 0,
+ "reqd": 1,
"search_index": 0
- },
+ },
{
- "fieldname": "company",
- "fieldtype": "Select",
- "in_filter": 1,
- "label": "Company",
- "options": "link:Company",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "company",
+ "fieldtype": "Select",
+ "in_filter": 1,
+ "label": "Company",
+ "options": "link:Company",
+ "permlevel": 0,
+ "print_hide": 1,
"reqd": 1
- },
+ },
{
- "fieldname": "employment_details",
- "fieldtype": "Section Break",
- "label": "Employment Details",
+ "fieldname": "employment_details",
+ "fieldtype": "Section Break",
+ "label": "Employment Details",
"permlevel": 0
- },
+ },
{
- "fieldname": "col_break_21",
- "fieldtype": "Column Break",
+ "fieldname": "col_break_21",
+ "fieldtype": "Column Break",
"permlevel": 0
- },
+ },
{
- "default": "Active",
- "fieldname": "status",
- "fieldtype": "Select",
- "in_filter": 1,
- "in_list_view": 1,
- "label": "Status",
- "oldfieldname": "status",
- "oldfieldtype": "Select",
- "options": "\nActive\nLeft",
- "permlevel": 0,
- "reqd": 1,
+ "default": "Active",
+ "fieldname": "status",
+ "fieldtype": "Select",
+ "in_filter": 1,
+ "in_list_view": 1,
+ "label": "Status",
+ "oldfieldname": "status",
+ "oldfieldtype": "Select",
+ "options": "\nActive\nLeft",
+ "permlevel": 0,
+ "reqd": 1,
"search_index": 1
- },
+ },
{
- "fieldname": "employment_type",
- "fieldtype": "Link",
- "in_filter": 1,
- "in_list_view": 1,
- "label": "Employment Type",
- "oldfieldname": "employment_type",
- "oldfieldtype": "Link",
- "options": "Employment Type",
- "permlevel": 0,
+ "fieldname": "employment_type",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "in_list_view": 1,
+ "label": "Employment Type",
+ "oldfieldname": "employment_type",
+ "oldfieldtype": "Link",
+ "options": "Employment Type",
+ "permlevel": 0,
"search_index": 0
- },
+ },
{
- "description": "Applicable Holiday List",
- "fieldname": "holiday_list",
- "fieldtype": "Link",
- "label": "Holiday List",
- "oldfieldname": "holiday_list",
- "oldfieldtype": "Link",
- "options": "Holiday List",
+ "description": "Applicable Holiday List",
+ "fieldname": "holiday_list",
+ "fieldtype": "Link",
+ "label": "Holiday List",
+ "oldfieldname": "holiday_list",
+ "oldfieldtype": "Link",
+ "options": "Holiday List",
"permlevel": 0
- },
+ },
{
- "fieldname": "col_break_22",
- "fieldtype": "Column Break",
+ "fieldname": "col_break_22",
+ "fieldtype": "Column Break",
"permlevel": 0
- },
+ },
{
- "fieldname": "scheduled_confirmation_date",
- "fieldtype": "Date",
- "in_filter": 1,
- "label": "Offer Date",
- "oldfieldname": "scheduled_confirmation_date",
- "oldfieldtype": "Date",
- "permlevel": 0,
+ "fieldname": "scheduled_confirmation_date",
+ "fieldtype": "Date",
+ "in_filter": 1,
+ "label": "Offer Date",
+ "oldfieldname": "scheduled_confirmation_date",
+ "oldfieldtype": "Date",
+ "permlevel": 0,
"search_index": 0
- },
+ },
{
- "fieldname": "final_confirmation_date",
- "fieldtype": "Date",
- "label": "Confirmation Date",
- "oldfieldname": "final_confirmation_date",
- "oldfieldtype": "Date",
- "permlevel": 0,
+ "fieldname": "final_confirmation_date",
+ "fieldtype": "Date",
+ "label": "Confirmation Date",
+ "oldfieldname": "final_confirmation_date",
+ "oldfieldtype": "Date",
+ "permlevel": 0,
"search_index": 0
- },
+ },
{
- "fieldname": "contract_end_date",
- "fieldtype": "Date",
- "in_filter": 1,
- "label": "Contract End Date",
- "oldfieldname": "contract_end_date",
- "oldfieldtype": "Date",
- "permlevel": 0,
+ "fieldname": "contract_end_date",
+ "fieldtype": "Date",
+ "in_filter": 1,
+ "label": "Contract End Date",
+ "oldfieldname": "contract_end_date",
+ "oldfieldtype": "Date",
+ "permlevel": 0,
"search_index": 0
- },
+ },
{
- "fieldname": "date_of_retirement",
- "fieldtype": "Date",
- "label": "Date Of Retirement",
- "oldfieldname": "date_of_retirement",
- "oldfieldtype": "Date",
+ "fieldname": "date_of_retirement",
+ "fieldtype": "Date",
+ "label": "Date Of Retirement",
+ "oldfieldname": "date_of_retirement",
+ "oldfieldtype": "Date",
"permlevel": 0
- },
+ },
{
- "fieldname": "job_profile",
- "fieldtype": "Section Break",
- "label": "Job Profile",
+ "fieldname": "job_profile",
+ "fieldtype": "Section Break",
+ "label": "Job Profile",
"permlevel": 0
- },
+ },
{
- "fieldname": "column_break2",
- "fieldtype": "Column Break",
- "permlevel": 0,
+ "fieldname": "column_break2",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
"width": "50%"
- },
+ },
{
- "fieldname": "branch",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Branch",
- "oldfieldname": "branch",
- "oldfieldtype": "Link",
- "options": "Branch",
- "permlevel": 0,
+ "fieldname": "branch",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "label": "Branch",
+ "oldfieldname": "branch",
+ "oldfieldtype": "Link",
+ "options": "Branch",
+ "permlevel": 0,
"reqd": 0
- },
+ },
{
- "fieldname": "department",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Department",
- "oldfieldname": "department",
- "oldfieldtype": "Link",
- "options": "Department",
- "permlevel": 0,
+ "fieldname": "department",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "label": "Department",
+ "oldfieldname": "department",
+ "oldfieldtype": "Link",
+ "options": "Department",
+ "permlevel": 0,
"reqd": 0
- },
+ },
{
- "fieldname": "designation",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Designation",
- "oldfieldname": "designation",
- "oldfieldtype": "Link",
- "options": "Designation",
- "permlevel": 0,
- "reqd": 0,
+ "fieldname": "designation",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "label": "Designation",
+ "oldfieldname": "designation",
+ "oldfieldtype": "Link",
+ "options": "Designation",
+ "permlevel": 0,
+ "reqd": 0,
"search_index": 1
- },
+ },
{
- "fieldname": "grade",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Grade",
- "oldfieldname": "grade",
- "oldfieldtype": "Link",
- "options": "Grade",
- "permlevel": 0,
+ "description": "Provide email id registered in company",
+ "fieldname": "company_email",
+ "fieldtype": "Data",
+ "in_filter": 1,
+ "label": "Company Email",
+ "oldfieldname": "company_email",
+ "oldfieldtype": "Data",
+ "permlevel": 0,
"reqd": 0
- },
+ },
{
- "description": "Provide email id registered in company",
- "fieldname": "company_email",
- "fieldtype": "Data",
- "in_filter": 1,
- "label": "Company Email",
- "oldfieldname": "company_email",
- "oldfieldtype": "Data",
- "permlevel": 0,
- "reqd": 0
- },
- {
- "fieldname": "notice_number_of_days",
- "fieldtype": "Int",
- "label": "Notice (days)",
- "oldfieldname": "notice_number_of_days",
- "oldfieldtype": "Int",
+ "fieldname": "notice_number_of_days",
+ "fieldtype": "Int",
+ "label": "Notice (days)",
+ "oldfieldname": "notice_number_of_days",
+ "oldfieldtype": "Int",
"permlevel": 0
- },
+ },
{
- "fieldname": "salary_information",
- "fieldtype": "Column Break",
- "label": "Salary Information",
- "oldfieldtype": "Section Break",
- "permlevel": 0,
+ "fieldname": "salary_information",
+ "fieldtype": "Column Break",
+ "label": "Salary Information",
+ "oldfieldtype": "Section Break",
+ "permlevel": 0,
"width": "50%"
- },
+ },
{
- "fieldname": "salary_mode",
- "fieldtype": "Select",
- "label": "Salary Mode",
- "oldfieldname": "salary_mode",
- "oldfieldtype": "Select",
- "options": "\nBank\nCash\nCheque",
+ "fieldname": "salary_mode",
+ "fieldtype": "Select",
+ "label": "Salary Mode",
+ "oldfieldname": "salary_mode",
+ "oldfieldtype": "Select",
+ "options": "\nBank\nCash\nCheque",
"permlevel": 0
- },
+ },
{
- "depends_on": "eval:doc.salary_mode == 'Bank'",
- "fieldname": "bank_name",
- "fieldtype": "Data",
- "hidden": 0,
- "in_filter": 1,
- "label": "Bank Name",
- "oldfieldname": "bank_name",
- "oldfieldtype": "Link",
- "options": "Suggest",
+ "depends_on": "eval:doc.salary_mode == 'Bank'",
+ "fieldname": "bank_name",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "in_filter": 1,
+ "label": "Bank Name",
+ "oldfieldname": "bank_name",
+ "oldfieldtype": "Link",
+ "options": "Suggest",
"permlevel": 0
- },
+ },
{
- "depends_on": "eval:doc.salary_mode == 'Bank'",
- "fieldname": "bank_ac_no",
- "fieldtype": "Data",
- "hidden": 0,
- "label": "Bank A/C No.",
- "oldfieldname": "bank_ac_no",
- "oldfieldtype": "Data",
+ "depends_on": "eval:doc.salary_mode == 'Bank'",
+ "fieldname": "bank_ac_no",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "label": "Bank A/C No.",
+ "oldfieldname": "bank_ac_no",
+ "oldfieldtype": "Data",
"permlevel": 0
- },
+ },
{
- "fieldname": "esic_card_no",
- "fieldtype": "Data",
- "label": "ESIC CARD No",
- "oldfieldname": "esic_card_no",
- "oldfieldtype": "Data",
+ "fieldname": "esic_card_no",
+ "fieldtype": "Data",
+ "label": "ESIC CARD No",
+ "oldfieldname": "esic_card_no",
+ "oldfieldtype": "Data",
"permlevel": 0
- },
+ },
{
- "fieldname": "pf_number",
- "fieldtype": "Data",
- "label": "PF Number",
- "oldfieldname": "pf_number",
- "oldfieldtype": "Data",
+ "fieldname": "pf_number",
+ "fieldtype": "Data",
+ "label": "PF Number",
+ "oldfieldname": "pf_number",
+ "oldfieldtype": "Data",
"permlevel": 0
- },
+ },
{
- "fieldname": "gratuity_lic_id",
- "fieldtype": "Data",
- "label": "Gratuity LIC ID",
- "oldfieldname": "gratuity_lic_id",
- "oldfieldtype": "Data",
+ "fieldname": "gratuity_lic_id",
+ "fieldtype": "Data",
+ "label": "Gratuity LIC ID",
+ "oldfieldname": "gratuity_lic_id",
+ "oldfieldtype": "Data",
"permlevel": 0
- },
+ },
{
- "fieldname": "organization_profile",
- "fieldtype": "Section Break",
- "label": "Organization Profile",
+ "fieldname": "organization_profile",
+ "fieldtype": "Section Break",
+ "label": "Organization Profile",
"permlevel": 0
- },
+ },
{
- "fieldname": "reports_to",
- "fieldtype": "Link",
- "ignore_restrictions": 1,
- "label": "Reports to",
- "oldfieldname": "reports_to",
- "oldfieldtype": "Link",
- "options": "Employee",
+ "fieldname": "reports_to",
+ "fieldtype": "Link",
+ "ignore_restrictions": 1,
+ "label": "Reports to",
+ "oldfieldname": "reports_to",
+ "oldfieldtype": "Link",
+ "options": "Employee",
"permlevel": 0
- },
+ },
{
- "description": "The first Leave Approver in the list will be set as the default Leave Approver",
- "fieldname": "employee_leave_approvers",
- "fieldtype": "Table",
- "label": "Leave Approvers",
- "options": "Employee Leave Approver",
+ "description": "The first Leave Approver in the list will be set as the default Leave Approver",
+ "fieldname": "employee_leave_approvers",
+ "fieldtype": "Table",
+ "label": "Leave Approvers",
+ "options": "Employee Leave Approver",
"permlevel": 0
- },
+ },
{
- "fieldname": "contact_details",
- "fieldtype": "Section Break",
- "label": "Contact Details",
+ "fieldname": "contact_details",
+ "fieldtype": "Section Break",
+ "label": "Contact Details",
"permlevel": 0
- },
+ },
{
- "fieldname": "column_break3",
- "fieldtype": "Column Break",
- "permlevel": 0,
+ "fieldname": "column_break3",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
"width": "50%"
- },
+ },
{
- "fieldname": "cell_number",
- "fieldtype": "Data",
- "label": "Cell Number",
+ "fieldname": "cell_number",
+ "fieldtype": "Data",
+ "label": "Cell Number",
"permlevel": 0
- },
+ },
{
- "fieldname": "personal_email",
- "fieldtype": "Data",
- "label": "Personal Email",
+ "fieldname": "personal_email",
+ "fieldtype": "Data",
+ "label": "Personal Email",
"permlevel": 0
- },
+ },
{
- "fieldname": "unsubscribed",
- "fieldtype": "Check",
- "label": "Unsubscribed",
+ "fieldname": "unsubscribed",
+ "fieldtype": "Check",
+ "label": "Unsubscribed",
"permlevel": 0
- },
+ },
{
- "fieldname": "emergency_contact_details",
- "fieldtype": "HTML",
- "label": "Emergency Contact Details",
- "options": "<h4 class=\"text-muted\">Emergency Contact Details</h4>",
+ "fieldname": "emergency_contact_details",
+ "fieldtype": "HTML",
+ "label": "Emergency Contact Details",
+ "options": "<h4 class=\"text-muted\">Emergency Contact Details</h4>",
"permlevel": 0
- },
+ },
{
- "fieldname": "person_to_be_contacted",
- "fieldtype": "Data",
- "label": "Emergency Contact",
+ "fieldname": "person_to_be_contacted",
+ "fieldtype": "Data",
+ "label": "Emergency Contact",
"permlevel": 0
- },
+ },
{
- "fieldname": "relation",
- "fieldtype": "Data",
- "label": "Relation",
+ "fieldname": "relation",
+ "fieldtype": "Data",
+ "label": "Relation",
"permlevel": 0
- },
+ },
{
- "fieldname": "emergency_phone_number",
- "fieldtype": "Data",
- "label": "Emergency Phone",
+ "fieldname": "emergency_phone_number",
+ "fieldtype": "Data",
+ "label": "Emergency Phone",
"permlevel": 0
- },
+ },
{
- "fieldname": "column_break4",
- "fieldtype": "Column Break",
- "permlevel": 0,
+ "fieldname": "column_break4",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
"width": "50%"
- },
+ },
{
- "fieldname": "permanent_accommodation_type",
- "fieldtype": "Select",
- "label": "Permanent Address Is",
- "options": "\nRented\nOwned",
+ "fieldname": "permanent_accommodation_type",
+ "fieldtype": "Select",
+ "label": "Permanent Address Is",
+ "options": "\nRented\nOwned",
"permlevel": 0
- },
+ },
{
- "fieldname": "permanent_address",
- "fieldtype": "Small Text",
- "label": "Permanent Address",
+ "fieldname": "permanent_address",
+ "fieldtype": "Small Text",
+ "label": "Permanent Address",
"permlevel": 0
- },
+ },
{
- "fieldname": "current_accommodation_type",
- "fieldtype": "Select",
- "label": "Current Address Is",
- "options": "\nRented\nOwned",
+ "fieldname": "current_accommodation_type",
+ "fieldtype": "Select",
+ "label": "Current Address Is",
+ "options": "\nRented\nOwned",
"permlevel": 0
- },
+ },
{
- "fieldname": "current_address",
- "fieldtype": "Small Text",
- "label": "Current Address",
+ "fieldname": "current_address",
+ "fieldtype": "Small Text",
+ "label": "Current Address",
"permlevel": 0
- },
+ },
{
- "fieldname": "sb53",
- "fieldtype": "Section Break",
- "label": "Bio",
+ "fieldname": "sb53",
+ "fieldtype": "Section Break",
+ "label": "Bio",
"permlevel": 0
- },
+ },
{
- "description": "Short biography for website and other publications.",
- "fieldname": "bio",
- "fieldtype": "Text Editor",
- "label": "Bio",
+ "description": "Short biography for website and other publications.",
+ "fieldname": "bio",
+ "fieldtype": "Text Editor",
+ "label": "Bio",
"permlevel": 0
- },
+ },
{
- "fieldname": "personal_details",
- "fieldtype": "Section Break",
- "label": "Personal Details",
+ "fieldname": "personal_details",
+ "fieldtype": "Section Break",
+ "label": "Personal Details",
"permlevel": 0
- },
+ },
{
- "fieldname": "column_break5",
- "fieldtype": "Column Break",
- "permlevel": 0,
+ "fieldname": "column_break5",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
"width": "50%"
- },
+ },
{
- "fieldname": "pan_number",
- "fieldtype": "Data",
- "label": "PAN Number",
+ "fieldname": "pan_number",
+ "fieldtype": "Data",
+ "label": "PAN Number",
"permlevel": 0
- },
+ },
{
- "fieldname": "passport_number",
- "fieldtype": "Data",
- "label": "Passport Number",
+ "fieldname": "passport_number",
+ "fieldtype": "Data",
+ "label": "Passport Number",
"permlevel": 0
- },
+ },
{
- "fieldname": "date_of_issue",
- "fieldtype": "Date",
- "label": "Date of Issue",
+ "fieldname": "date_of_issue",
+ "fieldtype": "Date",
+ "label": "Date of Issue",
"permlevel": 0
- },
+ },
{
- "fieldname": "valid_upto",
- "fieldtype": "Date",
- "label": "Valid Upto",
+ "fieldname": "valid_upto",
+ "fieldtype": "Date",
+ "label": "Valid Upto",
"permlevel": 0
- },
+ },
{
- "fieldname": "place_of_issue",
- "fieldtype": "Data",
- "label": "Place of Issue",
+ "fieldname": "place_of_issue",
+ "fieldtype": "Data",
+ "label": "Place of Issue",
"permlevel": 0
- },
+ },
{
- "fieldname": "column_break6",
- "fieldtype": "Column Break",
- "permlevel": 0,
+ "fieldname": "column_break6",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
"width": "50%"
- },
+ },
{
- "fieldname": "marital_status",
- "fieldtype": "Select",
- "label": "Marital Status",
- "options": "\nSingle\nMarried\nDivorced\nWidowed",
+ "fieldname": "marital_status",
+ "fieldtype": "Select",
+ "label": "Marital Status",
+ "options": "\nSingle\nMarried\nDivorced\nWidowed",
"permlevel": 0
- },
+ },
{
- "fieldname": "blood_group",
- "fieldtype": "Select",
- "label": "Blood Group",
- "options": "\nA+\nA-\nB+\nB-\nAB+\nAB-\nO+\nO-",
+ "fieldname": "blood_group",
+ "fieldtype": "Select",
+ "label": "Blood Group",
+ "options": "\nA+\nA-\nB+\nB-\nAB+\nAB-\nO+\nO-",
"permlevel": 0
- },
+ },
{
- "description": "Here you can maintain family details like name and occupation of parent, spouse and children",
- "fieldname": "family_background",
- "fieldtype": "Small Text",
- "label": "Family Background",
+ "description": "Here you can maintain family details like name and occupation of parent, spouse and children",
+ "fieldname": "family_background",
+ "fieldtype": "Small Text",
+ "label": "Family Background",
"permlevel": 0
- },
+ },
{
- "description": "Here you can maintain height, weight, allergies, medical concerns etc",
- "fieldname": "health_details",
- "fieldtype": "Small Text",
- "label": "Health Details",
+ "description": "Here you can maintain height, weight, allergies, medical concerns etc",
+ "fieldname": "health_details",
+ "fieldtype": "Small Text",
+ "label": "Health Details",
"permlevel": 0
- },
+ },
{
- "fieldname": "educational_qualification",
- "fieldtype": "Section Break",
- "label": "Educational Qualification",
+ "fieldname": "educational_qualification",
+ "fieldtype": "Section Break",
+ "label": "Educational Qualification",
"permlevel": 0
- },
+ },
{
- "fieldname": "educational_qualification_details",
- "fieldtype": "Table",
- "label": "Educational Qualification Details",
- "options": "Employee Education",
+ "fieldname": "educational_qualification_details",
+ "fieldtype": "Table",
+ "label": "Educational Qualification Details",
+ "options": "Employee Education",
"permlevel": 0
- },
+ },
{
- "fieldname": "previous_work_experience",
- "fieldtype": "Section Break",
- "label": "Previous Work Experience",
- "options": "Simple",
+ "fieldname": "previous_work_experience",
+ "fieldtype": "Section Break",
+ "label": "Previous Work Experience",
+ "options": "Simple",
"permlevel": 0
- },
+ },
{
- "fieldname": "previous_experience_details",
- "fieldtype": "Table",
- "label": "Employee External Work History",
- "options": "Employee External Work History",
+ "fieldname": "previous_experience_details",
+ "fieldtype": "Table",
+ "label": "Employee External Work History",
+ "options": "Employee External Work History",
"permlevel": 0
- },
+ },
{
- "fieldname": "history_in_company",
- "fieldtype": "Section Break",
- "label": "History In Company",
- "options": "Simple",
+ "fieldname": "history_in_company",
+ "fieldtype": "Section Break",
+ "label": "History In Company",
+ "options": "Simple",
"permlevel": 0
- },
+ },
{
- "fieldname": "experience_in_company_details",
- "fieldtype": "Table",
- "label": "Employee Internal Work Historys",
- "options": "Employee Internal Work History",
+ "fieldname": "experience_in_company_details",
+ "fieldtype": "Table",
+ "label": "Employee Internal Work Historys",
+ "options": "Employee Internal Work History",
"permlevel": 0
- },
+ },
{
- "fieldname": "exit",
- "fieldtype": "Section Break",
- "label": "Exit",
- "oldfieldtype": "Section Break",
+ "fieldname": "exit",
+ "fieldtype": "Section Break",
+ "label": "Exit",
+ "oldfieldtype": "Section Break",
"permlevel": 0
- },
+ },
{
- "fieldname": "column_break7",
- "fieldtype": "Column Break",
- "permlevel": 0,
+ "fieldname": "column_break7",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
"width": "50%"
- },
+ },
{
- "fieldname": "resignation_letter_date",
- "fieldtype": "Date",
- "label": "Resignation Letter Date",
- "oldfieldname": "resignation_letter_date",
- "oldfieldtype": "Date",
+ "fieldname": "resignation_letter_date",
+ "fieldtype": "Date",
+ "label": "Resignation Letter Date",
+ "oldfieldname": "resignation_letter_date",
+ "oldfieldtype": "Date",
"permlevel": 0
- },
+ },
{
- "fieldname": "relieving_date",
- "fieldtype": "Date",
- "in_filter": 1,
- "label": "Relieving Date",
- "oldfieldname": "relieving_date",
- "oldfieldtype": "Date",
+ "fieldname": "relieving_date",
+ "fieldtype": "Date",
+ "in_filter": 1,
+ "label": "Relieving Date",
+ "oldfieldname": "relieving_date",
+ "oldfieldtype": "Date",
"permlevel": 0
- },
+ },
{
- "fieldname": "reason_for_leaving",
- "fieldtype": "Data",
- "label": "Reason for Leaving",
- "oldfieldname": "reason_for_leaving",
- "oldfieldtype": "Data",
+ "fieldname": "reason_for_leaving",
+ "fieldtype": "Data",
+ "label": "Reason for Leaving",
+ "oldfieldname": "reason_for_leaving",
+ "oldfieldtype": "Data",
"permlevel": 0
- },
+ },
{
- "fieldname": "leave_encashed",
- "fieldtype": "Select",
- "label": "Leave Encashed?",
- "oldfieldname": "leave_encashed",
- "oldfieldtype": "Select",
- "options": "\nYes\nNo",
+ "fieldname": "leave_encashed",
+ "fieldtype": "Select",
+ "label": "Leave Encashed?",
+ "oldfieldname": "leave_encashed",
+ "oldfieldtype": "Select",
+ "options": "\nYes\nNo",
"permlevel": 0
- },
+ },
{
- "fieldname": "encashment_date",
- "fieldtype": "Date",
- "label": "Encashment Date",
- "oldfieldname": "encashment_date",
- "oldfieldtype": "Date",
+ "fieldname": "encashment_date",
+ "fieldtype": "Date",
+ "label": "Encashment Date",
+ "oldfieldname": "encashment_date",
+ "oldfieldtype": "Date",
"permlevel": 0
- },
+ },
{
- "fieldname": "exit_interview_details",
- "fieldtype": "Column Break",
- "label": "Exit Interview Details",
- "oldfieldname": "col_brk6",
- "oldfieldtype": "Column Break",
- "permlevel": 0,
+ "fieldname": "exit_interview_details",
+ "fieldtype": "Column Break",
+ "label": "Exit Interview Details",
+ "oldfieldname": "col_brk6",
+ "oldfieldtype": "Column Break",
+ "permlevel": 0,
"width": "50%"
- },
+ },
{
- "fieldname": "held_on",
- "fieldtype": "Date",
- "label": "Held On",
- "oldfieldname": "held_on",
- "oldfieldtype": "Date",
+ "fieldname": "held_on",
+ "fieldtype": "Date",
+ "label": "Held On",
+ "oldfieldname": "held_on",
+ "oldfieldtype": "Date",
"permlevel": 0
- },
+ },
{
- "fieldname": "reason_for_resignation",
- "fieldtype": "Select",
- "label": "Reason for Resignation",
- "oldfieldname": "reason_for_resignation",
- "oldfieldtype": "Select",
- "options": "\nBetter Prospects\nHealth Concerns",
+ "fieldname": "reason_for_resignation",
+ "fieldtype": "Select",
+ "label": "Reason for Resignation",
+ "oldfieldname": "reason_for_resignation",
+ "oldfieldtype": "Select",
+ "options": "\nBetter Prospects\nHealth Concerns",
"permlevel": 0
- },
+ },
{
- "fieldname": "new_workplace",
- "fieldtype": "Data",
- "label": "New Workplace",
- "oldfieldname": "new_workplace",
- "oldfieldtype": "Data",
+ "fieldname": "new_workplace",
+ "fieldtype": "Data",
+ "label": "New Workplace",
+ "oldfieldname": "new_workplace",
+ "oldfieldtype": "Data",
"permlevel": 0
- },
+ },
{
- "fieldname": "feedback",
- "fieldtype": "Small Text",
- "label": "Feedback",
- "oldfieldname": "feedback",
- "oldfieldtype": "Text",
+ "fieldname": "feedback",
+ "fieldtype": "Small Text",
+ "label": "Feedback",
+ "oldfieldname": "feedback",
+ "oldfieldtype": "Text",
"permlevel": 0
- },
+ },
{
- "fieldname": "trash_reason",
- "fieldtype": "Small Text",
- "label": "Trash Reason",
- "oldfieldname": "trash_reason",
- "oldfieldtype": "Small Text",
- "permlevel": 0,
+ "fieldname": "trash_reason",
+ "fieldtype": "Small Text",
+ "label": "Trash Reason",
+ "oldfieldname": "trash_reason",
+ "oldfieldtype": "Small Text",
+ "permlevel": 0,
"read_only": 1
}
- ],
- "icon": "icon-user",
- "idx": 1,
- "modified": "2014-04-30 09:01:10.879762",
- "modified_by": "Administrator",
- "module": "HR",
- "name": "Employee",
- "owner": "Administrator",
+ ],
+ "icon": "icon-user",
+ "idx": 1,
+ "modified": "2014-04-30 09:03:10.879762",
+ "modified_by": "Administrator",
+ "module": "HR",
+ "name": "Employee",
+ "owner": "Administrator",
"permissions": [
{
- "amend": 0,
- "cancel": 0,
- "create": 0,
- "delete": 0,
- "email": 1,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Employee",
- "submit": 0,
+ "amend": 0,
+ "cancel": 0,
+ "create": 0,
+ "delete": 0,
+ "email": 1,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Employee",
+ "submit": 0,
"write": 0
- },
+ },
{
- "amend": 0,
- "cancel": 0,
- "create": 1,
- "delete": 1,
- "email": 1,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "restrict": 0,
- "role": "HR User",
- "submit": 0,
+ "amend": 0,
+ "cancel": 0,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "restrict": 0,
+ "role": "HR User",
+ "submit": 0,
"write": 1
- },
+ },
{
- "amend": 0,
- "cancel": 0,
- "create": 1,
- "delete": 1,
- "email": 1,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "restrict": 1,
- "role": "HR Manager",
- "submit": 0,
+ "amend": 0,
+ "cancel": 0,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "restrict": 1,
+ "role": "HR Manager",
+ "submit": 0,
"write": 1
- },
+ },
{
- "permlevel": 0,
- "read": 1,
- "restricted": 1,
+ "permlevel": 0,
+ "read": 1,
+ "restricted": 1,
"role": "Leave Approver"
}
- ],
+ ],
"search_fields": "employee_name"
-}
\ No newline at end of file
+}
diff --git a/erpnext/hr/doctype/employee_internal_work_history/employee_internal_work_history.json b/erpnext/hr/doctype/employee_internal_work_history/employee_internal_work_history.json
index d358990..935f289 100644
--- a/erpnext/hr/doctype/employee_internal_work_history/employee_internal_work_history.json
+++ b/erpnext/hr/doctype/employee_internal_work_history/employee_internal_work_history.json
@@ -1,72 +1,62 @@
{
- "creation": "2013-02-22 01:27:45.000000",
- "docstatus": 0,
- "doctype": "DocType",
+ "creation": "2013-02-22 01:27:45.000000",
+ "docstatus": 0,
+ "doctype": "DocType",
"fields": [
{
- "fieldname": "branch",
- "fieldtype": "Select",
- "in_list_view": 1,
- "label": "Branch",
- "oldfieldname": "branch",
- "oldfieldtype": "Select",
- "options": "link:Branch",
+ "fieldname": "branch",
+ "fieldtype": "Select",
+ "in_list_view": 1,
+ "label": "Branch",
+ "oldfieldname": "branch",
+ "oldfieldtype": "Select",
+ "options": "link:Branch",
"permlevel": 0
- },
+ },
{
- "fieldname": "department",
- "fieldtype": "Select",
- "in_list_view": 1,
- "label": "Department",
- "oldfieldname": "department",
- "oldfieldtype": "Select",
- "options": "link:Department",
+ "fieldname": "department",
+ "fieldtype": "Select",
+ "in_list_view": 1,
+ "label": "Department",
+ "oldfieldname": "department",
+ "oldfieldtype": "Select",
+ "options": "link:Department",
"permlevel": 0
- },
+ },
{
- "fieldname": "designation",
- "fieldtype": "Select",
- "in_list_view": 1,
- "label": "Designation",
- "oldfieldname": "designation",
- "oldfieldtype": "Select",
- "options": "link:Designation",
+ "fieldname": "designation",
+ "fieldtype": "Select",
+ "in_list_view": 1,
+ "label": "Designation",
+ "oldfieldname": "designation",
+ "oldfieldtype": "Select",
+ "options": "link:Designation",
"permlevel": 0
- },
+ },
{
- "fieldname": "grade",
- "fieldtype": "Select",
- "in_list_view": 1,
- "label": "Grade",
- "oldfieldname": "grade",
- "oldfieldtype": "Select",
- "options": "link:Grade",
+ "fieldname": "from_date",
+ "fieldtype": "Date",
+ "in_list_view": 1,
+ "label": "From Date",
+ "oldfieldname": "from_date",
+ "oldfieldtype": "Date",
"permlevel": 0
- },
+ },
{
- "fieldname": "from_date",
- "fieldtype": "Date",
- "in_list_view": 1,
- "label": "From Date",
- "oldfieldname": "from_date",
- "oldfieldtype": "Date",
- "permlevel": 0
- },
- {
- "fieldname": "to_date",
- "fieldtype": "Date",
- "in_list_view": 1,
- "label": "To Date",
- "oldfieldname": "to_date",
- "oldfieldtype": "Date",
+ "fieldname": "to_date",
+ "fieldtype": "Date",
+ "in_list_view": 1,
+ "label": "To Date",
+ "oldfieldname": "to_date",
+ "oldfieldtype": "Date",
"permlevel": 0
}
- ],
- "idx": 1,
- "istable": 1,
- "modified": "2013-12-20 19:23:12.000000",
- "modified_by": "Administrator",
- "module": "HR",
- "name": "Employee Internal Work History",
+ ],
+ "idx": 1,
+ "istable": 1,
+ "modified": "2013-12-20 19:24:12.000000",
+ "modified_by": "Administrator",
+ "module": "HR",
+ "name": "Employee Internal Work History",
"owner": "Administrator"
-}
\ No newline at end of file
+}
diff --git a/erpnext/hr/doctype/employment_type/employment_type.json b/erpnext/hr/doctype/employment_type/employment_type.json
index 4fa41fe..1aa43bf 100644
--- a/erpnext/hr/doctype/employment_type/employment_type.json
+++ b/erpnext/hr/doctype/employment_type/employment_type.json
@@ -1,63 +1,54 @@
{
- "allow_import": 1,
- "autoname": "field:employee_type_name",
- "creation": "2013-01-10 16:34:14.000000",
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "Master",
+ "allow_import": 1,
+ "autoname": "field:employee_type_name",
+ "creation": "2013-01-10 16:34:14.000000",
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "Master",
"fields": [
{
- "fieldname": "employee_type_name",
- "fieldtype": "Data",
- "label": "Employment Type",
- "oldfieldname": "employee_type_name",
- "oldfieldtype": "Data",
- "permlevel": 0,
+ "fieldname": "employee_type_name",
+ "fieldtype": "Data",
+ "label": "Employment Type",
+ "oldfieldname": "employee_type_name",
+ "oldfieldtype": "Data",
+ "permlevel": 0,
"reqd": 1
- },
- {
- "fieldname": "trash_reason",
- "fieldtype": "Small Text",
- "label": "Trash Reason",
- "oldfieldname": "trash_reason",
- "oldfieldtype": "Small Text",
- "permlevel": 0,
- "read_only": 1
}
- ],
- "icon": "icon-flag",
- "idx": 1,
- "modified": "2014-01-20 17:48:43.000000",
- "modified_by": "Administrator",
- "module": "HR",
- "name": "Employment Type",
- "owner": "Administrator",
+ ],
+ "icon": "icon-flag",
+ "idx": 1,
+ "modified": "2014-01-20 17:48:43.000000",
+ "modified_by": "Administrator",
+ "module": "HR",
+ "name": "Employment Type",
+ "owner": "Administrator",
"permissions": [
{
- "cancel": 0,
- "create": 1,
- "delete": 1,
- "email": 1,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "HR User",
- "submit": 0,
+ "cancel": 0,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "HR User",
+ "submit": 0,
"write": 1
- },
+ },
{
- "cancel": 0,
- "create": 1,
- "delete": 1,
- "email": 1,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "HR Manager",
- "submit": 0,
+ "cancel": 0,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "HR Manager",
+ "submit": 0,
"write": 1
}
]
-}
\ No newline at end of file
+}
diff --git a/erpnext/hr/doctype/grade/README.md b/erpnext/hr/doctype/grade/README.md
deleted file mode 100644
index fedc03b..0000000
--- a/erpnext/hr/doctype/grade/README.md
+++ /dev/null
@@ -1 +0,0 @@
-Employee grade.
\ No newline at end of file
diff --git a/erpnext/hr/doctype/grade/__init__.py b/erpnext/hr/doctype/grade/__init__.py
deleted file mode 100644
index baffc48..0000000
--- a/erpnext/hr/doctype/grade/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from __future__ import unicode_literals
diff --git a/erpnext/hr/doctype/grade/grade.json b/erpnext/hr/doctype/grade/grade.json
deleted file mode 100644
index 24de355..0000000
--- a/erpnext/hr/doctype/grade/grade.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
- "allow_import": 1,
- "autoname": "field:grade_name",
- "creation": "2013-01-10 16:34:14.000000",
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "Master",
- "fields": [
- {
- "fieldname": "grade_name",
- "fieldtype": "Data",
- "label": "Grade",
- "oldfieldname": "grade_name",
- "oldfieldtype": "Data",
- "permlevel": 0,
- "reqd": 1
- }
- ],
- "icon": "icon-star-half-empty",
- "idx": 1,
- "modified": "2014-01-20 17:48:46.000000",
- "modified_by": "Administrator",
- "module": "HR",
- "name": "Grade",
- "owner": "Administrator",
- "permissions": [
- {
- "cancel": 0,
- "create": 1,
- "delete": 1,
- "email": 1,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "HR User",
- "submit": 0,
- "write": 1
- }
- ]
-}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/grade/grade.py b/erpnext/hr/doctype/grade/grade.py
deleted file mode 100644
index 04e3e97..0000000
--- a/erpnext/hr/doctype/grade/grade.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-
-from frappe.model.document import Document
-
-class Grade(Document):
- pass
\ No newline at end of file
diff --git a/erpnext/hr/doctype/grade/test_grade.py b/erpnext/hr/doctype/grade/test_grade.py
deleted file mode 100644
index fabab8d..0000000
--- a/erpnext/hr/doctype/grade/test_grade.py
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-
-import frappe
-test_records = frappe.get_test_records('Grade')
\ No newline at end of file
diff --git a/erpnext/hr/doctype/grade/test_records.json b/erpnext/hr/doctype/grade/test_records.json
deleted file mode 100644
index 0637a08..0000000
--- a/erpnext/hr/doctype/grade/test_records.json
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/erpnext/hr/doctype/leave_control_panel/leave_control_panel.json b/erpnext/hr/doctype/leave_control_panel/leave_control_panel.json
index 65fa38d..427ce6d 100644
--- a/erpnext/hr/doctype/leave_control_panel/leave_control_panel.json
+++ b/erpnext/hr/doctype/leave_control_panel/leave_control_panel.json
@@ -1,122 +1,114 @@
{
- "allow_copy": 1,
- "allow_email": 1,
- "allow_print": 1,
- "creation": "2013-01-10 16:34:15.000000",
- "docstatus": 0,
- "doctype": "DocType",
+ "allow_copy": 1,
+ "allow_email": 1,
+ "allow_print": 1,
+ "creation": "2013-01-10 16:34:15.000000",
+ "docstatus": 0,
+ "doctype": "DocType",
"fields": [
{
- "fieldname": "column_break0",
- "fieldtype": "Column Break",
- "permlevel": 0,
+ "fieldname": "column_break0",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
"width": "50%"
- },
+ },
{
- "description": "Leave blank if considered for all employee types",
- "fieldname": "employee_type",
- "fieldtype": "Select",
- "label": "Employee Type",
- "options": "link:Employment Type",
+ "description": "Leave blank if considered for all employee types",
+ "fieldname": "employee_type",
+ "fieldtype": "Select",
+ "label": "Employee Type",
+ "options": "link:Employment Type",
"permlevel": 0
- },
+ },
{
- "description": "Leave blank if considered for all branches",
- "fieldname": "branch",
- "fieldtype": "Select",
- "label": "Branch",
- "options": "link:Branch",
+ "description": "Leave blank if considered for all branches",
+ "fieldname": "branch",
+ "fieldtype": "Select",
+ "label": "Branch",
+ "options": "link:Branch",
"permlevel": 0
- },
+ },
{
- "description": "Leave blank if considered for all departments",
- "fieldname": "department",
- "fieldtype": "Select",
- "label": "Department",
- "options": "link:Department",
+ "description": "Leave blank if considered for all departments",
+ "fieldname": "department",
+ "fieldtype": "Select",
+ "label": "Department",
+ "options": "link:Department",
"permlevel": 0
- },
+ },
{
- "description": "Leave blank if considered for all designations",
- "fieldname": "designation",
- "fieldtype": "Select",
- "label": "Designation",
- "options": "link:Designation",
+ "description": "Leave blank if considered for all designations",
+ "fieldname": "designation",
+ "fieldtype": "Select",
+ "label": "Designation",
+ "options": "link:Designation",
"permlevel": 0
- },
+ },
{
- "description": "Leave blank if considered for all grades",
- "fieldname": "grade",
- "fieldtype": "Select",
- "label": "Grade",
- "options": "link:Grade",
- "permlevel": 0
- },
- {
- "fieldname": "column_break1",
- "fieldtype": "Column Break",
- "permlevel": 0,
+ "fieldname": "column_break1",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
"width": "50%"
- },
+ },
{
- "fieldname": "fiscal_year",
- "fieldtype": "Select",
- "in_filter": 1,
- "label": "Fiscal Year",
- "options": "link:Fiscal Year",
- "permlevel": 0,
+ "fieldname": "fiscal_year",
+ "fieldtype": "Select",
+ "in_filter": 1,
+ "label": "Fiscal Year",
+ "options": "link:Fiscal Year",
+ "permlevel": 0,
"reqd": 1
- },
+ },
{
- "fieldname": "leave_type",
- "fieldtype": "Select",
- "label": "Leave Type",
- "options": "link:Leave Type",
- "permlevel": 0,
+ "fieldname": "leave_type",
+ "fieldtype": "Select",
+ "label": "Leave Type",
+ "options": "link:Leave Type",
+ "permlevel": 0,
"reqd": 1
- },
+ },
{
- "description": "Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year",
- "fieldname": "carry_forward",
- "fieldtype": "Check",
- "label": "Carry Forward",
+ "description": "Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year",
+ "fieldname": "carry_forward",
+ "fieldtype": "Check",
+ "label": "Carry Forward",
"permlevel": 0
- },
+ },
{
- "fieldname": "no_of_days",
- "fieldtype": "Float",
- "label": "New Leaves Allocated (In Days)",
- "permlevel": 0,
+ "fieldname": "no_of_days",
+ "fieldtype": "Float",
+ "label": "New Leaves Allocated (In Days)",
+ "permlevel": 0,
"reqd": 1
- },
+ },
{
- "fieldname": "allocate",
- "fieldtype": "Button",
- "label": "Allocate",
- "options": "allocate_leave",
+ "fieldname": "allocate",
+ "fieldtype": "Button",
+ "label": "Allocate",
+ "options": "allocate_leave",
"permlevel": 0
}
- ],
- "hide_heading": 0,
- "hide_toolbar": 0,
- "icon": "icon-cog",
- "idx": 1,
- "issingle": 1,
- "modified": "2013-07-05 14:44:50.000000",
- "modified_by": "Administrator",
- "module": "HR",
- "name": "Leave Control Panel",
- "owner": "Administrator",
+ ],
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "icon": "icon-cog",
+ "idx": 1,
+ "issingle": 1,
+ "modified": "2013-07-05 14:45:50.000000",
+ "modified_by": "Administrator",
+ "module": "HR",
+ "name": "Leave Control Panel",
+ "owner": "Administrator",
"permissions": [
{
- "create": 1,
- "permlevel": 0,
- "read": 1,
- "report": 0,
- "role": "HR User",
- "submit": 0,
+ "create": 1,
+ "permlevel": 0,
+ "read": 1,
+ "report": 0,
+ "role": "HR User",
+ "submit": 0,
"write": 1
}
- ],
+ ],
"read_only": 1
-}
\ No newline at end of file
+}
diff --git a/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py b/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py
index 6e33e6a..79f298c 100644
--- a/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py
+++ b/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py
@@ -10,7 +10,7 @@
class LeaveControlPanel(Document):
def get_employees(self):
- lst1 = [[self.employee_type,"employment_type"],[self.branch,"branch"],[self.designation,"designation"],[self.department, "department"],[self.grade,"grade"]]
+ lst1 = [[self.employee_type,"employment_type"],[self.branch,"branch"],[self.designation,"designation"],[self.department, "department"]]
condition = "where "
flag = 0
for l in lst1:
diff --git a/erpnext/hr/doctype/salary_manager/salary_manager.json b/erpnext/hr/doctype/salary_manager/salary_manager.json
index 7a65b3f..7f6a1a7 100644
--- a/erpnext/hr/doctype/salary_manager/salary_manager.json
+++ b/erpnext/hr/doctype/salary_manager/salary_manager.json
@@ -1,166 +1,159 @@
{
- "allow_copy": 1,
- "allow_email": 1,
- "allow_print": 1,
- "creation": "2012-03-27 14:35:59.000000",
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "Other",
+ "allow_copy": 1,
+ "allow_email": 1,
+ "allow_print": 1,
+ "creation": "2012-03-27 14:35:59.000000",
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "Other",
"fields": [
{
- "fieldname": "document_description",
- "fieldtype": "HTML",
- "label": "Document Description",
- "options": "<div class=\"field_description\">You can generate multiple salary slips based on the selected criteria, submit and mail those to the employee directly from here</div>",
+ "fieldname": "document_description",
+ "fieldtype": "HTML",
+ "label": "Document Description",
+ "options": "<div class=\"field_description\">You can generate multiple salary slips based on the selected criteria, submit and mail those to the employee directly from here</div>",
"permlevel": 0
- },
+ },
{
- "fieldname": "section_break0",
- "fieldtype": "Section Break",
+ "fieldname": "section_break0",
+ "fieldtype": "Section Break",
"permlevel": 0
- },
+ },
{
- "fieldname": "column_break0",
- "fieldtype": "Column Break",
- "permlevel": 0,
+ "fieldname": "column_break0",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
"width": "50%"
- },
+ },
{
- "fieldname": "company",
- "fieldtype": "Select",
- "label": "Company",
- "options": "link:Company",
- "permlevel": 0,
+ "fieldname": "company",
+ "fieldtype": "Select",
+ "label": "Company",
+ "options": "link:Company",
+ "permlevel": 0,
"reqd": 1
- },
+ },
{
- "fieldname": "branch",
- "fieldtype": "Link",
- "label": "Branch",
- "options": "Branch",
+ "fieldname": "branch",
+ "fieldtype": "Link",
+ "label": "Branch",
+ "options": "Branch",
"permlevel": 0
- },
+ },
{
- "fieldname": "department",
- "fieldtype": "Link",
- "label": "Department",
- "options": "Department",
+ "fieldname": "department",
+ "fieldtype": "Link",
+ "label": "Department",
+ "options": "Department",
"permlevel": 0
- },
+ },
{
- "fieldname": "designation",
- "fieldtype": "Link",
- "label": "Designation",
- "options": "Designation",
+ "fieldname": "designation",
+ "fieldtype": "Link",
+ "label": "Designation",
+ "options": "Designation",
"permlevel": 0
- },
+ },
{
- "fieldname": "column_break1",
- "fieldtype": "Column Break",
- "permlevel": 0,
+ "fieldname": "column_break1",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
"width": "50%"
- },
+ },
{
- "fieldname": "grade",
- "fieldtype": "Select",
- "label": "Grade",
- "options": "link:Grade",
- "permlevel": 0
- },
- {
- "fieldname": "fiscal_year",
- "fieldtype": "Select",
- "label": "Fiscal Year",
- "options": "link:Fiscal Year",
- "permlevel": 0,
+ "fieldname": "fiscal_year",
+ "fieldtype": "Select",
+ "label": "Fiscal Year",
+ "options": "link:Fiscal Year",
+ "permlevel": 0,
"reqd": 1
- },
+ },
{
- "fieldname": "month",
- "fieldtype": "Select",
- "label": "Month",
- "options": "\n01\n02\n03\n04\n05\n06\n07\n08\n09\n10\n11\n12",
- "permlevel": 0,
+ "fieldname": "month",
+ "fieldtype": "Select",
+ "label": "Month",
+ "options": "\n01\n02\n03\n04\n05\n06\n07\n08\n09\n10\n11\n12",
+ "permlevel": 0,
"reqd": 1
- },
+ },
{
- "description": "Check if you want to send salary slip in mail to each employee while submitting salary slip",
- "fieldname": "send_email",
- "fieldtype": "Check",
- "label": "Send Email",
+ "description": "Check if you want to send salary slip in mail to each employee while submitting salary slip",
+ "fieldname": "send_email",
+ "fieldtype": "Check",
+ "label": "Send Email",
"permlevel": 0
- },
+ },
{
- "fieldname": "section_break1",
- "fieldtype": "Section Break",
+ "fieldname": "section_break1",
+ "fieldtype": "Section Break",
"permlevel": 0
- },
+ },
{
- "fieldname": "column_break2",
- "fieldtype": "Column Break",
- "permlevel": 0,
+ "fieldname": "column_break2",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
"width": "50%"
- },
+ },
{
- "description": "Creates salary slip for above mentioned criteria.",
- "fieldname": "create_salary_slip",
- "fieldtype": "Button",
- "label": "Create Salary Slip",
+ "description": "Creates salary slip for above mentioned criteria.",
+ "fieldname": "create_salary_slip",
+ "fieldtype": "Button",
+ "label": "Create Salary Slip",
"permlevel": 0
- },
+ },
{
- "fieldname": "column_break3",
- "fieldtype": "Column Break",
- "permlevel": 0,
+ "fieldname": "column_break3",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
"width": "25%"
- },
+ },
{
- "description": "Submit all salary slips for the above selected criteria",
- "fieldname": "submit_salary_slip",
- "fieldtype": "Button",
- "label": "Submit Salary Slip",
+ "description": "Submit all salary slips for the above selected criteria",
+ "fieldname": "submit_salary_slip",
+ "fieldtype": "Button",
+ "label": "Submit Salary Slip",
"permlevel": 0
- },
+ },
{
- "fieldname": "column_break4",
- "fieldtype": "Column Break",
- "permlevel": 0,
+ "fieldname": "column_break4",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
"width": "25%"
- },
+ },
{
- "description": "Create Bank Voucher for the total salary paid for the above selected criteria",
- "fieldname": "make_bank_voucher",
- "fieldtype": "Button",
- "label": "Make Bank Voucher",
+ "description": "Create Bank Voucher for the total salary paid for the above selected criteria",
+ "fieldname": "make_bank_voucher",
+ "fieldtype": "Button",
+ "label": "Make Bank Voucher",
"permlevel": 0
- },
+ },
{
- "fieldname": "section_break2",
- "fieldtype": "Section Break",
+ "fieldname": "section_break2",
+ "fieldtype": "Section Break",
"permlevel": 0
- },
+ },
{
- "fieldname": "activity_log",
- "fieldtype": "HTML",
- "label": "Activity Log",
+ "fieldname": "activity_log",
+ "fieldtype": "HTML",
+ "label": "Activity Log",
"permlevel": 0
}
- ],
- "icon": "icon-cog",
- "idx": 1,
- "issingle": 1,
- "modified": "2013-07-22 15:22:58.000000",
- "modified_by": "Administrator",
- "module": "HR",
- "name": "Salary Manager",
- "owner": "Administrator",
+ ],
+ "icon": "icon-cog",
+ "idx": 1,
+ "issingle": 1,
+ "modified": "2013-07-22 15:23:58.000000",
+ "modified_by": "Administrator",
+ "module": "HR",
+ "name": "Salary Manager",
+ "owner": "Administrator",
"permissions": [
{
- "create": 1,
- "permlevel": 0,
- "read": 1,
- "role": "HR Manager",
+ "create": 1,
+ "permlevel": 0,
+ "read": 1,
+ "role": "HR Manager",
"write": 1
}
]
-}
\ No newline at end of file
+}
diff --git a/erpnext/hr/doctype/salary_manager/salary_manager.py b/erpnext/hr/doctype/salary_manager/salary_manager.py
index e73bd69..dcc1665 100644
--- a/erpnext/hr/doctype/salary_manager/salary_manager.py
+++ b/erpnext/hr/doctype/salary_manager/salary_manager.py
@@ -33,7 +33,7 @@
self.check_mandatory()
cond = ''
- for f in ['company', 'branch', 'department', 'designation', 'grade']:
+ for f in ['company', 'branch', 'department', 'designation']:
if self.get(f):
cond += " and t1." + f + " = '" + self.get(f).replace("'", "\'") + "'"
diff --git a/erpnext/hr/doctype/salary_slip/salary_slip.json b/erpnext/hr/doctype/salary_slip/salary_slip.json
index e0d0585..43a1543 100644
--- a/erpnext/hr/doctype/salary_slip/salary_slip.json
+++ b/erpnext/hr/doctype/salary_slip/salary_slip.json
@@ -1,398 +1,386 @@
{
- "creation": "2013-01-10 16:34:15",
- "docstatus": 0,
- "doctype": "DocType",
+ "creation": "2013-01-10 16:34:15",
+ "docstatus": 0,
+ "doctype": "DocType",
"fields": [
{
- "fieldname": "column_break0",
- "fieldtype": "Column Break",
- "oldfieldtype": "Column Break",
- "permlevel": 0,
+ "fieldname": "column_break0",
+ "fieldtype": "Column Break",
+ "oldfieldtype": "Column Break",
+ "permlevel": 0,
"width": "50%"
- },
+ },
{
- "fieldname": "employee",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Employee",
- "oldfieldname": "employee",
- "oldfieldtype": "Link",
- "options": "Employee",
- "permlevel": 0,
- "reqd": 1,
+ "fieldname": "employee",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "label": "Employee",
+ "oldfieldname": "employee",
+ "oldfieldtype": "Link",
+ "options": "Employee",
+ "permlevel": 0,
+ "reqd": 1,
"search_index": 1
- },
+ },
{
- "fieldname": "employee_name",
- "fieldtype": "Data",
- "in_filter": 1,
- "in_list_view": 1,
- "label": "Employee Name",
- "oldfieldname": "employee_name",
- "oldfieldtype": "Data",
- "permlevel": 0,
- "read_only": 1,
+ "fieldname": "employee_name",
+ "fieldtype": "Data",
+ "in_filter": 1,
+ "in_list_view": 1,
+ "label": "Employee Name",
+ "oldfieldname": "employee_name",
+ "oldfieldtype": "Data",
+ "permlevel": 0,
+ "read_only": 1,
"reqd": 1
- },
+ },
{
- "fieldname": "department",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Department",
- "oldfieldname": "department",
- "oldfieldtype": "Link",
- "options": "Department",
- "permlevel": 0,
- "read_only": 1,
- "reqd": 0,
+ "fieldname": "department",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "label": "Department",
+ "oldfieldname": "department",
+ "oldfieldtype": "Link",
+ "options": "Department",
+ "permlevel": 0,
+ "read_only": 1,
+ "reqd": 0,
"search_index": 0
- },
+ },
{
- "fieldname": "designation",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Designation",
- "oldfieldname": "designation",
- "oldfieldtype": "Link",
- "options": "Designation",
- "permlevel": 0,
- "read_only": 1,
+ "fieldname": "designation",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "label": "Designation",
+ "oldfieldname": "designation",
+ "oldfieldtype": "Link",
+ "options": "Designation",
+ "permlevel": 0,
+ "read_only": 1,
"search_index": 0
- },
+ },
{
- "fieldname": "branch",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Branch",
- "oldfieldname": "branch",
- "oldfieldtype": "Link",
- "options": "Branch",
- "permlevel": 0,
- "read_only": 1,
+ "fieldname": "branch",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "label": "Branch",
+ "oldfieldname": "branch",
+ "oldfieldtype": "Link",
+ "options": "Branch",
+ "permlevel": 0,
+ "read_only": 1,
"search_index": 0
- },
+ },
{
- "fieldname": "grade",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Grade",
- "oldfieldname": "grade",
- "oldfieldtype": "Link",
- "options": "Grade",
- "permlevel": 0,
- "read_only": 1,
- "search_index": 0
- },
- {
- "fieldname": "pf_no",
- "fieldtype": "Data",
- "label": "PF No.",
- "oldfieldname": "pf_no",
- "oldfieldtype": "Data",
- "permlevel": 0,
+ "fieldname": "pf_no",
+ "fieldtype": "Data",
+ "label": "PF No.",
+ "oldfieldname": "pf_no",
+ "oldfieldtype": "Data",
+ "permlevel": 0,
"read_only": 1
- },
+ },
{
- "fieldname": "esic_no",
- "fieldtype": "Data",
- "label": "ESIC No.",
- "oldfieldname": "esic_no",
- "oldfieldtype": "Data",
- "permlevel": 0,
+ "fieldname": "esic_no",
+ "fieldtype": "Data",
+ "label": "ESIC No.",
+ "oldfieldname": "esic_no",
+ "oldfieldtype": "Data",
+ "permlevel": 0,
"read_only": 1
- },
+ },
{
- "fieldname": "letter_head",
- "fieldtype": "Link",
- "label": "Letter Head",
- "options": "Letter Head",
+ "fieldname": "letter_head",
+ "fieldtype": "Link",
+ "label": "Letter Head",
+ "options": "Letter Head",
"permlevel": 0
- },
+ },
{
- "fieldname": "column_break1",
- "fieldtype": "Column Break",
- "oldfieldtype": "Column Break",
- "permlevel": 0,
+ "fieldname": "column_break1",
+ "fieldtype": "Column Break",
+ "oldfieldtype": "Column Break",
+ "permlevel": 0,
"width": "50%"
- },
+ },
{
- "fieldname": "fiscal_year",
- "fieldtype": "Link",
- "in_filter": 1,
- "in_list_view": 1,
- "label": "Fiscal Year",
- "oldfieldname": "fiscal_year",
- "oldfieldtype": "Data",
- "options": "Fiscal Year",
- "permlevel": 0,
- "reqd": 1,
+ "fieldname": "fiscal_year",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "in_list_view": 1,
+ "label": "Fiscal Year",
+ "oldfieldname": "fiscal_year",
+ "oldfieldtype": "Data",
+ "options": "Fiscal Year",
+ "permlevel": 0,
+ "reqd": 1,
"search_index": 0
- },
+ },
{
- "fieldname": "company",
- "fieldtype": "Select",
- "in_filter": 1,
- "label": "Company",
- "options": "link:Company",
- "permlevel": 0,
+ "fieldname": "company",
+ "fieldtype": "Select",
+ "in_filter": 1,
+ "label": "Company",
+ "options": "link:Company",
+ "permlevel": 0,
"reqd": 1
- },
+ },
{
- "fieldname": "month",
- "fieldtype": "Select",
- "in_filter": 1,
- "in_list_view": 1,
- "label": "Month",
- "oldfieldname": "month",
- "oldfieldtype": "Select",
- "options": "\n01\n02\n03\n04\n05\n06\n07\n08\n09\n10\n11\n12",
- "permlevel": 0,
- "reqd": 1,
- "search_index": 1,
+ "fieldname": "month",
+ "fieldtype": "Select",
+ "in_filter": 1,
+ "in_list_view": 1,
+ "label": "Month",
+ "oldfieldname": "month",
+ "oldfieldtype": "Select",
+ "options": "\n01\n02\n03\n04\n05\n06\n07\n08\n09\n10\n11\n12",
+ "permlevel": 0,
+ "reqd": 1,
+ "search_index": 1,
"width": "37%"
- },
+ },
{
- "fieldname": "total_days_in_month",
- "fieldtype": "Data",
- "label": "Total Working Days In The Month",
- "oldfieldname": "total_days_in_month",
- "oldfieldtype": "Int",
- "permlevel": 0,
- "read_only": 1,
+ "fieldname": "total_days_in_month",
+ "fieldtype": "Data",
+ "label": "Total Working Days In The Month",
+ "oldfieldname": "total_days_in_month",
+ "oldfieldtype": "Int",
+ "permlevel": 0,
+ "read_only": 1,
"reqd": 1
- },
+ },
{
- "fieldname": "leave_without_pay",
- "fieldtype": "Float",
- "label": "Leave Without Pay",
- "oldfieldname": "leave_without_pay",
- "oldfieldtype": "Currency",
+ "fieldname": "leave_without_pay",
+ "fieldtype": "Float",
+ "label": "Leave Without Pay",
+ "oldfieldname": "leave_without_pay",
+ "oldfieldtype": "Currency",
"permlevel": 0
- },
+ },
{
- "fieldname": "payment_days",
- "fieldtype": "Float",
- "label": "Payment Days",
- "oldfieldname": "payment_days",
- "oldfieldtype": "Float",
- "permlevel": 0,
- "read_only": 1,
+ "fieldname": "payment_days",
+ "fieldtype": "Float",
+ "label": "Payment Days",
+ "oldfieldname": "payment_days",
+ "oldfieldtype": "Float",
+ "permlevel": 0,
+ "read_only": 1,
"reqd": 1
- },
+ },
{
- "fieldname": "bank_name",
- "fieldtype": "Data",
- "label": "Bank Name",
- "oldfieldname": "bank_name",
- "oldfieldtype": "Data",
- "permlevel": 0,
+ "fieldname": "bank_name",
+ "fieldtype": "Data",
+ "label": "Bank Name",
+ "oldfieldname": "bank_name",
+ "oldfieldtype": "Data",
+ "permlevel": 0,
"read_only": 1
- },
+ },
{
- "fieldname": "bank_account_no",
- "fieldtype": "Data",
- "label": "Bank Account No.",
- "oldfieldname": "bank_account_no",
- "oldfieldtype": "Data",
- "permlevel": 0,
+ "fieldname": "bank_account_no",
+ "fieldtype": "Data",
+ "label": "Bank Account No.",
+ "oldfieldname": "bank_account_no",
+ "oldfieldtype": "Data",
+ "permlevel": 0,
"read_only": 1
- },
+ },
{
- "fieldname": "email_check",
- "fieldtype": "Check",
- "label": "Email",
- "no_copy": 1,
- "oldfieldname": "email_check",
- "oldfieldtype": "Check",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "email_check",
+ "fieldtype": "Check",
+ "label": "Email",
+ "no_copy": 1,
+ "oldfieldname": "email_check",
+ "oldfieldtype": "Check",
+ "permlevel": 0,
+ "print_hide": 1,
"report_hide": 1
- },
+ },
{
- "fieldname": "amended_from",
- "fieldtype": "Data",
- "hidden": 0,
- "ignore_restrictions": 1,
- "label": "Amended From",
- "no_copy": 1,
- "oldfieldname": "amended_from",
- "oldfieldtype": "Data",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "amended_from",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_restrictions": 1,
+ "label": "Amended From",
+ "no_copy": 1,
+ "oldfieldname": "amended_from",
+ "oldfieldtype": "Data",
+ "permlevel": 0,
+ "print_hide": 1,
"report_hide": 0
- },
+ },
{
- "fieldname": "earning_deduction",
- "fieldtype": "Section Break",
- "label": "Earning & Deduction",
- "oldfieldtype": "Section Break",
+ "fieldname": "earning_deduction",
+ "fieldtype": "Section Break",
+ "label": "Earning & Deduction",
+ "oldfieldtype": "Section Break",
"permlevel": 0
- },
+ },
{
- "fieldname": "earning",
- "fieldtype": "Column Break",
- "label": "Earning",
- "oldfieldtype": "Column Break",
- "permlevel": 0,
- "reqd": 0,
+ "fieldname": "earning",
+ "fieldtype": "Column Break",
+ "label": "Earning",
+ "oldfieldtype": "Column Break",
+ "permlevel": 0,
+ "reqd": 0,
"width": "50%"
- },
+ },
{
- "fieldname": "earning_details",
- "fieldtype": "Table",
- "label": "Salary Structure Earnings",
- "oldfieldname": "earning_details",
- "oldfieldtype": "Table",
- "options": "Salary Slip Earning",
+ "fieldname": "earning_details",
+ "fieldtype": "Table",
+ "label": "Salary Structure Earnings",
+ "oldfieldname": "earning_details",
+ "oldfieldtype": "Table",
+ "options": "Salary Slip Earning",
"permlevel": 0
- },
+ },
{
- "fieldname": "deduction",
- "fieldtype": "Column Break",
- "label": "Deduction",
- "oldfieldtype": "Column Break",
- "permlevel": 0,
+ "fieldname": "deduction",
+ "fieldtype": "Column Break",
+ "label": "Deduction",
+ "oldfieldtype": "Column Break",
+ "permlevel": 0,
"width": "50%"
- },
+ },
{
- "fieldname": "deduction_details",
- "fieldtype": "Table",
- "label": "Deductions",
- "oldfieldname": "deduction_details",
- "oldfieldtype": "Table",
- "options": "Salary Slip Deduction",
+ "fieldname": "deduction_details",
+ "fieldtype": "Table",
+ "label": "Deductions",
+ "oldfieldname": "deduction_details",
+ "oldfieldtype": "Table",
+ "options": "Salary Slip Deduction",
"permlevel": 0
- },
+ },
{
- "fieldname": "totals",
- "fieldtype": "Section Break",
- "label": "Totals",
- "oldfieldtype": "Section Break",
+ "fieldname": "totals",
+ "fieldtype": "Section Break",
+ "label": "Totals",
+ "oldfieldtype": "Section Break",
"permlevel": 0
- },
+ },
{
- "fieldname": "column_break2",
- "fieldtype": "Column Break",
- "oldfieldtype": "Column Break",
- "permlevel": 0,
+ "fieldname": "column_break2",
+ "fieldtype": "Column Break",
+ "oldfieldtype": "Column Break",
+ "permlevel": 0,
"width": "50%"
- },
+ },
{
- "fieldname": "arrear_amount",
- "fieldtype": "Currency",
- "label": "Arrear Amount",
- "oldfieldname": "arrear_amount",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
+ "fieldname": "arrear_amount",
+ "fieldtype": "Currency",
+ "label": "Arrear Amount",
+ "oldfieldname": "arrear_amount",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
"permlevel": 0
- },
+ },
{
- "fieldname": "leave_encashment_amount",
- "fieldtype": "Currency",
- "label": "Leave Encashment Amount",
- "oldfieldname": "encashment_amount",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
+ "fieldname": "leave_encashment_amount",
+ "fieldtype": "Currency",
+ "label": "Leave Encashment Amount",
+ "oldfieldname": "encashment_amount",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
"permlevel": 0
- },
+ },
{
- "fieldname": "gross_pay",
- "fieldtype": "Currency",
- "label": "Gross Pay",
- "oldfieldname": "gross_pay",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "permlevel": 0,
+ "fieldname": "gross_pay",
+ "fieldtype": "Currency",
+ "label": "Gross Pay",
+ "oldfieldname": "gross_pay",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
"read_only": 1
- },
+ },
{
- "fieldname": "total_deduction",
- "fieldtype": "Currency",
- "label": "Total Deduction",
- "oldfieldname": "total_deduction",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "permlevel": 0,
+ "fieldname": "total_deduction",
+ "fieldtype": "Currency",
+ "label": "Total Deduction",
+ "oldfieldname": "total_deduction",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
"read_only": 1
- },
+ },
{
- "fieldname": "column_break3",
- "fieldtype": "Column Break",
- "oldfieldtype": "Column Break",
- "permlevel": 0,
+ "fieldname": "column_break3",
+ "fieldtype": "Column Break",
+ "oldfieldtype": "Column Break",
+ "permlevel": 0,
"width": "50%"
- },
+ },
{
- "description": "Gross Pay + Arrear Amount +Encashment Amount - Total Deduction",
- "fieldname": "net_pay",
- "fieldtype": "Currency",
- "label": "Net Pay",
- "oldfieldname": "net_pay",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "permlevel": 0,
+ "description": "Gross Pay + Arrear Amount +Encashment Amount - Total Deduction",
+ "fieldname": "net_pay",
+ "fieldtype": "Currency",
+ "label": "Net Pay",
+ "oldfieldname": "net_pay",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
"read_only": 1
- },
+ },
{
- "fieldname": "rounded_total",
- "fieldtype": "Currency",
- "label": "Rounded Total",
- "options": "Company:company:default_currency",
- "permlevel": 0,
+ "fieldname": "rounded_total",
+ "fieldtype": "Currency",
+ "label": "Rounded Total",
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
"read_only": 1
- },
+ },
{
- "description": "Net Pay (in words) will be visible once you save the Salary Slip.",
- "fieldname": "total_in_words",
- "fieldtype": "Data",
- "label": "Total in words",
- "oldfieldname": "net_pay_in_words",
- "oldfieldtype": "Data",
- "permlevel": 0,
+ "description": "Net Pay (in words) will be visible once you save the Salary Slip.",
+ "fieldname": "total_in_words",
+ "fieldtype": "Data",
+ "label": "Total in words",
+ "oldfieldname": "net_pay_in_words",
+ "oldfieldtype": "Data",
+ "permlevel": 0,
"read_only": 1
}
- ],
- "icon": "icon-file-text",
- "idx": 1,
- "is_submittable": 1,
- "modified": "2014-05-01 04:31:14.543092",
- "modified_by": "Administrator",
- "module": "HR",
- "name": "Salary Slip",
- "owner": "Administrator",
+ ],
+ "icon": "icon-file-text",
+ "idx": 1,
+ "is_submittable": 1,
+ "modified": "2014-05-01 04:21:14.543092",
+ "modified_by": "Administrator",
+ "module": "HR",
+ "name": "Salary Slip",
+ "owner": "Administrator",
"permissions": [
{
- "amend": 0,
- "create": 1,
- "delete": 0,
- "email": 1,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "HR User",
- "submit": 1,
+ "amend": 0,
+ "create": 1,
+ "delete": 0,
+ "email": 1,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "HR User",
+ "submit": 1,
"write": 1
- },
+ },
{
- "amend": 1,
- "cancel": 1,
- "create": 1,
- "delete": 1,
- "email": 1,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "HR Manager",
- "submit": 1,
+ "amend": 1,
+ "cancel": 1,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "HR Manager",
+ "submit": 1,
"write": 1
- },
+ },
{
- "permlevel": 0,
- "read": 1,
- "restricted": 0,
+ "permlevel": 0,
+ "read": 1,
+ "restricted": 0,
"role": "Employee"
}
]
-}
\ No newline at end of file
+}
diff --git a/erpnext/hr/doctype/salary_slip/salary_slip.py b/erpnext/hr/doctype/salary_slip/salary_slip.py
index 9912252..029c84e 100644
--- a/erpnext/hr/doctype/salary_slip/salary_slip.py
+++ b/erpnext/hr/doctype/salary_slip/salary_slip.py
@@ -241,7 +241,6 @@
</tr>
<tr>
<td width = "50%%">Designation : %s</td>
- <td width = "50%%">Grade : %s</td>
</tr>
<tr>
<td width = "50%%">Bank Account No. : %s</td>
@@ -285,7 +284,7 @@
</table></div>''' % (cstr(letter_head), cstr(self.employee),
cstr(self.employee_name), cstr(self.month), cstr(self.fiscal_year),
cstr(self.department), cstr(self.branch), cstr(self.designation),
- cstr(self.grade), cstr(self.bank_account_no), cstr(self.bank_name),
+ cstr(self.bank_account_no), cstr(self.bank_name),
cstr(self.arrear_amount), cstr(self.payment_days), earn_table, ded_table,
cstr(flt(self.gross_pay)), cstr(flt(self.total_deduction)),
cstr(flt(self.net_pay)), cstr(self.total_in_words))
diff --git a/erpnext/hr/doctype/salary_structure/salary_structure.json b/erpnext/hr/doctype/salary_structure/salary_structure.json
index 9394fce..7045e23 100644
--- a/erpnext/hr/doctype/salary_structure/salary_structure.json
+++ b/erpnext/hr/doctype/salary_structure/salary_structure.json
@@ -1,273 +1,261 @@
{
- "allow_import": 1,
- "creation": "2013-03-07 18:50:29.000000",
- "docstatus": 0,
- "doctype": "DocType",
+ "allow_import": 1,
+ "creation": "2013-03-07 18:50:29.000000",
+ "docstatus": 0,
+ "doctype": "DocType",
"fields": [
{
- "fieldname": "column_break0",
- "fieldtype": "Column Break",
- "permlevel": 0,
- "read_only": 0,
+ "fieldname": "column_break0",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
+ "read_only": 0,
"width": "50%"
- },
+ },
{
- "fieldname": "employee",
- "fieldtype": "Link",
- "in_filter": 1,
- "label": "Employee",
- "oldfieldname": "employee",
- "oldfieldtype": "Link",
- "options": "Employee",
- "permlevel": 0,
- "read_only": 0,
+ "fieldname": "employee",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "label": "Employee",
+ "oldfieldname": "employee",
+ "oldfieldtype": "Link",
+ "options": "Employee",
+ "permlevel": 0,
+ "read_only": 0,
"reqd": 1
- },
+ },
{
- "fieldname": "employee_name",
- "fieldtype": "Data",
- "in_list_view": 1,
- "label": "Employee Name",
- "oldfieldname": "employee_name",
- "oldfieldtype": "Data",
- "permlevel": 0,
+ "fieldname": "employee_name",
+ "fieldtype": "Data",
+ "in_list_view": 1,
+ "label": "Employee Name",
+ "oldfieldname": "employee_name",
+ "oldfieldtype": "Data",
+ "permlevel": 0,
"read_only": 1
- },
+ },
{
- "fieldname": "branch",
- "fieldtype": "Select",
- "in_filter": 1,
- "label": "Branch",
- "oldfieldname": "branch",
- "oldfieldtype": "Select",
- "options": "link:Branch",
- "permlevel": 0,
- "read_only": 1,
+ "fieldname": "branch",
+ "fieldtype": "Select",
+ "in_filter": 1,
+ "label": "Branch",
+ "oldfieldname": "branch",
+ "oldfieldtype": "Select",
+ "options": "link:Branch",
+ "permlevel": 0,
+ "read_only": 1,
"reqd": 0
- },
+ },
{
- "fieldname": "designation",
- "fieldtype": "Select",
- "in_filter": 1,
- "label": "Designation",
- "oldfieldname": "designation",
- "oldfieldtype": "Select",
- "options": "link:Designation",
- "permlevel": 0,
- "read_only": 1,
+ "fieldname": "designation",
+ "fieldtype": "Select",
+ "in_filter": 1,
+ "label": "Designation",
+ "oldfieldname": "designation",
+ "oldfieldtype": "Select",
+ "options": "link:Designation",
+ "permlevel": 0,
+ "read_only": 1,
"reqd": 0
- },
+ },
{
- "fieldname": "department",
- "fieldtype": "Select",
- "in_filter": 1,
- "label": "Department",
- "oldfieldname": "department",
- "oldfieldtype": "Select",
- "options": "link:Department",
- "permlevel": 0,
- "read_only": 1,
+ "fieldname": "department",
+ "fieldtype": "Select",
+ "in_filter": 1,
+ "label": "Department",
+ "oldfieldname": "department",
+ "oldfieldtype": "Select",
+ "options": "link:Department",
+ "permlevel": 0,
+ "read_only": 1,
"reqd": 0
- },
+ },
{
- "fieldname": "grade",
- "fieldtype": "Select",
- "in_filter": 1,
- "label": "Grade",
- "oldfieldname": "grade",
- "oldfieldtype": "Select",
- "options": "link:Grade",
- "permlevel": 0,
- "read_only": 1,
- "reqd": 0
- },
- {
- "fieldname": "column_break1",
- "fieldtype": "Column Break",
- "permlevel": 0,
- "read_only": 0,
+ "fieldname": "column_break1",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
+ "read_only": 0,
"width": "50%"
- },
+ },
{
- "default": "Yes",
- "fieldname": "is_active",
- "fieldtype": "Select",
- "in_filter": 1,
- "in_list_view": 1,
- "label": "Is Active",
- "oldfieldname": "is_active",
- "oldfieldtype": "Select",
- "options": "\nYes\nNo",
- "permlevel": 0,
- "read_only": 0,
+ "default": "Yes",
+ "fieldname": "is_active",
+ "fieldtype": "Select",
+ "in_filter": 1,
+ "in_list_view": 1,
+ "label": "Is Active",
+ "oldfieldname": "is_active",
+ "oldfieldtype": "Select",
+ "options": "\nYes\nNo",
+ "permlevel": 0,
+ "read_only": 0,
"reqd": 1
- },
+ },
{
- "fieldname": "from_date",
- "fieldtype": "Date",
- "in_list_view": 1,
- "label": "From Date",
- "oldfieldname": "from_date",
- "oldfieldtype": "Date",
- "permlevel": 0,
- "read_only": 0,
+ "fieldname": "from_date",
+ "fieldtype": "Date",
+ "in_list_view": 1,
+ "label": "From Date",
+ "oldfieldname": "from_date",
+ "oldfieldtype": "Date",
+ "permlevel": 0,
+ "read_only": 0,
"reqd": 1
- },
+ },
{
- "fieldname": "to_date",
- "fieldtype": "Date",
- "in_list_view": 1,
- "label": "To Date",
- "oldfieldname": "to_date",
- "oldfieldtype": "Date",
- "permlevel": 0,
+ "fieldname": "to_date",
+ "fieldtype": "Date",
+ "in_list_view": 1,
+ "label": "To Date",
+ "oldfieldname": "to_date",
+ "oldfieldtype": "Date",
+ "permlevel": 0,
"read_only": 0
- },
+ },
{
- "fieldname": "company",
- "fieldtype": "Select",
- "in_filter": 1,
- "label": "Company",
- "options": "link:Company",
- "permlevel": 0,
- "read_only": 0,
+ "fieldname": "company",
+ "fieldtype": "Select",
+ "in_filter": 1,
+ "label": "Company",
+ "options": "link:Company",
+ "permlevel": 0,
+ "read_only": 0,
"reqd": 1
- },
+ },
{
- "description": "Salary breakup based on Earning and Deduction.",
- "fieldname": "earning_deduction",
- "fieldtype": "Section Break",
- "label": "Monthly Earning & Deduction",
- "oldfieldname": "earning_deduction",
- "oldfieldtype": "Section Break",
- "permlevel": 0,
+ "description": "Salary breakup based on Earning and Deduction.",
+ "fieldname": "earning_deduction",
+ "fieldtype": "Section Break",
+ "label": "Monthly Earning & Deduction",
+ "oldfieldname": "earning_deduction",
+ "oldfieldtype": "Section Break",
+ "permlevel": 0,
"read_only": 0
- },
+ },
{
- "fieldname": "earning",
- "fieldtype": "Column Break",
- "hidden": 0,
- "label": "Earning",
- "oldfieldname": "col_brk2",
- "oldfieldtype": "Column Break",
- "permlevel": 0,
- "read_only": 0,
+ "fieldname": "earning",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "label": "Earning",
+ "oldfieldname": "col_brk2",
+ "oldfieldtype": "Column Break",
+ "permlevel": 0,
+ "read_only": 0,
"width": "50%"
- },
+ },
{
- "fieldname": "earning_details",
- "fieldtype": "Table",
- "hidden": 0,
- "label": "Earning1",
- "oldfieldname": "earning_details",
- "oldfieldtype": "Table",
- "options": "Salary Structure Earning",
- "permlevel": 0,
+ "fieldname": "earning_details",
+ "fieldtype": "Table",
+ "hidden": 0,
+ "label": "Earning1",
+ "oldfieldname": "earning_details",
+ "oldfieldtype": "Table",
+ "options": "Salary Structure Earning",
+ "permlevel": 0,
"read_only": 0
- },
+ },
{
- "fieldname": "deduction",
- "fieldtype": "Column Break",
- "hidden": 0,
- "label": "Deduction",
- "oldfieldname": "col_brk3",
- "oldfieldtype": "Column Break",
- "permlevel": 0,
- "read_only": 0,
+ "fieldname": "deduction",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "label": "Deduction",
+ "oldfieldname": "col_brk3",
+ "oldfieldtype": "Column Break",
+ "permlevel": 0,
+ "read_only": 0,
"width": "50%"
- },
+ },
{
- "fieldname": "deduction_details",
- "fieldtype": "Table",
- "hidden": 0,
- "label": "Deduction1",
- "oldfieldname": "deduction_details",
- "oldfieldtype": "Table",
- "options": "Salary Structure Deduction",
- "permlevel": 0,
+ "fieldname": "deduction_details",
+ "fieldtype": "Table",
+ "hidden": 0,
+ "label": "Deduction1",
+ "oldfieldname": "deduction_details",
+ "oldfieldtype": "Table",
+ "options": "Salary Structure Deduction",
+ "permlevel": 0,
"read_only": 0
- },
+ },
{
- "fieldname": "section_break0",
- "fieldtype": "Section Break",
- "options": "Simple",
- "permlevel": 0,
+ "fieldname": "section_break0",
+ "fieldtype": "Section Break",
+ "options": "Simple",
+ "permlevel": 0,
"read_only": 0
- },
+ },
{
- "fieldname": "column_break2",
- "fieldtype": "Column Break",
- "permlevel": 0,
- "read_only": 0,
+ "fieldname": "column_break2",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
+ "read_only": 0,
"width": "50%"
- },
+ },
{
- "fieldname": "total_earning",
- "fieldtype": "Currency",
- "label": "Total Earning",
- "oldfieldname": "total_earning",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "permlevel": 0,
+ "fieldname": "total_earning",
+ "fieldtype": "Currency",
+ "label": "Total Earning",
+ "oldfieldname": "total_earning",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
"read_only": 1
- },
+ },
{
- "fieldname": "total_deduction",
- "fieldtype": "Currency",
- "label": "Total Deduction",
- "oldfieldname": "total_deduction",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "permlevel": 0,
+ "fieldname": "total_deduction",
+ "fieldtype": "Currency",
+ "label": "Total Deduction",
+ "oldfieldname": "total_deduction",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
"read_only": 1
- },
+ },
{
- "fieldname": "column_break3",
- "fieldtype": "Column Break",
- "permlevel": 0,
- "read_only": 0,
+ "fieldname": "column_break3",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
+ "read_only": 0,
"width": "50%"
- },
+ },
{
- "fieldname": "net_pay",
- "fieldtype": "Currency",
- "label": "Net Pay",
- "options": "Company:company:default_currency",
- "permlevel": 0,
+ "fieldname": "net_pay",
+ "fieldtype": "Currency",
+ "label": "Net Pay",
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
"read_only": 1
}
- ],
- "icon": "icon-file-text",
- "idx": 1,
- "modified": "2013-12-20 19:24:28.000000",
- "modified_by": "Administrator",
- "module": "HR",
- "name": "Salary Structure",
- "owner": "Administrator",
+ ],
+ "icon": "icon-file-text",
+ "idx": 1,
+ "modified": "2013-12-20 19:23:28.000000",
+ "modified_by": "Administrator",
+ "module": "HR",
+ "name": "Salary Structure",
+ "owner": "Administrator",
"permissions": [
{
- "amend": 0,
- "create": 1,
- "email": 1,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "HR User",
- "submit": 0,
+ "amend": 0,
+ "create": 1,
+ "email": 1,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "HR User",
+ "submit": 0,
"write": 1
- },
+ },
{
- "amend": 0,
- "create": 1,
- "email": 1,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "HR Manager",
- "submit": 0,
+ "amend": 0,
+ "create": 1,
+ "email": 1,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "HR Manager",
+ "submit": 0,
"write": 1
}
]
-}
\ No newline at end of file
+}
diff --git a/erpnext/hr/doctype/salary_structure/salary_structure.py b/erpnext/hr/doctype/salary_structure/salary_structure.py
index f46df7a..07cbb5e 100644
--- a/erpnext/hr/doctype/salary_structure/salary_structure.py
+++ b/erpnext/hr/doctype/salary_structure/salary_structure.py
@@ -16,7 +16,7 @@
def get_employee_details(self):
ret = {}
- det = frappe.db.sql("""select employee_name, branch, designation, department, grade
+ det = frappe.db.sql("""select employee_name, branch, designation, department
from `tabEmployee` where name = %s""", self.employee)
if det:
ret = {
@@ -24,7 +24,6 @@
'branch': cstr(det[0][1]),
'designation': cstr(det[0][2]),
'department': cstr(det[0][3]),
- 'grade': cstr(det[0][4]),
'backup_employee': cstr(self.employee)
}
return ret
diff --git a/erpnext/hr/report/employee_information/employee_information.json b/erpnext/hr/report/employee_information/employee_information.json
index 0dc3d40..7022aae 100644
--- a/erpnext/hr/report/employee_information/employee_information.json
+++ b/erpnext/hr/report/employee_information/employee_information.json
@@ -1,16 +1,16 @@
{
- "creation": "2013-05-06 18:43:53.000000",
- "docstatus": 0,
- "doctype": "Report",
- "idx": 1,
- "is_standard": "Yes",
- "json": "{\"filters\":[],\"columns\":[[\"name\",\"Employee\"],[\"employee_number\",\"Employee\"],[\"date_of_joining\",\"Employee\"],[\"branch\",\"Employee\"],[\"department\",\"Employee\"],[\"designation\",\"Employee\"],[\"gender\",\"Employee\"],[\"status\",\"Employee\"],[\"company\",\"Employee\"],[\"employment_type\",\"Employee\"],[\"grade\",\"Employee\"],[\"reports_to\",\"Employee\"],[\"company_email\",\"Employee\"]],\"sort_by\":\"Employee.bank_ac_no\",\"sort_order\":\"desc\",\"sort_by_next\":\"\",\"sort_order_next\":\"desc\"}",
- "modified": "2014-03-07 15:30:27.000000",
- "modified_by": "Administrator",
- "module": "HR",
- "name": "Employee Information",
- "owner": "Administrator",
- "ref_doctype": "Employee",
- "report_name": "Employee Information",
+ "creation": "2013-05-06 18:43:53.000000",
+ "docstatus": 0,
+ "doctype": "Report",
+ "idx": 1,
+ "is_standard": "Yes",
+ "json": "{\"filters\":[],\"columns\":[[\"name\",\"Employee\"],[\"employee_number\",\"Employee\"],[\"date_of_joining\",\"Employee\"],[\"branch\",\"Employee\"],[\"department\",\"Employee\"],[\"designation\",\"Employee\"],[\"gender\",\"Employee\"],[\"status\",\"Employee\"],[\"company\",\"Employee\"],[\"employment_type\",\"Employee\"],\"Employee\"],[\"reports_to\",\"Employee\"],[\"company_email\",\"Employee\"]],\"sort_by\":\"Employee.bank_ac_no\",\"sort_order\":\"desc\",\"sort_by_next\":\"\",\"sort_order_next\":\"desc\"}",
+ "modified": "2014-03-07 15:30:27.000000",
+ "modified_by": "Administrator",
+ "module": "HR",
+ "name": "Employee Information",
+ "owner": "Administrator",
+ "ref_doctype": "Employee",
+ "report_name": "Employee Information",
"report_type": "Report Builder"
-}
\ No newline at end of file
+}
diff --git a/erpnext/setup/page/setup_wizard/install_fixtures.py b/erpnext/setup/page/setup_wizard/install_fixtures.py
index 67e8350..08e9548 100644
--- a/erpnext/setup/page/setup_wizard/install_fixtures.py
+++ b/erpnext/setup/page/setup_wizard/install_fixtures.py
@@ -7,7 +7,7 @@
from frappe import _
-def install():
+def install(country=None):
records = [
# item group
@@ -44,6 +44,51 @@
{'doctype': 'Leave Type', 'leave_type_name': _('Privilege Leave'), 'name': _('Privilege Leave'), 'is_encash': 0, 'is_carry_forward': 0, },
{'doctype': 'Leave Type', 'leave_type_name': _('Leave Without Pay'), 'name': _('Leave Without Pay'), 'is_encash': 0, 'is_carry_forward': 0, 'is_lwp':1},
+ # Employment Type
+ {'doctype': 'Employment Type', 'employee_type_name': _('Full-time')},
+ {'doctype': 'Employment Type', 'employee_type_name': _('Part-time')},
+ {'doctype': 'Employment Type', 'employee_type_name': _('Probation')},
+ {'doctype': 'Employment Type', 'employee_type_name': _('Contract')},
+ {'doctype': 'Employment Type', 'employee_type_name': _('Commission')},
+ {'doctype': 'Employment Type', 'employee_type_name': _('Piecework')},
+ {'doctype': 'Employment Type', 'employee_type_name': _('Trainee')},
+ {'doctype': 'Employment Type', 'employee_type_name': _('Intern')},
+ {'doctype': 'Employment Type', 'employee_type_name': _('Apprentice')},
+
+ # Department
+ {'doctype': 'Department', 'department_name': _('Accounts')},
+ {'doctype': 'Department', 'department_name': _('Marketing')},
+ {'doctype': 'Department', 'department_name': _('Sales')},
+ {'doctype': 'Department', 'department_name': _('Purchase')},
+ {'doctype': 'Department', 'department_name': _('Operations')},
+ {'doctype': 'Department', 'department_name': _('Production')},
+ {'doctype': 'Department', 'department_name': _('Dispatch')},
+ {'doctype': 'Department', 'department_name': _('Customer Service')},
+ {'doctype': 'Department', 'department_name': _('Human Resources')},
+ {'doctype': 'Department', 'department_name': _('Management')},
+ {'doctype': 'Department', 'department_name': _('Quality Management')},
+ {'doctype': 'Department', 'department_name': _('Research & Development')},
+ {'doctype': 'Department', 'department_name': _('Legal')},
+
+ # Designation
+ {'doctype': 'Designation', 'designation_name': _('CEO')},
+ {'doctype': 'Designation', 'designation_name': _('Director')},
+ {'doctype': 'Designation', 'designation_name': _('Manager')},
+ {'doctype': 'Designation', 'designation_name': _('Analyst')},
+ {'doctype': 'Designation', 'designation_name': _('Engineer')},
+ {'doctype': 'Designation', 'designation_name': _('Accountant')},
+ {'doctype': 'Designation', 'designation_name': _('Secretary')},
+ {'doctype': 'Designation', 'designation_name': _('Associate')},
+ {'doctype': 'Designation', 'designation_name': _('Administrative Officer')},
+ {'doctype': 'Designation', 'designation_name': _('Business Development Manager')},
+ {'doctype': 'Designation', 'designation_name': _('HR Manager')},
+ {'doctype': 'Designation', 'designation_name': _('Project Manager')},
+ {'doctype': 'Designation', 'designation_name': _('Head of Marketing and Sales')},
+ {'doctype': 'Designation', 'designation_name': _('Software Developer')},
+ {'doctype': 'Designation', 'designation_name': _('Designer')},
+ {'doctype': 'Designation', 'designation_name': _('Assistant')},
+ {'doctype': 'Designation', 'designation_name': _('Researcher')},
+
# territory
{'doctype': 'Territory', 'territory_name': _('All Territories'), 'is_group': 'Yes', 'name': _('All Territories'), 'parent_territory': ''},
@@ -76,6 +121,72 @@
{'uom_name': _('Hour'), 'doctype': 'UOM', 'name': 'Hour'},
{'uom_name': _('Minute'), 'doctype': 'UOM', 'name': 'Minute'},
+ # Mode of Payment
+ {'doctype': 'Mode of Payment', 'mode_of_payment': 'Check' if country=="United States" else _('Cheque')},
+ {'doctype': 'Mode of Payment', 'mode_of_payment': _('Cash')},
+ {'doctype': 'Mode of Payment', 'mode_of_payment': _('Credit Card')},
+ {'doctype': 'Mode of Payment', 'mode_of_payment': _('Wire Transfer')},
+ {'doctype': 'Mode of Payment', 'mode_of_payment': _('Bank Draft')},
+
+ # Activity Type
+ {'doctype': 'Activity Type', 'activity_type': _('Planning')},
+ {'doctype': 'Activity Type', 'activity_type': _('Research')},
+ {'doctype': 'Activity Type', 'activity_type': _('Proposal Writing')},
+ {'doctype': 'Activity Type', 'activity_type': _('Execution')},
+ {'doctype': 'Activity Type', 'activity_type': _('Communication')},
+
+ # Industry Type
+ {'doctype': 'Industry Type', 'industry': _('Accounting')},
+ {'doctype': 'Industry Type', 'industry': _('Advertising')},
+ {'doctype': 'Industry Type', 'industry': _('Aerospace')},
+ {'doctype': 'Industry Type', 'industry': _('Agriculture')},
+ {'doctype': 'Industry Type', 'industry': _('Airline')},
+ {'doctype': 'Industry Type', 'industry': _('Apparel & Accessories')},
+ {'doctype': 'Industry Type', 'industry': _('Automotive')},
+ {'doctype': 'Industry Type', 'industry': _('Banking')},
+ {'doctype': 'Industry Type', 'industry': _('Biotechnology')},
+ {'doctype': 'Industry Type', 'industry': _('Broadcasting')},
+ {'doctype': 'Industry Type', 'industry': _('Brokerage')},
+ {'doctype': 'Industry Type', 'industry': _('Chemical')},
+ {'doctype': 'Industry Type', 'industry': _('Computer')},
+ {'doctype': 'Industry Type', 'industry': _('Consulting')},
+ {'doctype': 'Industry Type', 'industry': _('Consumer Products')},
+ {'doctype': 'Industry Type', 'industry': _('Cosmetics')},
+ {'doctype': 'Industry Type', 'industry': _('Defense')},
+ {'doctype': 'Industry Type', 'industry': _('Department Stores')},
+ {'doctype': 'Industry Type', 'industry': _('Education')},
+ {'doctype': 'Industry Type', 'industry': _('Electronics')},
+ {'doctype': 'Industry Type', 'industry': _('Energy')},
+ {'doctype': 'Industry Type', 'industry': _('Entertainment & Leisure')},
+ {'doctype': 'Industry Type', 'industry': _('Executive Search')},
+ {'doctype': 'Industry Type', 'industry': _('Financial Services')},
+ {'doctype': 'Industry Type', 'industry': _('Food, Beverage & Tobacco')},
+ {'doctype': 'Industry Type', 'industry': _('Grocery')},
+ {'doctype': 'Industry Type', 'industry': _('Health Care')},
+ {'doctype': 'Industry Type', 'industry': _('Internet Publishing')},
+ {'doctype': 'Industry Type', 'industry': _('Investment Banking')},
+ {'doctype': 'Industry Type', 'industry': _('Legal')},
+ {'doctype': 'Industry Type', 'industry': _('Manufacturing')},
+ {'doctype': 'Industry Type', 'industry': _('Motion Picture & Video')},
+ {'doctype': 'Industry Type', 'industry': _('Music')},
+ {'doctype': 'Industry Type', 'industry': _('Newspaper Publishers')},
+ {'doctype': 'Industry Type', 'industry': _('Online Auctions')},
+ {'doctype': 'Industry Type', 'industry': _('Pension Funds')},
+ {'doctype': 'Industry Type', 'industry': _('Pharmaceuticals')},
+ {'doctype': 'Industry Type', 'industry': _('Private Equity')},
+ {'doctype': 'Industry Type', 'industry': _('Publishing')},
+ {'doctype': 'Industry Type', 'industry': _('Real Estate')},
+ {'doctype': 'Industry Type', 'industry': _('Retail & Wholesale')},
+ {'doctype': 'Industry Type', 'industry': _('Securities & Commodity Exchanges')},
+ {'doctype': 'Industry Type', 'industry': _('Service')},
+ {'doctype': 'Industry Type', 'industry': _('Soap & Detergent')},
+ {'doctype': 'Industry Type', 'industry': _('Software')},
+ {'doctype': 'Industry Type', 'industry': _('Sports')},
+ {'doctype': 'Industry Type', 'industry': _('Technology')},
+ {'doctype': 'Industry Type', 'industry': _('Telecommunications')},
+ {'doctype': 'Industry Type', 'industry': _('Television')},
+ {'doctype': 'Industry Type', 'industry': _('Transportation')},
+ {'doctype': 'Industry Type', 'industry': _('Venture Capital')}
]
from frappe.modules import scrub
diff --git a/erpnext/setup/page/setup_wizard/setup_wizard.py b/erpnext/setup/page/setup_wizard/setup_wizard.py
index 3366433..36ef345 100644
--- a/erpnext/setup/page/setup_wizard/setup_wizard.py
+++ b/erpnext/setup/page/setup_wizard/setup_wizard.py
@@ -27,7 +27,7 @@
if args.language != "english":
set_default_language(args.language)
- install_fixtures.install()
+ install_fixtures.install(args.get("country"))
update_user_name(args)
frappe.local.message_log = []