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

Started permission relogication

Browse Source
This commit is contained in:
Anand Doshi
2014-05-27 08:39:35 +05:30
parent ffc28faa51
commit fab0904af7
59 changed files with 2811 additions and 2984 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/hr/doctype/appraisal/appraisal.json
View File

@@ -181,7 +181,7 @@
"fieldname": "amended_from",
"fieldtype": "Data",
"hidden": 1,
"ignore_restrictions": 1,
"ignore_user_permissions": 1,
"label": "Amended From",
"no_copy": 1,
"oldfieldname": "amended_from",
@@ -196,13 +196,14 @@
"icon": "icon-thumbs-up",
"idx": 1,
"is_submittable": 1,
"modified": "2014-05-09 02:16:37.334857",
"modified": "2014-05-26 03:05:46.761819",
"modified_by": "Administrator",
"module": "HR",
"name": "Appraisal",
"owner": "ashwini@webnotestech.com",
"permissions": [
{
"apply_user_permissions": 1,
"cancel": 0,
"create": 1,
"delete": 0,
@@ -211,7 +212,6 @@
"print": 1,
"read": 1,
"report": 1,
"restricted": 1,
"role": "Employee",
"submit": 0,
"write": 1

4
erpnext/hr/doctype/attendance/attendance.json
View File

@@ -117,7 +117,7 @@
{
"fieldname": "amended_from",
"fieldtype": "Link",
"ignore_restrictions": 1,
"ignore_user_permissions": 1,
"label": "Amended From",
"no_copy": 1,
"options": "Attendance",
@@ -129,7 +129,7 @@
"icon": "icon-ok",
"idx": 1,
"is_submittable": 1,
"modified": "2014-05-09 02:16:37.761770",
"modified": "2014-05-26 03:05:46.906637",
"modified_by": "Administrator",
"module": "HR",
"name": "Attendance",

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

File diff suppressed because it is too large Load Diff

6
erpnext/hr/doctype/employee/employee.py
View File

@@ -8,7 +8,7 @@ from frappe.utils import getdate, validate_email_add, cint
from frappe.model.naming import make_autoname
from frappe import throw, _
import frappe.permissions
from frappe.defaults import get_restrictions
from frappe.defaults import get_user_permissions
from frappe.model.document import Document
from frappe.model.mapper import get_mapped_doc
@@ -72,9 +72,9 @@ class Employee(Document):
def add_restriction_if_required(self, doctype, user):
if frappe.permissions.has_only_non_restrict_role(doctype, user) \
and self.name not in get_restrictions(user).get("Employee", []):
and self.name not in get_user_permissions(user).get("Employee", []):
frappe.defaults.add_default("Employee", self.name, user, "Restriction")
frappe.defaults.add_default("Employee", self.name, user, "User Permission")
def update_user(self):
# add employee role if missing

6
erpnext/hr/doctype/expense_claim/expense_claim.json
View File

@@ -172,7 +172,7 @@
{
"fieldname": "amended_from",
"fieldtype": "Data",
"ignore_restrictions": 1,
"ignore_user_permissions": 1,
"label": "Amended From",
"no_copy": 1,
"oldfieldname": "amended_from",
@@ -187,13 +187,14 @@
"icon": "icon-money",
"idx": 1,
"is_submittable": 1,
"modified": "2014-05-09 02:16:38.198490",
"modified": "2014-05-26 03:05:48.690180",
"modified_by": "Administrator",
"module": "HR",
"name": "Expense Claim",
"owner": "harshada@webnotestech.com",
"permissions": [
{
"apply_user_permissions": 1,
"create": 1,
"delete": 0,
"email": 1,
@@ -201,7 +202,6 @@
"print": 1,
"read": 1,
"report": 1,
"restricted": 1,
"role": "Employee",
"write": 1
},

6
erpnext/hr/doctype/leave_allocation/leave_allocation.json
View File

@@ -123,7 +123,7 @@
"fieldname": "amended_from",
"fieldtype": "Data",
"hidden": 0,
"ignore_restrictions": 1,
"ignore_user_permissions": 1,
"label": "Amended From",
"no_copy": 1,
"oldfieldname": "amended_from",
@@ -136,7 +136,7 @@
"icon": "icon-ok",
"idx": 1,
"is_submittable": 1,
"modified": "2014-05-09 02:16:39.508488",
"modified": "2014-05-26 03:05:49.674303",
"modified_by": "Administrator",
"module": "HR",
"name": "Leave Allocation",
@@ -144,6 +144,7 @@
"permissions": [
{
"amend": 1,
"apply_user_permissions": 1,
"cancel": 1,
"create": 1,
"delete": 1,
@@ -152,7 +153,6 @@
"print": 1,
"read": 1,
"report": 1,
"restricted": 1,
"role": "HR User",
"submit": 1,
"write": 1

422
erpnext/hr/doctype/leave_application/leave_application.json
View File

@@ -1,269 +1,269 @@
{
"allow_attach": 1,
"autoname": "LAP/.#####",
"creation": "2013-02-20 11:18:11",
"description": "Apply / Approve Leaves",
"docstatus": 0,
"doctype": "DocType",
"document_type": "Transaction",
"allow_attach": 1,
"autoname": "LAP/.#####",
"creation": "2013-02-20 11:18:11",
"description": "Apply / Approve Leaves",
"docstatus": 0,
"doctype": "DocType",
"document_type": "Transaction",
"fields": [
{
"default": "Open",
"fieldname": "status",
"fieldtype": "Select",
"in_list_view": 1,
"label": "Status",
"no_copy": 1,
"options": "Open\nApproved\nRejected",
"default": "Open",
"fieldname": "status",
"fieldtype": "Select",
"in_list_view": 1,
"label": "Status",
"no_copy": 1,
"options": "Open\nApproved\nRejected",
"permlevel": 1
},
},
{
"description": "Leave can be approved by users with Role, \"Leave Approver\"",
"fieldname": "leave_approver",
"fieldtype": "Select",
"label": "Leave Approver",
"options": "[Select]",
"description": "Leave can be approved by users with Role, \"Leave Approver\"",
"fieldname": "leave_approver",
"fieldtype": "Select",
"label": "Leave Approver",
"options": "[Select]",
"permlevel": 0
},
},
{
"fieldname": "leave_type",
"fieldtype": "Link",
"in_filter": 1,
"in_list_view": 1,
"label": "Leave Type",
"options": "Leave Type",
"permlevel": 0,
"reqd": 1,
"fieldname": "leave_type",
"fieldtype": "Link",
"in_filter": 1,
"in_list_view": 1,
"label": "Leave Type",
"options": "Leave Type",
"permlevel": 0,
"reqd": 1,
"search_index": 1
},
},
{
"fieldname": "from_date",
"fieldtype": "Date",
"in_list_view": 1,
"label": "From Date",
"permlevel": 0,
"reqd": 1,
"fieldname": "from_date",
"fieldtype": "Date",
"in_list_view": 1,
"label": "From Date",
"permlevel": 0,
"reqd": 1,
"search_index": 1
},
},
{
"fieldname": "to_date",
"fieldtype": "Date",
"in_list_view": 0,
"label": "To Date",
"permlevel": 0,
"reqd": 1,
"fieldname": "to_date",
"fieldtype": "Date",
"in_list_view": 0,
"label": "To Date",
"permlevel": 0,
"reqd": 1,
"search_index": 1
},
},
{
"fieldname": "half_day",
"fieldtype": "Check",
"label": "Half Day",
"fieldname": "half_day",
"fieldtype": "Check",
"label": "Half Day",
"permlevel": 0
},
},
{
"fieldname": "column_break1",
"fieldtype": "Column Break",
"permlevel": 0,
"print_width": "50%",
"fieldname": "column_break1",
"fieldtype": "Column Break",
"permlevel": 0,
"print_width": "50%",
"width": "50%"
},
},
{
"fieldname": "description",
"fieldtype": "Small Text",
"label": "Reason",
"fieldname": "description",
"fieldtype": "Small Text",
"label": "Reason",
"permlevel": 0
},
},
{
"fieldname": "employee",
"fieldtype": "Link",
"in_filter": 1,
"label": "Employee",
"options": "Employee",
"permlevel": 0,
"reqd": 1,
"fieldname": "employee",
"fieldtype": "Link",
"in_filter": 1,
"label": "Employee",
"options": "Employee",
"permlevel": 0,
"reqd": 1,
"search_index": 1
},
},
{
"fieldname": "employee_name",
"fieldtype": "Data",
"in_filter": 1,
"in_list_view": 1,
"label": "Employee Name",
"permlevel": 0,
"read_only": 1,
"fieldname": "employee_name",
"fieldtype": "Data",
"in_filter": 1,
"in_list_view": 1,
"label": "Employee Name",
"permlevel": 0,
"read_only": 1,
"search_index": 0
},
},
{
"fieldname": "leave_balance",
"fieldtype": "Float",
"label": "Leave Balance Before Application",
"no_copy": 1,
"permlevel": 0,
"fieldname": "leave_balance",
"fieldtype": "Float",
"label": "Leave Balance Before Application",
"no_copy": 1,
"permlevel": 0,
"read_only": 1
},
},
{
"fieldname": "total_leave_days",
"fieldtype": "Float",
"label": "Total Leave Days",
"no_copy": 1,
"permlevel": 0,
"fieldname": "total_leave_days",
"fieldtype": "Float",
"label": "Total Leave Days",
"no_copy": 1,
"permlevel": 0,
"read_only": 1
},
},
{
"fieldname": "sb10",
"fieldtype": "Section Break",
"label": "More Info",
"fieldname": "sb10",
"fieldtype": "Section Break",
"label": "More Info",
"permlevel": 0
},
},
{
"allow_on_submit": 1,
"default": "1",
"fieldname": "follow_via_email",
"fieldtype": "Check",
"label": "Follow via Email",
"permlevel": 0,
"allow_on_submit": 1,
"default": "1",
"fieldname": "follow_via_email",
"fieldtype": "Check",
"label": "Follow via Email",
"permlevel": 0,
"print_hide": 1
},
},
{
"default": "Today",
"fieldname": "posting_date",
"fieldtype": "Date",
"label": "Posting Date",
"no_copy": 1,
"permlevel": 0,
"default": "Today",
"fieldname": "posting_date",
"fieldtype": "Date",
"label": "Posting Date",
"no_copy": 1,
"permlevel": 0,
"reqd": 1
},
},
{
"fieldname": "fiscal_year",
"fieldtype": "Link",
"in_filter": 1,
"label": "Fiscal Year",
"options": "Fiscal Year",
"permlevel": 0,
"read_only": 0,
"reqd": 1,
"fieldname": "fiscal_year",
"fieldtype": "Link",
"in_filter": 1,
"label": "Fiscal Year",
"options": "Fiscal Year",
"permlevel": 0,
"read_only": 0,
"reqd": 1,
"search_index": 0
},
},
{
"fieldname": "column_break_17",
"fieldtype": "Column Break",
"fieldname": "column_break_17",
"fieldtype": "Column Break",
"permlevel": 0
},
},
{
"fieldname": "company",
"fieldtype": "Link",
"label": "Company",
"options": "Company",
"permlevel": 0,
"fieldname": "company",
"fieldtype": "Link",
"label": "Company",
"options": "Company",
"permlevel": 0,
"reqd": 1
},
},
{
"fieldname": "letter_head",
"fieldtype": "Link",
"label": "Letter Head",
"options": "Letter Head",
"permlevel": 0,
"print_hide": 1,
"fieldname": "letter_head",
"fieldtype": "Link",
"label": "Letter Head",
"options": "Letter Head",
"permlevel": 0,
"print_hide": 1,
"read_only": 0
},
},
{
"fieldname": "amended_from",
"fieldtype": "Link",
"ignore_restrictions": 1,
"label": "Amended From",
"no_copy": 1,
"options": "Leave Application",
"permlevel": 0,
"print_hide": 1,
"fieldname": "amended_from",
"fieldtype": "Link",
"ignore_user_permissions": 1,
"label": "Amended From",
"no_copy": 1,
"options": "Leave Application",
"permlevel": 0,
"print_hide": 1,
"read_only": 1
}
],
"icon": "icon-calendar",
"idx": 1,
"is_submittable": 1,
"max_attachments": 3,
"modified": "2014-05-15 19:30:47.331357",
"modified_by": "Administrator",
"module": "HR",
"name": "Leave Application",
"owner": "Administrator",
],
"icon": "icon-calendar",
"idx": 1,
"is_submittable": 1,
"max_attachments": 3,
"modified": "2014-05-26 03:05:49.838899",
"modified_by": "Administrator",
"module": "HR",
"name": "Leave Application",
"owner": "Administrator",
"permissions": [
{
"create": 1,
"delete": 0,
"email": 1,
"permlevel": 0,
"print": 1,
"read": 1,
"report": 1,
"role": "Employee",
"create": 1,
"delete": 0,
"email": 1,
"permlevel": 0,
"print": 1,
"read": 1,
"report": 1,
"role": "Employee",
"write": 1
},
},
{
"amend": 0,
"cancel": 0,
"create": 0,
"delete": 0,
"permlevel": 1,
"read": 1,
"role": "All",
"amend": 0,
"cancel": 0,
"create": 0,
"delete": 0,
"permlevel": 1,
"read": 1,
"role": "All",
"submit": 0
},
},
{
"amend": 1,
"cancel": 1,
"create": 1,
"delete": 1,
"email": 1,
"permlevel": 0,
"print": 1,
"read": 1,
"report": 1,
"restrict": 1,
"role": "HR User",
"submit": 1,
"amend": 1,
"cancel": 1,
"create": 1,
"delete": 1,
"email": 1,
"permlevel": 0,
"print": 1,
"read": 1,
"report": 1,
"set_user_permissions": 1,
"role": "HR User",
"submit": 1,
"write": 1
},
},
{
"amend": 1,
"cancel": 0,
"create": 0,
"delete": 0,
"email": 1,
"permlevel": 0,
"print": 1,
"read": 1,
"report": 1,
"role": "Leave Approver",
"submit": 1,
"amend": 1,
"cancel": 0,
"create": 0,
"delete": 0,
"email": 1,
"permlevel": 0,
"print": 1,
"read": 1,
"report": 1,
"role": "Leave Approver",
"submit": 1,
"write": 1
},
},
{
"amend": 0,
"cancel": 0,
"create": 0,
"delete": 0,
"permlevel": 1,
"read": 1,
"report": 1,
"role": "HR User",
"submit": 0,
"amend": 0,
"cancel": 0,
"create": 0,
"delete": 0,
"permlevel": 1,
"read": 1,
"report": 1,
"role": "HR User",
"submit": 0,
"write": 1
},
},
{
"amend": 0,
"cancel": 0,
"create": 0,
"delete": 0,
"permlevel": 1,
"read": 1,
"report": 1,
"role": "Leave Approver",
"submit": 0,
"amend": 0,
"cancel": 0,
"create": 0,
"delete": 0,
"permlevel": 1,
"read": 1,
"report": 1,
"role": "Leave Approver",
"submit": 0,
"write": 1
}
],
"search_fields": "employee,employee_name,leave_type,from_date,to_date,total_leave_days,fiscal_year",
"sort_field": "modified",
],
"search_fields": "employee,employee_name,leave_type,from_date,to_date,total_leave_days,fiscal_year",
"sort_field": "modified",
"sort_order": "DESC"
}
}

