Update societe.class.php
This commit is contained in:
parent
0a024f285d
commit
4f3b732ed5
@ -790,7 +790,7 @@ class Societe extends CommonObject
|
|||||||
if (empty($this->status)) $this->status = 0;
|
if (empty($this->status)) $this->status = 0;
|
||||||
$this->name = $this->name ?trim($this->name) : trim($this->nom);
|
$this->name = $this->name ?trim($this->name) : trim($this->nom);
|
||||||
if (!empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->name = ucwords($this->name);
|
if (!empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->name = ucwords($this->name);
|
||||||
if (!empty($conf->global->MAIN_ALL_TO_UPPER)) $this->name = strtoupper($this->name);
|
if (!empty($conf->global->MAIN_ALL_TO_UPPER)) $this->name = dol_strtoupper($this->name);
|
||||||
$this->nom = $this->name; // For backward compatibility
|
$this->nom = $this->name; // For backward compatibility
|
||||||
if (empty($this->client)) $this->client = 0;
|
if (empty($this->client)) $this->client = 0;
|
||||||
if (empty($this->fournisseur)) $this->fournisseur = 0;
|
if (empty($this->fournisseur)) $this->fournisseur = 0;
|
||||||
@ -1095,7 +1095,7 @@ class Societe extends CommonObject
|
|||||||
$now = dol_now();
|
$now = dol_now();
|
||||||
|
|
||||||
if (!empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->name = ucwords($this->name);
|
if (!empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->name = ucwords($this->name);
|
||||||
if (!empty($conf->global->MAIN_ALL_TO_UPPER)) $this->name = strtoupper($this->name);
|
if (!empty($conf->global->MAIN_ALL_TO_UPPER)) $this->name = dol_strtoupper($this->name);
|
||||||
// Clean parameters
|
// Clean parameters
|
||||||
$this->id = $id;
|
$this->id = $id;
|
||||||
$this->entity = ((isset($this->entity) && is_numeric($this->entity)) ? $this->entity : $conf->entity);
|
$this->entity = ((isset($this->entity) && is_numeric($this->entity)) ? $this->entity : $conf->entity);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user