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

Fix bad formatting of order / shipment ref on PDF

Browse Source
This commit is contained in:
Laurent Destailleur 2016-02-25 02:44:34 +01:00
parent b0f816a400
commit f1ba81ec66
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/core/lib/pdf.lib.php
View File

@ -364,6 +364,7 @@ function pdfBuildThirdpartyName($thirdparty, Translate $outputlangs, $includeali
return $outputlangs->convToOutputCharset($socname); return $outputlangs->convToOutputCharset($socname);
} }
/** /**
* Return a string with full address formated * Return a string with full address formated
* *
@ -1889,7 +1890,8 @@ function pdf_getLinkedObjects($object,$outputlangs)
foreach($objects as $elementobject) foreach($objects as $elementobject)
{ {
$elementobject->fetchObjectLinked(); $elementobject->fetchObjectLinked();
$order = $elementobject->linkedObjects['commande'][0];
$order = reset($elementobject->linkedObjects['commande']);
if (! empty($object->linkedObjects['commande'])) // There is already a link to order so we show only info of shipment if (! empty($object->linkedObjects['commande'])) // There is already a link to order so we show only info of shipment
{ {
@ -1903,9 +1905,9 @@ function pdf_getLinkedObjects($object,$outputlangs)
$linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefOrder") . ' / ' . $outputlangs->transnoentities("RefSending"); $linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefOrder") . ' / ' . $outputlangs->transnoentities("RefSending");
$linkedobjects[$objecttype]['ref_value'] = $outputlangs->convToOutputCharset($order->ref) . ($order->ref_client ? ' ('.$order->ref_client.')' : ''); $linkedobjects[$objecttype]['ref_value'] = $outputlangs->convToOutputCharset($order->ref) . ($order->ref_client ? ' ('.$order->ref_client.')' : '');
$linkedobjects[$objecttype]['ref_value'].= ' / ' . $outputlangs->transnoentities($elementobject->ref); $linkedobjects[$objecttype]['ref_value'].= ' / ' . $outputlangs->transnoentities($elementobject->ref);
$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("OrderDate") . ' / ' . $outputlangs->transnoentities("DateSending"); $linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("OrderDate") . ($elementobject->date_delivery ? ' / ' . $outputlangs->transnoentities("DateSending") : '');
$linkedobjects[$objecttype]['date_value'] = dol_print_date($order->date,'day','',$outputlangs); $linkedobjects[$objecttype]['date_value'] = dol_print_date($order->date,'day','',$outputlangs);
$linkedobjects[$objecttype]['date_value'].= ' / ' . dol_print_date($elementobject->date_delivery,'day','',$outputlangs); $linkedobjects[$objecttype]['date_value'].= ($elementobject->date_delivery ? ' / ' . dol_print_date($elementobject->date_delivery,'day','',$outputlangs) : '');
} }
} }
} }