From 8e7ab422e3ff8aaccd2beae482f34f2f42b821f0 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 3 Aug 2024 18:50:24 +0200 Subject: [PATCH 1/3] Fix info --- .../modules/facture/doc/doc_generic_invoice_odt.modules.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php index 2b4496820f2..8e0fba186b6 100644 --- a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php +++ b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php @@ -75,8 +75,8 @@ class doc_generic_invoice_odt extends ModelePDFFactures $this->option_logo = 1; // Display logo $this->option_tva = 0; // Manage the vat option FACTURE_TVAOPTION - $this->option_modereg = 0; // Display payment mode - $this->option_condreg = 0; // Display payment terms + $this->option_modereg = 1; // Display payment mode + $this->option_condreg = 1; // Display payment terms $this->option_multilang = 1; // Available in several languages $this->option_escompte = 0; // Displays if there has been a discount $this->option_credit_note = 0; // Support credit notes From 650fa5ef1d90c8bddf8ed3e77570bfb60c0f38e0 Mon Sep 17 00:00:00 2001 From: HENRY Florian Date: Wed, 7 Aug 2024 00:09:27 +0200 Subject: [PATCH 2/3] fix: add missing fetch_optionals() call on OrderLine fetch method (#30560) --- htdocs/commande/class/commande.class.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index 9a3319c8138..c820acd6e6c 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -4376,6 +4376,8 @@ class OrderLine extends CommonOrderLine $this->multicurrency_total_tva = $objp->multicurrency_total_tva; $this->multicurrency_total_ttc = $objp->multicurrency_total_ttc; + $this->fetch_optionals(); + $this->db->free($result); return 1; From 7cde5adec814085405b8772f513492b8585479fb Mon Sep 17 00:00:00 2001 From: lvessiller-opendsi Date: Wed, 7 Aug 2024 00:53:16 +0200 Subject: [PATCH 3/3] FIX fatal error on loading pictures in attached documents of an event (#30553) --- htdocs/comm/action/class/actioncomm.class.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index df388d7b5fa..4f21d2f6765 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -841,9 +841,6 @@ class ActionComm extends CommonObject $this->type_color = $obj->type_color; $this->type_picto = $obj->type_picto; $this->type = $obj->type_type; - /*$transcode = $langs->trans("Action".$obj->type_code); - $this->type = (($transcode != "Action".$obj->type_code) ? $transcode : $obj->type_label); */ - $transcode = $langs->trans("Action".$obj->type_code.'Short'); $this->code = $obj->code; $this->label = $obj->label;