nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-20 05:29:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolve merge conflicts from enterprise_sprint branch

Browse Source
This commit is contained in:
Saurabh
2018-05-14 21:15:46 +05:30
parent 044d6908cf 8b04d431c0
commit 2ca83d61ea
463 changed files with 35469 additions and 5844 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/config/accounts.py
View File

@@ -128,6 +128,12 @@ def get_data():
"doctype": "GL Entry",
"is_query_report": True
},
{
"type": "report",
"name": "Consolidated Financial Statement",
"doctype": "GL Entry",
"is_query_report": True
},
]
},
{

8
erpnext/config/assets.py
View File

@@ -10,6 +10,10 @@ def get_data():
"type": "doctype",
"name": "Asset",
},
{
"type": "doctype",
"name": "Location",
},
{
"type": "doctype",
"name": "Asset Category",
@@ -39,6 +43,10 @@ def get_data():
"type": "doctype",
"name": "Asset Maintenance Log",
},
{
"type": "doctype",
"name": "Asset Adjustment",
},
{
"type": "doctype",
"name": "Asset Repair",

4
erpnext/config/buying.py
View File

@@ -39,8 +39,8 @@ def get_data():
},
{
"type": "doctype",
"name": "Supplier Type",
"description": _("Supplier Type master.")
"name": "Supplier Group",
"description": _("Supplier Group master.")
},
{
"type": "doctype",

245
erpnext/config/hr.py
View File

@@ -9,132 +9,148 @@ def get_data():
{
"type": "doctype",
"name": "Employee",
"description": _("Employee records."),
},
{
"type": "doctype",
"name": "Employee Attendance Tool",
"label": _("Employee Attendance Tool"),
"description":_("Mark Attendance for multiple employees"),
"hide_count": True
},
{
"type": "doctype",
"name": "Attendance",
"description": _("Attendance record."),
},
{
"type": "doctype",
"name": "Attendance Request",
},
{
"type": "doctype",
"name": "Upload Attendance",
"description":_("Upload attendance from a .csv file"),
"hide_count": True
},
]
},
{
"label": _("Recruitment"),
"items": [
{
"type": "doctype",
"name": "Job Applicant",
"description": _("Applicant for a Job."),
},
{
"type": "doctype",
"name": "Job Opening",
"description": _("Opening for a Job."),
},
{
"type": "doctype",
"name": "Job Offer",
"description": _("Offer candidate a Job."),
},
}
]
},
{
"label": _("Leaves and Holiday"),
"items": [
{
"type": "doctype",
"name": "Leave Period",
},
{
"type": "doctype",
"name": "Leave Policy",
},
{
"type": "doctype",
"name": "Leave Application",
"description": _("Applications for leave."),
},
{
"type": "doctype",
"name":"Leave Type",
"description": _("Type of leaves like casual, sick etc."),
},
{
"type": "doctype",
"name": "Holiday List",
"description": _("Holiday master.")
},
{
"type": "doctype",
"name": "Leave Allocation",
"description": _("Allocate leaves for a period.")
},
{
"type": "doctype",
"name": "Leave Control Panel",
"label": _("Leave Allocation Tool"),
"description":_("Allocate leaves for the year."),
"hide_count": True
"name": "Compensatory Leave Request",
},
{
"type": "doctype",
"name": "Leave Encashment",
},
{
"type": "doctype",
"name":"Leave Type",
},
{
"type": "doctype",
"name": "Holiday List",
},
{
"type": "doctype",
"name": "Leave Block List",
"description": _("Block leave applications by department.")
},
]
},
{
"label": _("Payroll"),
"items": [
{
"type": "doctype",
"name": "Salary Structure Assignment",
},
{
"type": "doctype",
"name": "Salary Slip",
"description": _("Monthly salary statement."),
},
{
"type": "doctype",
"name": "Payroll Entry",
"label": _("Payroll Entry"),
"description":_("Generate Salary Slips"),
"hide_count": True
"name": "Payroll Entry"
},
{
"type": "doctype",
"name": "Salary Structure",
"description": _("Salary template master.")
"name": "Employee Benefit Application",
},
{
"type": "doctype",
"name": "Employee Benefit Claim",
},
{
"type": "doctype",
"name": "Employee Tax Exemption Declaration",
},
{
"type": "doctype",
"name": "Employee Tax Exemption Proof Submission",
},
{
"type": "doctype",
"name": "Employee Incentive",
},
]
},
{
"label": _("Payroll Setup"),
"items": [
{
"type": "doctype",
"name": "Payroll Period",
},
{
"type": "doctype",
"name": "Salary Component",
"label": _("Salary Components"),
"description": _("Earnings, Deductions and other Salary components")
},
{
"type": "doctype",
"name": "Additional Salary Component",
},
{
"type": "doctype",
"name": "Salary Structure",
},
{
"type": "doctype",
"name": "Employee Tax Exemption Category",
},
{
"type": "doctype",
"name": "Employee Tax Exemption Sub Category"
}
]
},
{
"label": _("Expense Claims"),
"label": _("Expense Claim"),
"items": [
{
"type": "doctype",
"name": "Employee Advance",
"description": _("Manage advance amount given to the Employee"),
},
{
"type": "doctype",
"name": "Expense Claim",
"description": _("Claims for company expense."),
},
{
"type": "doctype",
"name": "Expense Claim Type",
"description": _("Types of Expense Claim.")
},
]
},
@@ -144,12 +160,10 @@ def get_data():
{
"type": "doctype",
"name": "Appraisal",
"description": _("Performance appraisal."),
},
{
"type": "doctype",
"name": "Appraisal Template",
"description": _("Template for performance appraisals.")
},
{
"type": "page",
@@ -165,12 +179,10 @@ def get_data():
{
"type": "doctype",
"name": "Loan Type",
"description": _("Define various loan types")
},
{
"type": "doctype",
"name": "Loan Application",
"description": _("Loan Application")
},
{
"type": "doctype",
@@ -178,6 +190,82 @@ def get_data():
},
]
},
{
"label": _("Employee Lifecycle"),
"items": [
{
"type": "doctype",
"name": "Employee Transfer",
},
{
"type": "doctype",
"name": "Employee Promotion",
}
]
},
{
"label": _("Recruitment"),
"items": [
{
"type": "doctype",
"name": "Job Applicant",
},
{
"type": "doctype",
"name": "Job Opening",
},
{
"type": "doctype",
"name": "Job Offer",
},
]
},
{
"label": _("Employee Lifecycle"),
"items": [
{
"type": "doctype",
"name": "Employee Transfer",
},
{
"type": "doctype",
"name": "Employee Promotion",
},
{
"type": "doctype",
"name": "Employee Lifecycle Activity",
},
{
"type": "doctype",
"name": "Employee Lifecycle Activity Type",
},
{
"type": "doctype",
"name": "Employee Lifecycle Process Template",
},
{
"type": "doctype",
"name": "Employee Lifecycle Process",
}
]
},
{
"label": _("Recruitment"),
"items": [
{
"type": "doctype",
"name": "Job Applicant",
},
{
"type": "doctype",
"name": "Job Opening",
},
{
"type": "doctype",
"name": "Job Offer",
},
]
},
{
"label": _("Training"),
"items": [
@@ -199,7 +287,23 @@ def get_data():
},
]
},
{
"label": _("Shift Management"),
"items": [
{
"type": "doctype",
"name": "Shift Type",
},
{
"type": "doctype",
"name": "Shift Request",
},
{
"type": "doctype",
"name": "Shift Assignment",
}
]
},
{
"label": _("Fleet Management"),
"items": [
@@ -220,27 +324,26 @@ def get_data():
{
"type": "doctype",
"name": "HR Settings",
"description": _("Settings for HR Module")
},
{
"type": "doctype",
"name": "Employment Type",
"description": _("Types of employment (permanent, contract, intern etc.).")
},
{
"type": "doctype",
"name": "Branch",
"description": _("Organization branch master.")
},
{
"type": "doctype",
"name": "Department",
"description": _("Organization unit (department) master.")
},
{
"type": "doctype",
"name": "Designation",
"description": _("Employee designation (e.g. CEO, Director etc.).")
},
{
"type": "doctype",
"name": "Employee Grade",
},
{
"type": "doctype",
@@ -248,7 +351,11 @@ def get_data():
},
{
"type": "doctype",
"name": "Health Insurance"
"name": "Employee Health Insurance"
},
{
"type": "doctype",
"name": "Staffing Plan",
}
]
},