From 88256b753133fb53a1dfc70a668fa955a55e11d6 Mon Sep 17 00:00:00 2001 From: Grand Philippe <contact@atoo-net.com> Date: Sun, 17 Mar 2013 10:21:44 +0100 Subject: [PATCH] normalize --- htdocs/admin/supplier_order.php | 4 ++-- htdocs/core/modules/modFournisseur.class.php | 11 ++++++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php index aa609d65721..a14b8cd1a6a 100644 --- a/htdocs/admin/supplier_order.php +++ b/htdocs/admin/supplier_order.php @@ -188,7 +188,7 @@ if ($action == 'setmod') // TODO Verifier si module numerotation choisi peut etre active // par appel methode canBeActivated - dolibarr_set_const($db, "COMMANDE_SUPPLIER_ADDON",$value,'chaine',0,'',$conf->entity); + dolibarr_set_const($db, "COMMANDE_SUPPLIER_ADDON_NUMBER",$value,'chaine',0,'',$conf->entity); } if ($action == 'addcat') @@ -306,7 +306,7 @@ foreach ($dirmodels as $reldir) print '</td>'."\n"; print '<td align="center">'; - if ($conf->global->COMMANDE_SUPPLIER_ADDON == "$file") + if ($conf->global->COMMANDE_SUPPLIER_ADDON_NUMBER == "$file") { print img_picto($langs->trans("Activated"),'switch_on'); } diff --git a/htdocs/core/modules/modFournisseur.class.php b/htdocs/core/modules/modFournisseur.class.php index 6a948192dc6..5868d6d2108 100644 --- a/htdocs/core/modules/modFournisseur.class.php +++ b/htdocs/core/modules/modFournisseur.class.php @@ -3,6 +3,7 @@ * Copyright (C) 2004-2012 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com> * Copyright (C) 2012 Juanjo Menent <jmenent@2byte.es> + * Copyright (C) 2013 Philippe Grand <philippe.grand@atoo-net.com> * * 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 @@ -81,21 +82,29 @@ class modFournisseur extends DolibarrModules $this->const[$r][0] = "COMMANDE_SUPPLIER_ADDON_PDF"; $this->const[$r][1] = "chaine"; $this->const[$r][2] = "muscadet"; + $this->const[$r][3] = 'Nom du gestionnaire de generation des bons de commande en PDF'; + $this->const[$r][4] = 0; $r++; - $this->const[$r][0] = "COMMANDE_SUPPLIER_ADDON"; + $this->const[$r][0] = "COMMANDE_SUPPLIER_ADDON_NUMBER"; $this->const[$r][1] = "chaine"; $this->const[$r][2] = "mod_commande_fournisseur_muguet"; + $this->const[$r][3] = 'Nom du gestionnaire de numerotation des commandes fournisseur'; + $this->const[$r][4] = 0; $r++; $this->const[$r][0] = "INVOICE_SUPPLIER_ADDON_PDF"; $this->const[$r][1] = "chaine"; $this->const[$r][2] = "canelle"; + $this->const[$r][3] = 'Nom du gestionnaire de generation des factures fournisseur en PDF'; + $this->const[$r][4] = 0; $r++; $this->const[$r][0] = "INVOICE_SUPPLIER_ADDON_NUMBER"; $this->const[$r][1] = "chaine"; $this->const[$r][2] = "mod_facture_fournisseur_tulip"; + $this->const[$r][3] = 'Nom du gestionnaire de numerotation des factures fournisseur'; + $this->const[$r][4] = 0; $r++; // Boxes -- GitLab