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

Fixed bug #18642

Browse Source
This commit is contained in:
liedekef 2007-01-04 14:58:06 +00:00
parent 589ddce2e2
commit 7d30337159
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -307,9 +307,15 @@ class pdf_sirocco extends ModelePDFDeliveryOrder
*/
$pdf->SetTextColor(0,0,0);
$pdf->SetFont('Arial','B',12);
$client = new Societe($this->db);
$client->fetch($delivery->socid);
$delivery->client = $client;
$client = new Societe($this->db);
/*
* if a delivery address is used, use that, else use the client address
*/
if ($commande->adresse_livraison_id>0) {
$client->fetch_adresse_livraison($commande->adresse_livraison_id);
} else {
$client->fetch($delivery->socid);
}
$pdf->SetXY(102,42);
$pdf->MultiCell(96,5, $delivery->client->nom);
$pdf->SetFont('Arial','B',11);

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

@ -729,12 +729,18 @@ class pdf_typhon extends ModelePDFDeliveryOrder
$pdf->SetTextColor(0,0,0);
$pdf->SetFont('Arial','',8);
$pdf->SetXY(102,$posy-5);
$pdf->MultiCell(80,5, $langs->transnoentities("BillTo").":");
//
$client = new Societe($this->db);
$client->fetch($delivery->socid);
$delivery->client = $client;
//
$pdf->MultiCell(80,5, $langs->transnoentities("DeliveryAddress").":");
/*
* if a delivery address is used, use that, else use the client address
*/
if ($commande->adresse_livraison_id>0) {
$client->fetch_adresse_livraison($commande->adresse_livraison_id);
} else {
$client->fetch($delivery->socid);
}
$delivery->client = $client;
//
// Cadre client destinataire
$pdf->rect(100, $posy, 100, $hautcadre);