diff --git a/htdocs/comm/addpropal.php b/htdocs/comm/addpropal.php index 355020e9902..20bda015571 100644 --- a/htdocs/comm/addpropal.php +++ b/htdocs/comm/addpropal.php @@ -30,6 +30,7 @@ */ require("./pre.inc.php"); + include_once(DOL_DOCUMENT_ROOT.'/includes/modules/propale/modules_propale.php'); if (defined("PROPALE_ADDON") && is_readable(DOL_DOCUMENT_ROOT ."/includes/modules/propale/".PROPALE_ADDON.".php")) { @@ -84,7 +85,6 @@ if ($_GET["action"] == 'create') $numpr .= "." . ($num + 1); } } - print "
id."\" method=\"post\">"; print ""; @@ -96,8 +96,8 @@ if ($_GET["action"] == 'create') print $langs->trans("Comments").''; print ''.$langs->trans("Company").''.$soc->nom.''; - print ''; - print ''; + print ''; + print ''; print ''; print "".$langs->trans("Date").""; @@ -107,6 +107,20 @@ if ($_GET["action"] == 'create') print ''.$langs->trans("Author").''.$user->fullname.''; print ''.$langs->trans("ValidityDuration").' '.$langs->trans("days").''; + // date de livraison + if ($conf->use_javascript) + { + print ''.$langs->trans("DateDelivery").''; + print ''; + $form->select_date('','liv_'); + print ''; + } + else + { + print "".$langs->trans("DateDelivery").""; + $form->select_date(); + print ""; + } // Conditions de réglement print ''.$langs->trans('PaymentConditions').''; $form->select_conditions_paiements($soc->cond_reglement,'cond_reglement_id'); diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 8f2547601e5..4df8417184f 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -112,6 +112,7 @@ if ($_POST['action'] == 'add') { $propal = new Propal($db, $_GET['socidp']); $propal->datep = mktime(12, 1, 1, $_POST['remonth'], $_POST['reday'], $_POST['reyear']); + $propal->date_livraison = mktime(12, 1, 1, $_POST['liv_month'], $_POST['liv_day'], $_POST['liv_year']); $propal->duree_validite = $_POST['duree_validite']; $propal->cond_reglement_id = $_POST['cond_reglement_id']; diff --git a/htdocs/langs/fr_FR/propal.lang b/htdocs/langs/fr_FR/propal.lang index 15e37f29861..fdba915ced1 100644 --- a/htdocs/langs/fr_FR/propal.lang +++ b/htdocs/langs/fr_FR/propal.lang @@ -62,4 +62,5 @@ RelatedBill=Facture associ RelatedBills=Factures associées ErrorPropalNotFound=Propal %s inexistante Estimate=Devis : -OtherPropals=Autres propositions \ No newline at end of file +OtherPropals=Autres propositions +DateDelivery=Date de livraison