From a2cca4c2153401f1193438dd8f8f984210783f7e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 1 Sep 2010 11:44:27 +0000
Subject: [PATCH] Work on FPDF replacement by TCPDF

---
 htdocs/compta/facture/impayees.php                          | 2 ++
 htdocs/includes/modules/action/rapport.pdf.php              | 2 ++
 htdocs/includes/modules/cheque/pdf/pdf_blochet.class.php    | 2 ++
 htdocs/includes/modules/commande/pdf_edison.modules.php     | 1 +
 htdocs/includes/modules/commande/pdf_einstein.modules.php   | 1 +
 .../modules/expedition/pdf/pdf_expedition_merou.modules.php | 2 ++
 .../expedition/pdf/pdf_expedition_rouget.modules.php        | 2 ++
 htdocs/includes/modules/facture/pdf_oursin.modules.php      | 2 ++
 htdocs/includes/modules/fichinter/pdf_soleil.modules.php    | 2 ++
 .../includes/modules/livraison/pdf/pdf_sirocco.modules.php  | 1 +
 .../includes/modules/livraison/pdf/pdf_typhon.modules.php   | 1 +
 htdocs/includes/modules/member/cards/pdf_standard.class.php | 2 ++
 .../modules/member/labels/pdf_standardlabel.class.php       | 6 ++++--
 htdocs/includes/modules/project/pdf/pdf_baleine.modules.php | 2 ++
 .../includes/modules/propale/pdf_propale_azur.modules.php   | 2 ++
 .../includes/modules/propale/pdf_propale_jaune.modules.php  | 2 ++
 htdocs/includes/modules/rapport/pdf_paiement.class.php      | 1 +
 .../modules/supplier_order/pdf/pdf_muscadet.modules.php     | 2 ++
 scripts/invoices/rebuild_merge_pdf.php                      | 2 ++
 19 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/facture/impayees.php b/htdocs/compta/facture/impayees.php
index 215d148c387..34de0347299 100644
--- a/htdocs/compta/facture/impayees.php
+++ b/htdocs/compta/facture/impayees.php
@@ -72,6 +72,8 @@ if ($_POST["action"] == "builddoc" && $user->rights->facture->lire)
 		if ($conf->global->MAIN_DISABLE_PDF_COMPRESSION) $pdf->SetCompression(false);
 		//$pdf->SetCompression(false);
 
+		$pdf->SetFont('Helvetica');
+
 		//$pdf->Open();
 		//$pdf->AddPage();
 		//$title=$langs->trans("BillsCustomersUnpaid");
diff --git a/htdocs/includes/modules/action/rapport.pdf.php b/htdocs/includes/modules/action/rapport.pdf.php
index 8ee2918d64e..7fbf2390887 100644
--- a/htdocs/includes/modules/action/rapport.pdf.php
+++ b/htdocs/includes/modules/action/rapport.pdf.php
@@ -112,6 +112,8 @@ class CommActionRapport
 				$pdf=new FPDI('P','mm',$this->format);
 			}
 
+            $pdf->SetFont('Helvetica');
+
 			$pdf->Open();
 			$pagenb=0;
 			$pdf->SetDrawColor(128,128,128);
diff --git a/htdocs/includes/modules/cheque/pdf/pdf_blochet.class.php b/htdocs/includes/modules/cheque/pdf/pdf_blochet.class.php
index 43b46246837..b73e768313a 100644
--- a/htdocs/includes/modules/cheque/pdf/pdf_blochet.class.php
+++ b/htdocs/includes/modules/cheque/pdf/pdf_blochet.class.php
@@ -127,6 +127,8 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
 			$pdf=new FPDI('P','mm',$this->format);
 		}
 
+        $pdf->SetFont('Helvetica');
+
 		$pdf->Open();
 		$pagenb=0;
 		$pdf->SetDrawColor(128,128,128);
diff --git a/htdocs/includes/modules/commande/pdf_edison.modules.php b/htdocs/includes/modules/commande/pdf_edison.modules.php
index 8da1af5cf1e..2b3958729e3 100644
--- a/htdocs/includes/modules/commande/pdf_edison.modules.php
+++ b/htdocs/includes/modules/commande/pdf_edison.modules.php
@@ -153,6 +153,7 @@ class pdf_edison extends ModelePDFCommandes
 					$pdf=new FPDI('P','mm',$this->format);
 				}
 
+                $pdf->SetFont('Helvetica');
 
 				$pdf->Open();
 				$pagenb=0;
