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

Fix: Better management of pdf generation when tcpdf not available.

Browse Source
This commit is contained in:
Laurent Destailleur
2013-09-22 19:53:27 +02:00
parent bd0e328d5b
commit ad09470f48
13 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/modules/action/rapport.pdf.php
View File

@@ -145,7 +145,7 @@ class CommActionRapport
$nbpage = $this->_pages($pdf, $outputlangs);
$pdf->AliasNbPages();
if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
$pdf->Close();
$pdf->Output($file,'F');

2
htdocs/core/modules/cheque/pdf/pdf_blochet.class.php
View File

@@ -161,7 +161,7 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
// Pied de page
$this->_pagefoot($pdf,'',$outputlangs);
$pdf->AliasNbPages();
if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
$pdf->Close();

2
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
View File

@@ -471,7 +471,7 @@ class pdf_einstein extends ModelePDFCommandes
// Pied de page
$this->_pagefoot($pdf,$object,$outputlangs);
$pdf->AliasNbPages();
if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
$pdf->Close();

4
htdocs/core/modules/expedition/doc/pdf_expedition_merou.modules.php
View File

@@ -169,7 +169,7 @@ class pdf_expedition_merou extends ModelePdfExpedition
$pagenb=0;
$pdf->SetDrawColor(128,128,128);
$pdf->AliasNbPages();
if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
$pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
$pdf->SetSubject($outputlangs->transnoentities("Sending"));
@@ -302,7 +302,7 @@ class pdf_expedition_merou extends ModelePdfExpedition
// Pied de page
$this->_pagefoot($pdf, $object, $outputlangs);
$pdf->AliasNbPages();
if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
$pdf->Close();

4
htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php
View File

@@ -155,7 +155,7 @@ class pdf_expedition_rouget extends ModelePdfExpedition
$pagenb=0;
$pdf->SetDrawColor(128,128,128);
$pdf->AliasNbPages();
if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
$pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
$pdf->SetSubject($outputlangs->transnoentities("Sending"));
@@ -322,7 +322,7 @@ class pdf_expedition_rouget extends ModelePdfExpedition
// Pied de page
$this->_pagefoot($pdf,$object,$outputlangs);
$pdf->AliasNbPages();
if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
$pdf->Close();

2
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
View File

@@ -473,7 +473,7 @@ class pdf_crabe extends ModelePDFFactures
// Pied de page
$this->_pagefoot($pdf,$object,$outputlangs);
$pdf->AliasNbPages();
if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
$pdf->Close();

2
htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
View File

@@ -320,7 +320,7 @@ class pdf_soleil extends ModelePDFFicheinter
}
$this->_pagefoot($pdf,$object,$outputlangs);
$pdf->AliasNbPages();
if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
$pdf->Close();

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

