Added new fixtures (Fixes #1540). Removed Employee Grade from HR.
This commit is contained in:
Anand Doshi
parent
4ceb20e07f
commit
f29bcaf436
@ -102,11 +102,6 @@ data = [
|
|||||||
"name": "Department",
|
"name": "Department",
|
||||||
"description": _("Organization unit (department) master.")
|
"description": _("Organization unit (department) master.")
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"type": "doctype",
|
|
||||||
"name": "Grade",
|
|
||||||
"description": _("Employee grade.")
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"type": "doctype",
|
"type": "doctype",
|
||||||
"name": "Designation",
|
"name": "Designation",
|
||||||
@ -199,4 +194,4 @@ data = [
|
|||||||
},
|
},
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
]
|
]
|
||||||
|
|||||||
@ -150,6 +150,11 @@ data = [
|
|||||||
"name": "Sales Email Settings",
|
"name": "Sales Email Settings",
|
||||||
"description": _("Setup incoming server for sales email id. (e.g. sales@example.com)")
|
"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 @@ data = [
|
|||||||
},
|
},
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
]
|
]
|
||||||
|
|||||||
@ -1,58 +1,49 @@
|
|||||||
{
|
{
|
||||||
"allow_import": 1,
|
"allow_import": 1,
|
||||||
"autoname": "field:department_name",
|
"autoname": "field:department_name",
|
||||||
"creation": "2013-02-05 11:48:26.000000",
|
"creation": "2013-02-05 11:48:26.000000",
|
||||||
"docstatus": 0,
|
"docstatus": 0,
|
||||||
"doctype": "DocType",
|
"doctype": "DocType",
|
||||||
"document_type": "Master",
|
"document_type": "Master",
|
||||||
"fields": [
|
"fields": [
|
||||||
{
|
{
|
||||||
"fieldname": "trash_reason",
|
"fieldname": "department_name",
|
||||||
"fieldtype": "Small Text",
|
"fieldtype": "Data",
|
||||||
"label": "Trash Reason",
|
"label": "Department",
|
||||||
"oldfieldname": "trash_reason",
|
"oldfieldname": "department_name",
|
||||||
"oldfieldtype": "Small Text",
|
"oldfieldtype": "Data",
|
||||||
"permlevel": 0,
|
"permlevel": 0,
|
||||||
"read_only": 1
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldname": "department_name",
|
|
||||||
"fieldtype": "Data",
|
|
||||||
"label": "Department",
|
|
||||||
"oldfieldname": "department_name",
|
|
||||||
"oldfieldtype": "Data",
|
|
||||||
"permlevel": 0,
|
|
||||||
"reqd": 1
|
"reqd": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"description": "Days for which Holidays are blocked for this department.",
|
"description": "Days for which Holidays are blocked for this department.",
|
||||||
"fieldname": "leave_block_list",
|
"fieldname": "leave_block_list",
|
||||||
"fieldtype": "Link",
|
"fieldtype": "Link",
|
||||||
"label": "Leave Block List",
|
"label": "Leave Block List",
|
||||||
"options": "Leave Block List",
|
"options": "Leave Block List",
|
||||||
"permlevel": 0
|
"permlevel": 0
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"icon": "icon-sitemap",
|
"icon": "icon-sitemap",
|
||||||
"idx": 1,
|
"idx": 1,
|
||||||
"modified": "2014-01-20 17:48:38.000000",
|
"modified": "2014-01-20 17:48:38.000000",
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "HR",
|
"module": "HR",
|
||||||
"name": "Department",
|
"name": "Department",
|
||||||
"owner": "Administrator",
|
"owner": "Administrator",
|
||||||
"permissions": [
|
"permissions": [
|
||||||
{
|
{
|
||||||
"cancel": 0,
|
"cancel": 0,
|
||||||
"create": 1,
|
"create": 1,
|
||||||
"delete": 1,
|
"delete": 1,
|
||||||
"email": 1,
|
"email": 1,
|
||||||
"permlevel": 0,
|
"permlevel": 0,
|
||||||
"print": 1,
|
"print": 1,
|
||||||
"read": 1,
|
"read": 1,
|
||||||
"report": 1,
|
"report": 1,
|
||||||
"role": "HR User",
|
"role": "HR User",
|
||||||
"submit": 0,
|
"submit": 0,
|
||||||
"write": 1
|
"write": 1
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,51 +1,42 @@
|
|||||||
{
|
{
|
||||||
"allow_import": 1,
|
"allow_import": 1,
|
||||||
"allow_rename": 1,
|
"allow_rename": 1,
|
||||||
"autoname": "field:designation_name",
|
"autoname": "field:designation_name",
|
||||||
"creation": "2013-01-10 16:34:13.000000",
|
"creation": "2013-01-10 16:34:13.000000",
|
||||||
"docstatus": 0,
|
"docstatus": 0,
|
||||||
"doctype": "DocType",
|
"doctype": "DocType",
|
||||||
"document_type": "Master",
|
"document_type": "Master",
|
||||||
"fields": [
|
"fields": [
|
||||||
{
|
{
|
||||||
"fieldname": "trash_reason",
|
"fieldname": "designation_name",
|
||||||
"fieldtype": "Small Text",
|
"fieldtype": "Data",
|
||||||
"label": "Trash Reason",
|
"label": "Designation",
|
||||||
"oldfieldname": "trash_reason",
|
"oldfieldname": "designation_name",
|
||||||
"oldfieldtype": "Small Text",
|
"oldfieldtype": "Data",
|
||||||
"permlevel": 0,
|
"permlevel": 0,
|
||||||
"read_only": 1
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldname": "designation_name",
|
|
||||||
"fieldtype": "Data",
|
|
||||||
"label": "Designation",
|
|
||||||
"oldfieldname": "designation_name",
|
|
||||||
"oldfieldtype": "Data",
|
|
||||||
"permlevel": 0,
|
|
||||||
"reqd": 1
|
"reqd": 1
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"icon": "icon-bookmark",
|
"icon": "icon-bookmark",
|
||||||
"idx": 1,
|
"idx": 1,
|
||||||
"modified": "2014-01-20 17:48:38.000000",
|
"modified": "2014-01-20 17:48:38.000000",
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "HR",
|
"module": "HR",
|
||||||
"name": "Designation",
|
"name": "Designation",
|
||||||
"owner": "Administrator",
|
"owner": "Administrator",
|
||||||
"permissions": [
|
"permissions": [
|
||||||
{
|
{
|
||||||
"cancel": 0,
|
"cancel": 0,
|
||||||
"create": 1,
|
"create": 1,
|
||||||
"delete": 1,
|
"delete": 1,
|
||||||
"email": 1,
|
"email": 1,
|
||||||
"permlevel": 0,
|
"permlevel": 0,
|
||||||
"print": 1,
|
"print": 1,
|
||||||
"read": 1,
|
"read": 1,
|
||||||
"report": 1,
|
"report": 1,
|
||||||
"role": "HR User",
|
"role": "HR User",
|
||||||
"submit": 0,
|
"submit": 0,
|
||||||
"write": 1
|
"write": 1
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@ -1,72 +1,62 @@
|
|||||||
{
|
{
|
||||||
"creation": "2013-02-22 01:27:45.000000",
|
"creation": "2013-02-22 01:27:45.000000",
|
||||||
"docstatus": 0,
|
"docstatus": 0,
|
||||||
"doctype": "DocType",
|
"doctype": "DocType",
|
||||||
"fields": [
|
"fields": [
|
||||||
{
|
{
|
||||||
"fieldname": "branch",
|
"fieldname": "branch",
|
||||||
"fieldtype": "Select",
|
"fieldtype": "Select",
|
||||||
"in_list_view": 1,
|
"in_list_view": 1,
|
||||||
"label": "Branch",
|
"label": "Branch",
|
||||||
"oldfieldname": "branch",
|
"oldfieldname": "branch",
|
||||||
"oldfieldtype": "Select",
|
"oldfieldtype": "Select",
|
||||||
"options": "link:Branch",
|
"options": "link:Branch",
|
||||||
"permlevel": 0
|
"permlevel": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "department",
|
"fieldname": "department",
|
||||||
"fieldtype": "Select",
|
"fieldtype": "Select",
|
||||||
"in_list_view": 1,
|
"in_list_view": 1,
|
||||||
"label": "Department",
|
"label": "Department",
|
||||||
"oldfieldname": "department",
|
"oldfieldname": "department",
|
||||||
"oldfieldtype": "Select",
|
"oldfieldtype": "Select",
|
||||||
"options": "link:Department",
|
"options": "link:Department",
|
||||||
"permlevel": 0
|
"permlevel": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "designation",
|
"fieldname": "designation",
|
||||||
"fieldtype": "Select",
|
"fieldtype": "Select",
|
||||||
"in_list_view": 1,
|
"in_list_view": 1,
|
||||||
"label": "Designation",
|
"label": "Designation",
|
||||||
"oldfieldname": "designation",
|
"oldfieldname": "designation",
|
||||||
"oldfieldtype": "Select",
|
"oldfieldtype": "Select",
|
||||||
"options": "link:Designation",
|
"options": "link:Designation",
|
||||||
"permlevel": 0
|
"permlevel": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "grade",
|
"fieldname": "from_date",
|
||||||
"fieldtype": "Select",
|
"fieldtype": "Date",
|
||||||
"in_list_view": 1,
|
"in_list_view": 1,
|
||||||
"label": "Grade",
|
"label": "From Date",
|
||||||
"oldfieldname": "grade",
|
"oldfieldname": "from_date",
|
||||||
"oldfieldtype": "Select",
|
"oldfieldtype": "Date",
|
||||||
"options": "link:Grade",
|
|
||||||
"permlevel": 0
|
"permlevel": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "from_date",
|
"fieldname": "to_date",
|
||||||
"fieldtype": "Date",
|
"fieldtype": "Date",
|
||||||
"in_list_view": 1,
|
"in_list_view": 1,
|
||||||
"label": "From Date",
|
"label": "To Date",
|
||||||
"oldfieldname": "from_date",
|
"oldfieldname": "to_date",
|
||||||
"oldfieldtype": "Date",
|
"oldfieldtype": "Date",
|
||||||
"permlevel": 0
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldname": "to_date",
|
|
||||||
"fieldtype": "Date",
|
|
||||||
"in_list_view": 1,
|
|
||||||
"label": "To Date",
|
|
||||||
"oldfieldname": "to_date",
|
|
||||||
"oldfieldtype": "Date",
|
|
||||||
"permlevel": 0
|
"permlevel": 0
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"idx": 1,
|
"idx": 1,
|
||||||
"istable": 1,
|
"istable": 1,
|
||||||
"modified": "2013-12-20 19:23:12.000000",
|
"modified": "2013-12-20 19:24:12.000000",
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "HR",
|
"module": "HR",
|
||||||
"name": "Employee Internal Work History",
|
"name": "Employee Internal Work History",
|
||||||
"owner": "Administrator"
|
"owner": "Administrator"
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,63 +1,54 @@
|
|||||||
{
|
{
|
||||||
"allow_import": 1,
|
"allow_import": 1,
|
||||||
"autoname": "field:employee_type_name",
|
"autoname": "field:employee_type_name",
|
||||||
"creation": "2013-01-10 16:34:14.000000",
|
"creation": "2013-01-10 16:34:14.000000",
|
||||||
"docstatus": 0,
|
"docstatus": 0,
|
||||||
"doctype": "DocType",
|
"doctype": "DocType",
|
||||||
"document_type": "Master",
|
"document_type": "Master",
|
||||||
"fields": [
|
"fields": [
|
||||||
{
|
{
|
||||||
"fieldname": "employee_type_name",
|
"fieldname": "employee_type_name",
|
||||||
"fieldtype": "Data",
|
"fieldtype": "Data",
|
||||||
"label": "Employment Type",
|
"label": "Employment Type",
|
||||||
"oldfieldname": "employee_type_name",
|
"oldfieldname": "employee_type_name",
|
||||||
"oldfieldtype": "Data",
|
"oldfieldtype": "Data",
|
||||||
"permlevel": 0,
|
"permlevel": 0,
|
||||||
"reqd": 1
|
"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",
|
"icon": "icon-flag",
|
||||||
"idx": 1,
|
"idx": 1,
|
||||||
"modified": "2014-01-20 17:48:43.000000",
|
"modified": "2014-01-20 17:48:43.000000",
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "HR",
|
"module": "HR",
|
||||||
"name": "Employment Type",
|
"name": "Employment Type",
|
||||||
"owner": "Administrator",
|
"owner": "Administrator",
|
||||||
"permissions": [
|
"permissions": [
|
||||||
{
|
{
|
||||||
"cancel": 0,
|
"cancel": 0,
|
||||||
"create": 1,
|
"create": 1,
|
||||||
"delete": 1,
|
"delete": 1,
|
||||||
"email": 1,
|
"email": 1,
|
||||||
"permlevel": 0,
|
"permlevel": 0,
|
||||||
"print": 1,
|
"print": 1,
|
||||||
"read": 1,
|
"read": 1,
|
||||||
"report": 1,
|
"report": 1,
|
||||||
"role": "HR User",
|
"role": "HR User",
|
||||||
"submit": 0,
|
"submit": 0,
|
||||||
"write": 1
|
"write": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"cancel": 0,
|
"cancel": 0,
|
||||||
"create": 1,
|
"create": 1,
|
||||||
"delete": 1,
|
"delete": 1,
|
||||||
"email": 1,
|
"email": 1,
|
||||||
"permlevel": 0,
|
"permlevel": 0,
|
||||||
"print": 1,
|
"print": 1,
|
||||||
"read": 1,
|
"read": 1,
|
||||||
"report": 1,
|
"report": 1,
|
||||||
"role": "HR Manager",
|
"role": "HR Manager",
|
||||||
"submit": 0,
|
"submit": 0,
|
||||||
"write": 1
|
"write": 1
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1 +0,0 @@
|
|||||||
Employee grade.
|
|
||||||
@ -1 +0,0 @@
|
|||||||
from __future__ import unicode_literals
|
|
||||||
@ -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
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
@ -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
|
|
||||||
@ -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')
|
|
||||||
@ -1 +0,0 @@
|
|||||||
[]
|
|
||||||
@ -1,122 +1,114 @@
|
|||||||
{
|
{
|
||||||
"allow_copy": 1,
|
"allow_copy": 1,
|
||||||
"allow_email": 1,
|
"allow_email": 1,
|
||||||
"allow_print": 1,
|
"allow_print": 1,
|
||||||
"creation": "2013-01-10 16:34:15.000000",
|
"creation": "2013-01-10 16:34:15.000000",
|
||||||
"docstatus": 0,
|
"docstatus": 0,
|
||||||
"doctype": "DocType",
|
"doctype": "DocType",
|
||||||
"fields": [
|
"fields": [
|
||||||
{
|
{
|
||||||
"fieldname": "column_break0",
|
"fieldname": "column_break0",
|
||||||
"fieldtype": "Column Break",
|
"fieldtype": "Column Break",
|
||||||
"permlevel": 0,
|
"permlevel": 0,
|
||||||
"width": "50%"
|
"width": "50%"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"description": "Leave blank if considered for all employee types",
|
"description": "Leave blank if considered for all employee types",
|
||||||
"fieldname": "employee_type",
|
"fieldname": "employee_type",
|
||||||
"fieldtype": "Select",
|
"fieldtype": "Select",
|
||||||
"label": "Employee Type",
|
"label": "Employee Type",
|
||||||
"options": "link:Employment Type",
|
"options": "link:Employment Type",
|
||||||
"permlevel": 0
|
"permlevel": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"description": "Leave blank if considered for all branches",
|
"description": "Leave blank if considered for all branches",
|
||||||
"fieldname": "branch",
|
"fieldname": "branch",
|
||||||
"fieldtype": "Select",
|
"fieldtype": "Select",
|
||||||
"label": "Branch",
|
"label": "Branch",
|
||||||
"options": "link:Branch",
|
"options": "link:Branch",
|
||||||
"permlevel": 0
|
"permlevel": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"description": "Leave blank if considered for all departments",
|
"description": "Leave blank if considered for all departments",
|
||||||
"fieldname": "department",
|
"fieldname": "department",
|
||||||
"fieldtype": "Select",
|
"fieldtype": "Select",
|
||||||
"label": "Department",
|
"label": "Department",
|
||||||
"options": "link:Department",
|
"options": "link:Department",
|
||||||
"permlevel": 0
|
"permlevel": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"description": "Leave blank if considered for all designations",
|
"description": "Leave blank if considered for all designations",
|
||||||
"fieldname": "designation",
|
"fieldname": "designation",
|
||||||
"fieldtype": "Select",
|
"fieldtype": "Select",
|
||||||
"label": "Designation",
|
"label": "Designation",
|
||||||
"options": "link:Designation",
|
"options": "link:Designation",
|
||||||
"permlevel": 0
|
"permlevel": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"description": "Leave blank if considered for all grades",
|
"fieldname": "column_break1",
|
||||||
"fieldname": "grade",
|
"fieldtype": "Column Break",
|
||||||
"fieldtype": "Select",
|
"permlevel": 0,
|
||||||
"label": "Grade",
|
|
||||||
"options": "link:Grade",
|
|
||||||
"permlevel": 0
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldname": "column_break1",
|
|
||||||
"fieldtype": "Column Break",
|
|
||||||
"permlevel": 0,
|
|
||||||
"width": "50%"
|
"width": "50%"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "fiscal_year",
|
"fieldname": "fiscal_year",
|
||||||
"fieldtype": "Select",
|
"fieldtype": "Select",
|
||||||
"in_filter": 1,
|
"in_filter": 1,
|
||||||
"label": "Fiscal Year",
|
"label": "Fiscal Year",
|
||||||
"options": "link:Fiscal Year",
|
"options": "link:Fiscal Year",
|
||||||
"permlevel": 0,
|
"permlevel": 0,
|
||||||
"reqd": 1
|
"reqd": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "leave_type",
|
"fieldname": "leave_type",
|
||||||
"fieldtype": "Select",
|
"fieldtype": "Select",
|
||||||
"label": "Leave Type",
|
"label": "Leave Type",
|
||||||
"options": "link:Leave Type",
|
"options": "link:Leave Type",
|
||||||
"permlevel": 0,
|
"permlevel": 0,
|
||||||
"reqd": 1
|
"reqd": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"description": "Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year",
|
"description": "Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year",
|
||||||
"fieldname": "carry_forward",
|
"fieldname": "carry_forward",
|
||||||
"fieldtype": "Check",
|
"fieldtype": "Check",
|
||||||
"label": "Carry Forward",
|
"label": "Carry Forward",
|
||||||
"permlevel": 0
|
"permlevel": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "no_of_days",
|
"fieldname": "no_of_days",
|
||||||
"fieldtype": "Float",
|
"fieldtype": "Float",
|
||||||
"label": "New Leaves Allocated (In Days)",
|
"label": "New Leaves Allocated (In Days)",
|
||||||
"permlevel": 0,
|
"permlevel": 0,
|
||||||
"reqd": 1
|
"reqd": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "allocate",
|
"fieldname": "allocate",
|
||||||
"fieldtype": "Button",
|
"fieldtype": "Button",
|
||||||
"label": "Allocate",
|
"label": "Allocate",
|
||||||
"options": "allocate_leave",
|
"options": "allocate_leave",
|
||||||
"permlevel": 0
|
"permlevel": 0
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"hide_heading": 0,
|
"hide_heading": 0,
|
||||||
"hide_toolbar": 0,
|
"hide_toolbar": 0,
|
||||||
"icon": "icon-cog",
|
"icon": "icon-cog",
|
||||||
"idx": 1,
|
"idx": 1,
|
||||||
"issingle": 1,
|
"issingle": 1,
|
||||||
"modified": "2013-07-05 14:44:50.000000",
|
"modified": "2013-07-05 14:45:50.000000",
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "HR",
|
"module": "HR",
|
||||||
"name": "Leave Control Panel",
|
"name": "Leave Control Panel",
|
||||||
"owner": "Administrator",
|
"owner": "Administrator",
|
||||||
"permissions": [
|
"permissions": [
|
||||||
{
|
{
|
||||||
"create": 1,
|
"create": 1,
|
||||||
"permlevel": 0,
|
"permlevel": 0,
|
||||||
"read": 1,
|
"read": 1,
|
||||||
"report": 0,
|
"report": 0,
|
||||||
"role": "HR User",
|
"role": "HR User",
|
||||||
"submit": 0,
|
"submit": 0,
|
||||||
"write": 1
|
"write": 1
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"read_only": 1
|
"read_only": 1
|
||||||
}
|
}
|
||||||
|
|||||||
@ -10,7 +10,7 @@ from frappe.model.document import Document
|
|||||||
|
|
||||||
class LeaveControlPanel(Document):
|
class LeaveControlPanel(Document):
|
||||||
def get_employees(self):
|
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 "
|
condition = "where "
|
||||||
flag = 0
|
flag = 0
|
||||||
for l in lst1:
|
for l in lst1:
|
||||||
|
|||||||
@ -1,166 +1,159 @@
|
|||||||
{
|
{
|
||||||
"allow_copy": 1,
|
"allow_copy": 1,
|
||||||
"allow_email": 1,
|
"allow_email": 1,
|
||||||
"allow_print": 1,
|
"allow_print": 1,
|
||||||
"creation": "2012-03-27 14:35:59.000000",
|
"creation": "2012-03-27 14:35:59.000000",
|
||||||
"docstatus": 0,
|
"docstatus": 0,
|
||||||
"doctype": "DocType",
|
"doctype": "DocType",
|
||||||
"document_type": "Other",
|
"document_type": "Other",
|
||||||
"fields": [
|
"fields": [
|
||||||
{
|
{
|
||||||
"fieldname": "document_description",
|
"fieldname": "document_description",
|
||||||
"fieldtype": "HTML",
|
"fieldtype": "HTML",
|
||||||
"label": "Document Description",
|
"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>",
|
"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
|
"permlevel": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "section_break0",
|
"fieldname": "section_break0",
|
||||||
"fieldtype": "Section Break",
|
"fieldtype": "Section Break",
|
||||||
"permlevel": 0
|
"permlevel": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "column_break0",
|
"fieldname": "column_break0",
|
||||||
"fieldtype": "Column Break",
|
"fieldtype": "Column Break",
|
||||||
"permlevel": 0,
|
"permlevel": 0,
|
||||||
"width": "50%"
|
"width": "50%"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "company",
|
"fieldname": "company",
|
||||||
"fieldtype": "Select",
|
"fieldtype": "Select",
|
||||||
"label": "Company",
|
"label": "Company",
|
||||||
"options": "link:Company",
|
"options": "link:Company",
|
||||||
"permlevel": 0,
|
"permlevel": 0,
|
||||||
"reqd": 1
|
"reqd": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "branch",
|
"fieldname": "branch",
|
||||||
"fieldtype": "Link",
|
"fieldtype": "Link",
|
||||||
"label": "Branch",
|
"label": "Branch",
|
||||||
"options": "Branch",
|
"options": "Branch",
|
||||||
"permlevel": 0
|
"permlevel": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "department",
|
"fieldname": "department",
|
||||||
"fieldtype": "Link",
|
"fieldtype": "Link",
|
||||||
"label": "Department",
|
"label": "Department",
|
||||||
"options": "Department",
|
"options": "Department",
|
||||||
"permlevel": 0
|
"permlevel": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "designation",
|
"fieldname": "designation",
|
||||||
"fieldtype": "Link",
|
"fieldtype": "Link",
|
||||||
"label": "Designation",
|
"label": "Designation",
|
||||||
"options": "Designation",
|
"options": "Designation",
|
||||||
"permlevel": 0
|
"permlevel": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "column_break1",
|
"fieldname": "column_break1",
|
||||||
"fieldtype": "Column Break",
|
"fieldtype": "Column Break",
|
||||||
"permlevel": 0,
|
"permlevel": 0,
|
||||||
"width": "50%"
|
"width": "50%"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "grade",
|
"fieldname": "fiscal_year",
|
||||||
"fieldtype": "Select",
|
"fieldtype": "Select",
|
||||||
"label": "Grade",
|
"label": "Fiscal Year",
|
||||||
"options": "link:Grade",
|
"options": "link:Fiscal Year",
|
||||||
"permlevel": 0
|
"permlevel": 0,
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldname": "fiscal_year",
|
|
||||||
"fieldtype": "Select",
|
|
||||||
"label": "Fiscal Year",
|
|
||||||
"options": "link:Fiscal Year",
|
|
||||||
"permlevel": 0,
|
|
||||||
"reqd": 1
|
"reqd": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "month",
|
"fieldname": "month",
|
||||||
"fieldtype": "Select",
|
"fieldtype": "Select",
|
||||||
"label": "Month",
|
"label": "Month",
|
||||||
"options": "\n01\n02\n03\n04\n05\n06\n07\n08\n09\n10\n11\n12",
|
"options": "\n01\n02\n03\n04\n05\n06\n07\n08\n09\n10\n11\n12",
|
||||||
"permlevel": 0,
|
"permlevel": 0,
|
||||||
"reqd": 1
|
"reqd": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"description": "Check if you want to send salary slip in mail to each employee while submitting salary slip",
|
"description": "Check if you want to send salary slip in mail to each employee while submitting salary slip",
|
||||||
"fieldname": "send_email",
|
"fieldname": "send_email",
|
||||||
"fieldtype": "Check",
|
"fieldtype": "Check",
|
||||||
"label": "Send Email",
|
"label": "Send Email",
|
||||||
"permlevel": 0
|
"permlevel": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "section_break1",
|
"fieldname": "section_break1",
|
||||||
"fieldtype": "Section Break",
|
"fieldtype": "Section Break",
|
||||||
"permlevel": 0
|
"permlevel": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "column_break2",
|
"fieldname": "column_break2",
|
||||||
"fieldtype": "Column Break",
|
"fieldtype": "Column Break",
|
||||||
"permlevel": 0,
|
"permlevel": 0,
|
||||||
"width": "50%"
|
"width": "50%"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"description": "Creates salary slip for above mentioned criteria.",
|
"description": "Creates salary slip for above mentioned criteria.",
|
||||||
"fieldname": "create_salary_slip",
|
"fieldname": "create_salary_slip",
|
||||||
"fieldtype": "Button",
|
"fieldtype": "Button",
|
||||||
"label": "Create Salary Slip",
|
"label": "Create Salary Slip",
|
||||||
"permlevel": 0
|
"permlevel": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "column_break3",
|
"fieldname": "column_break3",
|
||||||
"fieldtype": "Column Break",
|
"fieldtype": "Column Break",
|
||||||
"permlevel": 0,
|
"permlevel": 0,
|
||||||
"width": "25%"
|
"width": "25%"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"description": "Submit all salary slips for the above selected criteria",
|
"description": "Submit all salary slips for the above selected criteria",
|
||||||
"fieldname": "submit_salary_slip",
|
"fieldname": "submit_salary_slip",
|
||||||
"fieldtype": "Button",
|
"fieldtype": "Button",
|
||||||
"label": "Submit Salary Slip",
|
"label": "Submit Salary Slip",
|
||||||
"permlevel": 0
|
"permlevel": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "column_break4",
|
"fieldname": "column_break4",
|
||||||
"fieldtype": "Column Break",
|
"fieldtype": "Column Break",
|
||||||
"permlevel": 0,
|
"permlevel": 0,
|
||||||
"width": "25%"
|
"width": "25%"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"description": "Create Bank Voucher for the total salary paid for the above selected criteria",
|
"description": "Create Bank Voucher for the total salary paid for the above selected criteria",
|
||||||
"fieldname": "make_bank_voucher",
|
"fieldname": "make_bank_voucher",
|
||||||
"fieldtype": "Button",
|
"fieldtype": "Button",
|
||||||
"label": "Make Bank Voucher",
|
"label": "Make Bank Voucher",
|
||||||
"permlevel": 0
|
"permlevel": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "section_break2",
|
"fieldname": "section_break2",
|
||||||
"fieldtype": "Section Break",
|
"fieldtype": "Section Break",
|
||||||
"permlevel": 0
|
"permlevel": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "activity_log",
|
"fieldname": "activity_log",
|
||||||
"fieldtype": "HTML",
|
"fieldtype": "HTML",
|
||||||
"label": "Activity Log",
|
"label": "Activity Log",
|
||||||
"permlevel": 0
|
"permlevel": 0
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"icon": "icon-cog",
|
"icon": "icon-cog",
|
||||||
"idx": 1,
|
"idx": 1,
|
||||||
"issingle": 1,
|
"issingle": 1,
|
||||||
"modified": "2013-07-22 15:22:58.000000",
|
"modified": "2013-07-22 15:23:58.000000",
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "HR",
|
"module": "HR",
|
||||||
"name": "Salary Manager",
|
"name": "Salary Manager",
|
||||||
"owner": "Administrator",
|
"owner": "Administrator",
|
||||||
"permissions": [
|
"permissions": [
|
||||||
{
|
{
|
||||||
"create": 1,
|
"create": 1,
|
||||||
"permlevel": 0,
|
"permlevel": 0,
|
||||||
"read": 1,
|
"read": 1,
|
||||||
"role": "HR Manager",
|
"role": "HR Manager",
|
||||||
"write": 1
|
"write": 1
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@ -33,7 +33,7 @@ class SalaryManager(Document):
|
|||||||
self.check_mandatory()
|
self.check_mandatory()
|
||||||
|
|
||||||
cond = ''
|
cond = ''
|
||||||
for f in ['company', 'branch', 'department', 'designation', 'grade']:
|
for f in ['company', 'branch', 'department', 'designation']:
|
||||||
if self.get(f):
|
if self.get(f):
|
||||||
cond += " and t1." + f + " = '" + self.get(f).replace("'", "\'") + "'"
|
cond += " and t1." + f + " = '" + self.get(f).replace("'", "\'") + "'"
|
||||||
|
|
||||||
|
|||||||
@ -1,398 +1,386 @@
|
|||||||
{
|
{
|
||||||
"creation": "2013-01-10 16:34:15",
|
"creation": "2013-01-10 16:34:15",
|
||||||
"docstatus": 0,
|
"docstatus": 0,
|
||||||
"doctype": "DocType",
|
"doctype": "DocType",
|
||||||
"fields": [
|
"fields": [
|
||||||
{
|
{
|
||||||
"fieldname": "column_break0",
|
"fieldname": "column_break0",
|
||||||
"fieldtype": "Column Break",
|
"fieldtype": "Column Break",
|
||||||
"oldfieldtype": "Column Break",
|
"oldfieldtype": "Column Break",
|
||||||
"permlevel": 0,
|
"permlevel": 0,
|
||||||
"width": "50%"
|
"width": "50%"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "employee",
|
"fieldname": "employee",
|
||||||
"fieldtype": "Link",
|
"fieldtype": "Link",
|
||||||
"in_filter": 1,
|
"in_filter": 1,
|
||||||
"label": "Employee",
|
"label": "Employee",
|
||||||
"oldfieldname": "employee",
|
"oldfieldname": "employee",
|
||||||
"oldfieldtype": "Link",
|
"oldfieldtype": "Link",
|
||||||
"options": "Employee",
|
"options": "Employee",
|
||||||
"permlevel": 0,
|
"permlevel": 0,
|
||||||
"reqd": 1,
|
"reqd": 1,
|
||||||
"search_index": 1
|
"search_index": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "employee_name",
|
"fieldname": "employee_name",
|
||||||
"fieldtype": "Data",
|
"fieldtype": "Data",
|
||||||
"in_filter": 1,
|
"in_filter": 1,
|
||||||
"in_list_view": 1,
|
"in_list_view": 1,
|
||||||
"label": "Employee Name",
|
"label": "Employee Name",
|
||||||
"oldfieldname": "employee_name",
|
"oldfieldname": "employee_name",
|
||||||
"oldfieldtype": "Data",
|
"oldfieldtype": "Data",
|
||||||
"permlevel": 0,
|
"permlevel": 0,
|
||||||
"read_only": 1,
|
"read_only": 1,
|
||||||
"reqd": 1
|
"reqd": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "department",
|
"fieldname": "department",
|
||||||
"fieldtype": "Link",
|
"fieldtype": "Link",
|
||||||
"in_filter": 1,
|
"in_filter": 1,
|
||||||
"label": "Department",
|
"label": "Department",
|
||||||
"oldfieldname": "department",
|
"oldfieldname": "department",
|
||||||
"oldfieldtype": "Link",
|
"oldfieldtype": "Link",
|
||||||
"options": "Department",
|
"options": "Department",
|
||||||
"permlevel": 0,
|
"permlevel": 0,
|
||||||
"read_only": 1,
|
"read_only": 1,
|
||||||
"reqd": 0,
|
"reqd": 0,
|
||||||
"search_index": 0
|
"search_index": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "designation",
|
"fieldname": "designation",
|
||||||
"fieldtype": "Link",
|
"fieldtype": "Link",
|
||||||
"in_filter": 1,
|
"in_filter": 1,
|
||||||
"label": "Designation",
|
"label": "Designation",
|
||||||
"oldfieldname": "designation",
|
"oldfieldname": "designation",
|
||||||
"oldfieldtype": "Link",
|
"oldfieldtype": "Link",
|
||||||
"options": "Designation",
|
"options": "Designation",
|
||||||
"permlevel": 0,
|
"permlevel": 0,
|
||||||
"read_only": 1,
|
"read_only": 1,
|
||||||
"search_index": 0
|
"search_index": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "branch",
|
"fieldname": "branch",
|
||||||
"fieldtype": "Link",
|
"fieldtype": "Link",
|
||||||
"in_filter": 1,
|
"in_filter": 1,
|
||||||
"label": "Branch",
|
"label": "Branch",
|
||||||
"oldfieldname": "branch",
|
"oldfieldname": "branch",
|
||||||
"oldfieldtype": "Link",
|
"oldfieldtype": "Link",
|
||||||
"options": "Branch",
|
"options": "Branch",
|
||||||
"permlevel": 0,
|
"permlevel": 0,
|
||||||
"read_only": 1,
|
"read_only": 1,
|
||||||
"search_index": 0
|
"search_index": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "grade",
|
"fieldname": "pf_no",
|
||||||
"fieldtype": "Link",
|
"fieldtype": "Data",
|
||||||
"in_filter": 1,
|
"label": "PF No.",
|
||||||
"label": "Grade",
|
"oldfieldname": "pf_no",
|
||||||
"oldfieldname": "grade",
|
"oldfieldtype": "Data",
|
||||||
"oldfieldtype": "Link",
|
"permlevel": 0,
|
||||||
"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,
|
|
||||||
"read_only": 1
|
"read_only": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "esic_no",
|
"fieldname": "esic_no",
|
||||||
"fieldtype": "Data",
|
"fieldtype": "Data",
|
||||||
"label": "ESIC No.",
|
"label": "ESIC No.",
|
||||||
"oldfieldname": "esic_no",
|
"oldfieldname": "esic_no",
|
||||||
"oldfieldtype": "Data",
|
"oldfieldtype": "Data",
|
||||||
"permlevel": 0,
|
"permlevel": 0,
|
||||||
"read_only": 1
|
"read_only": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "letter_head",
|
"fieldname": "letter_head",
|
||||||
"fieldtype": "Link",
|
"fieldtype": "Link",
|
||||||
"label": "Letter Head",
|
"label": "Letter Head",
|
||||||
"options": "Letter Head",
|
"options": "Letter Head",
|
||||||
"permlevel": 0
|
"permlevel": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "column_break1",
|
"fieldname": "column_break1",
|
||||||
"fieldtype": "Column Break",
|
"fieldtype": "Column Break",
|
||||||
"oldfieldtype": "Column Break",
|
"oldfieldtype": "Column Break",
|
||||||
"permlevel": 0,
|
"permlevel": 0,
|
||||||
"width": "50%"
|
"width": "50%"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "fiscal_year",
|
"fieldname": "fiscal_year",
|
||||||
"fieldtype": "Link",
|
"fieldtype": "Link",
|
||||||
"in_filter": 1,
|
"in_filter": 1,
|
||||||
"in_list_view": 1,
|
"in_list_view": 1,
|
||||||
"label": "Fiscal Year",
|
"label": "Fiscal Year",
|
||||||
"oldfieldname": "fiscal_year",
|
"oldfieldname": "fiscal_year",
|
||||||
"oldfieldtype": "Data",
|
"oldfieldtype": "Data",
|
||||||
"options": "Fiscal Year",
|
"options": "Fiscal Year",
|
||||||
"permlevel": 0,
|
"permlevel": 0,
|
||||||
"reqd": 1,
|
"reqd": 1,
|
||||||
"search_index": 0
|
"search_index": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "company",
|
"fieldname": "company",
|
||||||
"fieldtype": "Select",
|
"fieldtype": "Select",
|
||||||
"in_filter": 1,
|
"in_filter": 1,
|
||||||
"label": "Company",
|
"label": "Company",
|
||||||
"options": "link:Company",
|
"options": "link:Company",
|
||||||
"permlevel": 0,
|
"permlevel": 0,
|
||||||
"reqd": 1
|
"reqd": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "month",
|
"fieldname": "month",
|
||||||
"fieldtype": "Select",
|
"fieldtype": "Select",
|
||||||
"in_filter": 1,
|
"in_filter": 1,
|
||||||
"in_list_view": 1,
|
"in_list_view": 1,
|
||||||
"label": "Month",
|
"label": "Month",
|
||||||
"oldfieldname": "month",
|
"oldfieldname": "month",
|
||||||
"oldfieldtype": "Select",
|
"oldfieldtype": "Select",
|
||||||
"options": "\n01\n02\n03\n04\n05\n06\n07\n08\n09\n10\n11\n12",
|
"options": "\n01\n02\n03\n04\n05\n06\n07\n08\n09\n10\n11\n12",
|
||||||
"permlevel": 0,
|
"permlevel": 0,
|
||||||
"reqd": 1,
|
"reqd": 1,
|
||||||
"search_index": 1,
|
"search_index": 1,
|
||||||
"width": "37%"
|
"width": "37%"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "total_days_in_month",
|
"fieldname": "total_days_in_month",
|
||||||
"fieldtype": "Data",
|
"fieldtype": "Data",
|
||||||
"label": "Total Working Days In The Month",
|
"label": "Total Working Days In The Month",
|
||||||
"oldfieldname": "total_days_in_month",
|
"oldfieldname": "total_days_in_month",
|
||||||
"oldfieldtype": "Int",
|
"oldfieldtype": "Int",
|
||||||
"permlevel": 0,
|
"permlevel": 0,
|
||||||
"read_only": 1,
|
"read_only": 1,
|
||||||
"reqd": 1
|
"reqd": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "leave_without_pay",
|
"fieldname": "leave_without_pay",
|
||||||
"fieldtype": "Float",
|
"fieldtype": "Float",
|
||||||
"label": "Leave Without Pay",
|
"label": "Leave Without Pay",
|
||||||
"oldfieldname": "leave_without_pay",
|
"oldfieldname": "leave_without_pay",
|
||||||
"oldfieldtype": "Currency",
|
"oldfieldtype": "Currency",
|
||||||
"permlevel": 0
|
"permlevel": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "payment_days",
|
"fieldname": "payment_days",
|
||||||
"fieldtype": "Float",
|
"fieldtype": "Float",
|
||||||
"label": "Payment Days",
|
"label": "Payment Days",
|
||||||
"oldfieldname": "payment_days",
|
"oldfieldname": "payment_days",
|
||||||
"oldfieldtype": "Float",
|
"oldfieldtype": "Float",
|
||||||
"permlevel": 0,
|
"permlevel": 0,
|
||||||
"read_only": 1,
|
"read_only": 1,
|
||||||
"reqd": 1
|
"reqd": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "bank_name",
|
"fieldname": "bank_name",
|
||||||
"fieldtype": "Data",
|
"fieldtype": "Data",
|
||||||
"label": "Bank Name",
|
"label": "Bank Name",
|
||||||
"oldfieldname": "bank_name",
|
"oldfieldname": "bank_name",
|
||||||
"oldfieldtype": "Data",
|
"oldfieldtype": "Data",
|
||||||
"permlevel": 0,
|
"permlevel": 0,
|
||||||
"read_only": 1
|
"read_only": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "bank_account_no",
|
"fieldname": "bank_account_no",
|
||||||
"fieldtype": "Data",
|
"fieldtype": "Data",
|
||||||
"label": "Bank Account No.",
|
"label": "Bank Account No.",
|
||||||
"oldfieldname": "bank_account_no",
|
"oldfieldname": "bank_account_no",
|
||||||
"oldfieldtype": "Data",
|
"oldfieldtype": "Data",
|
||||||
"permlevel": 0,
|
"permlevel": 0,
|
||||||
"read_only": 1
|
"read_only": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "email_check",
|
"fieldname": "email_check",
|
||||||
"fieldtype": "Check",
|
"fieldtype": "Check",
|
||||||
"label": "Email",
|
"label": "Email",
|
||||||
"no_copy": 1,
|
"no_copy": 1,
|
||||||
"oldfieldname": "email_check",
|
"oldfieldname": "email_check",
|
||||||
"oldfieldtype": "Check",
|
"oldfieldtype": "Check",
|
||||||
"permlevel": 0,
|
"permlevel": 0,
|
||||||
"print_hide": 1,
|
"print_hide": 1,
|
||||||
"report_hide": 1
|
"report_hide": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "amended_from",
|
"fieldname": "amended_from",
|
||||||
"fieldtype": "Data",
|
"fieldtype": "Data",
|
||||||
"hidden": 0,
|
"hidden": 0,
|
||||||
"ignore_restrictions": 1,
|
"ignore_restrictions": 1,
|
||||||
"label": "Amended From",
|
"label": "Amended From",
|
||||||
"no_copy": 1,
|
"no_copy": 1,
|
||||||
"oldfieldname": "amended_from",
|
"oldfieldname": "amended_from",
|
||||||
"oldfieldtype": "Data",
|
"oldfieldtype": "Data",
|
||||||
"permlevel": 0,
|
"permlevel": 0,
|
||||||
"print_hide": 1,
|
"print_hide": 1,
|
||||||
"report_hide": 0
|
"report_hide": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "earning_deduction",
|
"fieldname": "earning_deduction",
|
||||||
"fieldtype": "Section Break",
|
"fieldtype": "Section Break",
|
||||||
"label": "Earning & Deduction",
|
"label": "Earning & Deduction",
|
||||||
"oldfieldtype": "Section Break",
|
"oldfieldtype": "Section Break",
|
||||||
"permlevel": 0
|
"permlevel": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "earning",
|
"fieldname": "earning",
|
||||||
"fieldtype": "Column Break",
|
"fieldtype": "Column Break",
|
||||||
"label": "Earning",
|
"label": "Earning",
|
||||||
"oldfieldtype": "Column Break",
|
"oldfieldtype": "Column Break",
|
||||||
"permlevel": 0,
|
"permlevel": 0,
|
||||||
"reqd": 0,
|
"reqd": 0,
|
||||||
"width": "50%"
|
"width": "50%"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "earning_details",
|
"fieldname": "earning_details",
|
||||||
"fieldtype": "Table",
|
"fieldtype": "Table",
|
||||||
"label": "Salary Structure Earnings",
|
"label": "Salary Structure Earnings",
|
||||||
"oldfieldname": "earning_details",
|
"oldfieldname": "earning_details",
|
||||||
"oldfieldtype": "Table",
|
"oldfieldtype": "Table",
|
||||||
"options": "Salary Slip Earning",
|
"options": "Salary Slip Earning",
|
||||||
"permlevel": 0
|
"permlevel": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "deduction",
|
"fieldname": "deduction",
|
||||||
"fieldtype": "Column Break",
|
"fieldtype": "Column Break",
|
||||||
"label": "Deduction",
|
"label": "Deduction",
|
||||||
"oldfieldtype": "Column Break",
|
"oldfieldtype": "Column Break",
|
||||||
"permlevel": 0,
|
"permlevel": 0,
|
||||||
"width": "50%"
|
"width": "50%"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "deduction_details",
|
"fieldname": "deduction_details",
|
||||||
"fieldtype": "Table",
|
"fieldtype": "Table",
|
||||||
"label": "Deductions",
|
"label": "Deductions",
|
||||||
"oldfieldname": "deduction_details",
|
"oldfieldname": "deduction_details",
|
||||||
"oldfieldtype": "Table",
|
"oldfieldtype": "Table",
|
||||||
"options": "Salary Slip Deduction",
|
"options": "Salary Slip Deduction",
|
||||||
"permlevel": 0
|
"permlevel": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "totals",
|
"fieldname": "totals",
|
||||||
"fieldtype": "Section Break",
|
"fieldtype": "Section Break",
|
||||||
"label": "Totals",
|
"label": "Totals",
|
||||||
"oldfieldtype": "Section Break",
|
"oldfieldtype": "Section Break",
|
||||||
"permlevel": 0
|
"permlevel": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "column_break2",
|
"fieldname": "column_break2",
|
||||||
"fieldtype": "Column Break",
|
"fieldtype": "Column Break",
|
||||||
"oldfieldtype": "Column Break",
|
"oldfieldtype": "Column Break",
|
||||||
"permlevel": 0,
|
"permlevel": 0,
|
||||||
"width": "50%"
|
"width": "50%"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "arrear_amount",
|
"fieldname": "arrear_amount",
|
||||||
"fieldtype": "Currency",
|
"fieldtype": "Currency",
|
||||||
"label": "Arrear Amount",
|
"label": "Arrear Amount",
|
||||||
"oldfieldname": "arrear_amount",
|
"oldfieldname": "arrear_amount",
|
||||||
"oldfieldtype": "Currency",
|
"oldfieldtype": "Currency",
|
||||||
"options": "Company:company:default_currency",
|
"options": "Company:company:default_currency",
|
||||||
"permlevel": 0
|
"permlevel": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "leave_encashment_amount",
|
"fieldname": "leave_encashment_amount",
|
||||||
"fieldtype": "Currency",
|
"fieldtype": "Currency",
|
||||||
"label": "Leave Encashment Amount",
|
"label": "Leave Encashment Amount",
|
||||||
"oldfieldname": "encashment_amount",
|
"oldfieldname": "encashment_amount",
|
||||||
"oldfieldtype": "Currency",
|
"oldfieldtype": "Currency",
|
||||||
"options": "Company:company:default_currency",
|
"options": "Company:company:default_currency",
|
||||||
"permlevel": 0
|
"permlevel": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "gross_pay",
|
"fieldname": "gross_pay",
|
||||||
"fieldtype": "Currency",
|
"fieldtype": "Currency",
|
||||||
"label": "Gross Pay",
|
"label": "Gross Pay",
|
||||||
"oldfieldname": "gross_pay",
|
"oldfieldname": "gross_pay",
|
||||||
"oldfieldtype": "Currency",
|
"oldfieldtype": "Currency",
|
||||||
"options": "Company:company:default_currency",
|
"options": "Company:company:default_currency",
|
||||||
"permlevel": 0,
|
"permlevel": 0,
|
||||||
"read_only": 1
|
"read_only": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "total_deduction",
|
"fieldname": "total_deduction",
|
||||||
"fieldtype": "Currency",
|
"fieldtype": "Currency",
|
||||||
"label": "Total Deduction",
|
"label": "Total Deduction",
|
||||||
"oldfieldname": "total_deduction",
|
"oldfieldname": "total_deduction",
|
||||||
"oldfieldtype": "Currency",
|
"oldfieldtype": "Currency",
|
||||||
"options": "Company:company:default_currency",
|
"options": "Company:company:default_currency",
|
||||||
"permlevel": 0,
|
"permlevel": 0,
|
||||||
"read_only": 1
|
"read_only": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "column_break3",
|
"fieldname": "column_break3",
|
||||||
"fieldtype": "Column Break",
|
"fieldtype": "Column Break",
|
||||||
"oldfieldtype": "Column Break",
|
"oldfieldtype": "Column Break",
|
||||||
"permlevel": 0,
|
"permlevel": 0,
|
||||||
"width": "50%"
|
"width": "50%"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"description": "Gross Pay + Arrear Amount +Encashment Amount - Total Deduction",
|
"description": "Gross Pay + Arrear Amount +Encashment Amount - Total Deduction",
|
||||||
"fieldname": "net_pay",
|
"fieldname": "net_pay",
|
||||||
"fieldtype": "Currency",
|
"fieldtype": "Currency",
|
||||||
"label": "Net Pay",
|
"label": "Net Pay",
|
||||||
"oldfieldname": "net_pay",
|
"oldfieldname": "net_pay",
|
||||||
"oldfieldtype": "Currency",
|
"oldfieldtype": "Currency",
|
||||||
"options": "Company:company:default_currency",
|
"options": "Company:company:default_currency",
|
||||||
"permlevel": 0,
|
"permlevel": 0,
|
||||||
"read_only": 1
|
"read_only": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "rounded_total",
|
"fieldname": "rounded_total",
|
||||||
"fieldtype": "Currency",
|
"fieldtype": "Currency",
|
||||||
"label": "Rounded Total",
|
"label": "Rounded Total",
|
||||||
"options": "Company:company:default_currency",
|
"options": "Company:company:default_currency",
|
||||||
"permlevel": 0,
|
"permlevel": 0,
|
||||||
"read_only": 1
|
"read_only": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"description": "Net Pay (in words) will be visible once you save the Salary Slip.",
|
"description": "Net Pay (in words) will be visible once you save the Salary Slip.",
|
||||||
"fieldname": "total_in_words",
|
"fieldname": "total_in_words",
|
||||||
"fieldtype": "Data",
|
"fieldtype": "Data",
|
||||||
"label": "Total in words",
|
"label": "Total in words",
|
||||||
"oldfieldname": "net_pay_in_words",
|
"oldfieldname": "net_pay_in_words",
|
||||||
"oldfieldtype": "Data",
|
"oldfieldtype": "Data",
|
||||||
"permlevel": 0,
|
"permlevel": 0,
|
||||||
"read_only": 1
|
"read_only": 1
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"icon": "icon-file-text",
|
"icon": "icon-file-text",
|
||||||
"idx": 1,
|
"idx": 1,
|
||||||
"is_submittable": 1,
|
"is_submittable": 1,
|
||||||
"modified": "2014-05-01 04:31:14.543092",
|
"modified": "2014-05-01 04:21:14.543092",
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "HR",
|
"module": "HR",
|
||||||
"name": "Salary Slip",
|
"name": "Salary Slip",
|
||||||
"owner": "Administrator",
|
"owner": "Administrator",
|
||||||
"permissions": [
|
"permissions": [
|
||||||
{
|
{
|
||||||
"amend": 0,
|
"amend": 0,
|
||||||
"create": 1,
|
"create": 1,
|
||||||
"delete": 0,
|
"delete": 0,
|
||||||
"email": 1,
|
"email": 1,
|
||||||
"permlevel": 0,
|
"permlevel": 0,
|
||||||
"print": 1,
|
"print": 1,
|
||||||
"read": 1,
|
"read": 1,
|
||||||
"report": 1,
|
"report": 1,
|
||||||
"role": "HR User",
|
"role": "HR User",
|
||||||
"submit": 1,
|
"submit": 1,
|
||||||
"write": 1
|
"write": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"amend": 1,
|
"amend": 1,
|
||||||
"cancel": 1,
|
"cancel": 1,
|
||||||
"create": 1,
|
"create": 1,
|
||||||
"delete": 1,
|
"delete": 1,
|
||||||
"email": 1,
|
"email": 1,
|
||||||
"permlevel": 0,
|
"permlevel": 0,
|
||||||
"print": 1,
|
"print": 1,
|
||||||
"read": 1,
|
"read": 1,
|
||||||
"report": 1,
|
"report": 1,
|
||||||
"role": "HR Manager",
|
"role": "HR Manager",
|
||||||
"submit": 1,
|
"submit": 1,
|
||||||
"write": 1
|
"write": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"permlevel": 0,
|
"permlevel": 0,
|
||||||
"read": 1,
|
"read": 1,
|
||||||
"restricted": 0,
|
"restricted": 0,
|
||||||
"role": "Employee"
|
"role": "Employee"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@ -241,7 +241,6 @@ class SalarySlip(TransactionBase):
|
|||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td width = "50%%">Designation : %s</td>
|
<td width = "50%%">Designation : %s</td>
|
||||||
<td width = "50%%">Grade : %s</td>
|
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td width = "50%%">Bank Account No. : %s</td>
|
<td width = "50%%">Bank Account No. : %s</td>
|
||||||
@ -285,7 +284,7 @@ class SalarySlip(TransactionBase):
|
|||||||
</table></div>''' % (cstr(letter_head), cstr(self.employee),
|
</table></div>''' % (cstr(letter_head), cstr(self.employee),
|
||||||
cstr(self.employee_name), cstr(self.month), cstr(self.fiscal_year),
|
cstr(self.employee_name), cstr(self.month), cstr(self.fiscal_year),
|
||||||
cstr(self.department), cstr(self.branch), cstr(self.designation),
|
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(self.arrear_amount), cstr(self.payment_days), earn_table, ded_table,
|
||||||
cstr(flt(self.gross_pay)), cstr(flt(self.total_deduction)),
|
cstr(flt(self.gross_pay)), cstr(flt(self.total_deduction)),
|
||||||
cstr(flt(self.net_pay)), cstr(self.total_in_words))
|
cstr(flt(self.net_pay)), cstr(self.total_in_words))
|
||||||
|
|||||||
@ -1,273 +1,261 @@
|
|||||||
{
|
{
|
||||||
"allow_import": 1,
|
"allow_import": 1,
|
||||||
"creation": "2013-03-07 18:50:29.000000",
|
"creation": "2013-03-07 18:50:29.000000",
|
||||||
"docstatus": 0,
|
"docstatus": 0,
|
||||||
"doctype": "DocType",
|
"doctype": "DocType",
|
||||||
"fields": [
|
"fields": [
|
||||||
{
|
{
|
||||||
"fieldname": "column_break0",
|
"fieldname": "column_break0",
|
||||||
"fieldtype": "Column Break",
|
"fieldtype": "Column Break",
|
||||||
"permlevel": 0,
|
"permlevel": 0,
|
||||||
"read_only": 0,
|
"read_only": 0,
|
||||||
"width": "50%"
|
"width": "50%"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "employee",
|
"fieldname": "employee",
|
||||||
"fieldtype": "Link",
|
"fieldtype": "Link",
|
||||||
"in_filter": 1,
|
"in_filter": 1,
|
||||||
"label": "Employee",
|
"label": "Employee",
|
||||||
"oldfieldname": "employee",
|
"oldfieldname": "employee",
|
||||||
"oldfieldtype": "Link",
|
"oldfieldtype": "Link",
|
||||||
"options": "Employee",
|
"options": "Employee",
|
||||||
"permlevel": 0,
|
"permlevel": 0,
|
||||||
"read_only": 0,
|
"read_only": 0,
|
||||||
"reqd": 1
|
"reqd": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "employee_name",
|
"fieldname": "employee_name",
|
||||||
"fieldtype": "Data",
|
"fieldtype": "Data",
|
||||||
"in_list_view": 1,
|
"in_list_view": 1,
|
||||||
"label": "Employee Name",
|
"label": "Employee Name",
|
||||||
"oldfieldname": "employee_name",
|
"oldfieldname": "employee_name",
|
||||||
"oldfieldtype": "Data",
|
"oldfieldtype": "Data",
|
||||||
"permlevel": 0,
|
"permlevel": 0,
|
||||||
"read_only": 1
|
"read_only": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "branch",
|
"fieldname": "branch",
|
||||||
"fieldtype": "Select",
|
"fieldtype": "Select",
|
||||||
"in_filter": 1,
|
"in_filter": 1,
|
||||||
"label": "Branch",
|
"label": "Branch",
|
||||||
"oldfieldname": "branch",
|
"oldfieldname": "branch",
|
||||||
"oldfieldtype": "Select",
|
"oldfieldtype": "Select",
|
||||||
"options": "link:Branch",
|
"options": "link:Branch",
|
||||||
"permlevel": 0,
|
"permlevel": 0,
|
||||||
"read_only": 1,
|
"read_only": 1,
|
||||||
"reqd": 0
|
"reqd": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "designation",
|
"fieldname": "designation",
|
||||||
"fieldtype": "Select",
|
"fieldtype": "Select",
|
||||||
"in_filter": 1,
|
"in_filter": 1,
|
||||||
"label": "Designation",
|
"label": "Designation",
|
||||||
"oldfieldname": "designation",
|
"oldfieldname": "designation",
|
||||||
"oldfieldtype": "Select",
|
"oldfieldtype": "Select",
|
||||||
"options": "link:Designation",
|
"options": "link:Designation",
|
||||||
"permlevel": 0,
|
"permlevel": 0,
|
||||||
"read_only": 1,
|
"read_only": 1,
|
||||||
"reqd": 0
|
"reqd": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "department",
|
"fieldname": "department",
|
||||||
"fieldtype": "Select",
|
"fieldtype": "Select",
|
||||||
"in_filter": 1,
|
"in_filter": 1,
|
||||||
"label": "Department",
|
"label": "Department",
|
||||||
"oldfieldname": "department",
|
"oldfieldname": "department",
|
||||||
"oldfieldtype": "Select",
|
"oldfieldtype": "Select",
|
||||||
"options": "link:Department",
|
"options": "link:Department",
|
||||||
"permlevel": 0,
|
"permlevel": 0,
|
||||||
"read_only": 1,
|
"read_only": 1,
|
||||||
"reqd": 0
|
"reqd": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "grade",
|
"fieldname": "column_break1",
|
||||||
"fieldtype": "Select",
|
"fieldtype": "Column Break",
|
||||||
"in_filter": 1,
|
"permlevel": 0,
|
||||||
"label": "Grade",
|
"read_only": 0,
|
||||||
"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,
|
|
||||||
"width": "50%"
|
"width": "50%"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"default": "Yes",
|
"default": "Yes",
|
||||||
"fieldname": "is_active",
|
"fieldname": "is_active",
|
||||||
"fieldtype": "Select",
|
"fieldtype": "Select",
|
||||||
"in_filter": 1,
|
"in_filter": 1,
|
||||||
"in_list_view": 1,
|
"in_list_view": 1,
|
||||||
"label": "Is Active",
|
"label": "Is Active",
|
||||||
"oldfieldname": "is_active",
|
"oldfieldname": "is_active",
|
||||||
"oldfieldtype": "Select",
|
"oldfieldtype": "Select",
|
||||||
"options": "\nYes\nNo",
|
"options": "\nYes\nNo",
|
||||||
"permlevel": 0,
|
"permlevel": 0,
|
||||||
"read_only": 0,
|
"read_only": 0,
|
||||||
"reqd": 1
|
"reqd": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "from_date",
|
"fieldname": "from_date",
|
||||||
"fieldtype": "Date",
|
"fieldtype": "Date",
|
||||||
"in_list_view": 1,
|
"in_list_view": 1,
|
||||||
"label": "From Date",
|
"label": "From Date",
|
||||||
"oldfieldname": "from_date",
|
"oldfieldname": "from_date",
|
||||||
"oldfieldtype": "Date",
|
"oldfieldtype": "Date",
|
||||||
"permlevel": 0,
|
"permlevel": 0,
|
||||||
"read_only": 0,
|
"read_only": 0,
|
||||||
"reqd": 1
|
"reqd": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "to_date",
|
"fieldname": "to_date",
|
||||||
"fieldtype": "Date",
|
"fieldtype": "Date",
|
||||||
"in_list_view": 1,
|
"in_list_view": 1,
|
||||||
"label": "To Date",
|
"label": "To Date",
|
||||||
"oldfieldname": "to_date",
|
"oldfieldname": "to_date",
|
||||||
"oldfieldtype": "Date",
|
"oldfieldtype": "Date",
|
||||||
"permlevel": 0,
|
"permlevel": 0,
|
||||||
"read_only": 0
|
"read_only": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "company",
|
"fieldname": "company",
|
||||||
"fieldtype": "Select",
|
"fieldtype": "Select",
|
||||||
"in_filter": 1,
|
"in_filter": 1,
|
||||||
"label": "Company",
|
"label": "Company",
|
||||||
"options": "link:Company",
|
"options": "link:Company",
|
||||||
"permlevel": 0,
|
"permlevel": 0,
|
||||||
"read_only": 0,
|
"read_only": 0,
|
||||||
"reqd": 1
|
"reqd": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"description": "Salary breakup based on Earning and Deduction.",
|
"description": "Salary breakup based on Earning and Deduction.",
|
||||||
"fieldname": "earning_deduction",
|
"fieldname": "earning_deduction",
|
||||||
"fieldtype": "Section Break",
|
"fieldtype": "Section Break",
|
||||||
"label": "Monthly Earning & Deduction",
|
"label": "Monthly Earning & Deduction",
|
||||||
"oldfieldname": "earning_deduction",
|
"oldfieldname": "earning_deduction",
|
||||||
"oldfieldtype": "Section Break",
|
"oldfieldtype": "Section Break",
|
||||||
"permlevel": 0,
|
"permlevel": 0,
|
||||||
"read_only": 0
|
"read_only": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "earning",
|
"fieldname": "earning",
|
||||||
"fieldtype": "Column Break",
|
"fieldtype": "Column Break",
|
||||||
"hidden": 0,
|
"hidden": 0,
|
||||||
"label": "Earning",
|
"label": "Earning",
|
||||||
"oldfieldname": "col_brk2",
|
"oldfieldname": "col_brk2",
|
||||||
"oldfieldtype": "Column Break",
|
"oldfieldtype": "Column Break",
|
||||||
"permlevel": 0,
|
"permlevel": 0,
|
||||||
"read_only": 0,
|
"read_only": 0,
|
||||||
"width": "50%"
|
"width": "50%"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "earning_details",
|
"fieldname": "earning_details",
|
||||||
"fieldtype": "Table",
|
"fieldtype": "Table",
|
||||||
"hidden": 0,
|
"hidden": 0,
|
||||||
"label": "Earning1",
|
"label": "Earning1",
|
||||||
"oldfieldname": "earning_details",
|
"oldfieldname": "earning_details",
|
||||||
"oldfieldtype": "Table",
|
"oldfieldtype": "Table",
|
||||||
"options": "Salary Structure Earning",
|
"options": "Salary Structure Earning",
|
||||||
"permlevel": 0,
|
"permlevel": 0,
|
||||||
"read_only": 0
|
"read_only": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "deduction",
|
"fieldname": "deduction",
|
||||||
"fieldtype": "Column Break",
|
"fieldtype": "Column Break",
|
||||||
"hidden": 0,
|
"hidden": 0,
|
||||||
"label": "Deduction",
|
"label": "Deduction",
|
||||||
"oldfieldname": "col_brk3",
|
"oldfieldname": "col_brk3",
|
||||||
"oldfieldtype": "Column Break",
|
"oldfieldtype": "Column Break",
|
||||||
"permlevel": 0,
|
"permlevel": 0,
|
||||||
"read_only": 0,
|
"read_only": 0,
|
||||||
"width": "50%"
|
"width": "50%"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "deduction_details",
|
"fieldname": "deduction_details",
|
||||||
"fieldtype": "Table",
|
"fieldtype": "Table",
|
||||||
"hidden": 0,
|
"hidden": 0,
|
||||||
"label": "Deduction1",
|
"label": "Deduction1",
|
||||||
"oldfieldname": "deduction_details",
|
"oldfieldname": "deduction_details",
|
||||||
"oldfieldtype": "Table",
|
"oldfieldtype": "Table",
|
||||||
"options": "Salary Structure Deduction",
|
"options": "Salary Structure Deduction",
|
||||||
"permlevel": 0,
|
"permlevel": 0,
|
||||||
"read_only": 0
|
"read_only": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "section_break0",
|
"fieldname": "section_break0",
|
||||||
"fieldtype": "Section Break",
|
"fieldtype": "Section Break",
|
||||||
"options": "Simple",
|
"options": "Simple",
|
||||||
"permlevel": 0,
|
"permlevel": 0,
|
||||||
"read_only": 0
|
"read_only": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "column_break2",
|
"fieldname": "column_break2",
|
||||||
"fieldtype": "Column Break",
|
"fieldtype": "Column Break",
|
||||||
"permlevel": 0,
|
"permlevel": 0,
|
||||||
"read_only": 0,
|
"read_only": 0,
|
||||||
"width": "50%"
|
"width": "50%"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "total_earning",
|
"fieldname": "total_earning",
|
||||||
"fieldtype": "Currency",
|
"fieldtype": "Currency",
|
||||||
"label": "Total Earning",
|
"label": "Total Earning",
|
||||||
"oldfieldname": "total_earning",
|
"oldfieldname": "total_earning",
|
||||||
"oldfieldtype": "Currency",
|
"oldfieldtype": "Currency",
|
||||||
"options": "Company:company:default_currency",
|
"options": "Company:company:default_currency",
|
||||||
"permlevel": 0,
|
"permlevel": 0,
|
||||||
"read_only": 1
|
"read_only": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "total_deduction",
|
"fieldname": "total_deduction",
|
||||||
"fieldtype": "Currency",
|
"fieldtype": "Currency",
|
||||||
"label": "Total Deduction",
|
"label": "Total Deduction",
|
||||||
"oldfieldname": "total_deduction",
|
"oldfieldname": "total_deduction",
|
||||||
"oldfieldtype": "Currency",
|
"oldfieldtype": "Currency",
|
||||||
"options": "Company:company:default_currency",
|
"options": "Company:company:default_currency",
|
||||||
"permlevel": 0,
|
"permlevel": 0,
|
||||||
"read_only": 1
|
"read_only": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "column_break3",
|
"fieldname": "column_break3",
|
||||||
"fieldtype": "Column Break",
|
"fieldtype": "Column Break",
|
||||||
"permlevel": 0,
|
"permlevel": 0,
|
||||||
"read_only": 0,
|
"read_only": 0,
|
||||||
"width": "50%"
|
"width": "50%"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "net_pay",
|
"fieldname": "net_pay",
|
||||||
"fieldtype": "Currency",
|
"fieldtype": "Currency",
|
||||||
"label": "Net Pay",
|
"label": "Net Pay",
|
||||||
"options": "Company:company:default_currency",
|
"options": "Company:company:default_currency",
|
||||||
"permlevel": 0,
|
"permlevel": 0,
|
||||||
"read_only": 1
|
"read_only": 1
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"icon": "icon-file-text",
|
"icon": "icon-file-text",
|
||||||
"idx": 1,
|
"idx": 1,
|
||||||
"modified": "2013-12-20 19:24:28.000000",
|
"modified": "2013-12-20 19:23:28.000000",
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "HR",
|
"module": "HR",
|
||||||
"name": "Salary Structure",
|
"name": "Salary Structure",
|
||||||
"owner": "Administrator",
|
"owner": "Administrator",
|
||||||
"permissions": [
|
"permissions": [
|
||||||
{
|
{
|
||||||
"amend": 0,
|
"amend": 0,
|
||||||
"create": 1,
|
"create": 1,
|
||||||
"email": 1,
|
"email": 1,
|
||||||
"permlevel": 0,
|
"permlevel": 0,
|
||||||
"print": 1,
|
"print": 1,
|
||||||
"read": 1,
|
"read": 1,
|
||||||
"report": 1,
|
"report": 1,
|
||||||
"role": "HR User",
|
"role": "HR User",
|
||||||
"submit": 0,
|
"submit": 0,
|
||||||
"write": 1
|
"write": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"amend": 0,
|
"amend": 0,
|
||||||
"create": 1,
|
"create": 1,
|
||||||
"email": 1,
|
"email": 1,
|
||||||
"permlevel": 0,
|
"permlevel": 0,
|
||||||
"print": 1,
|
"print": 1,
|
||||||
"read": 1,
|
"read": 1,
|
||||||
"report": 1,
|
"report": 1,
|
||||||
"role": "HR Manager",
|
"role": "HR Manager",
|
||||||
"submit": 0,
|
"submit": 0,
|
||||||
"write": 1
|
"write": 1
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@ -16,7 +16,7 @@ class SalaryStructure(Document):
|
|||||||
|
|
||||||
def get_employee_details(self):
|
def get_employee_details(self):
|
||||||
ret = {}
|
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)
|
from `tabEmployee` where name = %s""", self.employee)
|
||||||
if det:
|
if det:
|
||||||
ret = {
|
ret = {
|
||||||
@ -24,7 +24,6 @@ class SalaryStructure(Document):
|
|||||||
'branch': cstr(det[0][1]),
|
'branch': cstr(det[0][1]),
|
||||||
'designation': cstr(det[0][2]),
|
'designation': cstr(det[0][2]),
|
||||||
'department': cstr(det[0][3]),
|
'department': cstr(det[0][3]),
|
||||||
'grade': cstr(det[0][4]),
|
|
||||||
'backup_employee': cstr(self.employee)
|
'backup_employee': cstr(self.employee)
|
||||||
}
|
}
|
||||||
return ret
|
return ret
|
||||||
|
|||||||
@ -1,16 +1,16 @@
|
|||||||
{
|
{
|
||||||
"creation": "2013-05-06 18:43:53.000000",
|
"creation": "2013-05-06 18:43:53.000000",
|
||||||
"docstatus": 0,
|
"docstatus": 0,
|
||||||
"doctype": "Report",
|
"doctype": "Report",
|
||||||
"idx": 1,
|
"idx": 1,
|
||||||
"is_standard": "Yes",
|
"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\"}",
|
"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": "2014-03-07 15:30:27.000000",
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "HR",
|
"module": "HR",
|
||||||
"name": "Employee Information",
|
"name": "Employee Information",
|
||||||
"owner": "Administrator",
|
"owner": "Administrator",
|
||||||
"ref_doctype": "Employee",
|
"ref_doctype": "Employee",
|
||||||
"report_name": "Employee Information",
|
"report_name": "Employee Information",
|
||||||
"report_type": "Report Builder"
|
"report_type": "Report Builder"
|
||||||
}
|
}
|
||||||
|
|||||||
@ -7,7 +7,7 @@ import frappe
|
|||||||
|
|
||||||
from frappe import _
|
from frappe import _
|
||||||
|
|
||||||
def install():
|
def install(country=None):
|
||||||
records = [
|
records = [
|
||||||
|
|
||||||
# item group
|
# item group
|
||||||
@ -44,6 +44,51 @@ def install():
|
|||||||
{'doctype': 'Leave Type', 'leave_type_name': _('Privilege Leave'), 'name': _('Privilege Leave'), 'is_encash': 0, 'is_carry_forward': 0, },
|
{'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},
|
{'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
|
# territory
|
||||||
{'doctype': 'Territory', 'territory_name': _('All Territories'), 'is_group': 'Yes', 'name': _('All Territories'), 'parent_territory': ''},
|
{'doctype': 'Territory', 'territory_name': _('All Territories'), 'is_group': 'Yes', 'name': _('All Territories'), 'parent_territory': ''},
|
||||||
|
|
||||||
@ -76,6 +121,72 @@ def install():
|
|||||||
{'uom_name': _('Hour'), 'doctype': 'UOM', 'name': 'Hour'},
|
{'uom_name': _('Hour'), 'doctype': 'UOM', 'name': 'Hour'},
|
||||||
{'uom_name': _('Minute'), 'doctype': 'UOM', 'name': 'Minute'},
|
{'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
|
from frappe.modules import scrub
|
||||||
|
|||||||
@ -27,7 +27,7 @@ def setup_account(args=None):
|
|||||||
if args.language != "english":
|
if args.language != "english":
|
||||||
set_default_language(args.language)
|
set_default_language(args.language)
|
||||||
|
|
||||||
install_fixtures.install()
|
install_fixtures.install(args.get("country"))
|
||||||
|
|
||||||
update_user_name(args)
|
update_user_name(args)
|
||||||
frappe.local.message_log = []
|
frappe.local.message_log = []
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user