diff --git a/ChangeLog b/ChangeLog
index 7637e59294c8ee91a5d54ba220b25b55af6b5265..3b4b0ac87dac4652515763f0f36eb7d303b34f2d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,7 @@ English Dolibarr ChangeLog
- Fix: [ bug #1804 ] SQL error when sending email without addresee
- Fix: [ bug #1803 ] AJAX company contact input is not aligned
- Fix: [ bug #1787 ] Incorrect behaviour of doActions hook
+- Fix: [ bug #1796 ] Unable to use numeration modules from an external module
***** ChangeLog for 3.6.2 compared to 3.6.1 *****
- Fix: fix ErrorBadValueForParamNotAString error message in price customer multiprice.
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 846bb5acb10e86afa2c62e7b04b19460725f9ae2..84b0f65d67946cafc4a0a3a22302c8dcbe5723aa 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -2564,11 +2564,14 @@ class Propal extends CommonObject
$classname = $conf->global->PROPALE_ADDON;
// Include file with class
- foreach ($conf->file->dol_document_root as $dirroot)
- {
- $dir = $dirroot."/core/modules/propale/";
- // Load file with numbering class (if found)
- $mybool|=@include_once $dir.$file;
+ $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+
+ foreach ($dirmodels as $reldir) {
+
+ $dir = dol_buildpath($reldir."core/modules/propale/");
+
+ // Load file with numbering class (if found)
+ $mybool|=@include_once $dir.$file;
}
if (! $mybool)
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 52e454bf14e697624dc90d21c2ae6bbfa7da7bf4..573778e808cc46218d204c07f53cb05e4a56458f 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -137,17 +137,20 @@ class Commande extends CommonOrder
$classname = $conf->global->COMMANDE_ADDON;
// Include file with class
- foreach ($conf->file->dol_document_root as $dirroot)
- {
- $dir = $dirroot."/core/modules/commande/";
- // Load file with numbering class (if found)
- $mybool|=@include_once $dir.$file;
+ $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+
+ foreach ($dirmodels as $reldir) {
+
+ $dir = dol_buildpath($reldir."core/modules/commande/");
+
+ // Load file with numbering class (if found)
+ $mybool|=@include_once $dir.$file;
}
if (! $mybool)
{
- dol_print_error('',"Failed to include file ".$file);
- return '';
+ dol_print_error('',"Failed to include file ".$file);
+ return '';
}
$obj = new $classname();
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 1df0696486c1ae48f1d20da6055ef983c56967c0..63cdcaeb86501b86912a6d7624fd2afdc276d536 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -2504,52 +2504,64 @@ class Facture extends CommonInvoice
else if ($conf->global->FACTURE_ADDON=='terre') $conf->global->FACTURE_ADDON='mod_facture_terre';
else if ($conf->global->FACTURE_ADDON=='mercure') $conf->global->FACTURE_ADDON='mod_facture_mercure';
- $mybool=false;
-
- $file = $conf->global->FACTURE_ADDON.".php";
- $classname = $conf->global->FACTURE_ADDON;
- // Include file with class
- foreach ($conf->file->dol_document_root as $dirroot)
+ if (! empty($conf->global->FACTURE_ADDON))
{
- $dir = $dirroot."/core/modules/facture/";
- // Load file with numbering class (if found)
- $mybool|=@include_once $dir.$file;
- }
+ $mybool=false;
+
+ $file = $conf->global->FACTURE_ADDON.".php";
+ $classname = $conf->global->FACTURE_ADDON;
- // For compatibility
- if (! $mybool)
- {
- $file = $conf->global->FACTURE_ADDON."/".$conf->global->FACTURE_ADDON.".modules.php";
- $classname = "mod_facture_".$conf->global->FACTURE_ADDON;
- $classname = preg_replace('/\-.*$/','',$classname);
// Include file with class
- foreach ($conf->file->dol_document_root as $dirroot)
- {
- $dir = $dirroot."/core/modules/facture/";
+ $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+
+ foreach ($dirmodels as $reldir) {
+
+ $dir = dol_buildpath($reldir."core/modules/facture/");
+
// Load file with numbering class (if found)
$mybool|=@include_once $dir.$file;
}
- }
- //print "xx".$mybool.$dir.$file."-".$classname;
- if (! $mybool)
- {
- dol_print_error('',"Failed to include file ".$file);
- return '';
- }
+ // For compatibility
+ if (! $mybool)
+ {
+ $file = $conf->global->FACTURE_ADDON."/".$conf->global->FACTURE_ADDON.".modules.php";
+ $classname = "mod_facture_".$conf->global->FACTURE_ADDON;
+ $classname = preg_replace('/\-.*$/','',$classname);
+ // Include file with class
+ foreach ($conf->file->dol_document_root as $dirroot)
+ {
+ $dir = $dirroot."/core/modules/facture/";
+ // Load file with numbering class (if found)
+ $mybool|=@include_once $dir.$file;
+ }
+ }
- $obj = new $classname();
- $numref = "";
- $numref = $obj->getNumRef($soc,$this,$mode);
+ if (! $mybool)
+ {
+ dol_print_error('',"Failed to include file ".$file);
+ return '';
+ }
- if ($numref != "")
- {
- return $numref;
+ $obj = new $classname();
+ $numref = "";
+ $numref = $obj->getNextValue($soc,$this,$mode);
+
+ if ($numref != "")
+ {
+ return $numref;
+ }
+ else
+ {
+ dol_print_error($db,"Facture::getNextNumRef ".$obj->error);
+ return "";
+ }
}
else
{
- //dol_print_error($db,get_class($this)."::getNextNumRef ".$obj->error);
- return false;
+ $langs->load("errors");
+ print $langs->trans("Error")." ".$langs->trans("ErrorModuleSetupNotComplete");
+ return "";
}
}
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 6cf04c10522e36fce246faceb8e89ffa704ef5b8..3e4605a8f2c91435180316d322a919d11af156d4 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -92,23 +92,31 @@ class Contrat extends CommonObject
global $db, $langs, $conf;
$langs->load("contracts");
- $dir = DOL_DOCUMENT_ROOT . "/core/modules/contract";
-
- if (empty($conf->global->CONTRACT_ADDON))
+ if (!empty($conf->global->CONTRACT_ADDON))
{
- $conf->global->CONTRACT_ADDON='mod_contract_serpis';
- }
+ $mybool = false;
- $file = $conf->global->CONTRACT_ADDON.".php";
+ $file = $conf->global->CONTRACT_ADDON.".php";
+ $classname = $conf->global->CONTRACT_ADDON;
- // Chargement de la classe de numerotation
- $classname = $conf->global->CONTRACT_ADDON;
+ // Include file with class
+ $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
- $result=include_once $dir.'/'.$file;
- if ($result)
- {
- $obj = new $classname();
+ foreach ($dirmodels as $reldir) {
+
+ $dir = dol_buildpath($reldir."core/modules/contract/");
+
+ // Load file with numbering class (if found)
+ $mybool|=@include_once $dir.$file;
+ }
+
+ if (! $mybool)
+ {
+ dol_print_error('',"Failed to include file ".$file);
+ return '';
+ }
+ $obj = new $classname();
$numref = "";
$numref = $obj->getNextValue($soc,$this);
@@ -118,15 +126,17 @@ class Contrat extends CommonObject
}
else
{
+ $this->error = $obj->error;
dol_print_error($db,get_class($this)."::getNextValue ".$obj->error);
return "";
}
}
else
{
- print $langs->trans("Error")." ".$langs->trans("Error_CONTRACT_ADDON_NotDefined");
+ $langs->load("errors");
+ print $langs->trans("Error")." ".$langs->trans("ErrorModuleSetupNotComplete");
return "";
- }
+ }
}
/**
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index b6cdf5457d3d492860578d5dc6e678422c5769a5..1045bed42be1ec2b67fc477510b708780833b782 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -119,21 +119,30 @@ class Expedition extends CommonObject
global $db, $langs, $conf;
$langs->load("sendings");
- $dir = DOL_DOCUMENT_ROOT . "/core/modules/expedition";
-
- if (empty($conf->global->EXPEDITION_ADDON_NUMBER))
+ if (!empty($conf->global->EXPEDITION_ADDON_NUMBER))
{
- $conf->global->EXPEDITION_ADDON_NUMBER='mod_expedition_safor';
- }
+ $mybool = false;
- $file = $conf->global->EXPEDITION_ADDON_NUMBER.".php";
+ $file = $conf->global->EXPEDITION_ADDON_NUMBER.".php";
+ $classname = $conf->global->EXPEDITION_ADDON_NUMBER;
- // Chargement de la classe de numerotation
- $classname = $conf->global->EXPEDITION_ADDON_NUMBER;
+ // Include file with class
+ $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+
+ foreach ($dirmodels as $reldir) {
+
+ $dir = dol_buildpath($reldir."core/modules/expedition/");
+
+ // Load file with numbering class (if found)
+ $mybool|=@include_once $dir.$file;
+ }
+
+ if (! $mybool)
+ {
+ dol_print_error('',"Failed to include file ".$file);
+ return '';
+ }
- $result=include_once $dir.'/'.$file;
- if ($result)
- {
$obj = new $classname();
$numref = "";
$numref = $obj->getNextValue($soc,$this);
@@ -147,12 +156,12 @@ class Expedition extends CommonObject
dol_print_error($db,get_class($this)."::getNextNumRef ".$obj->error);
return "";
}
- }
- else
- {
- print $langs->trans("Error")." ".$langs->trans("Error_EXPEDITION_ADDON_NUMBER_NotDefined");
- return "";
- }
+ }
+ else
+ {
+ print $langs->trans("Error")." ".$langs->trans("Error_EXPEDITION_ADDON_NUMBER_NotDefined");
+ return "";
+ }
}
/**
diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index 5c556ff23564b24fbafeb7e0e64467ba7f1e6767..c1ec1bef0fcfef12e6c45776225e30677fae1daf 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -599,25 +599,33 @@ class Fichinter extends CommonObject
global $conf, $db, $langs;
$langs->load("interventions");
- $dir = DOL_DOCUMENT_ROOT . "/core/modules/fichinter/";
-
if (! empty($conf->global->FICHEINTER_ADDON))
{
- $file = $conf->global->FICHEINTER_ADDON.".php";
- $classname = $conf->global->FICHEINTER_ADDON;
- if (! file_exists($dir.$file))
- {
- $file='mod_'.$file;
- $classname='mod_'.$classname;
+ $mybool = false;
+
+ $file = "mod_".$conf->global->FICHEINTER_ADDON.".php";
+ $classname = "mod_".$conf->global->FICHEINTER_ADDON;
+
+ // Include file with class
+ $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+
+ foreach ($dirmodels as $reldir) {
+
+ $dir = dol_buildpath($reldir."core/modules/fichinter/");
+
+ // Load file with numbering class (if found)
+ $mybool|=@include_once $dir.$file;
}
- // Chargement de la classe de numerotation
- require_once $dir.$file;
+ if (! $mybool)
+ {
+ dol_print_error('',"Failed to include file ".$file);
+ return '';
+ }
$obj = new $classname();
-
$numref = "";
- $numref = $obj->getNumRef($soc,$this);
+ $numref = $obj->getNextValue($soc,$this);
if ( $numref != "")
{
@@ -631,6 +639,7 @@ class Fichinter extends CommonObject
}
else
{
+ $langs->load("errors");
print $langs->trans("Error")." ".$langs->trans("Error_FICHEINTER_ADDON_NotDefined");
return "";
}
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 3aa9d77f5dea7470cb60c544a1df40513d109afb..8e618ba0eee1f466c01a0e6b99776649fdd248ab 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -551,44 +551,50 @@ class CommandeFournisseur extends CommonOrder
global $db, $langs, $conf;
$langs->load("orders");
- $dir = DOL_DOCUMENT_ROOT .'/core/modules/supplier_order/';
-
if (! empty($conf->global->COMMANDE_SUPPLIER_ADDON_NUMBER))
{
+ $mybool = false;
+
$file = $conf->global->COMMANDE_SUPPLIER_ADDON_NUMBER.'.php';
+ $classname=$conf->global->COMMANDE_SUPPLIER_ADDON_NUMBER;
- if (is_readable($dir.'/'.$file))
- {
- // Definition du nom de modele de numerotation de commande fournisseur
- $modName=$conf->global->COMMANDE_SUPPLIER_ADDON_NUMBER;
- require_once $dir.'/'.$file;
+ // Include file with class
+ $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
- // Recuperation de la nouvelle reference
- $objMod = new $modName($this->db);
+ foreach ($dirmodels as $reldir) {
- $numref = "";
- $numref = $objMod->commande_get_num($soc,$this);
+ $dir = dol_buildpath($reldir."core/modules/supplier_order/");
- if ( $numref != "")
- {
- return $numref;
- }
- else
- {
- dol_print_error($db, get_class($this)."::getNextNumRef ".$obj->error);
- return -1;
- }
+ // Load file with numbering class (if found)
+ $mybool|=@include_once $dir.$file;
+ }
+
+ if (! $mybool)
+ {
+ dol_print_error('',"Failed to include file ".$file);
+ return '';
+ }
+
+ $obj = new $classname();
+ $numref = "";
+ $numref = $obj->getNextValue($soc,$this);
+
+ if ( $numref != "")
+ {
+ return $numref;
}
else
{
- print $langs->trans("Error")." ".$langs->trans("Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File",$conf->global->COMMANDE_SUPPLIER_ADDON_NUMBER);
- return -2;
+ $this->error = $obj->error;
+ dol_print_error($db, get_class($this)."::getNextNumRef ".$obj->error);
+ return "";
}
}
else
{
- print $langs->trans("Error")." ".$langs->trans("Error_COMMANDE_SUPPLIER_ADDON_NotDefined");
- return -3;
+ $langs->load("errors");
+ print $langs->trans("Error")." ".$langs->trans("ErrorModuleSetupNotComplete");
+ return "";
}
}
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 786d619665ee14483c2544a850654ab8077aa719..918baea1425fd4eee22a40e651bbc1be88ccb223 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -1497,10 +1497,14 @@ class FactureFournisseur extends CommonInvoice
$file = $conf->global->INVOICE_SUPPLIER_ADDON_NUMBER.".php";
$classname = $conf->global->INVOICE_SUPPLIER_ADDON_NUMBER;
+
// Include file with class
- foreach ($conf->file->dol_document_root as $dirroot)
- {
- $dir = $dirroot."/core/modules/supplier_invoice/";
+ $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+
+ foreach ($dirmodels as $reldir) {
+
+ $dir = dol_buildpath($reldir."core/modules/supplier_invoice/");
+
// Load file with numbering class (if found)
$mybool|=@include_once $dir.$file;
}