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

Fix: bug #34545 : Sauts de lignes en vue de produit libre - New lines in

Browse Source 
free product line view
This commit is contained in:
Laurent Destailleur 2011-10-17 14:45:31 +02:00
parent c747376945
commit 1948fc115e
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/tpl/freeproductline_view.tpl.php
View File

@ -35,14 +35,14 @@
$discount->fetch($line->fk_remise_except); $discount->fetch($line->fk_remise_except);
echo ' - '.$langs->transnoentities("DiscountFromDeposit",$discount->getNomUrl(0)); echo ' - '.$langs->transnoentities("DiscountFromDeposit",$discount->getNomUrl(0));
} else { } else {
echo ' - '.dol_nl2br($line->description,1,true); echo ' - '.dol_htmlentitiesbr($line->description,1,true);
} }
} }
} else { } else {
if (! empty($line->fk_parent_line)) echo img_picto('', 'rightarrow'); if (! empty($line->fk_parent_line)) echo img_picto('', 'rightarrow');
if ($type==1) $text = img_object($langs->trans('Service'),'service'); if ($type==1) $text = img_object($langs->trans('Service'),'service');
else $text = img_object($langs->trans('Product'),'product'); else $text = img_object($langs->trans('Product'),'product');
echo $text.' '.dol_nl2br($line->description,1,true); echo $text.' '.dol_htmlentitiesbr($line->description,1,true);
// Show range // Show range
print_date_range($line->date_start,$line->date_end); print_date_range($line->date_start,$line->date_end);
} ?> } ?>

2
htdocs/includes/modules/facture/modules_facture.php
View File

@ -167,8 +167,6 @@ function facture_pdf_create($db, $object, $message, $modele, $outputlangs, $hide
} }
else else
{ {
//print $langs->trans("Error")." ".$langs->trans("Error_FACTURE_ADDON_PDF_NotDefined");
//return 0;
$modele = 'crabe'; $modele = 'crabe';
} }
} }

15
htdocs/includes/modules/propale/modules_propale.php
View File

@ -149,6 +149,19 @@ function propale_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0,
$srctemplatepath=''; $srctemplatepath='';
$modelisok=0; $modelisok=0;
// Positionne le modele sur le nom du modele a utiliser
if (! dol_strlen($modele))
{
if (! empty($conf->global->PROPALE_ADDON_PDF))
{
$modele = $conf->global->PROPALE_ADDON_PDF;
}
else
{
$modele = 'azur';
}
}
// Positionne modele sur le nom du modele de propale a utiliser // Positionne modele sur le nom du modele de propale a utiliser
$file = "pdf_propale_".$modele.".modules.php"; $file = "pdf_propale_".$modele.".modules.php";
@ -168,7 +181,7 @@ function propale_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0,
} }
// Si model pas encore bon // Si model pas encore bon
if (! $modelisok) if (! $modelisok && is_array($liste))
{ {
$liste=ModelePDFPropales::liste_modeles($db); $liste=ModelePDFPropales::liste_modeles($db);
$modele=key($liste); // Renvoie premiere valeur de cle trouve dans le tableau $modele=key($liste); // Renvoie premiere valeur de cle trouve dans le tableau