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

Implemented a correct error handling, if the $line->product_ref has not been set

Browse Source
This commit is contained in:
Gerhard Stephan 2018-02-13 08:41:57 +01:00
parent 2aaf3a466d
commit f93934905f
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
htdocs/core/class/commondocgenerator.class.php
View File

@ -529,10 +529,13 @@ abstract class CommonDocGenerator
$resarray = $this->fill_substitutionarray_with_extrafields($line,$resarray,$extrafields,$array_key=$array_key,$outputlangs);
// Load product data optional fields to the line -> enables to use "line_options_{extrafield}"
$product = new Product($this->db);
$result = $product->fetch(null, $line->product_ref);
foreach($product->array_options as $key=>$label)
$resarray["line_".$key] = $label;
if (isset($line->product_ref))
{
$product = new Product($this->db);
$result = $product->fetch(null, $line->product_ref);
foreach($product->array_options as $key=>$label)
$resarray["line_".$key] = $label;
}
return $resarray;
}