From 2e9dc28eaa59ad3613b24933f84f5a7e700f1eda Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Thu, 26 Jul 2007 20:42:46 +0000
Subject: [PATCH] =?UTF-8?q?Ajout=20de=20la=20possibilit=E9=20de=20pouvoir?=
 =?UTF-8?q?=20d=E9terminer=20la=20date=20et=20l'adresse=20de=20livraison?=
 =?UTF-8?q?=20dans=20une=20propale?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/admin/propale.php      | 35 ++++++++++++++++++++++++++++++++++-
 htdocs/langs/en_US/admin.lang |  2 ++
 htdocs/langs/fr_FR/admin.lang |  2 ++
 3 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/htdocs/admin/propale.php b/htdocs/admin/propale.php
index 9f212b99056..ca74e8673c3 100644
--- a/htdocs/admin/propale.php
+++ b/htdocs/admin/propale.php
@@ -85,6 +85,20 @@ if ($_POST["action"] == 'setdefaultduration')
     exit;
 }
 
+if ($_POST["action"] == 'addshippingdate')
+{
+    dolibarr_set_const($db, "PROPALE_ADD_SHIPPING_DATE",$_POST["value"]);
+    Header("Location: propale.php");
+    exit;
+}
+
+if ($_POST["action"] == 'adddeliveryaddress')
+{
+    dolibarr_set_const($db, "PROPALE_ADD_DELIVERY_ADDRESS",$_POST["value"]);
+    Header("Location: propale.php");
+    exit;
+}
+
 if ($_POST["action"] == 'setclassifiedinvoiced')
 {
     dolibarr_set_const($db, "PROPALE_CLASSIFIED_INVOICED_WITH_ORDER",$_POST["value"]);
@@ -391,6 +405,25 @@ print '<td align="right"><input type="submit" class="button" value="'.$langs->tr
 print '</tr>';
 print '</form>';
 
+$var=!$var;
+print "<form method=\"post\" action=\"".$_SERVER["PHP_SELF"]."\">";
+print "<input type=\"hidden\" name=\"action\" value=\"setaddshippingdate\">";
+print "<tr ".$bc[$var].">";
+print '<td>'.$langs->trans("AddShippingDateAbility").'</td>';
+print '<td>'.$html->selectyesno('value',$conf->global->PROPALE_ADD_SHIPPING_DATE,1).'</td>';
+print '<td align="right"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
+print '</tr>';
+print '</form>';
+
+$var=!$var;
+print "<form method=\"post\" action=\"".$_SERVER["PHP_SELF"]."\">";
+print "<input type=\"hidden\" name=\"action\" value=\"setadddeliveryaddress\">";
+print "<tr ".$bc[$var].">";
+print '<td>'.$langs->trans("AddDeliveryAddressAbility").'</td>';
+print '<td>'.$html->selectyesno('value',$conf->global->PROPALE_ADD_DELIVERY_ADDRESS,1).'</td>';
+print '<td align="right"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
+print '</tr>';
+print '</form>';
 
 if ($conf->commande->enabled)
 {
@@ -422,7 +455,7 @@ print "<tr class=\"liste_titre\">\n";
 print "  <td>".$langs->trans("Name")."</td>\n";
 print "  <td>".$langs->trans("Value")."</td>\n";
 print "</tr>\n";
-print "<tr ".$bc[false].">\n  <td width=\"140\">".$langs->trans("Directory")."</td>\n  <td>".$conf->propal->dir_output."</td>\n</tr>\n";
+print "<tr ".$bc[false].">\n  <td width=\"140\">".$langs->trans("PathDirectory")."</td>\n  <td>".$conf->propal->dir_output."</td>\n</tr>\n";
 print "</table>\n<br>";
 
 
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 166d6fe8b4f..66158c8f22a 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -524,6 +524,8 @@ ProposalsPDFModules=Commercial proposal documents models
 ClassifiedInvoiced=Classified invoiced
 ClassifiedInvoicedWithOrder=Classify invoiced proposal at the same time as the order
 HideTreadedPropal=Hide the treated commercial proposals in the list
+AddShippingDateAbility=Add shipping date ability
+AddDeliveryAddressAbility=Add delivery date ability
 ##### Orders #####
 OrdersSetup=Orders' management setup
 OrdersNumberingModules=Orders numbering modules
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 5790daf79b1..8f9dddb127a 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -526,6 +526,8 @@ ProposalsPDFModules=Mod
 ClassifiedInvoiced=Classé facturée
 ClassifiedInvoicedWithOrder=Classé facturée la propale en même temps que la commande
 HideTreadedPropal=Cacher les propositions commerciales traitées de la liste
+AddShippingDateAbility=Possibilité de déterminer une date de livraison
+AddDeliveryAddressAbility=Possibilité de sélectionner une adresse de livraison
 ##### Orders #####
 OrdersSetup=Configuration du module Commandes
 OrdersNumberingModules=Modules de numérotation des commandes