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

Merge pull request #640 from defrance69/patch-11

Browse Source 
Update htdocs/product/class/product.class.php
This commit is contained in:
Laurent Destailleur 2013-02-10 17:36:27 -08:00
commit 638871c40c
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/product/class/product.class.php
View File

@ -2186,7 +2186,7 @@ class Product extends CommonObject
} }
// Recursive call // Recursive call
if (is_array($desc_pere)) if (is_array($desc_pere)>2)
{ {
$this ->fetch_prod_arbo($desc_pere, $nom_pere." -> ", $desc_pere[1]*$multiply, $level+1); $this ->fetch_prod_arbo($desc_pere, $nom_pere." -> ", $desc_pere[1]*$multiply, $level+1);
} }
@ -2340,12 +2340,13 @@ class Product extends CommonObject
$prods = array(); $prods = array();
while ($rec = $this->db->fetch_array($res)) while ($rec = $this->db->fetch_array($res))
{ {
$prods[$rec['rowid']]= array(0=>$rec['id'],1=>$rec['qty'],2=>$rec['fk_product_type'],3=>$this->db->escape($rec['label']));
//$prods[$this->db->escape($rec['label'])]= array(0=>$rec['id'],1=>$rec['qty'],2=>$rec['fk_product_type']); //$prods[$this->db->escape($rec['label'])]= array(0=>$rec['id'],1=>$rec['qty'],2=>$rec['fk_product_type']);
$prods[$this->db->escape($rec['label'])]= array(0=>$rec['id'],1=>$rec['qty']); //$prods[$this->db->escape($rec['label'])]= array(0=>$rec['id'],1=>$rec['qty']);
$listofchilds=$this->getChildsArbo($rec['id']); $listofchilds=$this->getChildsArbo($rec['id']);
foreach($listofchilds as $keyChild => $valueChild) foreach($listofchilds as $keyChild => $valueChild)
{ {
$prods[$this->db->escape($rec['label'])][$keyChild] = $valueChild; $prods[$rec['rowid']][$keyChild] = $valueChild;
} }
} }