From fe45d283252957f578b40eee3d8620be6fc6b962 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 12 Aug 2004 21:35:59 +0000
Subject: [PATCH] =?UTF-8?q?Fix:=20Meilleur=20affichage=20de=20la=20date=20?=
 =?UTF-8?q?de=20validit=E9=20d'un=20service=20sur=20la=20ligne=20facture?=
 =?UTF-8?q?=20si=20toutes=20les=20infos=20ne=20sont=20pas=20renseign=E9es.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/compta/facture.php | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 024aad733fd..d72e3875863 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -333,7 +333,7 @@ if ($_POST["action"] == 'send' || $_POST["action"] == 'relance')
 	  if (strlen($sendto))
 	    {	  
 	      if ($_POST["action"] == 'send') {
-		$subject = "Facture $fac->ref";
+		$subject = $langs->trans("Bill")." $fac->ref";
 		$actioncode=9;
 		$actionmsg="Envoyée à $sendto";
 		$actionmsg2="Envoi Facture par mail";
@@ -391,13 +391,11 @@ if ($_POST["action"] == 'send' || $_POST["action"] == 'relance')
  */
 if ($_GET["action"] == 'pdf')
 {
-  /*
-   * Generation de la facture
-   * définit dans /includes/modules/facture/modules_facture.php
-   */
+  // Generation de la facture définie dans /includes/modules/facture/modules_facture.php
   facture_pdf_create($db, $_GET["facid"]);
 } 
 
+
 llxHeader('','Facture','Facture');
 
 $html = new Form($db);
@@ -407,7 +405,6 @@ $html = new Form($db);
  *
  * Mode creation
  *
- *
  ************************************************************************/
 if ($_GET["action"] == 'create') 
 {
@@ -669,11 +666,11 @@ if ($_GET["action"] == 'create')
 
 	      print '</table>';
 	    }
+
 	  /*
 	   * Produits dans la commande
 	   *
 	   */
-
 	  if ($_GET["commandeid"])
 	    {
 	      print_titre("Produits");
@@ -933,13 +930,17 @@ else
 		  if ($objp->fk_product > 0)
 		    {
 		      print '<td><a href="'.DOL_URL_ROOT.'/product/fiche.php?id='.$objp->fk_product.'">'.stripslashes(nl2br($objp->description)).'</a>';
-		      if ($objp->date_start) { print " (Du ".dolibarr_print_date($objp->date_start)." au ".dolibarr_print_date($objp->date_end).")"; }
+		      if ($objp->date_start && $objp->date_end) { print " (Du ".dolibarr_print_date($objp->date_start)." au ".dolibarr_print_date($objp->date_end).")"; }
+		      if ($objp->date_start && ! $objp->date_end) { print " (A partir du ".dolibarr_print_date($objp->date_start).")"; }
+		      if (! $objp->date_start && $objp->date_end) { print " (Jusqu'au ".dolibarr_print_date($objp->date_end).")"; }
 		      print '</td>';
 		    }
 		  else
 		    {
 		      print "<td>".stripslashes(nl2br($objp->description));
-		      if ($objp->date_start) { print " (Du ".dolibarr_print_date($objp->date_start)." au ".dolibarr_print_date($objp->date_end).")"; }
+		      if ($objp->date_start && $objp->date_end) { print " (Du ".dolibarr_print_date($objp->date_start)." au ".dolibarr_print_date($objp->date_end).")"; }
+		      if ($objp->date_start && ! $objp->date_end) { print " (A partir du ".dolibarr_print_date($objp->date_start).")"; }
+		      if (! $objp->date_start && $objp->date_end) { print " (Jusqu'au ".dolibarr_print_date($objp->date_end).")"; }
 		      print "</td>\n";
 		    }