| '.$langs->trans("Description").' | ';
diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index aee38a67ccf..032a0f3a56d 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -123,8 +123,8 @@ class Entrepot extends CommonObject
$this->db->begin();
- $sql = "INSERT INTO ".MAIN_DB_PREFIX."entrepot (entity, datec, fk_user_author, label)";
- $sql .= " VALUES (".$conf->entity.",'".$this->db->idate($now)."',".$user->id.",'".$this->db->escape($this->libelle)."')";
+ $sql = "INSERT INTO ".MAIN_DB_PREFIX."entrepot (entity, datec, fk_user_author, label, fk_parent)";
+ $sql .= " VALUES (".$conf->entity.",'".$this->db->idate($now)."',".$user->id.",'".$this->db->escape($this->libelle)."', ".($this->fk_parent > 0 ? $this->fk_parent : 'NULL').")";
dol_syslog(get_class($this)."::create", LOG_DEBUG);
$result=$this->db->query($sql);
@@ -172,6 +172,16 @@ class Entrepot extends CommonObject
*/
function update($id, $user)
{
+ // Check if new parent is already a child of current warehouse
+ if(!empty($this->fk_parent)) {
+ $TChildWarehouses = array($id);
+ $TChildWarehouses = $this->get_children_warehouses($this->id, $TChildWarehouses);
+ if(in_array($this->fk_parent, $TChildWarehouses)) {
+ $this->error = 'ErrorCannotAddThisParentWarehouse';
+ return -2;
+ }
+ }
+
$this->libelle=trim($this->libelle);
$this->description=trim($this->description);
@@ -184,6 +194,7 @@ class Entrepot extends CommonObject
$sql = "UPDATE ".MAIN_DB_PREFIX."entrepot ";
$sql .= " SET label = '" . $this->db->escape($this->libelle) ."'";
+ $sql .= ", fk_parent = '" . (($this->fk_parent > 0) ? $this->fk_parent : 'NULL') ."'";
$sql .= ", description = '" . $this->db->escape($this->description) ."'";
$sql .= ", statut = " . $this->statut;
$sql .= ", lieu = '" . $this->db->escape($this->lieu) ."'";
@@ -294,7 +305,7 @@ class Entrepot extends CommonObject
{
global $conf;
- $sql = "SELECT rowid, label, description, statut, lieu, address, zip, town, fk_pays as country_id";
+ $sql = "SELECT rowid, fk_parent, label, description, statut, lieu, address, zip, town, fk_pays as country_id";
$sql .= " FROM ".MAIN_DB_PREFIX."entrepot";
if ($id)
@@ -317,6 +328,7 @@ class Entrepot extends CommonObject
$obj=$this->db->fetch_object($result);
$this->id = $obj->rowid;
+ $this->fk_parent = $obj->fk_parent;
$this->ref = $obj->rowid;
$this->libelle = $obj->label;
$this->description = $obj->description;
@@ -573,7 +585,7 @@ class Entrepot extends CommonObject
$linkend='';
if ($withpicto) $result.=($link.img_object($label, 'stock', 'class="classfortooltip"').$linkend.' ');
- $result.=$link.(empty($this->label)?$this->libelle:$this->label).$linkend;
+ $result.=$link.$this->get_full_arbo().$linkend;
return $result;
}
@@ -604,4 +616,69 @@ class Entrepot extends CommonObject
$this->country_id=1;
$this->country_code='FR';
}
+
+ /**
+ * Return full path to current warehouse
+ *
+ * @param int $protection Deep counter to avoid infinite loop
+ * @return string String full path to current warehouse separated by " >> "
+ */
+ function get_full_arbo($protection=1000) {
+
+ global $user,$langs,$conf;
+
+ $TArbo = array($this->libelle);
+
+ $id = $this->id;
+
+ $i=0;
+
+ while((empty($protection) || $i < $protection)) {
+ $sql = 'SELECT fk_parent
+ FROM '.MAIN_DB_PREFIX.'entrepot
+ WHERE rowid = '.$id;
+
+ $resql = $this->db->query($sql);
+ if($resql) {
+ $res = $this->db->fetch_object($resql);
+ if(empty($res->fk_parent)) break;
+ $id = $res->fk_parent;
+ $o = new Entrepot($this->db);
+ $o->fetch($id);
+ $TArbo[] = $o->libelle;
+ } else break;
+
+ $i++;
+
+ }
+
+ return implode(' >> ', array_reverse($TArbo));
+
+ }
+
+ /**
+ * Return array of children warehouses ids from $id warehouse (recursive function)
+ *
+ * @param int $id id parent warehouse
+ * @param array() $TChildWarehouses array which will contain all children (param by reference)
+ * @return array() $TChildWarehouses array which will contain all children
+ */
+ function get_children_warehouses($id, &$TChildWarehouses) {
+
+ $sql = 'SELECT rowid
+ FROM '.MAIN_DB_PREFIX.'entrepot
+ WHERE fk_parent = '.$id;
+
+ $resql = $this->db->query($sql);
+ if($resql) {
+ while($res = $this->db->fetch_object($resql)) {
+ $TChildWarehouses[] = $res->rowid;
+ $this->get_children_warehouses($res->rowid, $TChildWarehouses);
+ }
+ }
+
+ return $TChildWarehouses;
+
+ }
+
}
|