From cdf2e4408c10a7482f63c213f37d97de3f7f5a5f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 9 Jan 2024 16:56:32 +0100 Subject: [PATCH] Debug v19 --- htdocs/core/class/commonobject.class.php | 1 - htdocs/core/lib/functions.lib.php | 11 ++++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index f860242ff8c..92970904f50 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -7713,7 +7713,6 @@ abstract class CommonObject } } } - $objectfield = $this->element.($this->module ? '@'.$this->module : '').':'.$key.$keysuffix; $out = $form->selectForForms($param_list_array[0], $keyprefix.$key.$keysuffix, $value, $showempty, '', '', $morecss, $moreparam, 0, (empty($val['disabled']) ? 0 : 1), '', $objectfield); diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index b706c895368..c1358d95be7 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -11880,6 +11880,8 @@ function getElementProperties($element_type) $regs = array(); + //$element_type='facture'; + $classfile = $classname = $classpath = $subdir = $dir_output = ''; // Parse element/subelement @@ -12086,6 +12088,13 @@ function getElementProperties($element_type) $module = 'tax'; $subdir = '/vat'; $table_element = 'tva'; + } elseif ($element_type == 'emailsenderprofile') { + $module = ''; + $classpath = 'core/class'; + $classfile = 'emailsenderprofile'; + $classname = 'EmailSenderProfile'; + $table_element = 'c_email_senderprofile'; + $subelement = ''; } if (empty($classfile)) { @@ -12162,7 +12171,7 @@ function fetchObjectByElement($element_id, $element_type, $element_ref = '') $ismodenabled = isModEnabled($element_prop['module']); } - if (is_array($element_prop) && $ismodenabled) { + if (is_array($element_prop) && (empty($element_prop['module']) || $ismodenabled)) { dol_include_once('/'.$element_prop['classpath'].'/'.$element_prop['classfile'].'.class.php'); if (class_exists($element_prop['classname'])) {