lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix label

Browse Source
This commit is contained in:
Laurent Destailleur 2020-04-23 20:03:41 +02:00
parent 4e6017e5bf
commit 2ba6e65feb
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/product/stock/class/entrepot.class.php
View File

@ -272,6 +272,7 @@ class Entrepot extends CommonObject
$error = 0; $error = 0;
if (empty($id)) $id = $this->id; if (empty($id)) $id = $this->id;
if (empty($this->label)) $this->label = $this->libelle; // For backward compatibility
// Check if new parent is already a child of current warehouse // Check if new parent is already a child of current warehouse
if (!empty($this->fk_parent)) if (!empty($this->fk_parent))
@ -285,7 +286,7 @@ class Entrepot extends CommonObject
} }
} }
$this->libelle = trim($this->libelle); $this->label = trim($this->label);
$this->description = trim($this->description); $this->description = trim($this->description);
$this->lieu = trim($this->lieu); $this->lieu = trim($this->lieu);
@ -296,7 +297,7 @@ class Entrepot extends CommonObject
$this->country_id = ($this->country_id > 0 ? $this->country_id : 0); $this->country_id = ($this->country_id > 0 ? $this->country_id : 0);
$sql = "UPDATE ".MAIN_DB_PREFIX."entrepot "; $sql = "UPDATE ".MAIN_DB_PREFIX."entrepot ";
$sql .= " SET ref = '".$this->db->escape($this->libelle)."'"; $sql .= " SET ref = '".$this->db->escape($this->label)."'";
$sql .= ", fk_parent = ".(($this->fk_parent > 0) ? $this->fk_parent : "NULL"); $sql .= ", fk_parent = ".(($this->fk_parent > 0) ? $this->fk_parent : "NULL");
$sql .= ", description = '".$this->db->escape($this->description)."'"; $sql .= ", description = '".$this->db->escape($this->description)."'";
$sql .= ", statut = ".$this->statut; $sql .= ", statut = ".$this->statut;