From 6cd0d9e9a797252fd1497c0a02ade91fd4738e26 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 18 May 2006 20:44:34 +0000 Subject: [PATCH] =?UTF-8?q?Ajout=20dimensions=20dans=20infos=20du=20mod=E8?= =?UTF-8?q?le?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/admin/expedition.php | 12 ++++++------ .../mods/pdf/pdf_expedition_dorade.modules.php | 13 ++++++++++--- .../mods/pdf/pdf_expedition_merou.modules.php | 6 ++++++ .../mods/pdf/pdf_expedition_rouget.modules.php | 11 +++++++++-- 4 files changed, 31 insertions(+), 11 deletions(-) diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php index e4a930482c8..d1a0a746c5e 100644 --- a/htdocs/admin/expedition.php +++ b/htdocs/admin/expedition.php @@ -166,18 +166,18 @@ if(is_dir($dir)) require_once($dir.$file); - $obj = new $classname(); + $module = new $classname(); $var=!$var; print ""; - echo $obj->name; + echo $module->name; print "\n"; - print $obj->description; + print $module->description; print ''; - if (in_array($obj->id, $mods)) + if (in_array($module->id, $mods)) { print img_tick(); print ''; @@ -278,9 +278,9 @@ if(is_dir($dir)) print $name; print "\n"; require_once($dir.$file); - $obj = new $classname(); + $module = new $classname(); - print $obj->description; + print $module->description; print ''; // Activ diff --git a/htdocs/expedition/mods/pdf/pdf_expedition_dorade.modules.php b/htdocs/expedition/mods/pdf/pdf_expedition_dorade.modules.php index ed0e1649042..ae8711a9552 100644 --- a/htdocs/expedition/mods/pdf/pdf_expedition_dorade.modules.php +++ b/htdocs/expedition/mods/pdf/pdf_expedition_dorade.modules.php @@ -1,7 +1,7 @@ - * Copyright (C) 2005 Laurent Destailleur - * Copyright (C) 2005 Regis Houssin +/* Copyright (C) 2005 Rodolphe Quiedeville + * Copyright (C) 2005-2006 Laurent Destailleur + * Copyright (C) 2005 Regis Houssin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -33,6 +33,13 @@ Class pdf_expedition_dorade extends ModelePdfExpedition $this->db = $db; $this->name = "dorade"; $this->description = "Modèle identique au rouget utilisé pour debug uniquement."; + + $this->type = 'pdf'; + $this->page_largeur = 210; + $this->page_hauteur = 297; + $this->format = array($this->page_largeur,$this->page_hauteur); + + $this->option_logo = 0; } diff --git a/htdocs/expedition/mods/pdf/pdf_expedition_merou.modules.php b/htdocs/expedition/mods/pdf/pdf_expedition_merou.modules.php index 43dc1be2487..39dcc4cc08d 100644 --- a/htdocs/expedition/mods/pdf/pdf_expedition_merou.modules.php +++ b/htdocs/expedition/mods/pdf/pdf_expedition_merou.modules.php @@ -39,7 +39,13 @@ Class pdf_expedition_merou extends ModelePdfExpedition |element->commande,source->external,code->EXPEDITEUR \n |element->commande,source->external,code->DESTINATAIRE \n "; + $this->type = 'pdf'; + $this->page_largeur = 148.5; + $this->page_hauteur = 210; + $this->format = array($this->page_largeur,$this->page_hauteur); + + $this->option_logo = 1; // Affiche logo } //***************************** diff --git a/htdocs/expedition/mods/pdf/pdf_expedition_rouget.modules.php b/htdocs/expedition/mods/pdf/pdf_expedition_rouget.modules.php index f7a7d04ab63..17a53a8541f 100644 --- a/htdocs/expedition/mods/pdf/pdf_expedition_rouget.modules.php +++ b/htdocs/expedition/mods/pdf/pdf_expedition_rouget.modules.php @@ -1,6 +1,6 @@ - * Copyright (C) 2005 Laurent Destailleur +/* Copyright (C) 2005 Rodolphe Quiedeville + * Copyright (C) 2005-2006 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -32,6 +32,13 @@ Class pdf_expedition_rouget extends ModelePdfExpedition $this->db = $db; $this->name = "rouget"; $this->description = "Modèle simple."; + + $this->type = 'pdf'; + $this->page_largeur = 210; + $this->page_hauteur = 297; + $this->format = array($this->page_largeur,$this->page_hauteur); + + $this->option_logo = 0; } function Header()