From 7e5a35cb45928fa20e47705b4e297110381535f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Thu, 6 Feb 2025 14:02:17 +0100 Subject: [PATCH 1/2] asset doesn't have lines --- .../core/modules/asset/doc/doc_generic_asset_odt.modules.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/modules/asset/doc/doc_generic_asset_odt.modules.php b/htdocs/core/modules/asset/doc/doc_generic_asset_odt.modules.php index 1f63e7bac91..ba6c8e41029 100644 --- a/htdocs/core/modules/asset/doc/doc_generic_asset_odt.modules.php +++ b/htdocs/core/modules/asset/doc/doc_generic_asset_odt.modules.php @@ -391,7 +391,7 @@ class doc_generic_asset_odt extends ModelePDFAsset } } // Replace tags of lines - try { + /*try { $foundtagforlines = 1; try { $listlines = $odfHandler->setSegment('lines'); @@ -429,7 +429,7 @@ class doc_generic_asset_odt extends ModelePDFAsset $this->error = $e->getMessage(); dol_syslog($this->error, LOG_WARNING); return -1; - } + }*/ // Replace labels translated $tmparray = $outputlangs->get_translations_for_substitutions(); From d8246d936add8945a858ff9b4af5d800d78b9bc0 Mon Sep 17 00:00:00 2001 From: "Laurent Destailleur (aka Eldy)" Date: Thu, 6 Feb 2025 15:21:11 +0100 Subject: [PATCH 2/2] Fix css --- htdocs/core/tpl/admin_extrafields_view.tpl.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/tpl/admin_extrafields_view.tpl.php b/htdocs/core/tpl/admin_extrafields_view.tpl.php index 75f92eda0cf..34b86b5a835 100644 --- a/htdocs/core/tpl/admin_extrafields_view.tpl.php +++ b/htdocs/core/tpl/admin_extrafields_view.tpl.php @@ -159,7 +159,7 @@ if (isset($extrafields->attributes[$elementtype]['type']) && is_array($extrafiel print ''.dol_escape_htmltag($extrafields->attributes[$elementtype]['csslist'][$key])."\n"; // Multicompany if (isModEnabled('multicompany')) { - print ''; + print ''; if (empty($extrafields->attributes[$elementtype]['entityid'][$key])) { print $langs->trans("All"); } else {