Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Merge remote-tracking branch 'upstream/develop' into camelCaps

Browse Source
This commit is contained in:
Frédéric FRANCE
2018-08-28 09:34:53 +02:00
parent d8bf4a0ecf 50d50c2e10
commit fe4260a014
335 changed files with 3278 additions and 1248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/user/class/user.class.php
View File

@@ -40,8 +40,16 @@ require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
*/
class User extends CommonObject
{
/**
* @var string ID to identify managed object
*/
public $element='user';
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element='user';
public $fk_element='fk_user';
public $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
@@ -1531,6 +1539,12 @@ class User extends CommonObject
$adh->societe=(empty($adh->societe) && $this->societe_id ? $this->societe_id : $adh->societe);
$adh->address=$this->address;
$adh->town=$this->town;
$adh->zip=$this->zip;
$adh->state_id=$this->state_id;
$adh->country_id=$this->country_id;
$adh->email=$this->email;
$adh->skype=$this->skype;
$adh->phone=$this->office_phone;