Qual: Remove deprecated code

ChangeLog

@@ -17,6 +17,8 @@ For developers:
 - Creation of directory in module descriptor is simpler.
 - Can use an alternate document_root directory to develop with 
   sources on two repositories.
+- Removed useless code of old commercial module.
+
 
 
 ***** Changelog for 2.6 compared to 2.5 *****

htdocs/includes/menus/barre_top/eldy_backoffice.php

@@ -140,14 +140,7 @@ class MenuTop {
 		}
 
 		// Commercial
-		/*$showcommercial=0;
+		if ($conf->societe->enabled)
-		if ($conf->societe->enabled)   $showcommercial=1;
-		if ($conf->propal->enabled)    $showcommercial=1;
-		if ($conf->commande->enabled)  $showcommercial=1;
-		if ($conf->contrat->enabled)   $showcommercial=1;
-		if ($conf->ficheinter->enabled) $showcommercial=1;
-		if ($showcommercial)*/
-		if ($conf->commercial->enabled)
 		{
 			$langs->load("commercial");
 

htdocs/includes/menus/barre_top/eldy_frontoffice.php

@@ -140,14 +140,7 @@ class MenuTop {
 		}
 
 		// Commercial
-		/*$showcommercial=0;
+		if ($conf->societe->enabled)
-		if ($conf->societe->enabled)   $showcommercial=1;
-		if ($conf->propal->enabled)    $showcommercial=1;
-		if ($conf->commande->enabled)  $showcommercial=1;
-		if ($conf->contrat->enabled)   $showcommercial=1;
-		if ($conf->ficheinter->enabled) $showcommercial=1;
-		if ($showcommercial)*/
-		if ($conf->commercial->enabled)
 		{
 			$langs->load("commercial");
 

htdocs/includes/menus/barre_top/rodolphe.php

@@ -140,14 +140,7 @@ class MenuTop {
         }
 
         // Commercial
-        /*$showcommercial=0;
+		if ($conf->societe->enabled)
-        if ($conf->societe->enabled)   $showcommercial=1;
-        if ($conf->propal->enabled)    $showcommercial=1;
-        if ($conf->commande->enabled)  $showcommercial=1;
-        if ($conf->contrat->enabled)   $showcommercial=1;
-        if ($conf->ficheinter->enabled) $showcommercial=1;
-        if ($showcommercial)*/
-		if ($conf->commercial->enabled)
         {
 	        $langs->load("commercial");
 
@@ -350,14 +343,14 @@ class MenuTop {
             	if (! $this->hideifnotallowed) print '<td class="tmenu"><a class="tmenudisabled" '.$idsel.'href="#">'.$langs->trans("MenuMembers").'</a></td>';
         	}
         }
-        
+
-        
+
         // Affichage des menus personnalises
        	require_once(DOL_DOCUMENT_ROOT."/core/menubase.class.php");
-       	
+
        	$menuArbo = new Menubase($this->db,'eldy','top');
        	$tabMenu = $menuArbo->menuTopCharger(0,$_SESSION['mainmenu'],'eldy');
-       	
+
        	for($i=0; $i<count($tabMenu); $i++)
         {
         	if ($tabMenu[$i]['enabled'] == true)

htdocs/includes/menus/init_menu_auguria.sql

@@ -327,7 +327,7 @@ insert into `llx_menu_constraint` (`rowid`, `action`) values (31, '$conf->adhere
 insert into `llx_menu_constraint` (`rowid`, `action`) values (32, '($conf->societe->enabled && $user->rights->societe->lire) || ($conf->fournisseur->enabled && $user->rights->fournisseur->lire)');
 insert into `llx_menu_constraint` (`rowid`, `action`) values (33, '$conf->produit->enabled || $conf->service->enabled');
 insert into `llx_menu_constraint` (`rowid`, `action`) values (34, '$conf->fournisseur->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (35, '$conf->commercial->enabled');
+insert into `llx_menu_constraint` (`rowid`, `action`) values (35, '$conf->societe->enabled');
 insert into `llx_menu_constraint` (`rowid`, `action`) values (36, '$conf->compta->enabled || $conf->comptaexpert->enabled || $conf->banque->enabled || $conf->commande->enabled || $conf->facture->enabled');
 insert into `llx_menu_constraint` (`rowid`, `action`) values (37, '$conf->mailing->enabled || $conf->export->enabled || $conf->bookmark->enabled');
 insert into `llx_menu_constraint` (`rowid`, `action`) values (38, '$conf->boutique->enabled');

htdocs/includes/modules/modCommercial.class.php

@@ -1,117 +0,0 @@
-<?php
-/* Copyright (C) 2003-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2004      Sebastien Di Cintio  <sdicintio@ressource-toi.org>
- * Copyright (C) 2004      Benoit Mortier       <benoit.mortier@opensides.be>
- * Copyright (C) 2005-2009 Regis Houssin      	<regis@dolibarr.fr>
- *
- * 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   commercial     Module commercial
- *      \brief      Module pour gerer les fonctions commerciales
- *		\version	$Id$
- */
-
-/**
-        \file       htdocs/includes/modules/modCommercial.class.php
-        \ingroup    commercial
-        \brief      Fichier de description et activation du module Commercial
-*/
-
-include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
-
-
-/** 	\class 		modCommercial
- *      \brief      Classe de description et activation du module Commercial
- */
-
-class modCommercial extends DolibarrModules
-{
-	/**
-   *   \brief      Constructeur. Definit les noms, constantes et boites
-   *   \param      DB      Database handler
-   */
-  function modCommercial($DB)
-  {
-  	$this->db = $DB ;
-    $this->numero = 2 ;
-
-    $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 = eregi_replace('^mod','',get_class($this));
-    $this->description = "Gestion commercial";
-
-    // 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='commercial';
-
-    // Data directories to create when module is enabled
-    $this->dirs = array();
-
-    // Dependancies
-    $this->depends = array("modSociete");
-    $this->requiredby = array("modPropale","modContrat","modCommande","modFicheinter");
-
-    // Constants
-    $this->const = array();
-
-    // Boxes
-    $this->boxes = array();
-
-    // Permissions
-    $this->rights = array();
-    $this->rights_class = 'commercial';
-    $r = 1;
-
-    // 261 : Permission generale
-    $this->rights[$r][0] = 261;
-    $this->rights[$r][1] = 'Consulter menu commercial';
-    $this->rights[$r][2] = 'r';
-    $this->rights[$r][3] = 1;
-    $this->rights[$r][4] = 'main';
-    $this->rights[$r][5] = 'lire';
-
-  }
-
-    /**
-     *  \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);
-    }
-}
-?>

mysql/migration/2.6.0-2.7.0.sql

@@ -10,6 +10,8 @@
 -- so we made first change to remove it
 alter table llx_menu_const drop foreign key fk_menu_const_fk_menu;
 
+update llx_menu_constraint set action = '$conf->societe->enabled' where action = '$conf->commercial->enabled';
+
 -- Clean no more required parameters
 delete from llx_const where name = 'MAIN_MODULE_COMMERCIAL';
 delete from llx_const where name like 'MAIN_MODULE_%_DIR_OUTPUT';