From 4df44aec0a55be73a4485afe6e7db9eb93cd5eaa Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Mon, 16 Feb 2009 20:02:03 +0000
Subject: [PATCH] New: Add a first version of a Paybox module

---
 htdocs/langs/en_US/contracts.lang   |  1 +
 htdocs/langs/fr_FR/contracts.lang   |  1 +
 htdocs/public/paybox/newpayment.php | 27 ++++++++++++++++-----------
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/htdocs/langs/en_US/contracts.lang b/htdocs/langs/en_US/contracts.lang
index 69ba8e6ee9b..2bc7acb5750 100644
--- a/htdocs/langs/en_US/contracts.lang
+++ b/htdocs/langs/en_US/contracts.lang
@@ -76,6 +76,7 @@ MoveToAnotherContract=Move service into another contract.
 ConfirmMoveToAnotherContract=I choosed new target contract and confirm I want to move this service into this contract.
 ConfirmMoveToAnotherContractQuestion=Choose in which existing contract (of same third party), you want to move this service to ?
 PaymentRenewContractId=Renew contract line (number %s)
+ExpiredSince=Expired since
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Sales representative signing contract
 TypeContact_contrat_internal_SALESREPFOLL=Sales representative following-up contract
diff --git a/htdocs/langs/fr_FR/contracts.lang b/htdocs/langs/fr_FR/contracts.lang
index 456bdf5fa25..f8be4264525 100644
--- a/htdocs/langs/fr_FR/contracts.lang
+++ b/htdocs/langs/fr_FR/contracts.lang
@@ -76,6 +76,7 @@ MoveToAnotherContract=Déplacer le service vers un autre contrat de ce tiers.
 ConfirmMoveToAnotherContract=J'ai choisi le contrat cible et confirme le déplacement du service dans ce contrat.
 ConfirmMoveToAnotherContractQuestion=Choisissez vers quel autre contrat de ce même tiers, vous voulez déplacer ce service ?
 PaymentRenewContractId=Renouvellement service (numéro %s)
+ExpiredSince=Expiré depuis le
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Commercial signataire du contrat
 TypeContact_contrat_internal_SALESREPFOLL=Commercial suivi du contrat
diff --git a/htdocs/public/paybox/newpayment.php b/htdocs/public/paybox/newpayment.php
index 791c3539377..0f568894e08 100644
--- a/htdocs/public/paybox/newpayment.php
+++ b/htdocs/public/paybox/newpayment.php
@@ -375,6 +375,13 @@ if ($_REQUEST["amount"] == 'contractline')
 	//	$text.='<br>'.$langs->trans("DateEndPlanned").': ';
 	//	$text.=dolibarr_print_date($contractline->date_fin_validite);
 	//}
+	if ($contractline->date_fin_validite)
+	{
+		//$dateactend = dol_time_plus_duree ($contractline->date_fin_validite, $product->duration_value, $product->duration_unit);
+		//print ', '.$langs->trans("DateEndPlanned").': '.dolibarr_print_date($contractline->date_fin_validite);
+		$text.='<br>'.$langs->trans("ExpiredSince").': '.dolibarr_print_date($contractline->date_fin_validite);
+	}
+
 	print '<tr><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
 	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
 	print '<input type="hidden" name="ref" value="'.$contractline->ref.'">';
@@ -382,12 +389,15 @@ if ($_REQUEST["amount"] == 'contractline')
 
 	// Quantity
 	$var=!$var;
-	print '<tr><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Quantity");
-	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$qty.'</b>';
+	$label=$langs->trans("Quantity");
+	$qty=1;
+	$duration='';
 	if ($contractline->fk_product)
 	{
-		if ($product->duration_value > 0)
+		if ($product->isservice() && $product->duration_value > 0)
 		{
+			$label=$langs->trans("Duration");
+
 			// TODO Put this in a global method
 			if ($product->duration_value > 1)
 			{
@@ -397,16 +407,11 @@ if ($_REQUEST["amount"] == 'contractline')
 			{
 				$dur=array("h"=>$langs->trans("Hour"),"d"=>$langs->trans("DurationDay"),"w"=>$langs->trans("DurationWeek"),"m"=>$langs->trans("DurationMonth"),"y"=>$langs->trans("DurationYear"));
 			}
-			$duration=' ('.$product->duration_value.' '.$dur[$product->duration_unit];
-			print $duration;
-			if ($contractline->date_fin_validite)
-			{
-				$dateactend = dol_time_plus_duree ($contractline->date_fin_validite, $product->duration_value, $product->duration_unit);
-				print ', '.$langs->trans("DateEndPlanned").': '.dolibarr_print_date($contractline->date_fin_validite);
-			}
-			print ')';
+			$duration=$product->duration_value.' '.$dur[$product->duration_unit];
 		}
 	}
+	print '<tr><td class="CTableRow'.($var?'1':'2').'">'.$label.'</td>';
+	print '<td class="CTableRow'.($var?'1':'2').'"><b>'.($duration?$duration:$qty).'</b>';
 	print '<input type="hidden" name="newqty" value="'.$qty.'">';
 	print '</b></td></tr>'."\n";