lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: add date delivery planned

Browse Source
This commit is contained in:
Regis Houssin 2010-03-13 16:23:43 +00:00
parent ed19e89531
commit 8ce5c5b66e
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/expedition/fiche.php
View File

@ -704,6 +704,11 @@ else
print '<td colspan="3">'.dol_print_date($expedition->date,"daytext")."</td>\n"; print '<td colspan="3">'.dol_print_date($expedition->date,"daytext")."</td>\n";
print '</tr>'; print '</tr>';
// Date delivery planned
print '<tr><td>'.$langs->trans("DateDeliveryPlanned").'</td>';
print '<td colspan="3">'.dol_print_date($expedition->date_delivery,'daytext')."</td>\n";
print '</tr>';
// Delivery address // Delivery address
if (($origin == 'commande' && $conf->global->COMMANDE_ADD_DELIVERY_ADDRESS) if (($origin == 'commande' && $conf->global->COMMANDE_ADD_DELIVERY_ADDRESS)
|| ($origin == 'propal' && $conf->global->PROPAL_ADD_DELIVERY_ADDRESS)) || ($origin == 'propal' && $conf->global->PROPAL_ADD_DELIVERY_ADDRESS))

11
htdocs/livraison/fiche.php
View File

@ -271,11 +271,11 @@ if ($_GET["action"] == 'create')
* Lignes de commandes * Lignes de commandes
* *
*/ */
echo '<br><table class="noborder" width="100%">'; print '<br><table class="noborder" width="100%">';
$lignes = $commande->fetch_lines(1); $lignes = $commande->fetch_lines(1);
/* Lecture des livraisons deje effectuees */ // Lecture des livraisons deja effectuees
$commande->livraison_array(); $commande->livraison_array();
$num = sizeof($commande->lignes); $num = sizeof($commande->lignes);
@ -471,7 +471,12 @@ else
// Date // Date
print '<tr><td>'.$langs->trans("Date").'</td>'; print '<tr><td>'.$langs->trans("Date").'</td>';
print '<td colspan="3">'.dol_print_date($delivery->date_creation,'dayhourtext')."</td>\n"; print '<td colspan="3">'.dol_print_date($delivery->date_creation,'daytext')."</td>\n";
print '</tr>';
// Date delivery planned
print '<tr><td>'.$langs->trans("DateDeliveryPlanned").'</td>';
print '<td colspan="3">'.dol_print_date($delivery->date_delivery,'daytext')."</td>\n";
print '</tr>'; print '</tr>';
// Statut // Statut

2
htdocs/livraison/livraison.class.php
View File

@ -101,6 +101,7 @@ class Livraison extends CommonObject
$sql.= ", ref_customer"; $sql.= ", ref_customer";
$sql.= ", date_creation"; $sql.= ", date_creation";
$sql.= ", fk_user_author"; $sql.= ", fk_user_author";
$sql.= ", date_delivery";
$sql.= ", fk_adresse_livraison"; $sql.= ", fk_adresse_livraison";
$sql.= ") VALUES ("; $sql.= ") VALUES (";
$sql.= "'(PROV)'"; $sql.= "'(PROV)'";
@ -109,6 +110,7 @@ class Livraison extends CommonObject
$sql.= ", '".$this->ref_customer."'"; $sql.= ", '".$this->ref_customer."'";
$sql.= ", ".$this->db->idate(mktime()); $sql.= ", ".$this->db->idate(mktime());
$sql.= ", ".$user->id; $sql.= ", ".$user->id;
$sql.= ", ".$this->db->idate($this->date_delivery);
$sql.= ", ".($this->fk_delivery_address > 0 ? $this->fk_delivery_address : "null"); $sql.= ", ".($this->fk_delivery_address > 0 ? $this->fk_delivery_address : "null");
$sql.= ")"; $sql.= ")";