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

Doc

Browse Source
This commit is contained in:
Laurent Destailleur 2013-09-25 12:37:19 +02:00
parent b6a083596a
commit d111ee97c2
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
View File

@ -697,6 +697,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
$posy+=2; $posy+=2;
// Add list of linked orders on shipment // Add list of linked orders on shipment
// Currently not supported by pdf_writeLinkedObjects, link for delivery to order is done through shipment)
if ($object->origin == 'expedition' || $object->origin == 'shipping') if ($object->origin == 'expedition' || $object->origin == 'shipping')
{ {
$Yoff=$posy-5; $Yoff=$posy-5;
@ -708,7 +709,6 @@ class pdf_typhon extends ModelePDFDeliveryOrder
$origin = $shipment->origin; $origin = $shipment->origin;
$origin_id = $shipment->origin_id; $origin_id = $shipment->origin_id;
// TODO move to external function
if ($conf->$origin->enabled) if ($conf->$origin->enabled)
{ {
$outputlangs->load('orders'); $outputlangs->load('orders');