@@ -162,7 +162,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
$dir = $conf->expedition->dir_output."/receipt/" . $objectref;
$file = $dir . "/" . $objectref . ".pdf";
}
if (! file_exists($dir))
{
if (dol_mkdir($dir) < 0)
@@ -175,7 +175,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
if (file_exists($dir))
{
$nblines = count($object->lines);
// Create pdf instance
$pdf=pdf_getInstance($this->format);
$default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
@@ -288,7 +288,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
$curX = $this->posxdesc-1;
$showpricebeforepagebreak=1;
$pdf->startTransaction();
pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxcomm-$curX,3,$curX,$curY,$hideref,$hidedesc);
$pageposafter=$pdf->getPage();
@@ -320,7 +320,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
{
$pdf->commitTransaction();
}
$nexY = $pdf->GetY();
$pageposafter=$pdf->getPage();
$pdf->setPage($pageposbefore);
@@ -429,11 +429,11 @@ class pdf_typhon extends ModelePDFDeliveryOrder
// Affiche zone infos
$posy=$this->_tableau_info($pdf, $object, $bottomlasttab, $outputlangs);
// Pied de page
$this->_pagefoot($pdf,$object,$outputlangs);
$pdf->AliasNbPages();
if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
// Check product remaining to be delivered
// TODO doit etre modifie
//$waitingDelivery = $object->getRemainingDelivered();
@@ -492,7 +492,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
$this->_pagefoot($pdf,$object,$outputlangs);
$pdf->AliasNbPages();
if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
}*/
$pdf->Close();
@@ -539,20 +539,20 @@ class pdf_typhon extends ModelePDFDeliveryOrder
{
global $conf;
$default_font_size = pdf_getPDFFontSize($outputlangs);
$pdf->SetFont('','', $default_font_size);
$pdf->SetXY($this->marge_gauche, $posy);
$larg_sign = ($this->page_largeur-$this->marge_gauche-$this->marge_droite)/3;
$pdf->Rect($this->marge_gauche, $posy + 1, $larg_sign, 25);
$pdf->SetXY($this->marge_gauche + 2, $posy + 2);
$pdf->MultiCell($larg_sign,2, $outputlangs->trans("For").' '.$outputlangs->convToOutputCharset($mysoc->name).":",'','L');
$pdf->Rect(2*$larg_sign+$this->marge_gauche, $posy + 1, $larg_sign, 25);
$pdf->SetXY(2*$larg_sign+$this->marge_gauche + 2, $posy + 2);
$pdf->MultiCell($larg_sign,2, $outputlangs->trans("ForCustomer").':','','L');
}
/**
* Show table for lines
*
@@ -568,13 +568,13 @@ class pdf_typhon extends ModelePDFDeliveryOrder
function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop=0, $hidebottom=0)
{
global $conf,$mysoc;
// Force to disable hidetop and hidebottom
$hidebottom=0;
if ($hidetop) $hidetop=-1;
$default_font_size = pdf_getPDFFontSize($outputlangs);
// Amount in (at tab_top - 1)
$pdf->SetTextColor(0,0,0);
$pdf->SetFont('','', $default_font_size - 2);
@@ -586,11 +586,11 @@ class pdf_typhon extends ModelePDFDeliveryOrder
{
$pdf->line($this->marge_gauche, $tab_top+6, $this->page_largeur-$this->marge_droite, $tab_top+6);
}
$pdf->SetDrawColor(128,128,128);
$pdf->SetFont('','', $default_font_size - 1);
if (empty($hidetop))
if (empty($hidetop))
{
$pdf->SetXY($this->posxdesc-1, $tab_top+1);
$pdf->MultiCell($this->posxcomm - $this->posxdesc,2, $outputlangs->transnoentities("Designation"),'','L');
@@ -634,15 +634,15 @@ class pdf_typhon extends ModelePDFDeliveryOrder
{
pdf_watermark($pdf,$outputlangs,$this->page_hauteur,$this->page_largeur,'mm',$conf->global->COMMANDE_DRAFT_WATERMARK);
}
$pdf->SetTextColor(0,0,60);
$pdf->SetFont('','B', $default_font_size + 3);
$posy=$this->marge_haute;
$posx=$this->page_largeur-$this->marge_droite-100;
$pdf->SetXY($this->marge_gauche,$posy);
// Logo
$logo=$conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
if ($this->emetteur->logo)
@@ -694,21 +694,21 @@ class pdf_typhon extends ModelePDFDeliveryOrder
$pdf->SetTextColor(0,0,60);
$posy+=2;
// Show list of linked objects
$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 100, 3, 'R', $default_font_size);
if ($showaddress)
{
// Sender properties
$carac_emetteur = pdf_build_address($outputlangs,$this->emetteur);
// Show sender
$posy=42;
$posx=$this->marge_gauche;
if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->page_largeur-$this->marge_droite-80;
$hautcadre=40;
// Show sender frame
$pdf->SetTextColor(0,0,0);
$pdf->SetFont('','', $default_font_size - 2);
@@ -728,7 +728,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
$pdf->SetXY($posx+2,$posy+8);
$pdf->SetFont('','', $default_font_size - 1);
$pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L');
// Client destinataire
$posy=42;
$pdf->SetTextColor(0,0,0);

2
htdocs/core/modules/project/pdf/pdf_baleine.modules.php
View File

@@ -287,7 +287,7 @@ class pdf_baleine extends ModelePDFProjects
* Pied de page
*/
$this->_pagefoot($pdf,$object,$outputlangs);
$pdf->AliasNbPages();
if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
$pdf->Close();

2
htdocs/core/modules/propale/doc/pdf_azur.modules.php
View File

@@ -471,7 +471,7 @@ class pdf_azur extends ModelePDFPropales
// Pied de page
$this->_pagefoot($pdf,$object,$outputlangs);
$pdf->AliasNbPages();
if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
$pdf->Close();

2
htdocs/core/modules/rapport/pdf_paiement.class.php
View File

@@ -210,7 +210,7 @@ class pdf_paiement
$this->Body($pdf, 1, $lines, $outputlangs);
$pdf->AliasNbPages();
if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
$pdf->Close();

2
htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
View File

@@ -407,7 +407,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
// Pied de page
$this->_pagefoot($pdf, $object, $outputlangs);
$pdf->AliasNbPages();
if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
$pdf->Close();

2
htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
View File

@@ -425,7 +425,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
// Pied de page
$this->_pagefoot($pdf, $object, $outputlangs);
$pdf->AliasNbPages();
if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
$pdf->Close();