From 10f45ef92d3de5dfda229dc3da4a10b4bfd07b7a Mon Sep 17 00:00:00 2001
From: Andre Cianfarani <acianfa@free.fr>
Date: Thu, 2 Mar 2006 08:53:00 +0000
Subject: [PATCH] =?UTF-8?q?modif=20pour=20d=E9caler=20la=20date=20de=20liv?=
 =?UTF-8?q?raison=20par=20defaut=20si=20DATE=5FLIVRAISON=5FWEEK=5FDELAY=20?=
 =?UTF-8?q?existe?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/comm/addpropal.php | 5 ++++-
 htdocs/commande/fiche.php | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/htdocs/comm/addpropal.php b/htdocs/comm/addpropal.php
index ca5eff971ce..b3f92cd2f17 100644
--- a/htdocs/comm/addpropal.php
+++ b/htdocs/comm/addpropal.php
@@ -110,7 +110,10 @@ if ($_GET["action"] == 'create')
 	  // date de livraison
 		print '<tr><td>'.$langs->trans("DateDelivery").'</td>';
 		print '<td>';
-		$form->select_date('','liv_','','','',"addprop");
+		if(DATE_LIVRAISON_WEEK_DELAY != "")
+			$form->select_date(time() + ((7*DATE_LIVRAISON_WEEK_DELAY) * 24 * 60 * 60),'liv_','','','',"addprop");
+		else
+			$form->select_date('','liv_','','','',"addprop");
 		print '</td></tr>';
   
 	  // Conditions de réglement
diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php
index 0a913594a1d..7c1784f532b 100644
--- a/htdocs/commande/fiche.php
+++ b/htdocs/commande/fiche.php
@@ -339,7 +339,10 @@ if ($_GET['action'] == 'create' && $user->rights->commande->creer)
 			
 			// date de livraison
 			print "<tr><td>".$langs->trans("DateDelivery")."</td><td>";
-    		$html->select_date('','liv_','','','',"crea_commande");
+			if(DATE_LIVRAISON_WEEK_DELAY != "")
+    			$html->select_date(time() + ((7*DATE_LIVRAISON_WEEK_DELAY) * 24 * 60 * 60),'liv_','','','',"crea_commande");
+			else
+				$html->select_date('','liv_','','','',"crea_commande");
     		print "</td></tr>";