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

rename Profile to User frappe/frappe#470

Browse Source
This commit is contained in:
Rushabh Mehta
2014-03-11 16:15:05 +05:30
parent c379c78fec
commit 7c932003ed
62 changed files with 196 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,7 +5,7 @@ frappe.provide("erpnext.hr");
erpnext.hr.EmployeeController = frappe.ui.form.Controller.extend({
setup: function() {
this.frm.fields_dict.user_id.get_query = function(doc, cdt, cdn) {
return { query:"frappe.core.doctype.profile.profile.profile_query"} }
return { query:"frappe.core.doctype.user.user.user_query"} }
this.frm.fields_dict.reports_to.get_query = function(doc, cdt, cdn) {
return { query: "erpnext.controllers.queries.employee_query"} }
},
@@ -33,8 +33,8 @@ erpnext.hr.EmployeeController = frappe.ui.form.Controller.extend({
callback: function(r) {
var df = frappe.meta.get_docfield("Employee Leave Approver", "leave_approver",
me.frm.doc.name);
df.options = $.map(r.message, function(profile) {
return {value: profile, label: frappe.user_info(profile).fullname};
df.options = $.map(r.message, function(user) {
return {value: user, label: frappe.user_info(user).fullname};
});
me.frm.fields_dict.employee_leave_approvers.refresh();
}

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

@@ -42,7 +42,7 @@ class DocType(DocListController):
if self.doc.user_id:
self.restrict_user()
self.update_user_default()
self.update_profile()
self.update_user()
self.update_dob_event()
self.restrict_leave_approver()
@@ -71,47 +71,47 @@ class DocType(DocListController):
frappe.defaults.add_default("Employee", self.doc.name, user, "Restriction")
def update_profile(self):
def update_user(self):
# add employee role if missing
if not "Employee" in frappe.db.sql_list("""select role from tabUserRole
where parent=%s""", self.doc.user_id):
from frappe.profile import add_role
from frappe.utils.user import add_role
add_role(self.doc.user_id, "Employee")
profile_wrapper = frappe.bean("Profile", self.doc.user_id)
user_wrapper = frappe.bean("User", self.doc.user_id)
# copy details like Fullname, DOB and Image to Profile
# copy details like Fullname, DOB and Image to User
if self.doc.employee_name:
employee_name = self.doc.employee_name.split(" ")
if len(employee_name) >= 3:
profile_wrapper.doc.last_name = " ".join(employee_name[2:])
profile_wrapper.doc.middle_name = employee_name[1]
user_wrapper.doc.last_name = " ".join(employee_name[2:])
user_wrapper.doc.middle_name = employee_name[1]
elif len(employee_name) == 2:
profile_wrapper.doc.last_name = employee_name[1]
user_wrapper.doc.last_name = employee_name[1]
profile_wrapper.doc.first_name = employee_name[0]
user_wrapper.doc.first_name = employee_name[0]
if self.doc.date_of_birth:
profile_wrapper.doc.birth_date = self.doc.date_of_birth
user_wrapper.doc.birth_date = self.doc.date_of_birth
if self.doc.gender:
profile_wrapper.doc.gender = self.doc.gender
user_wrapper.doc.gender = self.doc.gender
if self.doc.image:
if not profile_wrapper.doc.user_image == self.doc.image:
profile_wrapper.doc.user_image = self.doc.image
if not user_wrapper.doc.user_image == self.doc.image:
user_wrapper.doc.user_image = self.doc.image
try:
frappe.doc({
"doctype": "File Data",
"file_name": self.doc.image,
"attached_to_doctype": "Profile",
"attached_to_doctype": "User",
"attached_to_name": self.doc.user_id
}).insert()
except frappe.DuplicateEntryError, e:
# already exists
pass
profile_wrapper.ignore_permissions = True
profile_wrapper.save()
user_wrapper.ignore_permissions = True
user_wrapper.save()
def validate_date(self):
if self.doc.date_of_birth and self.doc.date_of_joining and getdate(self.doc.date_of_birth) >= getdate(self.doc.date_of_joining):
@@ -143,7 +143,7 @@ class DocType(DocListController):
throw(_("Please enter relieving date."))
def validate_for_enabled_user_id(self):
enabled = frappe.db.sql("""select name from `tabProfile` where
enabled = frappe.db.sql("""select name from `tabUser` where
name=%s and enabled=1""", self.doc.user_id)
if not enabled:
throw("{id}: {user_id} {msg}".format(**{
@@ -164,11 +164,11 @@ class DocType(DocListController):
}))
def validate_employee_leave_approver(self):
from frappe.profile import Profile
from frappe.utils.user import User
from erpnext.hr.doctype.leave_application.leave_application import InvalidLeaveApproverError
for l in self.doclist.get({"parentfield": "employee_leave_approvers"}):
if "Leave Approver" not in Profile(l.leave_approver).get_roles():
if "Leave Approver" not in User(l.leave_approver).get_roles():
throw(_("Invalid Leave Approver") + ": \"" + l.leave_approver + "\"",
exc=InvalidLeaveApproverError)

4
erpnext/hr/doctype/employee/employee.txt
View File

@@ -2,7 +2,7 @@
{
"creation": "2013-03-07 09:04:18",
"docstatus": 0,
"modified": "2014-02-03 18:06:03",
"modified": "2014-02-03 18:06:04",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -126,7 +126,7 @@
"fieldname": "user_id",
"fieldtype": "Link",
"label": "User ID",
"options": "Profile"
"options": "User"
},
{
"doctype": "DocField",

4
erpnext/hr/doctype/leave_application/leave_application.js
View File

@@ -16,8 +16,8 @@ cur_frm.cscript.onload = function(doc, dt, dn) {
method: "erpnext.hr.utils.get_leave_approver_list",
callback: function(r) {
cur_frm.set_df_property("leave_approver", "options", $.map(r.message,
function(profile) {
return {value: profile, label: frappe.user_info(profile).fullname};
function(user) {
return {value: user, label: frappe.user_info(user).fullname};
}));
if(leave_approver) cur_frm.set_value("leave_approver", leave_approver);
cur_frm.cscript.get_leave_balance(cur_frm.doc);

4
erpnext/hr/doctype/leave_application/leave_application.txt
View File

@@ -2,7 +2,7 @@
{
"creation": "2013-02-20 11:18:11",
"docstatus": 0,
"modified": "2014-01-20 17:48:55",
"modified": "2014-01-20 17:48:56",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -55,7 +55,7 @@
"fieldname": "leave_approver",
"fieldtype": "Select",
"label": "Leave Approver",
"options": "link:Profile",
"options": "link:User",
"permlevel": 0
},
{

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

@@ -41,7 +41,7 @@ class TestLeaveApplication(unittest.TestCase):
def test_block_list(self):
self._clear_roles()
from frappe.profile import add_role
from frappe.utils.user import add_role
add_role("test1@example.com", "HR User")
frappe.db.set_value("Department", "_Test Department",
@@ -64,7 +64,7 @@ class TestLeaveApplication(unittest.TestCase):
self._clear_roles()
self._clear_applications()
from frappe.profile import add_role
from frappe.utils.user import add_role
add_role("test@example.com", "Employee")
add_role("test2@example.com", "Leave Approver")
@@ -80,7 +80,7 @@ class TestLeaveApplication(unittest.TestCase):
def test_global_block_list(self):
self._clear_roles()
from frappe.profile import add_role
from frappe.utils.user import add_role
add_role("test1@example.com", "Employee")
add_role("test@example.com", "Leave Approver")
@@ -105,7 +105,7 @@ class TestLeaveApplication(unittest.TestCase):
def test_leave_approval(self):
self._clear_roles()
from frappe.profile import add_role
from frappe.utils.user import add_role
add_role("test@example.com", "Employee")
add_role("test1@example.com", "Leave Approver")
add_role("test2@example.com", "Leave Approver")

4
erpnext/hr/doctype/leave_block_list_allow/leave_block_list_allow.txt
View File

@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:47",
"docstatus": 0,
"modified": "2013-12-20 19:23:19",
"modified": "2013-12-20 19:23:18",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -19,7 +19,7 @@
"in_list_view": 1,
"label": "Allow User",
"name": "__common__",
"options": "Profile",
"options": "User",
"parent": "Leave Block List Allow",
"parentfield": "fields",
"parenttype": "DocType",