diff --git a/htdocs/comm/addpropal.php b/htdocs/comm/addpropal.php
index a78838d0524..b92cd4d185d 100644
--- a/htdocs/comm/addpropal.php
+++ b/htdocs/comm/addpropal.php
@@ -107,34 +107,36 @@ if ($_GET["action"] == 'create')
print '
| '.$langs->trans("Author").' | '.$user->fullname.' |
';
print '| '.$langs->trans("ValidityDuration").' | '.$langs->trans("days").' |
';
- // date de livraison
- print '| '.$langs->trans("DateDelivery").' | ';
- print '';
- if(DATE_LIVRAISON_WEEK_DELAY != "")
- {
- $tmpdte = time() + ((7*DATE_LIVRAISON_WEEK_DELAY) * 24 * 60 * 60);
- $syear = date("Y", $tmpdte);
- $smonth = date("m", $tmpdte);
- $sday = date("d", $tmpdte);
- $form->select_date($syear."-".$smonth."-".$sday,'liv_','','','',"addprop");
- }
- else
- $form->select_date('','liv_','','','',"addprop");
- print ' |
';
+ // Date de livraison
+ print '| '.$langs->trans("DateDelivery").' | ';
+ print '';
+ if ($conf->global->DATE_LIVRAISON_WEEK_DELAY != "")
+ {
+ $tmpdte = time() + ((7 * $conf->global->DATE_LIVRAISON_WEEK_DELAY) * 24 * 60 * 60);
+ $syear = date("Y", $tmpdte);
+ $smonth = date("m", $tmpdte);
+ $sday = date("d", $tmpdte);
+ $form->select_date($syear."-".$smonth."-".$sday,'liv_','','','',"addprop");
+ }
+ else
+ {
+ $form->select_date(-1,'liv_','','','',"addprop");
+ }
+ print ' |
';
- // Conditions de réglement
- print '| '.$langs->trans('PaymentConditions').' | ';
- $form->select_conditions_paiements($soc->cond_reglement,'cond_reglement_id');
- print ' |
';
-
- // Mode de réglement
- print '| '.$langs->trans('PaymentMode').' | ';
- $form->select_types_paiements($soc->mode_reglement,'mode_reglement_id');
- print ' |
';
+ // Conditions de réglement
+ print '| '.$langs->trans('PaymentConditions').' | ';
+ $form->select_conditions_paiements($soc->cond_reglement,'cond_reglement_id');
+ print ' |
';
+
+ // Mode de réglement
+ print '| '.$langs->trans('PaymentMode').' | ';
+ $form->select_types_paiements($soc->mode_reglement,'mode_reglement_id');
+ print ' |
';
/*
- * Destinataire de la propale
- */
+ * Destinataire de la propale
+ */
print "| ".$langs->trans("Contact")." | \n";
$sql = "SELECT p.idp, p.name, p.firstname, p.poste, p.phone, p.fax, p.email FROM ".MAIN_DB_PREFIX."socpeople as p";
$sql .= " WHERE p.fk_soc = ".$soc->id;
|