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

Added reference to order number and added 2 forgotten lines

Browse Source
This commit is contained in:
liedekef 2007-01-05 12:40:45 +00:00
parent 05d9be2469
commit 464619fbbb
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/livraison/mods/pdf/pdf_sirocco.modules.php
View File

@ -317,6 +317,8 @@ class pdf_sirocco extends ModelePDFDeliveryOrder
} else { } else {
$client->fetch($delivery->socid); $client->fetch($delivery->socid);
} }
$delivery->client = $client;
$pdf->SetXY(102,42); $pdf->SetXY(102,42);
$pdf->MultiCell(96,5, $delivery->client->nom); $pdf->MultiCell(96,5, $delivery->client->nom);
$pdf->SetFont('Arial','B',11); $pdf->SetFont('Arial','B',11);
@ -327,9 +329,15 @@ class pdf_sirocco extends ModelePDFDeliveryOrder
$pdf->SetTextColor(200,0,0); $pdf->SetTextColor(200,0,0);
$pdf->SetFont('Arial','B',12); $pdf->SetFont('Arial','B',12);
$pdf->Text(11, 88, $langs->transnoentities("Date")." : " . strftime("%d %b %Y", $delivery->date)); $pdf->Text(11, 88, $langs->transnoentities("Date")." : " . dolibarr_print_date($delivery->date_valid,"%d %b %Y"));
$pdf->Text(11, 94, $langs->transnoentities("DeliveryOrder")." ".$delivery->ref); $pdf->Text(11, 94, $langs->transnoentities("DeliveryOrder")." ".$delivery->ref);
$pdf->SetFont('Arial','B',9);
$commande = new Commande ($this->db);
if ($commande->fetch($delivery->commande_id) >0) {
$pdf->Text(11, 98, $langs->transnoentities("RefOrder")." ".$commande->ref);
}
} }

19
htdocs/livraison/mods/pdf/pdf_typhon.modules.php
View File

@ -670,11 +670,19 @@ class pdf_typhon extends ModelePDFDeliveryOrder
$pdf->SetTextColor(0,0,60); $pdf->SetTextColor(0,0,60);
$pdf->MultiCell(100, 4, $langs->transnoentities("DeliveryOrder")." ".$delivery->ref, '' , 'R'); $pdf->MultiCell(100, 4, $langs->transnoentities("DeliveryOrder")." ".$delivery->ref, '' , 'R');
$pdf->SetFont('Arial','',12); $pdf->SetFont('Arial','',12);
$posy+=6; $posy+=6;
$pdf->SetXY(100,$posy); $pdf->SetXY(100,$posy);
$pdf->SetTextColor(0,0,60); $pdf->SetTextColor(0,0,60);
$pdf->MultiCell(100, 4, $langs->transnoentities("Date")." : " . dolibarr_print_date($delivery->date_valid,"%d %b %Y"), '', 'R'); $pdf->MultiCell(100, 4, $langs->transnoentities("Date")." : " . dolibarr_print_date($delivery->date_valid,"%d %b %Y"), '', 'R');
$posy+=6;
$pdf->SetXY(100,$posy);
$pdf->SetTextColor(0,0,60);
$commande = new Commande ($this->db);
if ($commande->fetch($delivery->commande_id) >0) {
$pdf->MultiCell(100, 4, $langs->transnoentities("RefOrder")." : ".$commande->ref, '' , 'R');
}
if ($showadress) if ($showadress)
{ {
@ -735,6 +743,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
/* /*
* if a delivery address is used, use that, else use the client address * if a delivery address is used, use that, else use the client address
*/ */
$client = new Societe($this->db);
if ($commande->adresse_livraison_id>0) { if ($commande->adresse_livraison_id>0) {
$client->fetch_adresse_livraison($commande->adresse_livraison_id); $client->fetch_adresse_livraison($commande->adresse_livraison_id);
} else { } else {