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

Fix: contact of delivery of order not visible into typhon pdf.

Browse Source
This commit is contained in:
Laurent Destailleur 2014-05-06 13:43:41 +02:00
parent 4da918ce01
commit 647d431857
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -197,16 +197,16 @@ class pdf_typhon extends ModelePDFDeliveryOrder
$tplidx = $pdf->importPage(1); $tplidx = $pdf->importPage(1);
} }
// Complete object by loading several other informations // We get the shipment that is the origin of delivery receipt
$expedition=new Expedition($this->db); $expedition=new Expedition($this->db);
$result = $expedition->fetch($object->expedition_id); $result = $expedition->fetch($object->origin_id);
// Now we get the order that is origin of shipment
$commande = new Commande($this->db); $commande = new Commande($this->db);
if ($expedition->origin == 'commande') if ($expedition->origin == 'commande')
{ {
$commande->fetch($expedition->origin_id); $commande->fetch($expedition->origin_id);
} }
$object->commande=$commande; $object->commande=$commande; // We set order of shipment onto delivery.
$pdf->Open(); $pdf->Open();

2
htdocs/livraison/class/livraison.class.php
View File

@ -54,8 +54,6 @@ class Livraison extends CommonObject
var $note_public; var $note_public;
var $note_private; var $note_private;
var $expedition_id;
var $date_delivery; // Date really received var $date_delivery; // Date really received
var $date_creation; var $date_creation;
var $date_valid; var $date_valid;

2
htdocs/livraison/fiche.php
View File

@ -185,7 +185,7 @@ if ($action == 'builddoc') // En get ou en post
$object = new Livraison($db); $object = new Livraison($db);
$object->fetch($id); $object->fetch($id);
$object->fetch_thirdparty(); $object->fetch_thirdparty();
// Save last template used to generate document // Save last template used to generate document
if (GETPOST('model')) $object->setDocModel($user, GETPOST('model','alpha')); if (GETPOST('model')) $object->setDocModel($user, GETPOST('model','alpha'));