Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Fix: boxes must not be removed after update

Browse Source
This commit is contained in:
Laurent Destailleur
2012-03-03 17:37:45 +01:00
parent 4f1a49bd42
commit 80b75fa67d
45 changed files with 614 additions and 428 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
htdocs/core/modules/modBanque.class.php
View File

@@ -169,32 +169,35 @@ class modBanque extends DolibarrModules
* The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
* It also creates data directories.
*
* @return int 1 if OK, 0 if KO
*/
function init()
* @param string $options Options when enabling module ('', 'noboxes')
* @return int 1 if OK, 0 if KO
*/
function init($options='')
{
global $conf;
// Permissions
$this->remove();
$this->remove($options);
$sql = array();
return $this->_init($sql);
return $this->_init($sql,$options);
}
/**
* Function called when module is disabled.
* Remove from database constants, boxes and permissions from Dolibarr database.
* Data directories are not deleted.
*
* @return int 1 if OK, 0 if KO
* Function called when module is disabled.
* Remove from database constants, boxes and permissions from Dolibarr database.
* Data directories are not deleted
*
* @param string $options Options when enabling module ('', 'noboxes')
* @return int 1 if OK, 0 if KO
*/
function remove()
{
function remove($options='')
{
$sql = array();
return $this->_remove($sql);
}
return $this->_remove($sql,$options);
}
}
?>

37
htdocs/core/modules/modBarcode.class.php
View File

@@ -99,29 +99,38 @@ class modBarcode extends DolibarrModules
}
/**
* \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 called when module is enabled.
* The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
* It also creates data directories.
*
* @param string $options Options when enabling module ('', 'noboxes')
* @return int 1 if OK, 0 if KO
*/
function init()
function init($options='')
{
// Permissions
$this->remove();
$this->remove($options);
$sql = array();
return $this->_init($sql);
return $this->_init($sql,$options);
}
/**
* \brief Fonction appelee lors de la desactivation d'un module.
* Supprime de la base les constantes, boites et permissions du module.
*/
function remove()
{
/**
* Function called when module is disabled.
* Remove from database constants, boxes and permissions from Dolibarr database.
* Data directories are not deleted
*
* @param string $options Options when enabling module ('', 'noboxes')
* @return int 1 if OK, 0 if KO
*/
function remove($options='')
{
$sql = array();
return $this->_remove($sql);
}
return $this->_remove($sql,$options);
}
}
?>

42
htdocs/core/modules/modBookmark.class.php
View File

@@ -103,27 +103,35 @@ class modBookmark extends DolibarrModules
}
/**
* \brief Fonction appel<EFBFBD>e lors de l'activation du module. Ins<6E>re en base les constantes, boites, permissions du module.
* D<>finit <EFBFBD>galement les r<>pertoires de donn<6E>es <20> cr<63>er pour ce module.
/**
* Function called when module is enabled.
* The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
* It also creates data directories.
*
* @param string $options Options when enabling module ('', 'noboxes')
* @return int 1 if OK, 0 if KO
*/
function init()
{
$sql = array();
return $this->_init($sql);
}
/**
* \brief Fonction appel<65>e lors de la d<>sactivation d'un module.
* Supprime de la base les constantes, boites et permissions du module.
*/
function remove()
function init($options='')
{
$sql = array();
return $this->_remove($sql);
return $this->_init($sql,$options);
}
/**
* Function called when module is disabled.
* Remove from database constants, boxes and permissions from Dolibarr database.
* Data directories are not deleted
*
* @param string $options Options when enabling module ('', 'noboxes')
* @return int 1 if OK, 0 if KO
*/
function remove($options='')
{
$sql = array();
return $this->_remove($sql,$options);
}
}
?>

40
htdocs/core/modules/modBoutique.class.php
View File

@@ -86,27 +86,35 @@ class modBoutique extends DolibarrModules
$this->rights_class = 'boutique';
}
/**
* \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()
{
$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 called when module is enabled.
* The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
* It also creates data directories.
*
* @param string $options Options when enabling module ('', 'noboxes')
* @return int 1 if OK, 0 if KO
*/
function remove()
function init($options='')
{
$sql = array();
return $this->_remove($sql);
return $this->_init($sql,$options);
}
/**
* Function called when module is disabled.
* Remove from database constants, boxes and permissions from Dolibarr database.
* Data directories are not deleted
*
* @param string $options Options when enabling module ('', 'noboxes')
* @return int 1 if OK, 0 if KO
*/
function remove($options='')
{
$sql = array();
return $this->_remove($sql,$options);
}
}
?>

20
htdocs/core/modules/modCategorie.class.php
View File

@@ -170,7 +170,7 @@ class modCategorie extends DolibarrModules
function init($options='')
{
// Permissions
$this->remove();
$this->remove($options);
$sql = array();
@@ -178,17 +178,19 @@ class modCategorie extends DolibarrModules
}
/**
* Function called when module is disabled.
* Remove from database constants, boxes and permissions from Dolibarr database.
* Data directories are not deleted.
* @return int 1 if OK, 0 if KO
* Function called when module is disabled.
* Remove from database constants, boxes and permissions from Dolibarr database.
* Data directories are not deleted
*
* @param string $options Options when enabling module ('', 'noboxes')
* @return int 1 if OK, 0 if KO
*/
function remove()
{
function remove($options='')
{
$sql = array();
return $this->_remove($sql);
}
return $this->_remove($sql,$options);
}
}
?>

