Skip to content

Commit

Permalink
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into d…
Browse files Browse the repository at this point in the history 
…evelop
  • Loading branch information
@eldy
eldy committed Apr 11, 2019
2 parents 49fee63 + a7896c1 commit f13b30f
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 7 deletions.
2 changes: 1 addition & 1 deletion htdocs/core/class/html.form.class.php
View file
Expand Up @@ -6346,7 +6346,7 @@ public static function multiSelectArrayWithCheckbox($htmlname, &$array, $varpage
<dl class="dropdown">
<dt>
<a href="#">
<a href="#'.$htmlname.'">
'.img_picto('', 'list').'
</a>
<input type="hidden" class="'.$htmlname.'" name="'.$htmlname.'" value="'.$listcheckedstring.'">
Expand Down
5 changes: 5 additions & 0 deletions htdocs/install/mysql/migration/9.0.0-10.0.0.sql
View file
Expand Up @@ -271,6 +271,11 @@ 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;

ALTER TABLE llx_product ADD COLUMN fk_project integer DEFAULT NULL;
ALTER TABLE llx_product ADD INDEX idx_product_fk_project (fk_project);

Expand Down
6 changes: 5 additions & 1 deletion htdocs/install/mysql/tables/llx_user.sql
View file
Expand Up @@ -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),
Expand All @@ -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,
Expand Down
26 changes: 21 additions & 5 deletions htdocs/user/class/user.class.php
View file
Expand Up @@ -70,6 +70,7 @@ class User extends CommonObject
public $gender;
public $birth;
public $email;
public $personal_email;

public $skype;
public $twitter;
Expand All @@ -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;
Expand Down Expand Up @@ -145,6 +147,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;
Expand Down Expand Up @@ -242,12 +246,12 @@ public function fetch($id = '', $login = '', $sid = '', $loadpersonalconf = 0, $
$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,";
Expand Down Expand Up @@ -345,9 +349,11 @@ public function fetch($id = '', $login = '', $sid = '', $loadpersonalconf = 0, $
$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;
Expand Down Expand Up @@ -382,6 +388,8 @@ public function fetch($id = '', $login = '', $sid = '', $loadpersonalconf = 0, $
$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;
Expand Down Expand Up @@ -1482,7 +1490,9 @@ public function update($user, $notrigger = 0, $nosyncmember = 0, $nosyncmemberpa
$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);
Expand Down Expand Up @@ -1537,7 +1547,9 @@ public function update($user, $notrigger = 0, $nosyncmember = 0, $nosyncmemberpa
$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)."'";
Expand All @@ -1552,6 +1564,8 @@ public function update($user, $notrigger = 0, $nosyncmember = 0, $nosyncmemberpa
$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");
Expand Down Expand Up @@ -2664,13 +2678,15 @@ public function initAsSpecimen()
$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';
$this->linkedin='linkedinpseudo';
$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';
Expand Down

0 comments on commit f13b30f

Please sign in to comment.