From 8d1a84d56c8fece9c540247c7e2b3037f0193818 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Tue, 7 Feb 2023 14:56:38 +0100 Subject: [PATCH 1/4] fix : Warning: Undefined property: ExpenseReport:: in /home/httpd/vhosts/aflac.fr/domains/dev.aflac.fr/httpdocs/core/lib/pdf.lib.php on line 2289 --- .../expensereport/class/expensereport.class.php | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php index 2c4b4bec855..74d668f9d59 100644 --- a/htdocs/expensereport/class/expensereport.class.php +++ b/htdocs/expensereport/class/expensereport.class.php @@ -133,6 +133,21 @@ class ExpenseReport extends CommonObject public $statuts_short = array(); public $statuts_logo; + // Multicurrency + /** + * @var int Currency ID + */ + public $fk_multicurrency; + + /** + * @var string multicurrency code + */ + public $multicurrency_code; + public $multicurrency_tx; + public $multicurrency_total_ht; + public $multicurrency_total_tva; + public $multicurrency_total_ttc; + /** * Draft status From 495a8656522df4c752c4f48ddbf5ed39d268889b Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Tue, 7 Feb 2023 14:59:02 +0100 Subject: [PATCH 2/4] fix : Warning: Undefined property: ExpenseReportLine:: in /home/httpd/vhosts/aflac.fr/domains/dev.aflac.fr/httpdocs/core/lib/pdf.lib.php on line 2289 --- .../expensereport/class/expensereport.class.php | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php index 74d668f9d59..5526b5564c4 100644 --- a/htdocs/expensereport/class/expensereport.class.php +++ b/htdocs/expensereport/class/expensereport.class.php @@ -2754,6 +2754,21 @@ class ExpenseReportLine extends CommonObjectLine public $total_localtax1; public $total_localtax2; + // Multicurrency + /** + * @var int Currency ID + */ + public $fk_multicurrency; + + /** + * @var string multicurrency code + */ + public $multicurrency_code; + public $multicurrency_tx; + public $multicurrency_total_ht; + public $multicurrency_total_tva; + public $multicurrency_total_ttc; + /** * @var int ID into llx_ecm_files table to link line to attached file */ From 4cd7f7bedaceaaea1898bb04cf141127ef9c5fc6 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Tue, 7 Feb 2023 15:56:28 +0100 Subject: [PATCH 3/4] fix : Warning: Undefined property: pdf_standard:: in /home/httpd/vhosts/aflac.fr/domains/dev.aflac.fr/httpdocs/core/modules/expensereport/doc/pdf_standard.modules.php on line 582 --- htdocs/core/modules/expensereport/doc/pdf_standard.modules.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php index f365173ddbe..80418a86f91 100644 --- a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php +++ b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php @@ -92,6 +92,7 @@ class pdf_standard extends ModeleExpenseReport public $posxtva; public $posxup; public $posxqty; + public $posxtype; public $postotalht; public $postotalttc; From 9ad29faa32520163fe8e461c093891201f45146e Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Tue, 7 Feb 2023 16:01:09 +0100 Subject: [PATCH 4/4] fix : Warning: Undefined property: pdf_standard:: in /home/httpd/vhosts/aflac.fr/domains/dev.aflac.fr/httpdocs/core/modules/expensereport/doc/pdf_standard.modules.php on line 589 --- htdocs/core/modules/expensereport/doc/pdf_standard.modules.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php index 80418a86f91..4363a7e90f1 100644 --- a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php +++ b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php @@ -1,7 +1,7 @@ * Copyright (C) 2015 Alexandre Spangaro - * Copyright (C) 2016-2022 Philippe Grand + * Copyright (C) 2016-2023 Philippe Grand * Copyright (C) 2018-2020 Frédéric France * Copyright (C) 2018 Francis Appels * Copyright (C) 2019 Markus Welters @@ -93,6 +93,7 @@ class pdf_standard extends ModeleExpenseReport public $posxup; public $posxqty; public $posxtype; + public $posxprojet; public $postotalht; public $postotalttc;