19
htdocs/core/modules/modClickToDial.class.php
View File

@@ -95,16 +95,19 @@ class modClickToDial extends DolibarrModules
}
/**
* \brief Function called when module is disabled.
* Remove from database constants, boxes and permissions from Dolibarr database.
* Data directories are not deleted.
* \return int 1 if OK, 0 if KO
* Function called when module is disabled.
* Remove from database constants, boxes and permissions from Dolibarr database.
* Data directories are not deleted
*
* @param string $options Options when enabling module ('', 'noboxes')
* @return int 1 if OK, 0 if KO
*/
function remove()
{
function remove($options='')
{
$sql = array();
return $this->_remove($sql);
}
return $this->_remove($sql,$options);
}
}
?>

14
htdocs/core/modules/modCommande.class.php
View File

@@ -198,7 +198,7 @@ class modCommande extends DolibarrModules
global $conf,$langs;
// Permissions
$this->remove();
$this->remove($options);
//ODT template
require_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
@@ -222,20 +222,20 @@ class modCommande extends DolibarrModules
}
/**
/**
* Function called when module is disabled.
* Remove from database constants, boxes and permissions from Dolibarr database.
* Data directories are not deleted
*
* @param string $options Options when enabling module ('', 'noboxes')
* @return int 1 if OK, 0 if KO
*/
function remove()
{
*/
function remove($options='')
{
$sql = array();
return $this->_remove($sql);
return $this->_remove($sql,$options);
}
}
}
?>

22
htdocs/core/modules/modComptabilite.class.php
View File

@@ -134,23 +134,27 @@ class modComptabilite extends DolibarrModules
global $conf;
// Nettoyage avant activation
$this->remove();
$this->remove($options);
$sql = array();
return $this->_init($sql,$options);
}
/**
* \brief Fonction appelee lors de la desactivation d'un module.
* Supprime de la base les constantes, boites et permissions du module.
*/
function remove()
{
/**
* Function called when module is disabled.
* Remove from database constants, boxes and permissions from Dolibarr database.
* Data directories are not deleted
*
* @param string $options Options when enabling module ('', 'noboxes')
* @return int 1 if OK, 0 if KO
*/
function remove($options='')
{
$sql = array();
return $this->_remove($sql);
}
return $this->_remove($sql,$options);
}
}
?>

22
htdocs/core/modules/modContrat.class.php
View File

@@ -131,23 +131,27 @@ class modContrat extends DolibarrModules
global $conf;
// Nettoyage avant activation
$this->remove();
$this->remove($options);
$sql = array();
return $this->_init($sql,$options);
}
/**
* \brief Fonction appelee lors de la desactivation d'un module.
* Supprime de la base les constantes, boites et permissions du module.
*/
function remove()
{
/**
* Function called when module is disabled.
* Remove from database constants, boxes and permissions from Dolibarr database.
* Data directories are not deleted
*
* @param string $options Options when enabling module ('', 'noboxes')
* @return int 1 if OK, 0 if KO
*/
function remove($options='')
{
$sql = array();
return $this->_remove($sql);
return $this->_remove($sql,$options);
}
}
}
?>

22
htdocs/core/modules/modDeplacement.class.php
View File

@@ -144,23 +144,27 @@ class modDeplacement extends DolibarrModules
function init($options='')
{
// Permissions
$this->remove();
$this->remove($options);
$sql = array();
return $this->_init($sql,$options);
}
/**
* \brief Fonction appelee lors de la desactivation d'un module.
* Supprime de la base les constantes, boites et permissions du module.
*/
function remove()
{
/**
* Function called when module is disabled.
* Remove from database constants, boxes and permissions from Dolibarr database.
* Data directories are not deleted
*
* @param string $options Options when enabling module ('', 'noboxes')
* @return int 1 if OK, 0 if KO
*/
function remove($options='')
{
$sql = array();
return $this->_remove($sql);
return $this->_remove($sql,$options);
}
}
}
?>

23
htdocs/core/modules/modDocument.class.php
View File

@@ -110,7 +110,7 @@ class modDocument extends DolibarrModules
global $conf;
// Permissions
$this->remove();
$this->remove($options);
$sql = array();
@@ -118,15 +118,20 @@ class modDocument extends DolibarrModules
}
/**
* \brief Fonction appelee lors de la desactivation d'un module.
* Supprime de la base les constantes, boites et permissions du module.
*/
function remove()
{
/**
* Function called when module is disabled.
* Remove from database constants, boxes and permissions from Dolibarr database.
* Data directories are not deleted
*
* @param string $options Options when enabling module ('', 'noboxes')
* @return int 1 if OK, 0 if KO
*/
function remove($options='')
{
$sql = array();
return $this->_remove($sql);
}
return $this->_remove($sql,$options);
}
}
?>

21
htdocs/core/modules/modDon.class.php
View File

