diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php index 4d34edfdf2f..be6c30de580 100644 --- a/htdocs/admin/expedition.php +++ b/htdocs/admin/expedition.php @@ -80,6 +80,7 @@ if ($_GET["action"] == 'specimen') } } +// Activate a model if ($_GET["action"] == 'set') { $type='shipping'; @@ -104,6 +105,7 @@ if ($_GET["action"] == 'del') } } +// Set default model if ($_GET["action"] == 'setdoc') { $db->begin(); @@ -132,7 +134,7 @@ if ($_GET["action"] == 'setdoc') } } -// \todo A quoi servent les methode d'expedition ? +// TODO A quoi servent les methode d'expedition ? if ($_GET["action"] == 'setmethod' || $_GET["action"] == 'setmod') { $module=$_GET["module"]; @@ -205,7 +207,7 @@ if ($_GET["action"] == 'setmethod' || $_GET["action"] == 'setmod') if ($_GET["action"] == 'setmod') { - // \todo Verifier si module numerotation choisi peut etre active + // TODO Verifier si module numerotation choisi peut etre active // par appel methode canBeActivated dolibarr_set_const($db, "EXPEDITION_ADDON",$_GET["module"],'chaine',0,'',$conf->entity); @@ -342,7 +344,7 @@ if(is_dir($dir)) print ""; } - // Defaut + // Default print ""; if ($conf->global->EXPEDITION_ADDON_PDF == $name) { diff --git a/htdocs/admin/fournisseur.php b/htdocs/admin/fournisseur.php index a9a081f8f8f..15c5b3cfe8d 100644 --- a/htdocs/admin/fournisseur.php +++ b/htdocs/admin/fournisseur.php @@ -340,7 +340,7 @@ while (($file = readdir($handle))!==false) else { print "\n"; - print ''.$langs->trans("Activate").''; + print ''.img_picto($langs->trans("Disabled"),'off').''; print ""; } diff --git a/htdocs/includes/modules/modDon.class.php b/htdocs/includes/modules/modDon.class.php index 0ee1da25b60..625a4bba944 100644 --- a/htdocs/includes/modules/modDon.class.php +++ b/htdocs/includes/modules/modDon.class.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2007 Laurent Destailleur + * Copyright (C) 2004-2010 Laurent Destailleur * Copyright (C) 2005-2009 Regis Houssin * * This program is free software; you can redistribute it and/or modify @@ -19,9 +19,9 @@ */ /** - \defgroup don Module donation - \brief Module pour gerer le suivi des dons - \version $Id$ + * \defgroup don Module donation + * \brief Module pour gerer le suivi des dons + * \version $Id$ */ /** @@ -72,11 +72,14 @@ class modDon extends DolibarrModules // Constants $this->const = array(); - $this->const[0][0] = "DON_FORM"; - $this->const[0][1] = "chaine"; - $this->const[0][2] = "fsfe.fr.php"; - $this->const[0][3] = 'Nom du gestionnaire de formulaire de dons'; - $this->const[0][4] = 0; + $r=0; + + $this->const[$r][0] = "DON_ADDON_MODEL"; + $this->const[$r][1] = "chaine"; + $this->const[$r][2] = "html_cerfafr"; + $this->const[$r][3] = 'Nom du gestionnaire de generation de recu de dons'; + $this->const[$r][4] = 0; + $r++; // Boxes $this->boxes = array(); @@ -112,7 +115,12 @@ class modDon extends DolibarrModules */ function init() { - $sql = array(); + global $conf; + + $sql = array( + "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->const[0][2]."' AND entity = ".$conf->entity, + "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->const[0][2]."','donation',".$conf->entity.")", + ); return $this->_init($sql); } diff --git a/htdocs/includes/modules/modExpedition.class.php b/htdocs/includes/modules/modExpedition.class.php index 799d5df6225..fa4889ceb1c 100644 --- a/htdocs/includes/modules/modExpedition.class.php +++ b/htdocs/includes/modules/modExpedition.class.php @@ -1,187 +1,215 @@ - - * Copyright (C) 2004-2007 Laurent Destailleur - * Copyright (C) 2005-2009 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 - * 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. - */ - -/** - * \defgroup expedition Module shipping - * \brief Module pour gerer les expeditions de produits - */ - -/** - * \file htdocs/includes/modules/modExpedition.class.php - * \ingroup expedition - * \brief Fichier de description et activation du module Expedition - */ - -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); - - -/** \class modExpedition - * \brief Classe de description et activation du module Expedition - */ -class modExpedition extends DolibarrModules -{ - - /** - * \brief Constructeur. Definit les noms, constantes et boites - * \param DB handler d'acces base - */ - function modExpedition($DB) - { - $this->db = $DB ; - $this->numero = 80 ; - - $this->family = "crm"; - // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module) - $this->name = preg_replace('/^mod/i','',get_class($this)); - $this->description = "Gestion des expeditions"; - - // Possible values for version are: 'development', 'experimental', 'dolibarr' or version - $this->version = 'dolibarr'; - - $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name); - $this->special = 0; - $this->picto = "sending"; - - // Data directories to create when module is enabled - $this->dirs = array("/expedition/temp", - "/expedition/sending", - "/expedition/sending/temp", - "/expedition/receipt", - "/expedition/receipt/temp" - ); - - // Config pages - $this->config_page_url = array("confexped.php"); - - // Dependances - $this->depends = array("modCommande"); - $this->requiredby = array(); - - // Constantes - $this->const = array(); - $this->const[0][0] = "LIVRAISON_ADDON_PDF"; - $this->const[0][1] = "chaine"; - $this->const[0][2] = "typhon"; - $this->const[0][3] = 'Nom du gestionnaire de generation des commandes en PDF'; - $this->const[0][4] = 0; - - $this->const[1][0] = "LIVRAISON_ADDON"; - $this->const[1][1] = "chaine"; - $this->const[1][2] = "mod_livraison_jade"; - $this->const[1][3] = 'Nom du gestionnaire de numerotation des bons de livraison'; - $this->const[1][4] = 0; - - // Boxes - $this->boxes = array(); - - // Permissions - $this->rights = array(); - $this->rights_class = 'expedition'; - $r=0; - - $r++; - $this->rights[$r][0] = 101; - $this->rights[$r][1] = 'Lire les expeditions'; - $this->rights[$r][2] = 'r'; - $this->rights[$r][3] = 1; - $this->rights[$r][4] = 'lire'; - - $r++; - $this->rights[$r][0] = 102; - $this->rights[$r][1] = 'Creer modifier les expeditions'; - $this->rights[$r][2] = 'w'; - $this->rights[$r][3] = 0; - $this->rights[$r][4] = 'creer'; - - $r++; - $this->rights[$r][0] = 104; - $this->rights[$r][1] = 'Valider les expeditions'; - $this->rights[$r][2] = 'd'; - $this->rights[$r][3] = 0; - $this->rights[$r][4] = 'valider'; - - $r++; - $this->rights[$r][0] = 109; - $this->rights[$r][1] = 'Supprimer les expeditions'; - $this->rights[$r][2] = 'd'; - $this->rights[$r][3] = 0; - $this->rights[$r][4] = 'supprimer'; - - $r++; - $this->rights[$r][0] = 1101; - $this->rights[$r][1] = 'Lire les bons de livraison'; - $this->rights[$r][2] = 'r'; - $this->rights[$r][3] = 1; - $this->rights[$r][4] = 'livraison'; - $this->rights[$r][5] = 'lire'; - - $r++; - $this->rights[$r][0] = 1102; - $this->rights[$r][1] = 'Creer modifier les bons de livraison'; - $this->rights[$r][2] = 'w'; - $this->rights[$r][3] = 0; - $this->rights[$r][4] = 'livraison'; - $this->rights[$r][5] = 'creer'; - - $r++; - $this->rights[$r][0] = 1104; - $this->rights[$r][1] = 'Valider les bons de livraison'; - $this->rights[$r][2] = 'd'; - $this->rights[$r][3] = 0; - $this->rights[$r][4] = 'livraison'; - $this->rights[$r][5] = 'valider'; - - $r++; - $this->rights[$r][0] = 1109; - $this->rights[$r][1] = 'Supprimer les bons de livraison'; - $this->rights[$r][2] = 'd'; - $this->rights[$r][3] = 0; - $this->rights[$r][4] = 'livraison'; - $this->rights[$r][5] = 'supprimer'; - - } - - - /** - * \brief Fonction appelee lors de l'activation du module. Insere en base les constantes, boites, permissions du module. - * Definit egalement les repertoires de donnees a creer pour ce module. - */ - function init() - { - // Permissions - $this->remove(); - - $sql = array(); - - return $this->_init($sql); - } - - /** - * \brief Fonction appelee lors de la desactivation d'un module. - * Supprime de la base les constantes, boites et permissions du module. - */ - function remove() - { - $sql = array(); - - return $this->_remove($sql); - } -} -?> + + * Copyright (C) 2004-2010 Laurent Destailleur + * Copyright (C) 2005-2009 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 + * 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. + */ + +/** + * \defgroup expedition Module shipping + * \brief Module pour gerer les expeditions de produits + */ + +/** + * \file htdocs/includes/modules/modExpedition.class.php + * \ingroup expedition + * \brief Fichier de description et activation du module Expedition + */ + +include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); + + +/** \class modExpedition + * \brief Classe de description et activation du module Expedition + */ +class modExpedition extends DolibarrModules +{ + + /** + * \brief Constructeur. Definit les noms, constantes et boites + * \param DB handler d'acces base + */ + function modExpedition($DB) + { + $this->db = $DB ; + $this->numero = 80 ; + + $this->family = "crm"; + // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module) + $this->name = preg_replace('/^mod/i','',get_class($this)); + $this->description = "Gestion des expeditions"; + + // Possible values for version are: 'development', 'experimental', 'dolibarr' or version + $this->version = 'dolibarr'; + + $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name); + $this->special = 0; + $this->picto = "sending"; + + // Data directories to create when module is enabled + $this->dirs = array("/expedition/temp", + "/expedition/sending", + "/expedition/sending/temp", + "/expedition/receipt", + "/expedition/receipt/temp" + ); + + // Config pages + $this->config_page_url = array("confexped.php"); + + // Dependances + $this->depends = array("modCommande"); + $this->requiredby = array(); + + // Constantes + $this->const = array(); + $r=0; + + $this->const[$r][0] = "EXPEDITION_ADDON_PDF"; + $this->const[$r][1] = "chaine"; + $this->const[$r][2] = "rouget"; + $this->const[$r][3] = 'Nom du gestionnaire de generation des bons expeditions en PDF'; + $this->const[$r][4] = 0; + $r++; + + /*$this->const[$r][0] = "EXPEDITION_ADDON"; + $this->const[$r][1] = "chaine"; + $this->const[$r][2] = "xxx"; + $this->const[$r][3] = 'Nom du gestionnaire de generation des bons expeditions en PDF'; + $this->const[$r][4] = 0; + $r++; + */ + + $this->const[$r][0] = "LIVRAISON_ADDON_PDF"; + $this->const[$r][1] = "chaine"; + $this->const[$r][2] = "typhon"; + $this->const[$r][3] = 'Nom du gestionnaire de generation des bons de reception en PDF'; + $this->const[$r][4] = 0; + $r++; + + $this->const[$r][0] = "LIVRAISON_ADDON"; + $this->const[$r][1] = "chaine"; + $this->const[$r][2] = "mod_livraison_jade"; + $this->const[$r][3] = 'Nom du gestionnaire de numerotation des bons de reception'; + $this->const[$r][4] = 0; + $r++; + + // Boxes + $this->boxes = array(); + + // Permissions + $this->rights = array(); + $this->rights_class = 'expedition'; + $r=0; + + $r++; + $this->rights[$r][0] = 101; + $this->rights[$r][1] = 'Lire les expeditions'; + $this->rights[$r][2] = 'r'; + $this->rights[$r][3] = 1; + $this->rights[$r][4] = 'lire'; + + $r++; + $this->rights[$r][0] = 102; + $this->rights[$r][1] = 'Creer modifier les expeditions'; + $this->rights[$r][2] = 'w'; + $this->rights[$r][3] = 0; + $this->rights[$r][4] = 'creer'; + + $r++; + $this->rights[$r][0] = 104; + $this->rights[$r][1] = 'Valider les expeditions'; + $this->rights[$r][2] = 'd'; + $this->rights[$r][3] = 0; + $this->rights[$r][4] = 'valider'; + + $r++; + $this->rights[$r][0] = 109; + $this->rights[$r][1] = 'Supprimer les expeditions'; + $this->rights[$r][2] = 'd'; + $this->rights[$r][3] = 0; + $this->rights[$r][4] = 'supprimer'; + + $r++; + $this->rights[$r][0] = 1101; + $this->rights[$r][1] = 'Lire les bons de livraison'; + $this->rights[$r][2] = 'r'; + $this->rights[$r][3] = 1; + $this->rights[$r][4] = 'livraison'; + $this->rights[$r][5] = 'lire'; + + $r++; + $this->rights[$r][0] = 1102; + $this->rights[$r][1] = 'Creer modifier les bons de livraison'; + $this->rights[$r][2] = 'w'; + $this->rights[$r][3] = 0; + $this->rights[$r][4] = 'livraison'; + $this->rights[$r][5] = 'creer'; + + $r++; + $this->rights[$r][0] = 1104; + $this->rights[$r][1] = 'Valider les bons de livraison'; + $this->rights[$r][2] = 'd'; + $this->rights[$r][3] = 0; + $this->rights[$r][4] = 'livraison'; + $this->rights[$r][5] = 'valider'; + + $r++; + $this->rights[$r][0] = 1109; + $this->rights[$r][1] = 'Supprimer les bons de livraison'; + $this->rights[$r][2] = 'd'; + $this->rights[$r][3] = 0; + $this->rights[$r][4] = 'livraison'; + $this->rights[$r][5] = 'supprimer'; + + } + + + /** + * \brief Fonction appelee lors de l'activation du module. Insere en base les constantes, boites, permissions du module. + * Definit egalement les repertoires de donnees a creer pour ce module. + */ + function init() + { + global $conf; + + // Permissions + $this->remove(); + + $sql = array(); + + $sql = array( + "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->const[0][2]."' AND entity = ".$conf->entity, + "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->const[0][2]."','shipping',".$conf->entity.")", + "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->const[1][2]."' AND entity = ".$conf->entity, + "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->const[1][2]."','delivery',".$conf->entity.")", + ); + + return $this->_init($sql); + } + + /** + * \brief Fonction appelee lors de la desactivation d'un module. + * Supprime de la base les constantes, boites et permissions du module. + */ + function remove() + { + $sql = array(); + + return $this->_remove($sql); + } +} +?> diff --git a/htdocs/includes/modules/modFournisseur.class.php b/htdocs/includes/modules/modFournisseur.class.php index c4db1a7061f..ab57867adf1 100644 --- a/htdocs/includes/modules/modFournisseur.class.php +++ b/htdocs/includes/modules/modFournisseur.class.php @@ -78,14 +78,17 @@ class modFournisseur extends DolibarrModules // Constantes $this->const = array(); + $r=0; - $this->const[0][0] = "COMMANDE_SUPPLIER_ADDON_PDF"; - $this->const[0][1] = "chaine"; - $this->const[0][2] = "muscadet"; + $this->const[$r][0] = "COMMANDE_SUPPLIER_ADDON_PDF"; + $this->const[$r][1] = "chaine"; + $this->const[$r][2] = "muscadet"; + $r++; - $this->const[1][0] = "COMMANDE_SUPPLIER_ADDON"; - $this->const[1][1] = "chaine"; - $this->const[1][2] = "mod_commande_fournisseur_muguet"; + $this->const[$r][0] = "COMMANDE_SUPPLIER_ADDON"; + $this->const[$r][1] = "chaine"; + $this->const[$r][2] = "mod_commande_fournisseur_muguet"; + $r++; // Boxes $this->boxes = array(); @@ -252,9 +255,14 @@ class modFournisseur extends DolibarrModules */ function init() { + global $conf; + $this->remove(); - $sql = array(); + $sql = array( + "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->const[0][2]."' AND entity = ".$conf->entity, + "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->const[0][2]."','supplier_order',".$conf->entity.")", + ); $this->load_datas();