From 24652ec722606273f18e5dcdd3a3d501a3a89ea4 Mon Sep 17 00:00:00 2001 From: Marc de Lima Lucio <68746600+marc-dll@users.noreply.github.com> Date: Sat, 2 Aug 2025 00:50:07 +0200 Subject: [PATCH 1/3] FIX: asset: could not select invoice in disposal pop-in (#34725) --- htdocs/asset/card.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/htdocs/asset/card.php b/htdocs/asset/card.php index bd3255491fc..643d46f63a0 100644 --- a/htdocs/asset/card.php +++ b/htdocs/asset/card.php @@ -271,9 +271,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea $disposal_type_form = $object->showInputField(null, 'fk_disposal_type', $fk_disposal_type, '', '', '', 0); $object->fields['fk_disposal_type']['visible'] = -2; - $object->fields['disposal_invoice_id'] = array('type' => 'integer:Facture:compta/facture/class/facture.class.php::entity IN (__SHARED_ENTITIES__)', 'enabled' => '1', 'notnull' => 1, 'visible' => 1, 'index' => 1, 'validate' => '1',); - $disposal_invoice_form = $object->showInputField(null, 'disposal_invoice_id', $disposal_invoice_id, '', '', '', 0); - unset($object->fields['disposal_invoice_id']); + $disposal_invoice_form = $form->selectForForms('Facture:compta/facture/class/facture.class.php::(entity:IN:__SHARED_ENTITIES__)', 'disposal_invoice_id', $disposal_invoice_id); // Create an array for form $formquestion = array( From b3a22576382995077f5cbcf5f425828d2e3b4616 Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Wed, 6 Aug 2025 21:22:47 +0200 Subject: [PATCH 2/3] Fix : contract line activation error when duration not defined (#34813) * Fix : contract line activation error when duration not defined * Fix of fix * Update card.php --------- Co-authored-by: x Co-authored-by: Laurent Destailleur --- htdocs/contrat/card.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php index 6e5e32570f4..1656aed736b 100644 --- a/htdocs/contrat/card.php +++ b/htdocs/contrat/card.php @@ -1886,7 +1886,9 @@ if ($action == 'create') { if ($objp->fk_product > 0) { $product = new Product($db); $product->fetch($objp->fk_product); - $dateactend = dol_time_plus_duree(time(), $product->duration_value, $product->duration_unit); + if (!empty($product->duration_value) && !empty($product->duration_unit)) { + $dateactend = dol_time_plus_duree(time(), $product->duration_value, $product->duration_unit); + } } } From 5024aee975e2a966e4385d0cf584cc5fe6236b19 Mon Sep 17 00:00:00 2001 From: HENRY Florian Date: Thu, 7 Aug 2025 14:42:20 +0200 Subject: [PATCH 3/3] fix: with MAIN_MAIL_ADD_INLINE_IMAGES_IF_IN_MEDIAS and multicompany image are not find on send mail (#34894) --- htdocs/core/class/CMailFile.class.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php index e41fa2d0ca5..e1a90982b20 100644 --- a/htdocs/core/class/CMailFile.class.php +++ b/htdocs/core/class/CMailFile.class.php @@ -269,7 +269,11 @@ class CMailFile // Note because media links are public, this should be useless, except avoid blocking images with email browser. // This convert an embedd file with src="/viewimage.php?modulepart... into a cid link // TODO Exclude viewimage used for the read tracker ? - $findimg = $this->findHtmlImages($dolibarr_main_data_root.'/medias'); + $dolibarr_main_data_root_images=$dolibarr_main_data_root; + if ($conf->entity!==1) { + $dolibarr_main_data_root_images.='/'.$conf->entity.'/'; + } + $findimg = $this->findHtmlImages($dolibarr_main_data_root_images.'/medias'); if ($findimg<0) { dol_syslog("CMailFile::CMailfile: Error on findHtmlImages"); $this->error = 'ErrorInAddAttachementsImageBaseOnMedia';