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

Merge remote-tracking branch 'origin/3.3' into 3.4

Browse Source 
Conflicts:
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
This commit is contained in:
Laurent Destailleur 2013-09-22 19:57:48 +02:00
commit c2ba7956ab
12 changed files with 18 additions and 18 deletions
Show Stats 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

@ -467,7 +467,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"));
@ -323,7 +323,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();

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

@ -469,7 +469,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

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

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

@ -432,7 +432,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
// 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
@ -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();
@ -728,7 +728,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
$pdf->MultiCell(60, 2, $outputlangs->transnoentities("OrderDate")." : ".dol_print_date($linkedobject->date,"day",false,$outputlangs,true), 0, 'R');
}
}
$posy=$Yoff;
}

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

@ -468,7 +468,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();

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

@ -466,9 +466,9 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
$posy=$this->_tableau_versements($pdf, $object, $posy, $outputlangs);
}
// Pied de page
$this->_pagefoot($pdf,$object,$outputlangs);
$pdf->AliasNbPages();
// Pied de page
$this->_pagefoot($pdf, $object, $outputlangs);
if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
$pdf->Close();
@ -576,7 +576,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
$posy=$pdf->GetY()+2;
}
return $posy;
}