Merge pull request #1208 from grandoc/develop

Add an additional description for the category products
This commit is contained in:
Juanjo Menent 2013-09-03 02:43:30 -07:00
commit 7293d58002

View File

@ -1031,7 +1031,23 @@ function pdf_getlinedesc($object,$i,$outputlangs,$hideref=0,$hidedesc=0,$issuppl
$libelleproduitservice=$prefix_prodserv.$ref_prodserv.$libelleproduitservice;
}
}
// Add an additional description for the category products
if (! empty($conf->categorie->enabled))
{
include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
$categstatic=new Categorie($db);
// recovering the list of all the categories linked to product
$tblcateg=$categstatic->containing($idprod,0);
foreach ($tblcateg as $cate)
{
// Adding the descriptions if they are filled
$desccateg=$cate->add_description;
if ($desccateg)
$libelleproduitservice.='__N__'.$desccateg;
}
}
if (! empty($object->lines[$i]->date_start) || ! empty($object->lines[$i]->date_end))
{
$format='day';