@@ -125,15 +125,20 @@ class modDon extends DolibarrModules
return $this->_init($sql,$options);
}
/**
* \brief Fonction appelee lors de la desactivation d'un module.
* Supprime de la base les constantes, boites et permissions du module.
*/
function remove()
{
/**
* Function called when module is disabled.
* Remove from database constants, boxes and permissions from Dolibarr database.
* Data directories are not deleted
*
* @param string $options Options when enabling module ('', 'noboxes')
* @return int 1 if OK, 0 if KO
*/
function remove($options='')
{
$sql = array();
return $this->_remove($sql);
}
return $this->_remove($sql,$options);
}
}
?>

23
htdocs/core/modules/modECM.class.php
View File

@@ -200,17 +200,20 @@ class modECM extends DolibarrModules
return $this->_init($sql,$options);
}
/**
* \brief Function called when module is disabled.
* Remove from database constants, boxes and permissions from Dolibarr database.
* Data directories are not deleted.
*/
function remove()
{
$sql = array();
/**
* Function called when module is disabled.
* Remove from database constants, boxes and permissions from Dolibarr database.
* Data directories are not deleted
*
* @param string $options Options when enabling module ('', 'noboxes')
* @return int 1 if OK, 0 if KO
*/
function remove($options='')
{
$sql = array();
return $this->_remove($sql);
}
return $this->_remove($sql,$options);
}
}

23
htdocs/core/modules/modExpedition.class.php
View File

@@ -204,7 +204,7 @@ class modExpedition extends DolibarrModules
global $conf;
// Permissions
$this->remove();
$this->remove($options);
$sql = array();
@@ -218,15 +218,20 @@ class modExpedition extends DolibarrModules
return $this->_init($sql,$options);
}
/**
* \brief Fonction appelee lors de la desactivation d'un module.
* Supprime de la base les constantes, boites et permissions du module.
*/
function remove()
{
/**
* Function called when module is disabled.
* Remove from database constants, boxes and permissions from Dolibarr database.
* Data directories are not deleted
*
* @param string $options Options when enabling module ('', 'noboxes')
* @return int 1 if OK, 0 if KO
*/
function remove($options='')
{
$sql = array();
return $this->_remove($sql);
}
return $this->_remove($sql,$options);
}
}
?>

21
htdocs/core/modules/modExport.class.php
View File

@@ -106,15 +106,20 @@ class modExport extends DolibarrModules
return $this->_init($sql,$options);
}
/**
* \brief Fonction appelee lors de la desactivation d'un module.
* Supprime de la base les constantes, boites et permissions du module.
*/
function remove()
{
/**
* Function called when module is disabled.
* Remove from database constants, boxes and permissions from Dolibarr database.
* Data directories are not deleted
*
* @param string $options Options when enabling module ('', 'noboxes')
* @return int 1 if OK, 0 if KO
*/
function remove($options='')
{
$sql = array();
return $this->_remove($sql);
}
return $this->_remove($sql,$options);
}
}
?>

23
htdocs/core/modules/modExternalRss.class.php
View File

@@ -119,18 +119,23 @@ class modExternalRss extends DolibarrModules
return $this->_init($sql,$options);
}
/**
* \brief Fonction appelee lors de la desactivation d'un module.
* Supprime de la base les constantes, boites et permissions du module.
*/
function remove()
{
/**
* Function called when module is disabled.
* Remove from database constants, boxes and permissions from Dolibarr database.
* Data directories are not deleted
*
* @param string $options Options when enabling module ('', 'noboxes')
* @return int 1 if OK, 0 if KO
*/
function remove($options='')
{
$sql = array();
// Supprime anciennes delcarations de la boite RSS
// Delete old declarations of RSS box
$this->boxes[0][1] = "box_external_rss.php";
return $this->_remove($sql);
}
return $this->_remove($sql,$options);
}
}
?>

23
htdocs/core/modules/modExternalSite.class.php
View File

@@ -129,17 +129,20 @@ class modExternalSite extends DolibarrModules
return $this->_init($sql,$options);
}
/**
* \brief Function called when module is disabled.
* Remove from database constants, boxes and permissions from Dolibarr database.
* Data directories are not deleted.
*/
function remove()
{
$sql = array();
/**
* Function called when module is disabled.
* Remove from database constants, boxes and permissions from Dolibarr database.
* Data directories are not deleted
*
* @param string $options Options when enabling module ('', 'noboxes')
* @return int 1 if OK, 0 if KO
*/
function remove($options='')
{
$sql = array();
return $this->_remove($sql);
}
return $this->_remove($sql,$options);
}
}

23
htdocs/core/modules/modFTP.class.php
View File

@@ -142,17 +142,20 @@ class modFTP extends DolibarrModules
return $this->_init($sql,$options);
}
/**
* \brief Function called when module is disabled.
* Remove from database constants, boxes and permissions from Dolibarr database.
* Data directories are not deleted.
*/
function remove()
{
$sql = array();
/**
* Function called when module is disabled.
* Remove from database constants, boxes and permissions from Dolibarr database.
* Data directories are not deleted
*
* @param string $options Options when enabling module ('', 'noboxes')
* @return int 1 if OK, 0 if KO
*/
function remove($options='')
{
$sql = array();
return $this->_remove($sql);
}
return $this->_remove($sql,$options);
}
}

20
htdocs/core/modules/modFacture.class.php
View File

