From ed839114ab3b4fcc7f27f8a31f6c04c948af22b7 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:42:19 +0100
Subject: [PATCH] Fixed loading of external numeration modules in
FactureFournisseur and Propal
---
htdocs/comm/propal/class/propal.class.php | 13 ++++++++-----
htdocs/fourn/class/fournisseur.facture.class.php | 10 +++++++---
2 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 846bb5acb10..84b0f65d679 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/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 786d619665e..918baea1425 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;
}
--
GitLab