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

NEW : getNomUrl displays full path to warehouse

Browse Source 
# Conflicts:
#	htdocs/product/stock/class/entrepot.class.php
This commit is contained in:
gauthier 2016-09-20 09:27:27 +02:00
parent fe1bcb7e0a
commit 1a648cfc89
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/product/class/html.formproduct.class.php
View File

@ -117,6 +117,8 @@ class FormProduct
{ {
$obj = $this->db->fetch_object($resql); $obj = $this->db->fetch_object($resql);
if ($sumStock) $obj->stock = price2num($obj->stock,5); if ($sumStock) $obj->stock = price2num($obj->stock,5);
$o = new Entrepot($this->db);
$o->fetch($obj->rowid);
$this->cache_warehouses[$obj->rowid]['id'] =$obj->rowid; $this->cache_warehouses[$obj->rowid]['id'] =$obj->rowid;
$this->cache_warehouses[$obj->rowid]['label']=$o->get_full_arbo(); $this->cache_warehouses[$obj->rowid]['label']=$o->get_full_arbo();
$this->cache_warehouses[$obj->rowid]['description'] = $obj->description; $this->cache_warehouses[$obj->rowid]['description'] = $obj->description;

2
htdocs/product/stock/card.php
View File

@ -646,7 +646,7 @@ else
// Parent entrepot // Parent entrepot
print '<tr><td>'.$langs->trans("AddIn").'</td><td>'; print '<tr><td>'.$langs->trans("AddIn").'</td><td>';
print $formproduct->selectWarehouses('', 'fk_parent', '', 1, 0, 0, '', 0, 0, array(), 'minwidth200', array($object->id)); print $formproduct->selectWarehouses($object->fk_parent, 'fk_parent', '', 1, 0, 0, '', 0, 0, array(), 'minwidth200', array($object->id));
print '</td></tr>'; print '</td></tr>';
// Description // Description

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

@ -575,7 +575,7 @@ class Entrepot extends CommonObject
$linkend='</a>'; $linkend='</a>';
if ($withpicto) $result.=($link.img_object($label, 'stock', 'class="classfortooltip"').$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; return $result;
} }