\n | ".$modCodeTiers->nom." | \n ";
+ print $modCodeTiers->info($langs);
+ print " | \n";
+ print ''.$modCodeTiers->getExample($langs)." | \n";
- if ($conf->global->SOCIETE_CODECLIENT_ADDON == "$file")
- {
- print "\n";
- print img_tick();
- print " | \n";
- }
- else
- {
- print ''.$langs->trans("Activate").' | ';
- }
+ if ($conf->global->SOCIETE_CODECLIENT_ADDON == "$file")
+ {
+ print "\n";
+ print img_tick();
+ print " | \n";
+ }
+ else
+ {
+ print ''.$langs->trans("Activate").' | ';
+ }
- print '';
- $s=$modCodeTiers->getToolTip($langs,$soc,-1);
- print $form->textwithpicto('',$s,1);
- print ' | ';
+ print '';
+ $s=$modCodeTiers->getToolTip($langs,$soc,-1);
+ print $form->textwithpicto('',$s,1);
+ print ' | ';
- print '
';
+ print '';
}
}
closedir($handle);
diff --git a/htdocs/includes/modules/DolibarrModules.class.php b/htdocs/includes/modules/DolibarrModules.class.php
index dce5cc0c8d9..721805db99d 100644
--- a/htdocs/includes/modules/DolibarrModules.class.php
+++ b/htdocs/includes/modules/DolibarrModules.class.php
@@ -178,8 +178,12 @@ class DolibarrModules
{
if (! $err)
{
- if (!$this->db->query($array_sql[$i]))
+ dol_syslog("DolibarrModules::_remove sql=".$array_sql[$i], LOG_DEBUG);
+ $result=$this->db->query($array_sql[$i]);
+ if (! $result)
{
+ $this->error=$this->db->error();
+ dol_syslog("DolibarrModules::_remove Error ".$this->error, LOG_ERR);
$err++;
}
}
diff --git a/htdocs/includes/modules/modAccounting.class.php b/htdocs/includes/modules/modAccounting.class.php
index 0b18ad6e4a7..a8e2f84030f 100644
--- a/htdocs/includes/modules/modAccounting.class.php
+++ b/htdocs/includes/modules/modAccounting.class.php
@@ -54,7 +54,7 @@ class modAccounting extends DolibarrModules
$this->family = "financial";
// 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 complète de comptabilite (doubles parties)";
+ $this->description = "Gestion complete de comptabilite (doubles parties)";
// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
//$this->version = 'dolibarr';
@@ -66,14 +66,14 @@ class modAccounting extends DolibarrModules
// Config pages
$this->config_page_url = array("accounting.php");
- // Dependances
+ // Dependancies
$this->depends = array("modFacture","modBanque");
$this->requiredby = array();
$this->conflictwith = array("modComptabilite");
$this->langfiles = array("compta");
- // Constantes
- $this->const = array();
+ // Constants
+ $this->const = array(0=>array('MAIN_COMPANY_CODE_ALWAYS_REQUIRED','chaine','1','With this constants on, third party codes are always required whatever is numbering module behaviour',0)); // List of particular constants to add when module is enabled
// Data directories to create when module is enabled
$this->dirs = array("/accounting/temp");
@@ -134,25 +134,27 @@ class modAccounting 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 e creer pour ce module.
*/
- function init()
+ function init($options='')
{
- global $conf;
+ // Prevent pb of modules not correctly disabled
+ //$this->remove($options);
- // Nettoyage avant activation
- $this->remove();
+ $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 remove($options='')
{
- $sql = array();
+ global $conf;
- return $this->_remove($sql);
+ $sql = array("DELETE FROM ".MAIN_DB_PREFIX."const where name='MAIN_COMPANY_CODE_ALWAYS_REQUIRED' and entity IN ('0','".$conf->entity."')");
+
+ return $this->_remove($sql,$options);
}
}
?>
diff --git a/htdocs/includes/modules/societe/mod_codeclient_elephant.php b/htdocs/includes/modules/societe/mod_codeclient_elephant.php
index cd24c654df4..618eb067f0e 100644
--- a/htdocs/includes/modules/societe/mod_codeclient_elephant.php
+++ b/htdocs/includes/modules/societe/mod_codeclient_elephant.php
@@ -55,7 +55,7 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode
$this->nom = "Elephant";
$this->version = "dolibarr";
$this->code_null = 0;
- $this->code_modifiable = 0;
+ $this->code_modifiable = 1;
$this->code_modifiable_invalide = 1;
$this->code_modifiable_null = 1;
$this->code_auto = 1;
diff --git a/htdocs/includes/modules/societe/mod_codeclient_monkey.php b/htdocs/includes/modules/societe/mod_codeclient_monkey.php
index 7d8ce030aba..0b7b8cd47f2 100644
--- a/htdocs/includes/modules/societe/mod_codeclient_monkey.php
+++ b/htdocs/includes/modules/societe/mod_codeclient_monkey.php
@@ -19,7 +19,7 @@
*/
/**
- * \file htdocs/includes/modules/societe/mod_codeclient_lion.class.php
+ * \file htdocs/includes/modules/societe/mod_codeclient_monkey.class.php
* \ingroup societe
* \brief Fichier de la classe des gestion lion des codes clients
* \version $Id$
@@ -105,7 +105,7 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
if ($type == 0) $prefix=$this->prefixcustomer;
if ($type == 1) $prefix=$this->prefixsupplier;
- // D'abord on récupère la valeur max (réponse immédiate car champ indéxé)
+ // D'abord on r�cup�re la valeur max (r�ponse imm�diate car champ ind�x�)
$posindice=8;
$sql = "SELECT MAX(0+SUBSTRING(".$field.",".$posindice.")) as max";
$sql.= " FROM ".MAIN_DB_PREFIX."societe";
diff --git a/htdocs/includes/modules/societe/modules_societe.class.php b/htdocs/includes/modules/societe/modules_societe.class.php
index 928a03c0215..32b88f19a39 100644
--- a/htdocs/includes/modules/societe/modules_societe.class.php
+++ b/htdocs/includes/modules/societe/modules_societe.class.php
@@ -134,6 +134,8 @@ class ModeleThirdPartyCode
*/
function getToolTip($langs,$soc,$type)
{
+ global $conf;
+
$langs->load("admin");
$s='';
@@ -144,10 +146,33 @@ class ModeleThirdPartyCode
if ($type != -1) $s.=$langs->trans("ValidityControledByModule").':