diff --git a/htdocs/expedition/mods/methode_expedition_enl.modules.php b/htdocs/expedition/mods/methode_expedition_enl.modules.php index e39827c1219..33bc9a2a8aa 100644 --- a/htdocs/expedition/mods/methode_expedition_enl.modules.php +++ b/htdocs/expedition/mods/methode_expedition_enl.modules.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2003-2008 Rodolphe Quiedeville * * 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 @@ -12,9 +12,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * or see http://www.gnu.org/ + * along with this program. If not, see . * * $Id$ * $Source$ @@ -22,13 +20,13 @@ */ include_once "methode_expedition.modules.php"; -Class methode_expedition_enlevement extends methode_expedition +Class methode_expedition_enl extends methode_expedition { - Function methode_expedition_enlevement($db=0) + Function methode_expedition_enl($db=0) { $this->db = $db; - $this->id = 1; // Ne pas changer cette valeur + $this->id = 1; // Do not change this value $this->name = "Enlèvement"; $this->code = "ENL"; $this->description = "Enlèvement sur place par le client"; diff --git a/htdocs/expedition/mods/methode_expedition_enlevement.modules.php b/htdocs/expedition/mods/methode_expedition_enlevement.modules.php deleted file mode 100644 index e39827c1219..00000000000 --- a/htdocs/expedition/mods/methode_expedition_enlevement.modules.php +++ /dev/null @@ -1,38 +0,0 @@ - - * - * 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 - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * or see http://www.gnu.org/ - * - * $Id$ - * $Source$ - * - */ -include_once "methode_expedition.modules.php"; - -Class methode_expedition_enlevement extends methode_expedition -{ - - Function methode_expedition_enlevement($db=0) - { - $this->db = $db; - $this->id = 1; // Ne pas changer cette valeur - $this->name = "Enlèvement"; - $this->code = "ENL"; - $this->description = "Enlèvement sur place par le client"; - } -} - -?> diff --git a/htdocs/expedition/mods/methode_expedition_trans.modules.php b/htdocs/expedition/mods/methode_expedition_trans.modules.php index 7088c06ae3b..ef0f1dff32e 100644 --- a/htdocs/expedition/mods/methode_expedition_trans.modules.php +++ b/htdocs/expedition/mods/methode_expedition_trans.modules.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2003-2008 Rodolphe Quiedeville * * 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 @@ -12,9 +12,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * or see http://www.gnu.org/ + * along with this program. If not, see . * * $Id$ * $Source$ @@ -23,10 +21,10 @@ include_once "methode_expedition.modules.php"; -Class methode_expedition_transporteur extends methode_expedition +Class methode_expedition_trans extends methode_expedition { - Function methode_expedition_transporteur($db=0) + Function methode_expedition_trans($db=0) { $this->db = $db; $this->id = 2; // Ne pas changer cette valeur diff --git a/htdocs/expedition/mods/methode_expedition_transporteur.modules.php b/htdocs/expedition/mods/methode_expedition_transporteur.modules.php deleted file mode 100644 index 7088c06ae3b..00000000000 --- a/htdocs/expedition/mods/methode_expedition_transporteur.modules.php +++ /dev/null @@ -1,39 +0,0 @@ - - * - * 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 - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * or see http://www.gnu.org/ - * - * $Id$ - * $Source$ - * - */ - -include_once "methode_expedition.modules.php"; - -Class methode_expedition_transporteur extends methode_expedition -{ - - Function methode_expedition_transporteur($db=0) - { - $this->db = $db; - $this->id = 2; // Ne pas changer cette valeur - $this->code = "TRANS"; - $this->name = "Transporteur"; - $this->description = "Transporteur générique"; - } -} - -?>