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

Added new fixtures (Fixes #1540). Removed Employee Grade from HR.

Browse Source
This commit is contained in:
Anand Doshi 2014-05-02 13:54:49 +05:30
parent 4ceb20e07f
commit f29bcaf436
24 changed files with 1583 additions and 1621 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/config/hr.py
View File

@ -102,11 +102,6 @@ data = [
"name": "Department",
"description": _("Organization unit (department) master.")
},
{
"type": "doctype",
"name": "Grade",
"description": _("Employee grade.")
},
{
"type": "doctype",
"name": "Designation",

5
erpnext/config/selling.py
View File

@ -150,6 +150,11 @@ data = [
"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.")
},
]
},
{

9
erpnext/hr/doctype/department/department.json
View File

@ -6,15 +6,6 @@
"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",

9
erpnext/hr/doctype/designation/designation.json
View File

@ -7,15 +7,6 @@
"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",

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

@ -279,17 +279,6 @@
"reqd": 0,
"search_index": 1
},
{
"fieldname": "grade",
"fieldtype": "Link",
"in_filter": 1,
"label": "Grade",
"oldfieldname": "grade",
"oldfieldtype": "Link",
"options": "Grade",
"permlevel": 0,
"reqd": 0
},
{
"description": "Provide email id registered in company",
"fieldname": "company_email",
@ -722,7 +711,7 @@
],
"icon": "icon-user",
"idx": 1,
"modified": "2014-04-30 09:01:10.879762",
"modified": "2014-04-30 09:03:10.879762",
"modified_by": "Administrator",
"module": "HR",
"name": "Employee",

12
erpnext/hr/doctype/employee_internal_work_history/employee_internal_work_history.json
View File

@ -33,16 +33,6 @@
"options": "link:Designation",
"permlevel": 0
},
{
"fieldname": "grade",
"fieldtype": "Select",
"in_list_view": 1,
"label": "Grade",
"oldfieldname": "grade",
"oldfieldtype": "Select",
"options": "link:Grade",
"permlevel": 0
},
{
"fieldname": "from_date",
"fieldtype": "Date",
@ -64,7 +54,7 @@
],
"idx": 1,
"istable": 1,
"modified": "2013-12-20 19:23:12.000000",
"modified": "2013-12-20 19:24:12.000000",
"modified_by": "Administrator",
"module": "HR",
"name": "Employee Internal Work History",

9
erpnext/hr/doctype/employment_type/employment_type.json
View File

@ -14,15 +14,6 @@
"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",

1
erpnext/hr/doctype/grade/README.md
View File

@ -1 +0,0 @@
Employee grade.

1
erpnext/hr/doctype/grade/__init__.py
View File

@ -1 +0,0 @@
from __future__ import unicode_literals

41
erpnext/hr/doctype/grade/grade.json
View File

@ -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
}
]
}

10
erpnext/hr/doctype/grade/grade.py
View File

@ -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

6
erpnext/hr/doctype/grade/test_grade.py
View File

@ -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
erpnext/hr/doctype/grade/test_records.json
View File

@ -1 +0,0 @@
[]

10
erpnext/hr/doctype/leave_control_panel/leave_control_panel.json
View File

@ -44,14 +44,6 @@
"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",
@ -102,7 +94,7 @@
"icon": "icon-cog",
"idx": 1,
"issingle": 1,
"modified": "2013-07-05 14:44:50.000000",
"modified": "2013-07-05 14:45:50.000000",
"modified_by": "Administrator",
"module": "HR",
"name": "Leave Control Panel",

2
erpnext/hr/doctype/leave_control_panel/leave_control_panel.py
View File

@ -10,7 +10,7 @@ from frappe.model.document import Document
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:

9
erpnext/hr/doctype/salary_manager/salary_manager.json
View File

@ -60,13 +60,6 @@
"permlevel": 0,
"width": "50%"
},
{
"fieldname": "grade",
"fieldtype": "Select",
"label": "Grade",
"options": "link:Grade",
"permlevel": 0
},
{
"fieldname": "fiscal_year",
"fieldtype": "Select",
@ -149,7 +142,7 @@
"icon": "icon-cog",
"idx": 1,
"issingle": 1,
"modified": "2013-07-22 15:22:58.000000",
"modified": "2013-07-22 15:23:58.000000",
"modified_by": "Administrator",
"module": "HR",
"name": "Salary Manager",

2
erpnext/hr/doctype/salary_manager/salary_manager.py
View File

@ -33,7 +33,7 @@ class SalaryManager(Document):
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("'", "\'") + "'"

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

@ -71,18 +71,6 @@
"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",
@ -355,7 +343,7 @@
"icon": "icon-file-text",
"idx": 1,
"is_submittable": 1,
"modified": "2014-05-01 04:31:14.543092",
"modified": "2014-05-01 04:21:14.543092",
"modified_by": "Administrator",
"module": "HR",
"name": "Salary Slip",

3
erpnext/hr/doctype/salary_slip/salary_slip.py
View File

@ -241,7 +241,6 @@ class SalarySlip(TransactionBase):
</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 @@ class SalarySlip(TransactionBase):
</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))

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

@ -69,18 +69,6 @@
"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",
@ -239,7 +227,7 @@
],
"icon": "icon-file-text",
"idx": 1,
"modified": "2013-12-20 19:24:28.000000",
"modified": "2013-12-20 19:23:28.000000",
"modified_by": "Administrator",
"module": "HR",
"name": "Salary Structure",

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

@ -16,7 +16,7 @@ class SalaryStructure(Document):
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 @@ class SalaryStructure(Document):
'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

2
erpnext/hr/report/employee_information/employee_information.json
View File

@ -4,7 +4,7 @@
"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\"}",
"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",

113
erpnext/setup/page/setup_wizard/install_fixtures.py
View File

@ -7,7 +7,7 @@ import frappe
from frappe import _
def install():
def install(country=None):
records = [
# 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': _('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 @@ def install():
{'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

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

@ -27,7 +27,7 @@ def setup_account(args=None):
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 = []