From 7e1079c65c941dd3fc22b292afd74d107aa2800a Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Fri, 15 Apr 2022 10:57:16 +0200
Subject: [PATCH] on going

---
 htdocs/langs/en_US/projects.lang | 1 -
 htdocs/projet/tasks/time.php     | 5 ++---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index 645171e8ac7..166cf047354 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -276,7 +276,6 @@ NewInter=New intervention
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
 OneLinePerTimeSpentLine=One line for each time spent declaration
-OneLinePerTimeSpentLineProduct=One line for each time spent declaration with product defined
 AddDetailDateAndDuration=With date and duration into line description
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Profit is calculated using
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index df9babad42c..4978de0d1e2 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -475,7 +475,7 @@ if ($action == 'confirm_generateinvoice') {
 						}
 					}
 				}
-			} elseif ($generateinvoicemode == 'onelineperperiod' || $generateinvoicemode == 'onelineperperiodproduct') {	// One line for each time spent line
+			} elseif ($generateinvoicemode == 'onelineperperiod') {	// One line for each time spent line
 				$arrayoftasks = array();
 
 				$withdetail=GETPOST('detail_time_duration', 'alpha');
@@ -531,7 +531,7 @@ if ($action == 'confirm_generateinvoice') {
 					$localtax2line = $localtax2;
 
 
-					if ($generateinvoicemode == 'onelineperperiodproduct' && !empty($value['fk_product']) && $value['fk_product']!==$idprod) {
+					if (!empty($value['fk_product']) && $value['fk_product']!==$idprod) {
 						if (!array_key_exists($value['fk_product'], $product_data_cache)) {
 							$result = $tmpproduct->fetch($value['fk_product']);
 							if ($result < 0) {
@@ -1210,7 +1210,6 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 					'onelineperuser'=>'OneLinePerUser',
 					'onelinepertask'=>'OneLinePerTask',
 					'onelineperperiod'=>'OneLinePerTimeSpentLine',
-					'onelineperperiodproduct'=>'OneLinePerTimeSpentLineProduct',
 				);
 				print $form->selectarray('generateinvoicemode', $tmparray, 'onelineperuser', 0, 0, 0, '', 1);
 				print "\n".'<script type="text/javascript">';