lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enhancements in module activation

Browse Source
This commit is contained in:
Laurent Destailleur 2009-03-20 14:33:56 +00:00
parent 3b6ceb73f7
commit f54de2174e
5 changed files with 130 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/admin/modules.php
View File

@ -412,8 +412,6 @@ foreach ($orders as $key => $value)
print nl2br($objMod->getDesc()); print nl2br($objMod->getDesc());
print "</td>\n <td align=\"center\" valign=\"top\">"; print "</td>\n <td align=\"center\" valign=\"top\">";
print $objMod->getVersion(); print $objMod->getVersion();
// print "</td>\n <td align=\"center\" valign=\"top\">";
// print $objMod->getDbVersion();
print "</td>\n <td align=\"center\" valign=\"top\">"; print "</td>\n <td align=\"center\" valign=\"top\">";
if (! empty($conf->global->$const_name)) if (! empty($conf->global->$const_name))

96
htdocs/includes/modules/DolibarrModules.class.php
View File

@ -67,9 +67,10 @@ class DolibarrModules
/** /**
* \brief Fonction d'activation. Insere en base les constantes et boites du module * \brief Fonction d'activation. Insere en base les constantes et boites du module
* \param array_sql Tableau de requete sql a executer a l'activation * \param array_sql Tableau de requete sql a executer a l'activation
* \return int 1 if OK, 0 if KO * \param options Options when enabling module
* \return int 1 if OK, 0 if KO
*/ */
function _init($array_sql) function _init($array_sql, $options='')
{ {
global $langs; global $langs;
$err=0; $err=0;
@ -92,7 +93,7 @@ class DolibarrModules
if (! $err) $err+=$this->insert_const(); if (! $err) $err+=$this->insert_const();
// Insere les boites dans llx_boxes_def // Insere les boites dans llx_boxes_def
if (! $err) $err+=$this->insert_boxes(); if (! $err && $options != 'noboxes') $err+=$this->insert_boxes();
// Insere les permissions associees au module actif dans llx_rights_def // Insere les permissions associees au module actif dans llx_rights_def
if (! $err) $err+=$this->insert_permissions(); if (! $err) $err+=$this->insert_permissions();
@ -134,7 +135,7 @@ class DolibarrModules
} }
} }
// Renvoi valeur de retour // Return code
if (! $err) if (! $err)
{ {
$this->db->commit(); $this->db->commit();
@ -150,45 +151,60 @@ class DolibarrModules
/** /**
* \brief Fonction de desactivation. Supprime de la base les constantes et boites du module * \brief Fonction de desactivation. Supprime de la base les constantes et boites du module
* \param array_sql tableau de requete sql a executer a la desactivation * \param array_sql tableau de requete sql a executer a la desactivation
* \param options Options when disabling module
* \return int 1 if OK, 0 if KO * \return int 1 if OK, 0 if KO
*/ */
function _remove($array_sql) function _remove($array_sql, $options='')
{ {
$err = 0; global $langs;
$err=0;
$this->db->begin();
// Remove line in activation module // Remove line in activation module
$err+=$this->_dbunactive(); if (! $err) $err+=$this->_dbunactive();
// Remove activation module line // Remove activation module line
$err+=$this->_unactive(); if (! $err) $err+=$this->_unactive();
// Supprime les boites de la liste des boites disponibles // Remove activation of module's style sheet
$err+=$this->delete_style_sheet(); if (! $err) $err+=$this->delete_style_sheet();
// Supprime les liens de pages en onglets issus de modules // Remove activation of module's new tabs
$err+=$this->delete_tabs(); if (! $err) $err+=$this->delete_tabs();
// Supprime les boites de la liste des boites disponibles // Remove list of module's available boxes
$err+=$this->delete_boxes(); if (! $err && $options != 'noboxes') $err+=$this->delete_boxes();
// Supprime les droits de la liste des droits disponibles // Remove module's permissions from list of available permissions
$err+=$this->delete_permissions(); if (! $err) $err+=$this->delete_permissions();
// Supprime les menus apportes par le module // Remove modules's menus
$err+=$this->delete_menus(); if (! $err) $err+=$this->delete_menus();
// Execute les requetes sql complementaires // Run complementary sql requests
for ($i = 0 ; $i < sizeof($array_sql) ; $i++) for ($i = 0 ; $i < sizeof($array_sql) ; $i++)
{ {
if (!$this->db->query($array_sql[$i])) if (! $err)
{ {
$err++; if (!$this->db->query($array_sql[$i]))
} {
$err++;
}
}
} }
// Renvoi valeur de retour // Return code
if ($err > 0) return 0; if (! $err)
return 1; {
$this->db->commit();
return 1;
}
else
{
$this->db->rollback();
return 0;
}
} }
@ -259,8 +275,9 @@ class DolibarrModules
/** /**
* \brief Retourne la version en base du module. * \brief Return version of module stored in database table.
* \return string Version du module * \return string Version of module
* \remarks This function is not used but is kept in code because it can be used later.
*/ */
function getDbVersion() function getDbVersion()
{ {
@ -270,6 +287,7 @@ class DolibarrModules
$sql ="SELECT active_version FROM ".MAIN_DB_PREFIX."dolibarr_modules"; $sql ="SELECT active_version FROM ".MAIN_DB_PREFIX."dolibarr_modules";
$sql .= " WHERE numero=".$this->numero." AND active = 1"; $sql .= " WHERE numero=".$this->numero." AND active = 1";
dol_syslog("DolibarrModules::getDbVersion sql=".$sql);
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if ($resql) if ($resql)
{ {
@ -326,8 +344,9 @@ class DolibarrModules
/** /**
* \brief Insert line in module table * \brief Insert line in dolibarr_modules table.
* \return int Nombre d'erreurs (0 si ok) * \return int Nb of errors (0 if OK)
* \remarks Storage is made for information only, table is not required for Dolibarr usage.
*/ */
function _dbactive() function _dbactive()
{ {
@ -339,7 +358,7 @@ class DolibarrModules
$sql = "INSERT INTO ".MAIN_DB_PREFIX."dolibarr_modules (numero,active,active_date,active_version)"; $sql = "INSERT INTO ".MAIN_DB_PREFIX."dolibarr_modules (numero,active,active_date,active_version)";
$sql.= " VALUES ("; $sql.= " VALUES (";
$sql.= $this->numero.",1,".$this->db->idate(mktime()).",'".$this->version."')"; $sql.= $this->numero.",1,".$this->db->idate(gmmktime()).",'".$this->version."')";
dol_syslog("DolibarrModules::_dbactive sql=".$sql, LOG_DEBUG); dol_syslog("DolibarrModules::_dbactive sql=".$sql, LOG_DEBUG);
$this->db->query($sql); $this->db->query($sql);
@ -348,15 +367,16 @@ class DolibarrModules
/** /**
* \brief Remove line in module table * \brief Remove line in dolibarr_modules table
* \return int Nb of errors (0 if OK) * \return int Nb of errors (0 if OK)
* \remarks Storage is made for information only, table is not required for Dolibarr usage.
*/ */
function _dbunactive() function _dbunactive()
{ {
$err = 0; $err = 0;
$sql = "DELETE FROM ".MAIN_DB_PREFIX."dolibarr_modules WHERE numero=".$this->numero; $sql = "DELETE FROM ".MAIN_DB_PREFIX."dolibarr_modules WHERE numero=".$this->numero;
dol_syslog("DolibarrModules::_dbactive sql=".$sql, LOG_DEBUG); dol_syslog("DolibarrModules::_dbunactive sql=".$sql, LOG_DEBUG);
$this->db->query($sql); $this->db->query($sql);
return $err; return $err;
@ -375,8 +395,8 @@ class DolibarrModules
dol_syslog("DolibarrModules::_active sql=".$sql, LOG_DEBUG); dol_syslog("DolibarrModules::_active sql=".$sql, LOG_DEBUG);
$this->db->query($sql); $this->db->query($sql);
$sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name,value,visible) VALUES $sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name,value,visible) VALUES";
('".$this->const_name."','1',0)"; $sql.= " ('".$this->const_name."','1',0)";
dol_syslog("DolibarrModules::_active sql=".$sql, LOG_DEBUG); dol_syslog("DolibarrModules::_active sql=".$sql, LOG_DEBUG);
if (!$this->db->query($sql)) if (!$this->db->query($sql))
{ {
@ -493,7 +513,7 @@ class DolibarrModules
$sql.= " VALUES ('".addslashes($file)."',"; $sql.= " VALUES ('".addslashes($file)."',";
$sql.= $note?"'".addslashes($note)."'":"null"; $sql.= $note?"'".addslashes($note)."'":"null";
$sql.= ")"; $sql.= ")";
//print $sql; dol_syslog("DolibarrModules::insert_boxes sql=".$sql);
if (! $this->db->query($sql)) if (! $this->db->query($sql))
{ {
$err++; $err++;
@ -876,8 +896,8 @@ class DolibarrModules
/** /**
\brief Supprime les permissions * \brief Remove menus entries
\return int Nombre d'erreurs (0 si ok) * \return int Nombre d'erreurs (0 si ok)
*/ */
function delete_menus() function delete_menus()
{ {

19
htdocs/includes/modules/modAgenda.class.php
View File

@ -159,23 +159,28 @@ class modAgenda extends DolibarrModules
/** /**
* \brief Fonction appelee lors de l'activation du module. Insere en base les constantes, boites, permissions du module. * \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. * Definit egalement les repertoires de donnees a creer pour ce module.
* \param options Options when enabling module
*/ */
function init() function init($options='')
{ {
$sql = array(); // Prevent pb of modules not correctly disabled
//$this->remove($options);
return $this->_init($sql); $sql = array();
return $this->_init($sql,$options);
} }
/** /**
* \brief Fonction appelee lors de la desactivation d'un module. * \brief Fonction appelee lors de la desactivation d'un module.
* Supprime de la base les constantes, boites et permissions du module. * Supprime de la base les constantes, boites et permissions du module.
* \param options Options when disabling module
*/ */
function remove() function remove($options='')
{ {
$sql = array(); $sql = array();
return $this->_remove($sql); return $this->_remove($sql,$options);
} }
} }

26
htdocs/includes/modules/modSociete.class.php
View File

@ -211,33 +211,33 @@ class modSociete extends DolibarrModules
/** /**
* \brief Fonction appelee lors de l'activation du module. Insere en base les constantes, boites, permissions du module. * \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. * Definit egalement les repertoires de donnees a creer pour ce module.
* \param options Options when enabling module
*/ */
function init() function init($options='')
{ {
global $conf; global $conf;
// Permissions
$this->remove();
// Dir
$this->dirs[0] = $conf->societe->dir_output; $this->dirs[0] = $conf->societe->dir_output;
// Prevent pb of modules not correctly disabled
//$this->remove($options);
$sql = array(); $sql = array();
return $this->_init($sql); return $this->_init($sql,$options);
} }
/** /**
* \brief Fonction appelee lors de la desactivation d'un module. * \brief Fonction appelee lors de la desactivation d'un module.
* Supprime de la base les constantes, boites et permissions du module. * Supprime de la base les constantes, boites et permissions du module.
* \param options Options when disabling module
*/ */
function remove() function remove($options='')
{ {
$sql = array(); $sql = array();
return $this->_remove($sql); return $this->_remove($sql,$options);
} }
} }
?> ?>

58
htdocs/install/upgrade2.php
View File

@ -235,6 +235,7 @@ function migrate_paiements($db,$langs,$conf)
$sql .= " WHERE p.fk_facture > 0"; $sql .= " WHERE p.fk_facture > 0";
$resql = $db->query($sql); $resql = $db->query($sql);
dolibarr_install_syslog("upgrade2::migrate_paiements sql=".$sql);
if ($resql) if ($resql)
{ {
$i = 0; $i = 0;
@ -318,6 +319,7 @@ function migrate_paiements_orphelins_1($db,$langs,$conf)
$sql.= " AND (p.fk_facture = 0 OR p.fk_facture IS NULL)"; $sql.= " AND (p.fk_facture = 0 OR p.fk_facture IS NULL)";
$resql = $db->query($sql); $resql = $db->query($sql);
dolibarr_install_syslog("upgrade2::migrate_paiements_orphelins_1 sql=".$sql);
$row = array(); $row = array();
if ($resql) if ($resql)
{ {
@ -426,6 +428,7 @@ function migrate_paiements_orphelins_2($db,$langs,$conf)
$sql.= " AND (p.fk_facture = 0 OR p.fk_facture IS NULL)"; $sql.= " AND (p.fk_facture = 0 OR p.fk_facture IS NULL)";
$resql = $db->query($sql); $resql = $db->query($sql);
dolibarr_install_syslog("upgrade2::migrate_paiements_orphelins_2 sql=".$sql);
$row = array(); $row = array();
if ($resql) if ($resql)
{ {
@ -548,6 +551,7 @@ function migrate_contracts_det($db,$langs,$conf)
$sql.= " WHERE cd.rowid IS NULL AND p.rowid IS NOT NULL"; $sql.= " WHERE cd.rowid IS NULL AND p.rowid IS NOT NULL";
$resql = $db->query($sql); $resql = $db->query($sql);
dolibarr_install_syslog("upgrade2::migrate_contracts_det sql=".$sql);
if ($resql) if ($resql)
{ {
$i = 0; $i = 0;
@ -635,7 +639,7 @@ function migrate_links_transfert($db,$langs,$conf)
$sql.= " AND bu.fk_bank IS NULL"; $sql.= " AND bu.fk_bank IS NULL";
$resql = $db->query($sql); $resql = $db->query($sql);
dolibarr_install_syslog("migrate_links_transfert sql=".$sql); dolibarr_install_syslog("upgrade2::migrate_links_transfert sql=".$sql);
if ($resql) if ($resql)
{ {
$i = 0; $i = 0;
@ -706,6 +710,7 @@ function migrate_contracts_date1($db,$langs,$conf)
print '<b>'.$langs->trans('MigrationContractsEmptyDatesUpdate')."</b><br>\n"; print '<b>'.$langs->trans('MigrationContractsEmptyDatesUpdate')."</b><br>\n";
$sql="update llx_contrat set date_contrat=tms where date_contrat is null"; $sql="update llx_contrat set date_contrat=tms where date_contrat is null";
dolibarr_install_syslog("upgrade2::migrate_contracts_date1 sql=".$sql);
$resql = $db->query($sql); $resql = $db->query($sql);
if (! $resql) dol_print_error($db); if (! $resql) dol_print_error($db);
if ($db->affected_rows($resql) > 0) if ($db->affected_rows($resql) > 0)
@ -714,6 +719,7 @@ function migrate_contracts_date1($db,$langs,$conf)
print $langs->trans('MigrationContractsEmptyDatesNothingToUpdate')."<br>\n"; print $langs->trans('MigrationContractsEmptyDatesNothingToUpdate')."<br>\n";
$sql="update llx_contrat set datec=tms where datec is null"; $sql="update llx_contrat set datec=tms where datec is null";
dolibarr_install_syslog("upgrade2::migrate_contracts_date1 sql=".$sql);
$resql = $db->query($sql); $resql = $db->query($sql);
if (! $resql) dol_print_error($db); if (! $resql) dol_print_error($db);
if ($db->affected_rows($resql) > 0) if ($db->affected_rows($resql) > 0)
@ -744,6 +750,7 @@ function migrate_contracts_date2($db,$langs,$conf)
$sql.= " GROUP BY c.rowid, c.date_contrat"; $sql.= " GROUP BY c.rowid, c.date_contrat";
$resql = $db->query($sql); $resql = $db->query($sql);
dolibarr_install_syslog("upgrade2::migrate_contracts_date2 sql=".$sql);
if ($resql) if ($resql)
{ {
$i = 0; $i = 0;
@ -800,6 +807,7 @@ function migrate_contracts_date3($db,$langs,$conf)
print '<b>'.$langs->trans('MigrationContractsIncoherentCreationDateUpdate')."</b><br>\n"; print '<b>'.$langs->trans('MigrationContractsIncoherentCreationDateUpdate')."</b><br>\n";
$sql="update llx_contrat set datec=date_contrat where datec is null or datec > date_contrat"; $sql="update llx_contrat set datec=date_contrat where datec is null or datec > date_contrat";
dolibarr_install_syslog("upgrade2::migrate_contracts_date3 sql=".$sql);
$resql = $db->query($sql); $resql = $db->query($sql);
if (! $resql) dol_print_error($db); if (! $resql) dol_print_error($db);
if ($db->affected_rows() > 0) if ($db->affected_rows() > 0)
@ -823,6 +831,7 @@ function migrate_contracts_open($db,$langs,$conf)
$sql = "SELECT c.rowid as cref FROM llx_contrat as c, llx_contratdet as cd"; $sql = "SELECT c.rowid as cref FROM llx_contrat as c, llx_contratdet as cd";
$sql.= " WHERE cd.statut = 4 AND c.statut=2 AND c.rowid=cd.fk_contrat"; $sql.= " WHERE cd.statut = 4 AND c.statut=2 AND c.rowid=cd.fk_contrat";
dolibarr_install_syslog("upgrade2::migrate_contracts_open sql=".$sql);
$resql = $db->query($sql); $resql = $db->query($sql);
if (! $resql) dol_print_error($db); if (! $resql) dol_print_error($db);
if ($db->affected_rows() > 0) { if ($db->affected_rows() > 0) {
@ -882,6 +891,8 @@ function migrate_paiementfourn_facturefourn($db,$langs,$conf)
$select_sql = 'SELECT rowid, fk_facture_fourn, amount '; $select_sql = 'SELECT rowid, fk_facture_fourn, amount ';
$select_sql .= ' FROM '.MAIN_DB_PREFIX.'paiementfourn '; $select_sql .= ' FROM '.MAIN_DB_PREFIX.'paiementfourn ';
$select_sql .= ' WHERE fk_facture_fourn IS NOT NULL'; $select_sql .= ' WHERE fk_facture_fourn IS NOT NULL';
dolibarr_install_syslog("upgrade2::migrate_paiementfourn_facturefourn sql=".$sql);
$select_resql = $db->query($select_sql); $select_resql = $db->query($select_sql);
if ($select_resql) if ($select_resql)
{ {
@ -962,8 +973,6 @@ function migrate_price_facture($db,$langs,$conf)
{ {
$db->begin(); $db->begin();
dolibarr_install_syslog("upgrade2: Upgrade data for invoice");
print '<tr><td colspan="4">'; print '<tr><td colspan="4">';
print '<br>'; print '<br>';
@ -976,6 +985,8 @@ function migrate_price_facture($db,$langs,$conf)
$sql.= " WHERE fd.fk_facture = f.rowid"; $sql.= " WHERE fd.fk_facture = f.rowid";
$sql.= " AND (((fd.total_ttc = 0 AND fd.remise_percent != 100) or fd.total_ttc IS NULL) or f.total_ttc IS NULL)"; $sql.= " AND (((fd.total_ttc = 0 AND fd.remise_percent != 100) or fd.total_ttc IS NULL) or f.total_ttc IS NULL)";
//print $sql; //print $sql;
dolibarr_install_syslog("upgrade2::migrate_price_facture sql=".$sql);
$resql=$db->query($sql); $resql=$db->query($sql);
if ($resql) if ($resql)
{ {
@ -1072,8 +1083,6 @@ function migrate_price_propal($db,$langs,$conf)
{ {
$db->begin(); $db->begin();
dolibarr_install_syslog("upgrade2: Upgrade data for propal");
print '<tr><td colspan="4">'; print '<tr><td colspan="4">';
print '<br>'; print '<br>';
@ -1085,6 +1094,8 @@ function migrate_price_propal($db,$langs,$conf)
$sql.= " FROM ".MAIN_DB_PREFIX."propaldet as pd, ".MAIN_DB_PREFIX."propal as p"; $sql.= " FROM ".MAIN_DB_PREFIX."propaldet as pd, ".MAIN_DB_PREFIX."propal as p";
$sql.= " WHERE pd.fk_propal = p.rowid"; $sql.= " WHERE pd.fk_propal = p.rowid";
$sql.= " AND ((pd.total_ttc = 0 AND pd.remise_percent != 100) or pd.total_ttc IS NULL)"; $sql.= " AND ((pd.total_ttc = 0 AND pd.remise_percent != 100) or pd.total_ttc IS NULL)";
dolibarr_install_syslog("upgrade2::migrate_price_propal sql=".$sql);
$resql=$db->query($sql); $resql=$db->query($sql);
if ($resql) if ($resql)
{ {
@ -1177,8 +1188,6 @@ function migrate_price_contrat($db,$langs,$conf)
{ {
$db->begin(); $db->begin();
dolibarr_install_syslog("upgrade2: Upgrade data for contracts");
print '<tr><td colspan="4">'; print '<tr><td colspan="4">';
print '<br>'; print '<br>';
@ -1190,6 +1199,8 @@ function migrate_price_contrat($db,$langs,$conf)
$sql.= " FROM ".MAIN_DB_PREFIX."contratdet as cd, ".MAIN_DB_PREFIX."contrat as c"; $sql.= " FROM ".MAIN_DB_PREFIX."contratdet as cd, ".MAIN_DB_PREFIX."contrat as c";
$sql.= " WHERE cd.fk_contrat = c.rowid"; $sql.= " WHERE cd.fk_contrat = c.rowid";
$sql.= " AND ((cd.total_ttc = 0 AND cd.remise_percent != 100 AND cd.subprice > 0) or cd.total_ttc IS NULL)"; $sql.= " AND ((cd.total_ttc = 0 AND cd.remise_percent != 100 AND cd.subprice > 0) or cd.total_ttc IS NULL)";
dolibarr_install_syslog("upgrade2::migrate_price_contrat sql=".$sql);
$resql=$db->query($sql); $resql=$db->query($sql);
if ($resql) if ($resql)
{ {
@ -1282,8 +1293,6 @@ function migrate_price_commande($db,$langs,$conf)
{ {
$db->begin(); $db->begin();
dolibarr_install_syslog("upgrade2: Upgrade data for order");
print '<tr><td colspan="4">'; print '<tr><td colspan="4">';
print '<br>'; print '<br>';
@ -1295,6 +1304,8 @@ function migrate_price_commande($db,$langs,$conf)
$sql.= " FROM ".MAIN_DB_PREFIX."commandedet as cd, ".MAIN_DB_PREFIX."commande as c"; $sql.= " FROM ".MAIN_DB_PREFIX."commandedet as cd, ".MAIN_DB_PREFIX."commande as c";
$sql.= " WHERE cd.fk_commande = c.rowid"; $sql.= " WHERE cd.fk_commande = c.rowid";
$sql.= " AND ((cd.total_ttc = 0 AND cd.remise_percent != 100) or cd.total_ttc IS NULL)"; $sql.= " AND ((cd.total_ttc = 0 AND cd.remise_percent != 100) or cd.total_ttc IS NULL)";
dolibarr_install_syslog("upgrade2::migrate_price_commande sql=".$sql);
$resql=$db->query($sql); $resql=$db->query($sql);
if ($resql) if ($resql)
{ {
@ -1393,8 +1404,6 @@ function migrate_price_commande_fournisseur($db,$langs,$conf)
{ {
$db->begin(); $db->begin();
dolibarr_install_syslog("upgrade2: Upgrade data for supplier order");
print '<tr><td colspan="4">'; print '<tr><td colspan="4">';
print '<br>'; print '<br>';
@ -1406,6 +1415,8 @@ function migrate_price_commande_fournisseur($db,$langs,$conf)
$sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as cd, ".MAIN_DB_PREFIX."commande_fournisseur as c"; $sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as cd, ".MAIN_DB_PREFIX."commande_fournisseur as c";
$sql.= " WHERE cd.fk_commande = c.rowid"; $sql.= " WHERE cd.fk_commande = c.rowid";
$sql.= " AND ((cd.total_ttc = 0 AND cd.remise_percent != 100) or cd.total_ttc IS NULL)"; $sql.= " AND ((cd.total_ttc = 0 AND cd.remise_percent != 100) or cd.total_ttc IS NULL)";
dolibarr_install_syslog("upgrade2::migrate_price_commande_fournisseur sql=".$sql);
$resql=$db->query($sql); $resql=$db->query($sql);
if ($resql) if ($resql)
{ {
@ -1505,6 +1516,8 @@ function migrate_modeles($db,$langs,$conf)
//print '<br>'; //print '<br>';
//print '<b>'.$langs->trans('UpdateModelsTable')."</b><br>\n"; //print '<b>'.$langs->trans('UpdateModelsTable')."</b><br>\n";
dolibarr_install_syslog("upgrade2::migrate_modeles");
if ($conf->facture->enabled) if ($conf->facture->enabled)
{ {
include_once(DOL_DOCUMENT_ROOT.'/includes/modules/facture/modules_facture.php'); include_once(DOL_DOCUMENT_ROOT.'/includes/modules/facture/modules_facture.php');
@ -1557,6 +1570,8 @@ function migrate_delete_old_files($db,$langs,$conf)
{ {
$result=true; $result=true;
dolibarr_install_syslog("upgrade2::migrate_delete_old_files");
// List of files to delete // List of files to delete
$filetodeletearray=array( $filetodeletearray=array(
DOL_DOCUMENT_ROOT.'/includes/triggers/interface_demo.class.php', DOL_DOCUMENT_ROOT.'/includes/triggers/interface_demo.class.php',
@ -1586,35 +1601,44 @@ function migrate_delete_old_files($db,$langs,$conf)
*/ */
function migrate_module_menus($db,$langs,$conf) function migrate_module_menus($db,$langs,$conf)
{ {
dolibarr_install_syslog("upgrade2::migrate_module_menus");
if (! empty($conf->global->MAIN_MODULE_AGENDA)) if (! empty($conf->global->MAIN_MODULE_AGENDA))
{ {
dolibarr_install_syslog("upgrade2::migrate_module_menus Reactivate module Agenda");
require_once(DOL_DOCUMENT_ROOT.'/includes/modules/modAgenda.class.php'); require_once(DOL_DOCUMENT_ROOT.'/includes/modules/modAgenda.class.php');
$mod=new modAgenda($db); $mod=new modAgenda($db);
$mod->init(); $mod->remove('noboxes');
$mod->init('noboxes');
} }
if (! empty($conf->global->MAIN_MODULE_PHENIX)) if (! empty($conf->global->MAIN_MODULE_PHENIX))
{ {
dolibarr_install_syslog("upgrade2::migrate_module_menus Reactivate module Phenix");
require_once(DOL_DOCUMENT_ROOT.'/includes/modules/modPhenix.class.php'); require_once(DOL_DOCUMENT_ROOT.'/includes/modules/modPhenix.class.php');
$mod=new modPhenix($db); $mod=new modPhenix($db);
$mod->init(); $mod->init();
} }
if (! empty($conf->global->MAIN_MODULE_WEBCALENDAR)) if (! empty($conf->global->MAIN_MODULE_WEBCALENDAR))
{ {
dolibarr_install_syslog("upgrade2::migrate_module_menus Reactivate module Webcalendar");
require_once(DOL_DOCUMENT_ROOT.'/includes/modules/modWebcalendar.class.php'); require_once(DOL_DOCUMENT_ROOT.'/includes/modules/modWebcalendar.class.php');
$mod=new modWebcalendar($db); $mod=new modWebcalendar($db);
$mod->init(); $mod->init();
} }
if (! empty($conf->global->MAIN_MODULE_MANTIS)) if (! empty($conf->global->MAIN_MODULE_MANTIS))
{ {
dolibarr_install_syslog("upgrade2::migrate_module_menus Reactivate module Mantis");
require_once(DOL_DOCUMENT_ROOT.'/includes/modules/modMantis.class.php'); require_once(DOL_DOCUMENT_ROOT.'/includes/modules/modMantis.class.php');
$mod=new modMantis($db); $mod=new modMantis($db);
$mod->init(); $mod->init();
} }
if (! empty($conf->global->MAIN_MODULE_SOCIETE)) if (! empty($conf->global->MAIN_MODULE_SOCIETE))
{ {
dolibarr_install_syslog("upgrade2::migrate_module_menus Reactivate module Societe");
require_once(DOL_DOCUMENT_ROOT.'/includes/modules/modSociete.class.php'); require_once(DOL_DOCUMENT_ROOT.'/includes/modules/modSociete.class.php');
$mod=new modSociete($db); $mod=new modSociete($db);
$mod->init(); $mod->remove('noboxes');
$mod->init('noboxes');
} }
} }
@ -1623,6 +1647,8 @@ function migrate_module_menus($db,$langs,$conf)
*/ */
function migrate_commande_expedition($db,$langs,$conf) function migrate_commande_expedition($db,$langs,$conf)
{ {
dolibarr_install_syslog("upgrade2::migrate_commande_expedition");
print '<tr><td colspan="4">'; print '<tr><td colspan="4">';
print '<br>'; print '<br>';
@ -1695,6 +1721,8 @@ function migrate_commande_expedition($db,$langs,$conf)
*/ */
function migrate_commande_livraison($db,$langs,$conf) function migrate_commande_livraison($db,$langs,$conf)
{ {
dolibarr_install_syslog("upgrade2::migrate_commande_livraison");
print '<tr><td colspan="4">'; print '<tr><td colspan="4">';
print '<br>'; print '<br>';
@ -1781,6 +1809,8 @@ function migrate_commande_livraison($db,$langs,$conf)
*/ */
function migrate_detail_livraison($db,$langs,$conf) function migrate_detail_livraison($db,$langs,$conf)
{ {
dolibarr_install_syslog("upgrade2::migrate_detail_livraison");
print '<tr><td colspan="4">'; print '<tr><td colspan="4">';
print '<br>'; print '<br>';
@ -1898,6 +1928,8 @@ function migrate_detail_livraison($db,$langs,$conf)
*/ */
function migrate_stocks($db,$langs,$conf) function migrate_stocks($db,$langs,$conf)
{ {
dolibarr_install_syslog("upgrade2::migrate_stocks");
print '<tr><td colspan="4">'; print '<tr><td colspan="4">';
print '<br>'; print '<br>';