diff --git a/htdocs/includes/modules/commande/pdf_einstein.modules.php b/htdocs/includes/modules/commande/pdf_einstein.modules.php
index 040d668ec6c..09a3f5742ca 100644
--- a/htdocs/includes/modules/commande/pdf_einstein.modules.php
+++ b/htdocs/includes/modules/commande/pdf_einstein.modules.php
@@ -175,6 +175,7 @@ class pdf_einstein extends ModelePDFCommandes
 					$pdf=new FPDI('P','mm',$this->format);
 				}
 
+                $pdf->SetFont('Helvetica');
 
 				$pdf->Open();
 				$pagenb=0;
diff --git a/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php b/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php
index 777f0eff304..42e4d6aed05 100644
--- a/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php
+++ b/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php
@@ -152,6 +152,8 @@ Class pdf_expedition_merou extends ModelePdfExpedition
 					$pdf=new FPDI('l','mm',$this->format);
 				}
 
+                $pdf->SetFont('Helvetica');
+
 				$pdf->Open();
 				$pagenb=0;
 				$pdf->SetDrawColor(128,128,128);
diff --git a/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php b/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php
index 53df872b20a..5cea3727313 100644
--- a/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php
+++ b/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php
@@ -284,6 +284,8 @@ Class pdf_expedition_rouget extends ModelePdfExpedition
 					$pdf=new FPDI('P','mm',$this->format);
 				}
 
+                $pdf->SetFont('Helvetica');
+
 				$pdf->Open();
 				$pagenb=0;
 				$pdf->SetDrawColor(128,128,128);
diff --git a/htdocs/includes/modules/facture/pdf_oursin.modules.php b/htdocs/includes/modules/facture/pdf_oursin.modules.php
index 1a5922958b2..5e1b6d00e27 100644
--- a/htdocs/includes/modules/facture/pdf_oursin.modules.php
+++ b/htdocs/includes/modules/facture/pdf_oursin.modules.php
@@ -173,6 +173,8 @@ class pdf_oursin extends ModelePDFFactures
 					$pdf=new FPDI('P','mm',$this->format);
 				}
 
+                $pdf->SetFont('Helvetica');
+
 				$pdf->Open();
 				$pagenb=0;
 				$pdf->SetDrawColor(128,128,128);
diff --git a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php b/htdocs/includes/modules/fichinter/pdf_soleil.modules.php
index 4ff213fc702..adffc921175 100644
--- a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php
+++ b/htdocs/includes/modules/fichinter/pdf_soleil.modules.php
@@ -137,6 +137,8 @@ class pdf_soleil extends ModelePDFFicheinter
 					$pdf=new FPDI('P','mm',$this->format);
 				}
 
+                $pdf->SetFont('Helvetica');
+
 				$pdf->Open();
 				$pagenb=0;
 				$pdf->SetDrawColor(128,128,128);
diff --git a/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php b/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php
index bb33fc8d95d..79c8ec35803 100644
--- a/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php
+++ b/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php
@@ -144,6 +144,7 @@ class pdf_sirocco extends ModelePDFDeliveryOrder
 					$pdf=new FPDI('P','mm',$this->format);
 				}
 
+				$pdf->SetFont('Helvetica');
 
 				// Complete object by loading several other informations
 				$expedition=new Expedition($this->db);
diff --git a/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php b/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php
index 4b639fd7fcd..fb84fdb8690 100644
--- a/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php
+++ b/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php
@@ -166,6 +166,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 					$pdf=new FPDI('P','mm',$this->format);
 				}
 
+                $pdf->SetFont('Helvetica');
 
 				// Complete object by loading several other informations
 				$expedition=new Expedition($this->db);
diff --git a/htdocs/includes/modules/member/cards/pdf_standard.class.php b/htdocs/includes/modules/member/cards/pdf_standard.class.php
index f5d54b3fa9b..4933cc7de8b 100644
--- a/htdocs/includes/modules/member/cards/pdf_standard.class.php
+++ b/htdocs/includes/modules/member/cards/pdf_standard.class.php
@@ -412,6 +412,8 @@ class pdf_standard {
 			$pdf=new FPDI('P',$this->Tformat['metric'],$this->format);
 		}
 
+        $pdf->SetFont('Helvetica');
+
 		$pdf->SetTitle($outputlangs->transnoentities('MembersCards'));
 		$pdf->SetSubject($outputlangs->transnoentities("MembersCards"));
 		$pdf->SetCreator("Dolibarr ".DOL_VERSION);
diff --git a/htdocs/includes/modules/member/labels/pdf_standardlabel.class.php b/htdocs/includes/modules/member/labels/pdf_standardlabel.class.php
index 97727aaa3c2..a34e115d128 100644
--- a/htdocs/includes/modules/member/labels/pdf_standardlabel.class.php
+++ b/htdocs/includes/modules/member/labels/pdf_standardlabel.class.php
@@ -153,7 +153,7 @@ class pdf_standardlabel {
 			//$this->_Pointille($pdf,$_PosX,$_PosY,$_PosX+$this->_Width,$_PosY+$this->_Height,0.3,25);
 			$this->_Croix($pdf,$_PosX,$_PosY,$_PosX+$this->_Width,$_PosY+$this->_Height,0.1,10);
 		}
