From d61e5bae932633ab891e3c228bdf1c3fa6c935a2 Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Sat, 28 Jun 2014 17:01:52 +0200 Subject: [PATCH] Fix : Invoice PDF was not showing ref when created from a shipment. Now shows refs and dates of shipment and oreder related --- htdocs/core/lib/pdf.lib.php | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php index 543c2f5ef43..a9eb6c0d6e6 100644 --- a/htdocs/core/lib/pdf.lib.php +++ b/htdocs/core/lib/pdf.lib.php @@ -1583,6 +1583,25 @@ function pdf_getLinkedObjects($object,$outputlangs) $linkedobjects[$objecttype]['date_value'] = dol_print_date($objects[$i]->date,'day','',$outputlangs); } } + else if ($objecttype == 'shipping') + { + $outputlangs->load('orders'); + $outputlangs->load('sendings'); + + $num=count($objects); + for ($i=0;$i<$num;$i++) + { + $objects[$i]->fetchObjectLinked(); + $order = $objects[$i]->linkedObjects['commande'][0]; + + $linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefOrder") . ' / ' . $outputlangs->transnoentities("RefSending"); + $linkedobjects[$objecttype]['ref_value'] = $outputlangs->transnoentities($order->ref) . ($order->ref_client ? ' ('.$order->ref_client.')' : ''); + $linkedobjects[$objecttype]['ref_value'].= ' / ' . $outputlangs->transnoentities($objects[$i]->ref); + $linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("OrderDate") . ' / ' . $outputlangs->transnoentities("DateSending"); + $linkedobjects[$objecttype]['date_value'] = dol_print_date($order->date,'day','',$outputlangs); + $linkedobjects[$objecttype]['date_value'].= ' / ' . dol_print_date($objects[$i]->date_delivery,'day','',$outputlangs); + } + } else if ($objecttype == 'contrat') { $outputlangs->load('contracts');