@@ -237,16 +237,20 @@ class modFacture extends DolibarrModules
return $this->_init($sql,$options);
}
/**
* Fonction appelee lors de la desactivation d'un module.
* Supprime de la base les constantes, boites et permissions du module.
* @param options Options when disabling module
*/
function remove($options='')
{
/**
* Function called when module is disabled.
* Remove from database constants, boxes and permissions from Dolibarr database.
* Data directories are not deleted
*
* @param string $options Options when enabling module ('', 'noboxes')
* @return int 1 if OK, 0 if KO
*/
function remove($options='')
{
$sql = array();
return $this->_remove($sql,$options);
}
}
}
?>

21
htdocs/core/modules/modFckeditor.class.php
View File

@@ -97,15 +97,20 @@ class modFckeditor extends DolibarrModules
return $this->_init($sql,$options);
}
/**
* \brief Fonction appelee lors de la desactivation d'un module.
* Supprime de la base les constantes, boites et permissions du module.
*/
function remove()
{
/**
* Function called when module is disabled.
* Remove from database constants, boxes and permissions from Dolibarr database.
* Data directories are not deleted
*
* @param string $options Options when enabling module ('', 'noboxes')
* @return int 1 if OK, 0 if KO
*/
function remove($options='')
{
$sql = array();
return $this->_remove($sql);
}
return $this->_remove($sql,$options);
}
}
?>

17
htdocs/core/modules/modFicheinter.class.php
View File

@@ -164,7 +164,7 @@ class modFicheinter extends DolibarrModules
global $conf;
// Permissions
$this->remove();
$this->remove($options);
$sql = array(
"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->const[0][2]."' AND entity = ".$conf->entity,
@@ -175,14 +175,19 @@ class modFicheinter extends DolibarrModules
}
/**
* \brief Fonction appelee lors de la desactivation d'un module.
* Supprime de la base les constantes, boites et permissions du module.
* Function called when module is disabled.
* Remove from database constants, boxes and permissions from Dolibarr database.
* Data directories are not deleted
*
* @param string $options Options when enabling module ('', 'noboxes')
* @return int 1 if OK, 0 if KO
*/
function remove()
function remove($options='')
{
$sql = array();
$sql = array();
return $this->_remove($sql);
return $this->_remove($sql,$options);
}
}
?>

22
htdocs/core/modules/modFournisseur.class.php
View File

@@ -270,7 +270,7 @@ class modFournisseur extends DolibarrModules
{
global $conf;
$this->remove();
$this->remove($options);
$sql = array(
"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->const[0][2]."' AND entity = ".$conf->entity,
@@ -280,16 +280,20 @@ class modFournisseur extends DolibarrModules
return $this->_init($sql,$options);
}
/**
* \brief Fonction appelee lors de la desactivation d'un module.
* Supprime de la base les constantes, boites et permissions du module.
*/
function remove()
{
/**
* Function called when module is disabled.
* Remove from database constants, boxes and permissions from Dolibarr database.
* Data directories are not deleted
*
* @param string $options Options when enabling module ('', 'noboxes')
* @return int 1 if OK, 0 if KO
*/
function remove($options='')
{
$sql = array();
return $this->_remove($sql);
}
return $this->_remove($sql,$options);
}
}
?>

21
htdocs/core/modules/modGeoIPMaxmind.class.php
View File

@@ -101,15 +101,20 @@ class modGeoIPMaxmind extends DolibarrModules
return $this->_init($sql,$options);
}
/**
* \brief Fonction appelee lors de la desactivation d'un module.
* Supprime de la base les constantes, boites et permissions du module.
*/
function remove()
{
/**
* Function called when module is disabled.
* Remove from database constants, boxes and permissions from Dolibarr database.
* Data directories are not deleted
*
* @param string $options Options when enabling module ('', 'noboxes')
* @return int 1 if OK, 0 if KO
*/
function remove($options='')
{
$sql = array();
return $this->_remove($sql);
}
return $this->_remove($sql,$options);
}
}
?>

33
htdocs/core/modules/modGravatar.class.php
View File

@@ -197,26 +197,29 @@ class modGravatar extends DolibarrModules
return $this->_init($sql,$options);
}
/**
* \brief Function called when module is disabled.
* Remove from database constants, boxes and permissions from Dolibarr database.
* Data directories are not deleted.
* \return int 1 if OK, 0 if KO
*/
function remove()
{
/**
* Function called when module is disabled.
* Remove from database constants, boxes and permissions from Dolibarr database.
* Data directories are not deleted
*
* @param string $options Options when enabling module ('', 'noboxes')
* @return int 1 if OK, 0 if KO
*/
function remove($options='')
{
$sql = array();
return $this->_remove($sql);
}
return $this->_remove($sql,$options);
}
/**
* \brief Create tables, keys and data required by module
* Files llx_table1.sql, llx_table1.key.sql llx_data.sql with create table, create keys
* and create data commands must be stored in directory /mymodule/sql/
* This function is called by this->init.
* \return int <=0 if KO, >0 if OK
* Create tables, keys and data required by module
* Files llx_table1.sql, llx_table1.key.sql llx_data.sql with create table, create keys
* and create data commands must be stored in directory /mymodule/sql/
* This function is called by this->init.
*
* @return int <=0 if KO, >0 if OK
*/
function load_tables()
{

21
htdocs/core/modules/modImport.class.php
View File

@@ -101,15 +101,20 @@ class modImport extends DolibarrModules
return $this->_init($sql,$options);
}
/**
* \brief Fonction appelee lors de la desactivation d'un module.
* Supprime de la base les constantes, boites et permissions du module.
*/
function remove()
{
/**
* Function called when module is disabled.
* Remove from database constants, boxes and permissions from Dolibarr database.
* Data directories are not deleted
*
* @param string $options Options when enabling module ('', 'noboxes')
* @return int 1 if OK, 0 if KO
*/
function remove($options='')
{
$sql = array();
return $this->_remove($sql);
}
return $this->_remove($sql,$options);
}
}
?>