-		
+
 		// Top
 		if ($header!='')
 		{
@@ -226,7 +226,7 @@ class pdf_standardlabel {
 			$pdf->Cell($this->_Width, $this->_Line_Height, $outputlangs->convToOutputCharset($footer),0,1,'C');
 		}
 		//print "$_PosY+$this->_Height-$this->_Line_Height-1<br>\n";
-			
+
 		$this->_COUNTY++;
 
 		if ($this->_COUNTY == $this->_Y_Number) {
@@ -391,6 +391,8 @@ class pdf_standardlabel {
             $pdf=new FPDI('P',$this->Tformat['metric'],$this->format);
         }
 
+        $pdf->SetFont('Helvetica');
+
         $pdf->SetTitle($outputlangs->transnoentities('MembersLabels'));
         $pdf->SetSubject($outputlangs->transnoentities("MembersLabels"));
         $pdf->SetCreator("Dolibarr ".DOL_VERSION);
diff --git a/htdocs/includes/modules/project/pdf/pdf_baleine.modules.php b/htdocs/includes/modules/project/pdf/pdf_baleine.modules.php
index 0c51c681d42..89e9f6c7c58 100644
--- a/htdocs/includes/modules/project/pdf/pdf_baleine.modules.php
+++ b/htdocs/includes/modules/project/pdf/pdf_baleine.modules.php
@@ -150,6 +150,8 @@ class pdf_baleine extends ModelePDFProjects
 					$pdf=new FPDI('P','mm',$this->format);
 				}
 
+                $pdf->SetFont('Helvetica');
+
 				// Complete object by loading several other informations
 				$task = new Task($this->db);
 				$tasksarray = $task->getTasksArray(0,0,$object->id);
diff --git a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php
index 2357f02957b..777bf8b35ce 100644
--- a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php
+++ b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php
@@ -173,6 +173,8 @@ class pdf_propale_azur extends ModelePDFPropales
 					$pdf=new FPDI('P','mm',$this->format);
 				}
 
+                $pdf->SetFont('Helvetica');
+
 				$pdf->Open();
 				$pagenb=0;
 				$pdf->SetDrawColor(128,128,128);
diff --git a/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php b/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php
index 680d72e9078..1a44e87affa 100644
--- a/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php
+++ b/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php
@@ -146,6 +146,8 @@ class pdf_propale_jaune extends ModelePDFPropales
 					$pdf=new FPDI('P','mm',$this->format);
 				}
 
+                $pdf->SetFont('Helvetica');
+
 				$pdf->Open();
 				$pagenb=0;
 				$pdf->SetDrawColor(128,128,128);
diff --git a/htdocs/includes/modules/rapport/pdf_paiement.class.php b/htdocs/includes/modules/rapport/pdf_paiement.class.php
index 5e834c1642c..7dc459a16fb 100644
--- a/htdocs/includes/modules/rapport/pdf_paiement.class.php
+++ b/htdocs/includes/modules/rapport/pdf_paiement.class.php
@@ -117,6 +117,7 @@ class pdf_paiement
 			$pdf=new FPDI('P','mm',$this->format);
 		}
 
+        $pdf->SetFont('Helvetica');
 
 		$sql = "SELECT p.datep as dp, f.facnumber";
 		//$sql .= ", c.libelle as paiement_type, p.num_paiement";
diff --git a/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php b/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php
index 658ff3942f0..5afddbc4f1c 100644
--- a/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php
+++ b/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php
@@ -164,6 +164,8 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 					$pdf=new FPDI('P','mm',$this->format);
 				}
 
+                $pdf->SetFont('Helvetica');
+
 				$pdf->Open();
 				$pagenb=0;
 				$pdf->SetDrawColor(128,128,128);
diff --git a/scripts/invoices/rebuild_merge_pdf.php b/scripts/invoices/rebuild_merge_pdf.php
index b4e73ba4e14..cdad33907b3 100644
--- a/scripts/invoices/rebuild_merge_pdf.php
+++ b/scripts/invoices/rebuild_merge_pdf.php
@@ -250,6 +250,8 @@ if ( $resql=$db->query($sql) )
 		if ($conf->global->MAIN_DISABLE_PDF_COMPRESSION) $pdf->SetCompression(false);
 		//$pdf->SetCompression(false);
 
+        $pdf->SetFont('Helvetica');
+
 		//$pdf->Open();
 		//$pdf->AddPage();
 		//$title=$langs->trans("BillsCustomersUnpaid");