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

Dbut ajout bon de livraison

Browse Source
This commit is contained in:
Regis Houssin 2006-05-30 10:56:48 +00:00
parent 458ae54ade
commit 8819e2b286
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
htdocs/livraison/fiche.php
View File

@ -424,13 +424,16 @@ else
// Date
print '<tr><td>'.$langs->trans("Date").'</td>';
print "<td>".strftime("%A %d %B %Y",$livraison->date)."</td>\n";
/*
// Entrepot
$entrepot = new Entrepot($db);
$entrepot->fetch($expedition->entrepot_id);
print '<td width="20%">'.$langs->trans("Warehouse").'</td><td><a href="'.DOL_URL_ROOT.'/product/stock/fiche.php?id='.$entrepot->id.'">'.$entrepot->libelle.'</a></td>';
*/
print "<td>".strftime("%A %d %B %Y",$livraison->date_creation)."</td>\n";
if (!$conf->expedition->enabled && $conf->stock->enabled)
{
// Entrepot
$entrepot = new Entrepot($db);
$entrepot->fetch($expedition->entrepot_id);
print '<td width="20%">'.$langs->trans("Warehouse").'</td><td><a href="'.DOL_URL_ROOT.'/product/stock/fiche.php?id='.$entrepot->id.'">'.$entrepot->libelle.'</a></td>';
}
print '</tr>';
print "</table>\n";

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

@ -214,6 +214,7 @@ class Livraison
$obj = $this->db->fetch_object($result);
$this->id = $obj->rowid;
$this->date_creation = $obj->date_creation;
$this->ref = $obj->ref;
$this->soc_id = $obj->socid;
$this->statut = $obj->fk_statut;
@ -221,11 +222,11 @@ class Livraison
$this->expedition_id = $obj->fk_expedition;
$this->user_author_id = $obj->fk_user_author;
$this->user_valid_id = $obj->fk_user_valid;
$this->date = $obj->date_livraison;
$this->date_livraison = $obj->date_livraison;
$this->adresse_livraison_id = $obj->fk_entrepot;
$this->note = $obj->note;
$this->note_public = $obj->note_public;
$this->modelpdf = $obj->model_pdf;
$this->modelpdf = $obj->model_pdf;
$this->db->free();
if ($this->statut == 0) $this->brouillon = 1;