23
htdocs/core/modules/modLabel.class.php
View File

@@ -103,22 +103,27 @@ class modLabel extends DolibarrModules
function init($options='')
{
// Permissions
$this->remove();
$this->remove($options);
$sql = array();
return $this->_init($sql,$options);
}
/**
* \brief Fonction appelee lors de la desactivation d'un module.
* Supprime de la base les constantes, boites et permissions du module.
*/
function remove()
{
/**
* Function called when module is disabled.
* Remove from database constants, boxes and permissions from Dolibarr database.
* Data directories are not deleted
*
* @param string $options Options when enabling module ('', 'noboxes')
* @return int 1 if OK, 0 if KO
*/
function remove($options='')
{
$sql = array();
return $this->_remove($sql);
}
return $this->_remove($sql,$options);
}
}
?>

21
htdocs/core/modules/modLdap.class.php
View File

@@ -107,15 +107,20 @@ class modLdap extends DolibarrModules
return $this->_init($sql,$options);
}
/**
* \brief Fonction appelee lors de la desactivation d'un module.
* Supprime de la base les constantes, boites et permissions du module.
*/
function remove()
{
/**
* Function called when module is disabled.
* Remove from database constants, boxes and permissions from Dolibarr database.
* Data directories are not deleted
*
* @param string $options Options when enabling module ('', 'noboxes')
* @return int 1 if OK, 0 if KO
*/
function remove($options='')
{
$sql = array();
return $this->_remove($sql);
}
return $this->_remove($sql,$options);
}
}
?>

23
htdocs/core/modules/modMailing.class.php
View File

@@ -113,22 +113,27 @@ class modMailing extends DolibarrModules
function init($options='')
{
// Permissions
$this->remove();
$this->remove($options);
$sql = array();
return $this->_init($sql,$options);
}
/**
\brief Fonction appelee lors de la desactivation d'un module.
Supprime de la base les constantes, boites et permissions du module.
*/
function remove()
{
/**
* Function called when module is disabled.
* Remove from database constants, boxes and permissions from Dolibarr database.
* Data directories are not deleted
*
* @param string $options Options when enabling module ('', 'noboxes')
* @return int 1 if OK, 0 if KO
*/
function remove($options='')
{
$sql = array();
return $this->_remove($sql);
}
return $this->_remove($sql,$options);
}
}
?>

19
htdocs/core/modules/modMailmanSpip.class.php
View File

@@ -95,16 +95,19 @@ class modMailmanSpip extends DolibarrModules
}
/**
* \brief Function called when module is disabled.
* Remove from database constants, boxes and permissions from Dolibarr database.
* Data directories are not deleted.
* \return int 1 if OK, 0 if KO
* Function called when module is disabled.
* Remove from database constants, boxes and permissions from Dolibarr database.
* Data directories are not deleted
*
* @param string $options Options when enabling module ('', 'noboxes')
* @return int 1 if OK, 0 if KO
*/
function remove()
{
function remove($options='')
{
$sql = array();
return $this->_remove($sql);
}
return $this->_remove($sql,$options);
}
}
?>

23
htdocs/core/modules/modNotification.class.php
View File

@@ -86,22 +86,27 @@ class modNotification extends DolibarrModules
function init($options='')
{
// Permissions
$this->remove();
$this->remove($options);
$sql = array();
return $this->_init($sql,$options);
}
/**
\brief Fonction appelee lors de la desactivation d'un module.
Supprime de la base les constantes, boites et permissions du module.
*/
function remove()
{
/**
* Function called when module is disabled.
* Remove from database constants, boxes and permissions from Dolibarr database.
* Data directories are not deleted
*
* @param string $options Options when enabling module ('', 'noboxes')
* @return int 1 if OK, 0 if KO
*/
function remove($options='')
{
$sql = array();
return $this->_remove($sql);
}
return $this->_remove($sql,$options);
}
}
?>

28
htdocs/core/modules/modPaybox.class.php
View File