4
erpnext/hr/doctype/leave_application/test_leave_application.py
View File

@@ -5,7 +5,7 @@ import frappe
import unittest
from erpnext.hr.doctype.leave_application.leave_application import LeaveDayBlockedError, OverlapError
from frappe.core.page.user_properties.user_properties import clear_restrictions
from frappe.core.page.user_permissions.user_permissions import clear_user_permissions
test_dependencies = ["Leave Allocation", "Leave Block List"]
@@ -91,7 +91,7 @@ class TestLeaveApplication(unittest.TestCase):
from frappe.utils.user import add_role
add_role("test1@example.com", "HR User")
clear_restrictions("Employee")
clear_user_permissions("Employee")
frappe.db.set_value("Department", "_Test Department",
"leave_block_list", "_Test Leave Block List")

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

@@ -182,7 +182,7 @@
"fieldname": "amended_from",
"fieldtype": "Data",
"hidden": 0,
"ignore_restrictions": 1,
"ignore_user_permissions": 1,
"label": "Amended From",
"no_copy": 1,
"oldfieldname": "amended_from",
@@ -325,7 +325,7 @@
"icon": "icon-file-text",
"idx": 1,
"is_submittable": 1,
"modified": "2014-05-09 02:17:14.634335",
"modified": "2014-05-26 03:05:52.624169",
"modified_by": "Administrator",
"module": "HR",
"name": "Salary Slip",
@@ -361,7 +361,6 @@
{
"permlevel": 0,
"read": 1,
"restricted": 0,
"role": "Employee"
}
],