From b03c12c12947ad832dfe2b610e70d4df1bf2f3d5 Mon Sep 17 00:00:00 2001 From: Alexandre SPANGARO Date: Tue, 9 Sep 2025 19:25:09 +0200 Subject: [PATCH 1/7] FIX Societe - Problem of date on outstanding opened late (#35266) --- htdocs/societe/class/societe.class.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index 14ddcd19613..f2c9efdc3b3 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -4875,10 +4875,12 @@ class Societe extends CommonObject $alreadypayed=price2num($paiement + $creditnotes + $deposits,'MT'); $remaintopay=price2num($invoice->total_ttc - $paiement - $creditnotes - $deposits,'MT'); */ + $today = dol_get_first_hour(dol_now('tzuser')); // Returns today at 00:00 in the user's time zone + $sql = "SELECT rowid, ref, total_ht, total_ttc, paye, type, fk_statut as status, close_code FROM ".MAIN_DB_PREFIX.$table." as f"; $sql .= " WHERE fk_soc = ".((int) $this->id); if (!empty($late)) { - $sql .= " AND date_lim_reglement < '".$this->db->idate(dol_now())."'"; + $sql .= " AND date_lim_reglement < '".$this->db->idate($today)."'"; } if ($mode == 'supplier') { $sql .= " AND entity IN (".getEntity('facture_fourn').")"; From 601d1b986e4446d485ece629762d087bc265103c Mon Sep 17 00:00:00 2001 From: John BOTELLA <68917336+thersane-john@users.noreply.github.com> Date: Wed, 10 Sep 2025 10:51:31 +0200 Subject: [PATCH 2/7] Fix : sql filter for batch stats (#35272) * Fix : sql filter for batch stats * Fix : sql filter for batch stats --------- Co-authored-by: Laurent Destailleur --- htdocs/product/stock/class/productlot.class.php | 1 + htdocs/product/stock/stats/commande_fournisseur.php | 1 + 2 files changed, 2 insertions(+) diff --git a/htdocs/product/stock/class/productlot.class.php b/htdocs/product/stock/class/productlot.class.php index 753810de53f..cc22d5e2431 100644 --- a/htdocs/product/stock/class/productlot.class.php +++ b/htdocs/product/stock/class/productlot.class.php @@ -891,6 +891,7 @@ class Productlot extends CommonObject } $sql .= " WHERE cf.entity IN (".getEntity('expedition').")"; $sql .= " AND cfdi.batch = '".($this->db->escape($this->batch))."'"; + $sql .= " AND cfdi.fk_product = " . (int) $this->fk_product; if (!$user->hasRight('societe', 'client', 'voir')) { $sql .= " AND cf.fk_soc = sc.fk_soc AND sc.fk_user = ".((int) $user->id); } diff --git a/htdocs/product/stock/stats/commande_fournisseur.php b/htdocs/product/stock/stats/commande_fournisseur.php index f09dfa47de6..593e404d5ae 100644 --- a/htdocs/product/stock/stats/commande_fournisseur.php +++ b/htdocs/product/stock/stats/commande_fournisseur.php @@ -230,6 +230,7 @@ if ($id > 0 || !empty($ref)) { } $sql .= " WHERE cf.entity IN (".getEntity('product').")"; $sql .= " AND cfdi.batch = '".($db->escape($object->batch))."'"; + $sql .= " AND cfdi.fk_product = " . (int) $object->fk_product; if (!empty($search_month)) { $sql .= ' AND MONTH(cf.date_commande) IN ('.$db->sanitize($search_month).')'; } From eb3d752047a925681eda5cb7a468fed62a466c92 Mon Sep 17 00:00:00 2001 From: VIAL-GOUTEYRON Quentin Date: Wed, 10 Sep 2025 10:59:09 +0200 Subject: [PATCH 3/7] Fix (ecm): support for custom entity in file operations (#35283) * fix(ecm): add support for custom entity in file operations This commit addresses missing support for specifying custom `entity` values during file operations, ensuring proper handling of multi-entity configurations. Changes include: - Adding an `entity` parameter to the `fetch` method of `EcmFiles` and ensuring proper filtering based on the provided entity. - Modifying `dol_move`, `deleteFilesIntoDatabaseIndex`, and other file-related functions to support the `entity` parameter. - Ensuring entity propagation in operations like file indexing, renaming, and deletion. This resolves issues where operations were limited to the default entity value (`$conf->entity`), improving flexibility and correctness in multi-entity setups. * fix(ecm): improve code formatting for entity checks Ensure consistent coding style for entity-related conditions across file operations by adding spacing around `empty()` calls. This improves code readability and maintains uniformity in the handling of multi-entity configurations within the `EcmFiles` class and related modules. * fix(ecm): cast entity to int in SQL queries Ensure `entity` values are explicitly cast to integers in SQL conditions, improving type safety and preventing potential SQL injection vulnerabilities. This change applies consistent casting in multiple entity-related checks within the `EcmFiles` class to enhance code security and reliability. --- htdocs/core/actions_linkedfiles.inc.php | 2 +- htdocs/core/lib/files.lib.php | 28 ++++++++++++++++++------- htdocs/ecm/class/ecmfiles.class.php | 28 +++++++++++++++++++------ htdocs/societe/card.php | 2 +- 4 files changed, 44 insertions(+), 16 deletions(-) diff --git a/htdocs/core/actions_linkedfiles.inc.php b/htdocs/core/actions_linkedfiles.inc.php index 5c5fb2bfbbe..39561ca9d10 100644 --- a/htdocs/core/actions_linkedfiles.inc.php +++ b/htdocs/core/actions_linkedfiles.inc.php @@ -290,7 +290,7 @@ if ($action == 'confirm_deletefile' && $confirm == 'yes' && !empty($permissionto $langs->load("errors"); // lang must be loaded because we can't rely on loading during output, we need var substitution to be done now. setEventMessages($langs->trans("ErrorFilenameCantStartWithDot", $filenameto), null, 'errors'); } elseif (!file_exists($destpath)) { - $result = dol_move($srcpath, $destpath); + $result = dol_move($srcpath, $destpath, '0', 1, 0, 1, [], $object->entity ?? 0); if ($result) { // Define if we have to generate thumbs or not $generatethumbs = 1; diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php index 1c2e3c1c742..8d82ea46f9f 100644 --- a/htdocs/core/lib/files.lib.php +++ b/htdocs/core/lib/files.lib.php @@ -1028,11 +1028,12 @@ function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists, $arrayrep * @param int<0,1> $overwriteifexists Overwrite file if exists (1 by default) * @param int<0,1> $testvirus Do an antivirus test. Move is canceled if a virus is found. * @param int<0,1> $indexdatabase Index new file into database. - * @param array $moreinfo Array with more information to set in index table + * @param array $moreinfo Array with more information to set in index table + * @param int $entity Entity * @return boolean True if OK, false if KO * @see dol_move_uploaded_file() */ -function dol_move($srcfile, $destfile, $newmask = '0', $overwriteifexists = 1, $testvirus = 0, $indexdatabase = 1, $moreinfo = array()) +function dol_move($srcfile, $destfile, $newmask = '0', $overwriteifexists = 1, $testvirus = 0, $indexdatabase = 1, $moreinfo = array(), $entity = 0) { global $user, $db; $result = false; @@ -1106,13 +1107,13 @@ function dol_move($srcfile, $destfile, $newmask = '0', $overwriteifexists = 1, $ include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php'; $ecmfiletarget = new EcmFiles($db); - $resultecmtarget = $ecmfiletarget->fetch(0, '', $rel_filetorenameafter); + $resultecmtarget = $ecmfiletarget->fetch(0, '', $rel_filetorenameafter, '', '', '', 0, $entity); if ($resultecmtarget > 0) { // An entry for target name already exists for target, we delete it, a new one will be created. $ecmfiletarget->delete($user); } $ecmfile = new EcmFiles($db); - $resultecm = $ecmfile->fetch(0, '', $rel_filetorenamebefore); + $resultecm = $ecmfile->fetch(0, '', $rel_filetorenamebefore, '', '', '', 0, $entity); if ($resultecm > 0) { // If an entry was found for src file, we use it to move entry $filename = basename($rel_filetorenameafter); $rel_dir = dirname($rel_filetorenameafter); @@ -1166,6 +1167,9 @@ function dol_move($srcfile, $destfile, $newmask = '0', $overwriteifexists = 1, $ if (!empty($moreinfo) && !empty($moreinfo['cover'])) { $ecmfile->cover = $moreinfo['cover']; } + if (! empty($entity)) { + $ecmfile->entity = $entity; + } $resultecm = $ecmfile->create($user); if ($resultecm < 0) { @@ -1585,7 +1589,7 @@ function dol_delete_file($file, $disableglob = 0, $nophperrors = 0, $nohook = 0, dol_syslog("Try to remove also entries in database for full relative path = ".$rel_filetodelete, LOG_DEBUG); include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php'; $ecmfile = new EcmFiles($db); - $result = $ecmfile->fetch(0, '', $rel_filetodelete); + $result = $ecmfile->fetch(0, '', $rel_filetodelete, '', '', '', 0, $object->entity ?? 0); if ($result >= 0 && $ecmfile->id > 0) { $result = $ecmfile->delete($user); } @@ -2038,7 +2042,7 @@ function dol_add_file_process($upload_dir, $allowoverwrite = 0, $updatesessionor // If we allow overwrite, we may need to also overwrite index, so we delete index first so insert can work if ($allowoverwrite) { - deleteFilesIntoDatabaseIndex($upload_dir, basename($destfile).($resupload == 2 ? '.noexe' : ''), ''); + deleteFilesIntoDatabaseIndex($upload_dir, basename($destfile).($resupload == 2 ? '.noexe' : ''), '', $object); } $result = addFileIntoDatabaseIndex($upload_dir, basename($destfile).($resupload == 2 ? '.noexe' : ''), $TFile['name'][$i], 'uploaded', $sharefile, $object, $forceFullTextIndexation); @@ -2208,6 +2212,9 @@ function addFileIntoDatabaseIndex($dir, $file, $fullpathorig = '', $mode = 'uplo if (isset($object->src_object_keywords)) { $ecmfile->keywords = $object->src_object_keywords; } + if (isset($object->entity)) { + $ecmfile->entity = $object->entity; + } } if (getDolGlobalString('MAIN_FORCE_SHARING_ON_ANY_UPLOADED_FILE')) { @@ -2322,9 +2329,10 @@ function addFileIntoDatabaseIndex($dir, $file, $fullpathorig = '', $mode = 'uplo * @param string $dir Directory name (full real path without ending /) * @param string $file File name * @param string $mode How file was created ('uploaded', 'generated', ...) + * @param Object $object object used for entity * @return int Return integer <0 if KO, 0 if nothing done, >0 if OK */ -function deleteFilesIntoDatabaseIndex($dir, $file, $mode = 'uploaded') +function deleteFilesIntoDatabaseIndex($dir, $file, $mode = 'uploaded', $object = null) { global $conf, $db; @@ -2348,7 +2356,11 @@ function deleteFilesIntoDatabaseIndex($dir, $file, $mode = 'uploaded') if (!$error) { $sql = 'DELETE FROM '.MAIN_DB_PREFIX.'ecm_files'; - $sql .= ' WHERE entity = '.((int) $conf->entity); + if (isset($object->entity)) { + $sql .= ' WHERE entity = ' . ((int) $object->entity); + } else { + $sql .= ' WHERE entity = ' . ((int) $conf->entity); + } $sql .= " AND filepath = '".$db->escape($rel_dir)."'"; if ($file) { $sql .= " AND filename = '".$db->escape($file)."'"; diff --git a/htdocs/ecm/class/ecmfiles.class.php b/htdocs/ecm/class/ecmfiles.class.php index ec1a5fca746..debd3a2efbf 100644 --- a/htdocs/ecm/class/ecmfiles.class.php +++ b/htdocs/ecm/class/ecmfiles.class.php @@ -408,9 +408,10 @@ class EcmFiles extends CommonObject * @param string $hashforshare Hash of file sharing, or 'shared' * @param string $src_object_type src_object_type to search (value of object->table_element) * @param int $src_object_id src_object_id to search + * @param int $entity entity * @return int Return integer <0 if KO, 0 if not found, >0 if OK */ - public function fetch($id, $ref = '', $relativepath = '', $hashoffile = '', $hashforshare = '', $src_object_type = '', $src_object_id = 0) + public function fetch($id, $ref = '', $relativepath = '', $hashoffile = '', $hashforshare = '', $src_object_type = '', $src_object_id = 0, $entity = 0) { global $conf; @@ -457,17 +458,29 @@ class EcmFiles extends CommonObject if ($filename != '*') { $sql .= " AND t.filename = '".$this->db->escape($filename)."'"; } - $sql .= " AND t.entity = ".$conf->entity; // unique key include the entity so each company has its own index + if (! empty($entity)) { + $sql .= " AND t.entity = " . (int) $entity; + } else { + $sql .= " AND t.entity = " . $conf->entity; // unique key include the entity so each company has its own index + } $filterfound++; } if (!empty($ref)) { // hash of file path $sql .= " AND t.ref = '".$this->db->escape($ref)."'"; - $sql .= " AND t.entity = ".$conf->entity; // unique key include the entity so each company has its own index + if (! empty($entity)) { + $sql .= " AND t.entity = " . (int) $entity; + } else { + $sql .= " AND t.entity = " . $conf->entity; // unique key include the entity so each company has its own index + } $filterfound++; } if (!empty($hashoffile)) { // hash of content $sql .= " AND t.label = '".$this->db->escape($hashoffile)."'"; - $sql .= " AND t.entity = ".$conf->entity; // unique key include the entity so each company has its own index + if (! empty($entity)) { + $sql .= " AND t.entity = " . (int) $entity; + } else { + $sql .= " AND t.entity = " . $conf->entity; // unique key include the entity so each company has its own index + } $filterfound++; } if (!empty($hashforshare)) { @@ -481,7 +494,11 @@ class EcmFiles extends CommonObject } if ($src_object_type && $src_object_id) { $sql .= " AND t.src_object_type = '".$this->db->escape($src_object_type)."' AND t.src_object_id = ".((int) $src_object_id); - $sql .= " AND t.entity = ".((int) $conf->entity); + if (! empty($entity)) { + $sql .= " AND t.entity = " . (int) $entity; + } else { + $sql .= " AND t.entity = " . $conf->entity; // unique key include the entity so each company has its own index + } $filterfound++; } if ($id > 0 || empty($filterfound)) { @@ -766,7 +783,6 @@ class EcmFiles extends CommonObject $sql .= ' src_object_id = '.($this->src_object_id > 0 ? $this->src_object_id : "null").','; $sql .= ' src_object_type = '.(isset($this->src_object_type) ? "'".$this->db->escape($this->src_object_type)."'" : "null"); $sql .= ' WHERE rowid='.((int) $this->id); - $this->db->begin(); $resql = $this->db->query($sql); diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php index 861caa5e7e1..1c88d8a8409 100644 --- a/htdocs/societe/card.php +++ b/htdocs/societe/card.php @@ -783,7 +783,7 @@ if (empty($reshook)) { if (getDolGlobalString('THIRDPARTY_LOGO_ALLOW_EXTERNAL_DOWNLOAD')) { require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; // the dir dirname($newfile) is directory of logo, so we should have only one file at once into index, so we delete indexes for the dir - deleteFilesIntoDatabaseIndex(dirname($newfile), '', ''); + deleteFilesIntoDatabaseIndex(dirname($newfile), '', '', $object); // now we index the uploaded logo file addFileIntoDatabaseIndex(dirname($newfile), basename($newfile), '', 'uploaded', 1); } From 870c2a8f50e222287fc3ad03c78995440e2f0eba Mon Sep 17 00:00:00 2001 From: Eric - CAP-REL <1468823+rycks@users.noreply.github.com> Date: Thu, 11 Sep 2025 12:21:33 +0200 Subject: [PATCH 4/7] Prepare 18.0.8 (#35299) * Prepare 18.0.8 * Update filefunc.inc.php --------- Co-authored-by: Laurent Destailleur --- ChangeLog | 30 ++++++++++++++++++++++++++++++ htdocs/filefunc.inc.php | 2 +- 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 5dd29b7d23f..c8c324bfd5f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,36 @@ English Dolibarr ChangeLog -------------------------------------------------------------- +***** ChangeLog for 18.0.8 compared to 18.0.7 ***** +35 files changed, 647 insertions(+), 298 deletions(-) + +FIX: #34746 - More complete fix for CVE-2024-40137 +FIX: Correct the calculation of the amount of the current period between the period provided (#35083) +FIX: Add security test for show terminal selection if no terminal selected when invoice.php is call (#34717) +FIX: Add security test for show terminal selection if no terminal selected when invoice.php is call +FIX: missing quick edit for extrafields (baclport commit 4fc66c6) (#35160) +FIX: Missing sentence part (#35144) +FIX: set global mysoc and load langs in API access (#35041) +FIX: set global mysoc and load langs in API access +FIX: reset mysoc and langs only if entity of API has changed +FIX: accountancy general ledger: bad handling of hook return (#34029) +FIX: accountancy general ledger: bad handling of hook return +FIX: accountancy balance: bad handling of hook return +FIX: - Fix missing token for disable custom group category for compta report (page /htdocs/accountancy/admin/categories_list.php) (#35084) +FIX: The combo of custom groups has disappeared (backport v19) (#35016) +FIX: #34893 (#34897) +FIX: #34893 +FIX: change error code to USERNOTALLOWEDTOCHANGEPASS +FIX: asset: could not select invoice in disposal pop-in (#34725) +FIX: 17.0 SQL syntax error and/or constraint error when calling Facture::update() after a clone (e.g. in a trigger) (#34778) +FIX: 17.0: when you clone an invoice that was created from a template invoice, the clone should not be linked to the template invoice (#34777) +FIX: pre-send mail mass action: keep __EMAIL__ substitution (#34522) +FIX: pre-send mail mass action: keep __EMAIL__ substitution +FIX: comment +FIX: massaction email tpl: keep preset +FIX: loop interrupt if an error occurs in sendEmailsRemindersOnInvoiceDueDate (#34657) +FIX: #34654 + ***** ChangeLog for 18.0.7 compared to 18.0.6 ***** 138 files changed, 1622 insertions(+), 530 deletions(-) diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php index 28cbf4915b0..2880f95f814 100644 --- a/htdocs/filefunc.inc.php +++ b/htdocs/filefunc.inc.php @@ -34,7 +34,7 @@ if (!defined('DOL_APPLICATION_TITLE')) { define('DOL_APPLICATION_TITLE', 'Dolibarr'); } if (!defined('DOL_VERSION')) { - define('DOL_VERSION', '18.0.7'); // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c + define('DOL_VERSION', '18.0.8'); // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c } if (!defined('EURO')) { From 8efe6d477ee7a9e0450a2b02044104078c722477 Mon Sep 17 00:00:00 2001 From: Eric - CAP-REL <1468823+rycks@users.noreply.github.com> Date: Fri, 12 Sep 2025 02:15:56 +0200 Subject: [PATCH 5/7] exclude escpos-php/doc from filelist_xml (#35313) --- build/generate_filelist_xml.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/generate_filelist_xml.php b/build/generate_filelist_xml.php index 5614b5323bd..331cb8fc178 100755 --- a/build/generate_filelist_xml.php +++ b/build/generate_filelist_xml.php @@ -172,7 +172,7 @@ $files = new RegexIterator($iterator1, '#^(?:[A-Z]:)?(?:/(?!(?:'.($includecustom */ // Define qualified files (must be same than into generate_filelist_xml.php and in api_setup.class.php) $regextoinclude = '\.(php|php3|php4|php5|phtml|phps|phar|inc|css|scss|html|xml|js|json|tpl|jpg|jpeg|png|gif|ico|sql|lang|txt|yml|bak|md|mp3|mp4|wav|mkv|z|gz|zip|rar|tar|less|svg|eot|woff|woff2|ttf|manifest)$'; -$regextoexclude = '('.($includecustom?'':'custom|').'documents|conf|install|dejavu-fonts-ttf-.*|public\/test|sabre\/sabre\/.*\/tests|Shared\/PCLZip|nusoap\/lib\/Mail|php\/example|php\/test|geoip\/sample.*\.php|ckeditor\/samples|ckeditor\/adapters)$'; // Exclude dirs +$regextoexclude = '('.($includecustom?'':'custom|').'documents|escpos-php\/doc|conf|install|dejavu-fonts-ttf-.*|public\/test|sabre\/sabre\/.*\/tests|Shared\/PCLZip|nusoap\/lib\/Mail|php\/example|php\/test|geoip\/sample.*\.php|ckeditor\/samples|ckeditor\/adapters)$'; // Exclude dirs $files = dol_dir_list(DOL_DOCUMENT_ROOT, 'files', 1, $regextoinclude, $regextoexclude, 'fullname'); $dir=''; From 8e689c147944f137b995408cf60152ccc4df641a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 12 Sep 2025 02:26:21 +0200 Subject: [PATCH 6/7] Complete #35313 --- htdocs/api/class/api_setup.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/api/class/api_setup.class.php b/htdocs/api/class/api_setup.class.php index abb09397361..2010e41fbb4 100644 --- a/htdocs/api/class/api_setup.class.php +++ b/htdocs/api/class/api_setup.class.php @@ -2127,7 +2127,7 @@ class Setup extends DolibarrApi // Define qualified files (must be same than into generate_filelist_xml.php and in api_setup.class.php) $regextoinclude = '\.(php|php3|php4|php5|phtml|phps|phar|inc|css|scss|html|xml|js|json|tpl|jpg|jpeg|png|gif|ico|sql|lang|txt|yml|bak|md|mp3|mp4|wav|mkv|z|gz|zip|rar|tar|less|svg|eot|woff|woff2|ttf|manifest)$'; - $regextoexclude = '('.($includecustom ? '' : 'custom|').'documents|conf|install|dejavu-fonts-ttf-.*|public\/test|sabre\/sabre\/.*\/tests|Shared\/PCLZip|nusoap\/lib\/Mail|php\/example|php\/test|geoip\/sample.*\.php|ckeditor\/samples|ckeditor\/adapters)$'; // Exclude dirs + $regextoexclude = '('.($includecustom ? '' : 'custom|').'documents|escpos-php\/doc|conf|install|dejavu-fonts-ttf-.*|public\/test|sabre\/sabre\/.*\/tests|Shared\/PCLZip|nusoap\/lib\/Mail|php\/example|php\/test|geoip\/sample.*\.php|ckeditor\/samples|ckeditor\/adapters)$'; // Exclude dirs $scanfiles = dol_dir_list(DOL_DOCUMENT_ROOT, 'files', 1, $regextoinclude, $regextoexclude); // Fill file_list with files in signature, new files, modified files From e541438b7e7996f911126d9c8a5bc50ba00d66a4 Mon Sep 17 00:00:00 2001 From: Vincent Maury Date: Fri, 12 Sep 2025 18:57:44 +0200 Subject: [PATCH 7/7] Fix bug #35330 (#35331) in table header, instead of extrafield filters, this message appears ERROR : selectForForms: Error bad setup of field objectdescorig= --- htdocs/core/lib/functions.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 6843b630484..7d6bd6598e5 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -13475,7 +13475,7 @@ function getElementProperties($elementType) $classname = 'CommandeFournisseurLigne'; $table_element = 'commande_fournisseurdet'; $parent_element = 'commande_fournisseur'; - } elseif ($elementType == 'invoice_supplier') { + } elseif ($elementType == 'invoice_supplier' || $elementType == 'facture_fourn') { $classpath = 'fourn/class'; $module = 'fournisseur'; $classfile = 'fournisseur.facture';