From 0a0e29a08944521b108624d8a198c546912a858f Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Sat, 16 Mar 2019 08:53:06 +0100 Subject: [PATCH 1/2] New fields on user object for hrm purpose --- .../install/mysql/migration/9.0.0-10.0.0.sql | 4 +++ htdocs/install/mysql/tables/llx_user.sql | 6 ++++- htdocs/user/class/user.class.php | 26 +++++++++++++++---- 3 files changed, 30 insertions(+), 6 deletions(-) diff --git a/htdocs/install/mysql/migration/9.0.0-10.0.0.sql b/htdocs/install/mysql/migration/9.0.0-10.0.0.sql index a7f5ca87c9a..fcc22e3b875 100644 --- a/htdocs/install/mysql/migration/9.0.0-10.0.0.sql +++ b/htdocs/install/mysql/migration/9.0.0-10.0.0.sql @@ -254,3 +254,7 @@ ALTER TABLE llx_expensereport_det ADD COLUMN subprice double(24,8) DEFAULT 0 NOT ALTER TABLE llx_product_attribute_combination ADD INDEX idx_product_att_com_product_parent (fk_product_parent); ALTER TABLE llx_product_attribute_combination ADD INDEX idx_product_att_com_product_child (fk_product_child); +ALTER TABLE llx_user ADD COLUMN fk_user_expense_validator integer after fk_user; +ALTER TABLE llx_user ADD COLUMN fk_user_holiday_validator integer after fk_user_expense_validator; +ALTER TABLE llx_user ADD COLUMN personal_email varchar(255) after email; +ALTER TABLE llx_user ADD COLUMN personal_mobile varchar(20) after user_mobile; \ No newline at end of file diff --git a/htdocs/install/mysql/tables/llx_user.sql b/htdocs/install/mysql/tables/llx_user.sql index 0beffd73428..a54ed1418ab 100644 --- a/htdocs/install/mysql/tables/llx_user.sql +++ b/htdocs/install/mysql/tables/llx_user.sql @@ -48,11 +48,13 @@ create table llx_user fk_state integer DEFAULT 0, fk_country integer DEFAULT 0, birth date, -- birthday - job varchar(128), + job varchar(128), office_phone varchar(20), office_fax varchar(20), user_mobile varchar(20), + personal_mobile varchar(20), email varchar(255), + personal_email varchar(255), jabberid varchar(255), skype varchar(255), @@ -73,6 +75,8 @@ create table llx_user fk_socpeople integer, fk_member integer, fk_user integer, -- Hierarchic parent + fk_user_expense_validator integer, + fk_user_holiday_validator integer, note_public text, note text DEFAULT NULL, model_pdf varchar(255) DEFAULT NULL, diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php index 611ab7fadc2..769fc3d137d 100644 --- a/htdocs/user/class/user.class.php +++ b/htdocs/user/class/user.class.php @@ -70,6 +70,7 @@ class User extends CommonObject public $gender; public $birth; public $email; + public $personal_email; public $skype; public $twitter; @@ -92,6 +93,7 @@ class User extends CommonObject public $office_phone; public $office_fax; public $user_mobile; + public $personal_mobile; public $admin; public $login; public $api_key; @@ -134,6 +136,8 @@ class User extends CommonObject * @var int User ID */ public $fk_user; + public $fk_user_expense_validator; + public $fk_user_holiday_validator; public $clicktodial_url; public $clicktodial_login; @@ -231,12 +235,12 @@ class User extends CommonObject $login=trim($login); // Get user - $sql = "SELECT u.rowid, u.lastname, u.firstname, u.employee, u.gender, u.birth, u.email, u.job, u.skype, u.twitter, u.facebook, u.linkedin,"; - $sql.= " u.signature, u.office_phone, u.office_fax, u.user_mobile,"; + $sql = "SELECT u.rowid, u.lastname, u.firstname, u.employee, u.gender, u.birth, u.email, u.personal_email, u.job, u.skype, u.twitter, u.facebook, u.linkedin,"; + $sql.= " u.signature, u.office_phone, u.office_fax, u.user_mobile, u.personal_mobile,"; $sql.= " u.address, u.zip, u.town, u.fk_state as state_id, u.fk_country as country_id,"; $sql.= " u.admin, u.login, u.note,"; $sql.= " u.pass, u.pass_crypted, u.pass_temp, u.api_key,"; - $sql.= " u.fk_soc, u.fk_socpeople, u.fk_member, u.fk_user, u.ldap_sid,"; + $sql.= " u.fk_soc, u.fk_socpeople, u.fk_member, u.fk_user, u.ldap_sid, u.fk_user_expense_validator, u.fk_user_holiday_validator,"; $sql.= " u.statut, u.lang, u.entity,"; $sql.= " u.datec as datec,"; $sql.= " u.tms as datem,"; @@ -334,9 +338,11 @@ class User extends CommonObject $this->state = ($obj->state!='-'?$obj->state:''); $this->office_phone = $obj->office_phone; - $this->office_fax = $obj->office_fax; - $this->user_mobile = $obj->user_mobile; + $this->office_fax = $obj->office_fax; + $this->user_mobile = $obj->user_mobile; + $this->personal_mobile = $obj->personal_mobile; $this->email = $obj->email; + $this->personal_email = $obj->personal_email; $this->skype = $obj->skype; $this->twitter = $obj->twitter; $this->facebook = $obj->facebook; @@ -371,6 +377,8 @@ class User extends CommonObject $this->contactid = $obj->fk_socpeople; $this->fk_member = $obj->fk_member; $this->fk_user = $obj->fk_user; + $this->fk_user_expense_validator = $obj->fk_user_expense_validator; + $this->fk_user_holiday_validator = $obj->fk_user_holiday_validator; $this->default_range = $obj->default_range; $this->default_c_exp_tax_cat = $obj->default_c_exp_tax_cat; @@ -1470,7 +1478,9 @@ class User extends CommonObject $this->office_phone = trim($this->office_phone); $this->office_fax = trim($this->office_fax); $this->user_mobile = trim($this->user_mobile); + $this->personal_mobile = trim($this->personal_mobile); $this->email = trim($this->email); + $this->personal_email = trim($this->personal_email); $this->skype = trim($this->skype); $this->twitter = trim($this->twitter); @@ -1525,7 +1535,9 @@ class User extends CommonObject $sql.= ", office_phone = '".$this->db->escape($this->office_phone)."'"; $sql.= ", office_fax = '".$this->db->escape($this->office_fax)."'"; $sql.= ", user_mobile = '".$this->db->escape($this->user_mobile)."'"; + $sql.= ", personal_mobile = '".$this->db->escape($this->personal_mobile)."'"; $sql.= ", email = '".$this->db->escape($this->email)."'"; + $sql.= ", personal_email = '".$this->db->escape($this->personal_email)."'"; $sql.= ", skype = '".$this->db->escape($this->skype)."'"; $sql.= ", twitter = '".$this->db->escape($this->twitter)."'"; $sql.= ", facebook = '".$this->db->escape($this->facebook)."'"; @@ -1540,6 +1552,8 @@ class User extends CommonObject $sql.= ", photo = ".($this->photo?"'".$this->db->escape($this->photo)."'":"null"); $sql.= ", openid = ".($this->openid?"'".$this->db->escape($this->openid)."'":"null"); $sql.= ", fk_user = ".($this->fk_user > 0?"'".$this->db->escape($this->fk_user)."'":"null"); + $sql.= ", fk_user_expense_validator = ".($this->fk_user_expense_validator > 0?"'".$this->db->escape($this->fk_user_expense_validator)."'":"null"); + $sql.= ", fk_user_holiday_validator = ".($this->fk_user_holiday_validator > 0?"'".$this->db->escape($this->fk_user_holiday_validator)."'":"null"); if (isset($this->thm) || $this->thm != '') $sql.= ", thm= ".($this->thm != ''?"'".$this->db->escape($this->thm)."'":"null"); if (isset($this->tjm) || $this->tjm != '') $sql.= ", tjm= ".($this->tjm != ''?"'".$this->db->escape($this->tjm)."'":"null"); if (isset($this->salary) || $this->salary != '') $sql.= ", salary= ".($this->salary != ''?"'".$this->db->escape($this->salary)."'":"null"); @@ -2652,6 +2666,7 @@ class User extends CommonObject $this->gender='man'; $this->note='This is a note'; $this->email='email@specimen.com'; + $this->personal_email='personalemail@specimen.com'; $this->skype='skypepseudo'; $this->twitter='twitterpseudo'; $this->facebook='facebookpseudo'; @@ -2659,6 +2674,7 @@ class User extends CommonObject $this->office_phone='0999999999'; $this->office_fax='0999999998'; $this->user_mobile='0999999997'; + $this->personal_mobile='0999999996'; $this->admin=0; $this->login='dolibspec'; $this->pass='dolibspec'; From 09ce5bd9776e13dc4b4b61350e4b94cd7af84d82 Mon Sep 17 00:00:00 2001 From: Lionel VESSILLER Date: Thu, 11 Apr 2019 17:59:11 +0200 Subject: [PATCH 2/2] Fix dropdown menu in pages with several lists --- htdocs/core/class/html.form.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index c84c501ad21..4b25d23b882 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -6346,7 +6346,7 @@ class Form
- + '.img_picto('', 'list').'