@@ -194,25 +194,27 @@ class modPayBox extends DolibarrModules
}
/**
* \brief Function called when module is disabled.
* Remove from database constants, boxes and permissions from Dolibarr database.
* Data directories are not deleted.
* \return int 1 if OK, 0 if KO
* Function called when module is disabled.
* Remove from database constants, boxes and permissions from Dolibarr database.
* Data directories are not deleted
*
* @param string $options Options when enabling module ('', 'noboxes')
* @return int 1 if OK, 0 if KO
*/
function remove()
function remove($options='')
{
$sql = array();
$sql = array();
return $this->_remove($sql);
return $this->_remove($sql,$options);
}
/**
* \brief Create tables and keys required by module
* Files mymodule.sql and mymodule.key.sql with create table and create keys
* commands must be stored in directory /mymodule/sql/
* This function is called by this->init.
* \return int <=0 if KO, >0 if OK
* Create tables and keys required by module
* Files mymodule.sql and mymodule.key.sql with create table and create keys
* commands must be stored in directory /mymodule/sql/
* This function is called by this->init.
*
* @return int <=0 if KO, >0 if OK
*/
function load_tables()
{

27
htdocs/core/modules/modPaypal.class.php
View File

@@ -186,25 +186,28 @@ class modPaypal extends DolibarrModules
}
/**
* \brief Function called when module is disabled.
* Remove from database constants, boxes and permissions from Dolibarr database.
* Data directories are not deleted.
* \return int 1 if OK, 0 if KO
* Function called when module is disabled.
* Remove from database constants, boxes and permissions from Dolibarr database.
* Data directories are not deleted
*
* @param string $options Options when enabling module ('', 'noboxes')
* @return int 1 if OK, 0 if KO
*/
function remove()
function remove($options='')
{
$sql = array();
$sql = array();
return $this->_remove($sql);
return $this->_remove($sql,$options);
}
/**
* \brief Create tables and keys required by module
* Files mymodule.sql and mymodule.key.sql with create table and create keys
* commands must be stored in directory /mymodule/sql/
* This function is called by this->init.
* \return int <=0 if KO, >0 if OK
* Create tables and keys required by module
* Files mymodule.sql and mymodule.key.sql with create table and create keys
* commands must be stored in directory /mymodule/sql/
* This function is called by this->init.
*
* @return int <=0 if KO, >0 if OK
*/
function load_tables()
{

22
htdocs/core/modules/modPrelevement.class.php
View File

@@ -136,23 +136,27 @@ class modPrelevement extends DolibarrModules
global $conf;
// Permissions
$this->remove();
$this->remove($options);
$sql = array();
return $this->_init($sql,$options);
}
/**
* \brief Fonction appelee lors de la desactivation d'un module.
* Supprime de la base les constantes, boites et permissions du module.
*/
function remove()
{
/**
* Function called when module is disabled.
* Remove from database constants, boxes and permissions from Dolibarr database.
* Data directories are not deleted
*
* @param string $options Options when enabling module ('', 'noboxes')
* @return int 1 if OK, 0 if KO
*/
function remove($options='')
{
$sql = array();
return $this->_remove($sql);
}
return $this->_remove($sql,$options);
}
}
?>

23
htdocs/core/modules/modProduct.class.php
View File

@@ -202,22 +202,27 @@ class modProduct extends DolibarrModules
function init($options='')
{
// Permissions
$this->remove();
$this->remove($options);
$sql = array();
return $this->_init($sql,$options);
}
/**
* \brief Fonction appelee lors de la desactivation d'un module.
* Supprime de la base les constantes, boites et permissions du module.
*/
function remove()
{
/**
* Function called when module is disabled.
* Remove from database constants, boxes and permissions from Dolibarr database.
* Data directories are not deleted
*
* @param string $options Options when enabling module ('', 'noboxes')
* @return int 1 if OK, 0 if KO
*/
function remove($options='')
{
$sql = array();
return $this->_remove($sql);
}
return $this->_remove($sql,$options);
}
}
?>

23
htdocs/core/modules/modProjet.class.php
View File

@@ -152,7 +152,7 @@ class modProjet extends DolibarrModules
global $conf;
// Permissions
$this->remove();
$this->remove($options);
$sql = array(
"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->const[0][2]."' AND entity = ".$conf->entity,
@@ -162,15 +162,20 @@ class modProjet extends DolibarrModules
return $this->_init($sql,$options);
}
/**
* \brief Fonction appelee lors de la desactivation d'un module.
* Supprime de la base les constantes, boites et permissions du module.
*/
function remove()
{
/**
* Function called when module is disabled.
* Remove from database constants, boxes and permissions from Dolibarr database.
* Data directories are not deleted
*
* @param string $options Options when enabling module ('', 'noboxes')
* @return int 1 if OK, 0 if KO
*/
function remove($options='')
{
$sql = array();
return $this->_remove($sql);
}
return $this->_remove($sql,$options);
}
}
?>

22
htdocs/core/modules/modPropale.class.php
View File

@@ -193,7 +193,7 @@ class modPropale extends DolibarrModules
global $conf,$langs;
// Remove permissions and default values
$this->remove();
$this->remove($options);
//ODT template
require_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
@@ -217,16 +217,20 @@ class modPropale extends DolibarrModules
}
/**
* \brief Fonction appelee lors de la desactivation d'un module.
* Supprime de la base les constantes, boites et permissions du module.
*/
function remove()
{
/**
* Function called when module is disabled.
* Remove from database constants, boxes and permissions from Dolibarr database.
* Data directories are not deleted
*
* @param string $options Options when enabling module ('', 'noboxes')
* @return int 1 if OK, 0 if KO
*/
function remove($options='')
{
$sql = array();
return $this->_remove($sql);
return $this->_remove($sql,$options);
}
}
}
?>

