Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

PDF works with us letter format

Browse Source
This commit is contained in:
Laurent Destailleur
2011-08-31 12:24:47 +00:00
parent 59f78d03e3
commit a74f88c299
19 changed files with 943 additions and 459 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php
View File

@@ -55,8 +55,9 @@ class pdf_sirocco extends ModelePDFDeliveryOrder
// Dimension page pour format A4
$this->type = 'pdf';
$this->page_largeur = 210;
$this->page_hauteur = 297;
$formatarray=pdf_getFormat();
$this->page_largeur = $formatarray['width'];
$this->page_hauteur = $formatarray['height'];
$this->format = array($this->page_largeur,$this->page_hauteur);
$this->marge_gauche=10;
$this->marge_droite=10;
@@ -327,6 +328,7 @@ class pdf_sirocco extends ModelePDFDeliveryOrder
$pdf->SetTextColor(0,0,60);
$pdf->SetFont('','B', $default_font_size + 3);
$posx=$this->page_largeur-$this->marge_droite-100;
$posy=$this->marge_haute;
$pdf->SetXY($this->marge_gauche,$posy);
@@ -387,15 +389,15 @@ class pdf_sirocco extends ModelePDFDeliveryOrder
$pdf->SetTextColor(0,0,60);
$pdf->SetFont('','B', $default_font_size + 1);
$pdf->SetXY($this->page_largeur - $this->marge_droite - 100, 86);
$pdf->SetXY($posx, 86);
$pdf->MultiCell(100, 2, $outputlangs->transnoentities("Date")." : " . dol_print_date(($object->date_delivery?$object->date_delivery:$date->valid),"day",false,$outputlangs,true), 0, 'R');
$pdf->SetXY($this->page_largeur - $this->marge_droite - 100, 92);
$pdf->SetXY($posx, 92);
$pdf->MultiCell(100, 2, $outputlangs->transnoentities("DeliveryOrder")." ".$outputlangs->convToOutputCharset($object->ref), 0, 'R');
if ($object->client->code_client)
{
$posy+=7;
$pdf->SetXY($this->page_largeur - $this->marge_droite - 100, $posy);
$pdf->SetXY($posx, $posy);
$pdf->SetTextColor(0,0,60);
$pdf->MultiCell(100, 3, $outputlangs->transnoentities("CustomerCode")." : " . $outputlangs->transnoentities($object->client->code_client), '', 'R');
}
@@ -424,7 +426,7 @@ class pdf_sirocco extends ModelePDFDeliveryOrder
if ($result >= 0)
{
$posy+=5;
$pdf->SetXY(100,$posy);
$pdf->SetXY($posx,$posy);
$pdf->SetFont('','', $default_font_size - 1);
$text=$order->ref;
if ($order->ref_client) $text.=' ('.$order->ref_client.')';

25
htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php
View File

@@ -60,8 +60,9 @@ class pdf_typhon extends ModelePDFDeliveryOrder
// Dimension page pour format A4
$this->type = 'pdf';
$this->page_largeur = 210;
$this->page_hauteur = 297;
$formatarray=pdf_getFormat();
$this->page_largeur = $formatarray['width'];
$this->page_hauteur = $formatarray['height'];
$this->format = array($this->page_largeur,$this->page_hauteur);
$this->marge_gauche=10;
$this->marge_droite=10;
@@ -478,6 +479,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
$pdf->SetTextColor(0,0,60);
$pdf->SetFont('','B', $default_font_size + 3);
$posx=$this->page_largeur-$this->marge_droite-100;
$posy=$this->marge_haute;
$pdf->SetXY($this->marge_gauche,$posy);
@@ -501,14 +503,14 @@ class pdf_typhon extends ModelePDFDeliveryOrder
else $pdf->MultiCell(100, 4, $this->emetteur->name, 0, 'L');
$pdf->SetFont('','B', $default_font_size + 2);
$pdf->SetXY(100,$posy);
$pdf->SetXY($posx,$posy);
$pdf->SetTextColor(0,0,60);
$pdf->MultiCell(100, 4, $outputlangs->transnoentities("DeliveryOrder")." ".$outputlangs->convToOutputCharset($object->ref), '' , 'R');
$pdf->SetFont('','',$default_font_size + 2);
$posy+=5;
$pdf->SetXY(100,$posy);
$pdf->SetXY($posx,$posy);
$pdf->SetTextColor(0,0,60);
if ($object->date_valid)
{
@@ -524,7 +526,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
if ($object->client->code_client)
{
$posy+=5;
$pdf->SetXY(100,$posy);
$pdf->SetXY($posx,$posy);
$pdf->SetTextColor(0,0,60);
$pdf->MultiCell(100, 3, $outputlangs->transnoentities("CustomerCode")." : " . $outputlangs->transnoentities($object->client->code_client), '', 'R');
}
@@ -553,7 +555,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
if ($result >= 0)
{
$posy+=5;
$pdf->SetXY(100,$posy);
$pdf->SetXY($posx,$posy);
$pdf->SetFont('','', $default_font_size - 1);
$text=$order->ref;
if ($order->ref_client) $text.=' ('.$order->ref_client.')';
@@ -641,11 +643,12 @@ class pdf_typhon extends ModelePDFDeliveryOrder
}
/**
* \brief Show footer of page
* \param pdf PDF factory
* \param object Object invoice
* \param outputlangs Object lang for output
* \remarks Need this->emetteur object
* Show footer of page
* Need this->emetteur object
*
* @param pdf PDF factory
* @param object Object invoice
* @param outputlangs Object lang for output
*/
function _pagefoot(&$pdf,$object,$outputlangs)
{