From 8475e83fc73dd1e09ab88b5d857a7f125c3865b9 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Wed, 17 May 2006 14:46:42 +0000
Subject: [PATCH] bugfix

---
 .../mods/pdf/pdf_expedition_merou.modules.php          | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/htdocs/expedition/mods/pdf/pdf_expedition_merou.modules.php b/htdocs/expedition/mods/pdf/pdf_expedition_merou.modules.php
index 62999898029..ea735389bde 100644
--- a/htdocs/expedition/mods/pdf/pdf_expedition_merou.modules.php
+++ b/htdocs/expedition/mods/pdf/pdf_expedition_merou.modules.php
@@ -46,8 +46,10 @@ Class pdf_expedition_merou extends ModelePdfExpedition
 	//Creation du Document
 	//Initialisation des données
 	//*****************************
-	function generate(&$objExpe){
-      		global $user,$langs,$conf;
+	function generate(&$objExpe, $file)
+	{
+		global $user,$langs,$conf;
+		
 		//Initialisation des langues
 		$langs->load("main");
 		$langs->load("bills");
@@ -206,8 +208,10 @@ Class pdf_expedition_merou extends ModelePdfExpedition
 	//********************************
 	// Generation de l entete
 	//********************************
-	function _pagehead(&$pdf, $exp){
+	function _pagehead(&$pdf, $exp)
+	{
 		global $conf, $langs, $mysoc;
+		
 		$tab4_top = 60;
 		$tab4_hl = 6;
 		$tab4_sl = 4;