diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php
index 0d87973b223..a3f3fef98ed 100644
--- a/htdocs/expedition/fiche.php
+++ b/htdocs/expedition/fiche.php
@@ -703,6 +703,11 @@ else
print '
| '.$langs->trans("Date").' | ';
print ''.dol_print_date($expedition->date,"daytext")." | \n";
print '
';
+
+ // Date delivery planned
+ print '| '.$langs->trans("DateDeliveryPlanned").' | ';
+ print ''.dol_print_date($expedition->date_delivery,'daytext')." | \n";
+ print '
';
// Delivery address
if (($origin == 'commande' && $conf->global->COMMANDE_ADD_DELIVERY_ADDRESS)
diff --git a/htdocs/livraison/fiche.php b/htdocs/livraison/fiche.php
index 53d8ff65324..53080973f0c 100644
--- a/htdocs/livraison/fiche.php
+++ b/htdocs/livraison/fiche.php
@@ -271,11 +271,11 @@ if ($_GET["action"] == 'create')
* Lignes de commandes
*
*/
- echo '
';
+ print '
';
$lignes = $commande->fetch_lines(1);
- /* Lecture des livraisons deje effectuees */
+ // Lecture des livraisons deja effectuees
$commande->livraison_array();
$num = sizeof($commande->lignes);
@@ -471,7 +471,12 @@ else
// Date
print '| '.$langs->trans("Date").' | ';
- print ''.dol_print_date($delivery->date_creation,'dayhourtext')." | \n";
+ print ''.dol_print_date($delivery->date_creation,'daytext')." | \n";
+ print '
';
+
+ // Date delivery planned
+ print '| '.$langs->trans("DateDeliveryPlanned").' | ';
+ print ''.dol_print_date($delivery->date_delivery,'daytext')." | \n";
print '
';
// Statut
diff --git a/htdocs/livraison/livraison.class.php b/htdocs/livraison/livraison.class.php
index ce1670ece74..c813934238d 100644
--- a/htdocs/livraison/livraison.class.php
+++ b/htdocs/livraison/livraison.class.php
@@ -101,6 +101,7 @@ class Livraison extends CommonObject
$sql.= ", ref_customer";
$sql.= ", date_creation";
$sql.= ", fk_user_author";
+ $sql.= ", date_delivery";
$sql.= ", fk_adresse_livraison";
$sql.= ") VALUES (";
$sql.= "'(PROV)'";
@@ -109,6 +110,7 @@ class Livraison extends CommonObject
$sql.= ", '".$this->ref_customer."'";
$sql.= ", ".$this->db->idate(mktime());
$sql.= ", ".$user->id;
+ $sql.= ", ".$this->db->idate($this->date_delivery);
$sql.= ", ".($this->fk_delivery_address > 0 ? $this->fk_delivery_address : "null");
$sql.= ")";