Skip to content

Commit

Permalink
Merge pull request #9869 from ATM-Marc/FIX_6.0_typhon_order_ref
Browse files Browse the repository at this point in the history
FIX: pdf typhon: order reference duplicate
  • Loading branch information
eldy committed Oct 26, 2018
2 parents 4060dd5 + 16c3503 commit 7c81124
Showing 1 changed file with 0 additions and 37 deletions.
37 changes: 0 additions & 37 deletions htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
Expand Up @@ -754,43 +754,6 @@ function _pagehead(&$pdf, $object, $showaddress, $outputlangs)

$posy+=2;

// 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')
{
$Yoff=$posy-5;

include_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
$shipment = new Expedition($this->db);
$shipment->fetch($object->origin_id);

$origin = $shipment->origin;
$origin_id = $shipment->origin_id;

if ($conf->$origin->enabled)
{
$outputlangs->load('orders');

$classname = ucfirst($origin);
$linkedobject = new $classname($this->db);
$result=$linkedobject->fetch($origin_id);
if ($result >= 0)
{
$pdf->SetFont('','', $default_font_size - 2);
$text=$linkedobject->ref;
if ($linkedobject->ref_client) $text.=' ('.$linkedobject->ref_client.')';
$Yoff = $Yoff+8;
$pdf->SetXY($this->page_largeur - $this->marge_droite - 100,$Yoff);
$pdf->MultiCell(100, 2, $outputlangs->transnoentities("RefOrder") ." : ".$outputlangs->transnoentities($text), 0, 'R');
$Yoff = $Yoff+3;
$pdf->SetXY($this->page_largeur - $this->marge_droite - 60,$Yoff);
$pdf->MultiCell(60, 2, $outputlangs->transnoentities("OrderDate")." : ".dol_print_date($linkedobject->date,"day",false,$outputlangs,true), 0, 'R');
}
}

$posy=$Yoff;
}

// Show list of linked objects
$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 100, 3, 'R', $default_font_size);

Expand Down

0 comments on commit 7c81124

Please sign in to comment.