From 08269375200145363daee90f83443f96a202fbb8 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 11 Sep 2007 22:01:18 +0000 Subject: [PATCH] =?UTF-8?q?Ajout=20d'une=20notion=20de=20version=20sur=20l?= =?UTF-8?q?es=20modules=20de=20num=E9rotation.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mods/methode_expedition.modules.php | 12 ++++++------ .../modules/commande/modules_commande.php | 13 +++++++++++++ htdocs/includes/modules/dons/modules_don.php | 14 ++++++++++++++ .../modules/fichinter/modules_fichinter.php | 15 ++++++++++++++- .../modules/propale/modules_propale.php | 13 +++++++++++++ htdocs/livraison/mods/modules_livraison.php | 19 +++++++++++++++++++ 6 files changed, 79 insertions(+), 7 deletions(-) diff --git a/htdocs/expedition/mods/methode_expedition.modules.php b/htdocs/expedition/mods/methode_expedition.modules.php index 3943e6a269e..2b381ee7cde 100644 --- a/htdocs/expedition/mods/methode_expedition.modules.php +++ b/htdocs/expedition/mods/methode_expedition.modules.php @@ -35,17 +35,17 @@ require_once(DOL_DOCUMENT_ROOT.'/includes/fpdf/fpdfi/fpdi_protection.php'); \class methode_expedition \brief Classe mère des methodes expeditions */ -Class methode_expedition +class methode_expedition { - Function methode_expedition($db=0) + function methode_expedition($db=0) { $this->db = $db; $this->name = "NON DEFINIT"; $this->description = "ERREUR DANS LA DEFINITION DU MODULE."; } - Function Active($statut) + function Active($statut) { // Mise a jour du statut $sql = "UPDATE ".MAIN_DB_PREFIX."expedition_methode set statut = $statut "; @@ -79,7 +79,7 @@ Class methode_expedition } } - Function write_pdf_file($id) + function write_pdf_file($id) { global $user; $propale = new Propal($this->db,"",$id); @@ -217,7 +217,7 @@ Class methode_expedition } } - Function _tableau(&$pdf, $tab_top, $tab_height, $nexY) + function _tableau(&$pdf, $tab_top, $tab_height, $nexY) { $pdf->SetFont('Arial','',11); @@ -247,7 +247,7 @@ Class methode_expedition } - Function _pagehead(&$pdf, $propale) + function _pagehead(&$pdf, $propale) { $pdf->SetXY(10,5); if (defined("FAC_PDF_INTITULE")) diff --git a/htdocs/includes/modules/commande/modules_commande.php b/htdocs/includes/modules/commande/modules_commande.php index b56b17caf5e..19447011a56 100644 --- a/htdocs/includes/modules/commande/modules_commande.php +++ b/htdocs/includes/modules/commande/modules_commande.php @@ -135,6 +135,19 @@ class ModeleNumRefCommandes return $langs->trans("NotAvailable"); } + /** \brief Renvoi version du module numerotation + * \return string Valeur + */ + function getVersion() + { + global $langs; + $langs->load("admin"); + + if ($this->version == 'development') return $langs->trans("VersionDevelopment"); + if ($this->version == 'experimental') return $langs->trans("VersionExperimental"); + if ($this->version == 'dolibarr') return DOL_VERSION; + return $langs->trans("NotAvailable"); + } } diff --git a/htdocs/includes/modules/dons/modules_don.php b/htdocs/includes/modules/dons/modules_don.php index 0c2474ac183..b073a26c390 100644 --- a/htdocs/includes/modules/dons/modules_don.php +++ b/htdocs/includes/modules/dons/modules_don.php @@ -132,6 +132,20 @@ class ModeleNumRefDons global $langs; return $langs->trans("NotAvailable"); } + + /** \brief Renvoi version du module numerotation + * \return string Valeur + */ + function getVersion() + { + global $langs; + $langs->load("admin"); + + if ($this->version == 'development') return $langs->trans("VersionDevelopment"); + if ($this->version == 'experimental') return $langs->trans("VersionExperimental"); + if ($this->version == 'dolibarr') return DOL_VERSION; + return $langs->trans("NotAvailable"); + } } diff --git a/htdocs/includes/modules/fichinter/modules_fichinter.php b/htdocs/includes/modules/fichinter/modules_fichinter.php index 2d1bf02c662..9ef3498aa91 100644 --- a/htdocs/includes/modules/fichinter/modules_fichinter.php +++ b/htdocs/includes/modules/fichinter/modules_fichinter.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2005 Laurent Destailleur + * Copyright (C) 2004-2007 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 @@ -137,6 +137,19 @@ class ModeleNumRefFicheinter return $langs->trans("NotAvailable"); } + /** \brief Renvoi version du module numerotation + * \return string Valeur + */ + function getVersion() + { + global $langs; + $langs->load("admin"); + + if ($this->version == 'development') return $langs->trans("VersionDevelopment"); + if ($this->version == 'experimental') return $langs->trans("VersionExperimental"); + if ($this->version == 'dolibarr') return DOL_VERSION; + return $langs->trans("NotAvailable"); + } } diff --git a/htdocs/includes/modules/propale/modules_propale.php b/htdocs/includes/modules/propale/modules_propale.php index 0e9e49e8aff..18f6c701a95 100644 --- a/htdocs/includes/modules/propale/modules_propale.php +++ b/htdocs/includes/modules/propale/modules_propale.php @@ -130,6 +130,19 @@ class ModeleNumRefPropales return $langs->trans("NotAvailable"); } + /** \brief Renvoi version du module numerotation + * \return string Valeur + */ + function getVersion() + { + global $langs; + $langs->load("admin"); + + if ($this->version == 'development') return $langs->trans("VersionDevelopment"); + if ($this->version == 'experimental') return $langs->trans("VersionExperimental"); + if ($this->version == 'dolibarr') return DOL_VERSION; + return $langs->trans("NotAvailable"); + } } diff --git a/htdocs/livraison/mods/modules_livraison.php b/htdocs/livraison/mods/modules_livraison.php index a5bf41344df..dd7a658af54 100644 --- a/htdocs/livraison/mods/modules_livraison.php +++ b/htdocs/livraison/mods/modules_livraison.php @@ -132,7 +132,24 @@ class ModeleNumRefDeliveryOrder return $langs->trans("NotAvailable"); } + /** \brief Renvoi version du module numerotation + * \return string Valeur + */ + function getVersion() + { + global $langs; + $langs->load("admin"); + + if ($this->version == 'development') return $langs->trans("VersionDevelopment"); + if ($this->version == 'experimental') return $langs->trans("VersionExperimental"); + if ($this->version == 'dolibarr') return DOL_VERSION; + return $langs->trans("NotAvailable"); + } } + + + + function delivery_order_pdf_create($db, $deliveryid, $modele='', $outputlangs='') { global $langs; @@ -181,6 +198,8 @@ function delivery_order_pdf_create($db, $deliveryid, $modele='', $outputlangs='' return 0; } } + + function delivery_order_delete_preview($db, $deliveryid) { global $langs,$conf;