From 98bfba1f461be23fcce1451cd1f275ab82c9020e Mon Sep 17 00:00:00 2001
From: avolani <31508728+avolani@users.noreply.github.com>
Date: Wed, 8 Feb 2023 16:20:47 +0100
Subject: [PATCH 1/3] Add missing table_element

This allow usage of extrafields logic (still missing table and setup pages)
---
 htdocs/expensereport/class/expensereport.class.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index bc7e0f36baa..04c16fc2654 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -2680,6 +2680,11 @@ class ExpenseReportLine extends CommonObjectLine
 	 * @var DoliDB Database handler.
 	 */
 	public $db;
+	
+	/**
+     * @var string Name of table without prefix where object is stored
+     */
+    public $table_element = 'expensereport_det';
 
 	/**
 	 * @var string Error code (or message)

From 637603731a3785eadbdd454ae96ecc79ed570b7a Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Wed, 8 Feb 2023 15:26:10 +0000
Subject: [PATCH 2/3] Fixing style errors.

---
 htdocs/expensereport/class/expensereport.class.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index 04c16fc2654..6ee3c8e19e7 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -2680,11 +2680,11 @@ class ExpenseReportLine extends CommonObjectLine
 	 * @var DoliDB Database handler.
 	 */
 	public $db;
-	
+
 	/**
-     * @var string Name of table without prefix where object is stored
-     */
-    public $table_element = 'expensereport_det';
+	 * @var string Name of table without prefix where object is stored
+	 */
+	public $table_element = 'expensereport_det';
 
 	/**
 	 * @var string Error code (or message)

From f35d63cec148ae06928571e85ae9821b03b86a48 Mon Sep 17 00:00:00 2001
From: avolani <31508728+avolani@users.noreply.github.com>
Date: Wed, 8 Feb 2023 16:41:06 +0100
Subject: [PATCH 3/3] Clean placeholder of missing related project and products

---
 htdocs/core/class/commondocgenerator.class.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 82012400f68..05837331e16 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -538,6 +538,12 @@ abstract class CommonDocGenerator
 			$resarray[$array_key.'_project_description'] = $object->project->description;
 			$resarray[$array_key.'_project_date_start'] = dol_print_date($object->project->date_start, 'day');
 			$resarray[$array_key.'_project_date_end'] = dol_print_date($object->project->date_end, 'day');
+		} else { // empty replacement
+			$resarray[$array_key.'_project_ref'] ='';
+			$resarray[$array_key.'_project_title'] = '';
+			$resarray[$array_key.'_project_description'] = '';
+			$resarray[$array_key.'_project_date_start'] = '';
+			$resarray[$array_key.'_project_date_end'] = '';
 		}
 
 		// Add vat by rates
@@ -701,6 +707,14 @@ abstract class CommonDocGenerator
 			foreach ($tmpproduct->array_options as $key => $label) {
 				$resarray["line_product_".$key] = $label;
 			}
+		} else {
+			// Set unused placeholders as blank
+			$extrafields->fetch_name_optionals_label("product");
+			$extralabels = $extrafields->attributes["product"]['label'];
+
+			foreach ($extralabels as $key => $label) {
+				$resarray['line_product_options_'.$key] = '';
+			}
 		}
 
 		return $resarray;