From 41e01a22a3dfb5aa762ec212d3199f04a21f51b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
<marcosgdf@gmail.com>
Date: Sat, 17 Jan 2015 18:58:05 +0100
Subject: [PATCH] Fixed loading of external numeration modules in Contrat,
Commande, Facture, Contrat, Expedition, Fichinter, CommandeFournisseur and
uniformized code
---
htdocs/commande/class/commande.class.php | 17 ++--
htdocs/compta/facture/class/facture.class.php | 80 +++++++++++--------
htdocs/contrat/class/contrat.class.php | 38 +++++----
htdocs/expedition/class/expedition.class.php | 43 ++++++----
htdocs/fichinter/class/fichinter.class.php | 29 ++++---
.../class/fournisseur.commande.class.php | 54 +++++++------
6 files changed, 155 insertions(+), 106 deletions(-)
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 52e454bf14e..573778e808c 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 1df0696486c..63cdcaeb865 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 6cf04c10522..3e4605a8f2c 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 b6cdf5457d3..1045bed42be 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 5c556ff2356..42c9208ff08 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))
{
+ $mybool = false;
+
$file = $conf->global->FICHEINTER_ADDON.".php";
$classname = $conf->global->FICHEINTER_ADDON;
- if (! file_exists($dir.$file))
- {
- $file='mod_'.$file;
- $classname='mod_'.$classname;
+
+ // 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 3aa9d77f5de..8e618ba0eee 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 "";
}
}
--
GitLab