23
htdocs/core/modules/modService.class.php
View File

@@ -188,22 +188,27 @@ class modService extends DolibarrModules
function init($options='')
{
// Permissions et valeurs par defaut
$this->remove();
$this->remove($options);
$sql = array();
return $this->_init($sql,$options);
}
/**
* \brief Fonction appelee lors de la desactivation d'un module.
* Supprime de la base les constantes, boites et permissions du module.
*/
function remove()
{
/**
* Function called when module is disabled.
* Remove from database constants, boxes and permissions from Dolibarr database.
* Data directories are not deleted
*
* @param string $options Options when enabling module ('', 'noboxes')
* @return int 1 if OK, 0 if KO
*/
function remove($options='')
{
$sql = array();
return $this->_remove($sql);
}
return $this->_remove($sql,$options);
}
}
?>

17
htdocs/core/modules/modSociete.class.php
View File

@@ -345,16 +345,19 @@ class modSociete extends DolibarrModules
}
/**
* Function called when module is disabled.
* Remove from database constants, boxes and permissions from Dolibarr database.
* Data directories are not deleted.
* @return int 1 if OK, 0 if KO
* Function called when module is disabled.
* Remove from database constants, boxes and permissions from Dolibarr database.
* Data directories are not deleted
*
* @param string $options Options when enabling module ('', 'noboxes')
* @return int 1 if OK, 0 if KO
*/
function remove($options='')
{
function remove($options='')
{
$sql = array();
return $this->_remove($sql,$options);
}
}
}
?>

20
htdocs/core/modules/modStock.class.php
View File

@@ -147,16 +147,20 @@ class modStock extends DolibarrModules
return $this->_init($sql,$options);
}
/**
* \brief Fonction appelee lors de la desactivation d'un module.
* Supprime de la base les constantes, boites et permissions du module.
*/
function remove()
{
/**
* Function called when module is disabled.
* Remove from database constants, boxes and permissions from Dolibarr database.
* Data directories are not deleted
*
* @param string $options Options when enabling module ('', 'noboxes')
* @return int 1 if OK, 0 if KO
*/
function remove($options='')
{
$sql = array();
return $this->_remove($sql);
return $this->_remove($sql,$options);
}
}
}
?>

21
htdocs/core/modules/modSyslog.class.php
View File

@@ -99,15 +99,20 @@ class modSyslog extends DolibarrModules
}
/**
* \brief Fonction appelee lors de la desactivation d'un module.
* Supprime de la base les constantes, boites et permissions du module.
*/
function remove()
{
/**
* Function called when module is disabled.
* Remove from database constants, boxes and permissions from Dolibarr database.
* Data directories are not deleted
*
* @param string $options Options when enabling module ('', 'noboxes')
* @return int 1 if OK, 0 if KO
*/
function remove($options='')
{
$sql = array();
return $this->_remove($sql);
}
return $this->_remove($sql,$options);
}
}
?>

23
htdocs/core/modules/modTax.class.php
View File

@@ -151,24 +151,27 @@ class modTax extends DolibarrModules
global $conf;
// Nettoyage avant activation
$this->remove();
$this->remove($options);
$sql = array();
return $this->_init($sql,$options);
}
/**
* Fonction appelee lors de la desactivation d'un module.
* Supprime de la base les constantes, boites et permissions du module.
/**
* Function called when module is disabled.
* Remove from database constants, boxes and permissions from Dolibarr database.
* Data directories are not deleted
*
* @return int 1 if OK, 0 if KO
*/
function remove()
{
* @param string $options Options when enabling module ('', 'noboxes')
* @return int 1 if OK, 0 if KO
*/
function remove($options='')
{
$sql = array();
return $this->_remove($sql);
}
return $this->_remove($sql,$options);
}
}
?>

22
htdocs/core/modules/modUser.class.php
View File

@@ -236,7 +236,7 @@ class modUser extends DolibarrModules
global $conf;
// Permissions
$this->remove();
$this->remove($options);
$sql = array();
@@ -244,17 +244,19 @@ class modUser extends DolibarrModules
}
/**
* Function called when module is disabled.
* Remove from database constants, boxes and permissions from Dolibarr database.
* Data directories are not deleted.
*
* @return int 1 if OK, 0 if KO
* Function called when module is disabled.
* Remove from database constants, boxes and permissions from Dolibarr database.
* Data directories are not deleted
*
* @param string $options Options when enabling module ('', 'noboxes')
* @return int 1 if OK, 0 if KO
*/
function remove()
{
function remove($options='')
{
$sql = array();
return $this->_remove($sql);
}
return $this->_remove($sql,$options);
}
}
?>

13
htdocs/core/modules/modWebServices.class.php
View File

@@ -107,15 +107,18 @@ class modWebServices extends DolibarrModules
}
/**
* \brief Fonction appelee lors de la desactivation d'un module.
* Supprime de la base les constantes, boites et permissions du module.
* \param options Options when disabling module
* Function called when module is disabled.
* Remove from database constants, boxes and permissions from Dolibarr database.
* Data directories are not deleted
*
* @param string $options Options when enabling module ('', 'noboxes')
* @return int 1 if OK, 0 if KO
*/
function remove($options='')
{
$sql = array();
$sql = array();
return $this->_remove($sql,$options);
return $this->_remove($sql,$options);
}
}

23
htdocs/core/modules/modWorkflow.class.php
View File

@@ -145,7 +145,7 @@ class modWorkflow extends DolibarrModules
function init($options='')
{
// Permissions
$this->remove();
$this->remove($options);
$sql = array();
@@ -153,20 +153,25 @@ class modWorkflow extends DolibarrModules
}
/**
* \brief Fonction appelee lors de la desactivation d'un module.
* Supprime de la base les constantes, boites et permissions du module.
* Function called when module is disabled.
* Remove from database constants, boxes and permissions from Dolibarr database.
* Data directories are not deleted
*
* @param string $options Options when enabling module ('', 'noboxes')
* @return int 1 if OK, 0 if KO
*/
function remove()
function remove($options='')
{
$sql = array();
$sql = array();
return $this->_remove($sql);
return $this->_remove($sql,$options);
}
/**
* \brief Create tables and keys required by module
* This function is called by this->init.
* \return int <=0 if KO, >0 if OK
* Create tables and keys required by module
* This function is called by this->init.
*
* @return int <=0 if KO, >0 if OK
*/
function load_tables()
{

20
htdocs/install/upgrade2.php
View File

@@ -3518,7 +3518,7 @@ function migrate_reload_modules($db,$langs,$conf)
if ($res) {
$mod=new modProduct($db);
//$mod->remove('noboxes');
$mod->init();
$mod->init('noboxes');
}
}
if (! empty($conf->global->MAIN_MODULE_SERVICE)) // Permission has changed into 2.7
@@ -3528,7 +3528,7 @@ function migrate_reload_modules($db,$langs,$conf)
$res=@include_once(DOL_DOCUMENT_ROOT.'/core/modules/modService.class.php');
$mod=new modService($db);
//$mod->remove('noboxes');
$mod->init();
$mod->init('noboxes');
}
}
if (! empty($conf->global->MAIN_MODULE_COMMANDE)) // Permission has changed into 2.9
@@ -3538,7 +3538,7 @@ function migrate_reload_modules($db,$langs,$conf)
$res=@include_once(DOL_DOCUMENT_ROOT.'/core/modules/modCommande.class.php');
$mod=new modCommande($db);
//$mod->remove('noboxes');
$mod->init();
$mod->init('noboxes');
}
}
if (! empty($conf->global->MAIN_MODULE_FACTURE)) // Permission has changed into 2.9
@@ -3548,7 +3548,7 @@ function migrate_reload_modules($db,$langs,$conf)
$res=@include_once(DOL_DOCUMENT_ROOT.'/core/modules/modFacture.class.php');
$mod=new modFacture($db);
//$mod->remove('noboxes');
$mod->init();
$mod->init('noboxes');
}
}
if (! empty($conf->global->MAIN_MODULE_FOURNISSEUR)) // Permission has changed into 2.9
@@ -3558,7 +3558,7 @@ function migrate_reload_modules($db,$langs,$conf)
if ($res) {
$mod=new modFournisseur($db);
//$mod->remove('noboxes');
$mod->init();
$mod->init('noboxes');
}
}
@@ -3569,7 +3569,7 @@ function migrate_reload_modules($db,$langs,$conf)
if ($res) {
$mod=new modUser($db);
//$mod->remove('noboxes'); // We need to remove because id of module has changed
$mod->init();
$mod->init('noboxes');
}
}
if (! empty($conf->global->MAIN_MODULE_DEPLACEMENT)) // Permission has changed into 3.0
@@ -3579,7 +3579,7 @@ function migrate_reload_modules($db,$langs,$conf)
if ($res) {
$mod=new modDeplacement($db);
//$mod->remove('noboxes'); // We need to remove because a permission id has been removed
$mod->init();
$mod->init('noboxes');
}
}
if (! empty($conf->global->MAIN_MODULE_DON)) // Permission has changed into 3.0
@@ -3589,7 +3589,7 @@ function migrate_reload_modules($db,$langs,$conf)
if ($res) {
$mod=new modDon($db);
//$mod->remove('noboxes'); // We need to remove because a permission id has been removed
$mod->init();
$mod->init('noboxes');
}
}
if (! empty($conf->global->MAIN_MODULE_ECM)) // Permission has changed into 3.0 and 3.1
@@ -3599,7 +3599,7 @@ function migrate_reload_modules($db,$langs,$conf)
$res=@include_once(DOL_DOCUMENT_ROOT.'/core/modules/modECM.class.php');
$mod=new modECM($db);
$mod->remove('noboxes'); // We need to remove because a permission id has been removed
$mod->init();
$mod->init('noboxes');
}
}
if (! empty($conf->global->MAIN_MODULE_PAYBOX)) // Permission has changed into 3.0
@@ -3609,7 +3609,7 @@ function migrate_reload_modules($db,$langs,$conf)
if ($res) {
$mod=new modPaybox($db);
$mod->remove('noboxes'); // We need to remove because id of module has changed
$mod->init();
$mod->init('noboxes');
}
}