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 15:40:05 +00:00
parent 8a92041058
commit 234a582661
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/expedition/expedition.class.php
View File

@ -191,10 +191,13 @@ class Expedition
$sql = "SELECT e.rowid, e.date_creation, e.ref, e.fk_user_author, e.fk_statut, e.fk_commande, e.fk_entrepot";
$sql .= ", ".$this->db->pdate("e.date_expedition")." as date_expedition, c.fk_adresse_livraison";
if ($conf->livraison->enabled) $sql.=", l.rowid as livraison_id";
$sql .= " FROM ".MAIN_DB_PREFIX."expedition as e";
$sql .= ", ".MAIN_DB_PREFIX."commande as c";
if ($conf->livraison->enabled) $sql.=", ".MAIN_DB_PREFIX."livraison as l";
$sql .= " WHERE e.rowid = $id";
$sql .= " AND e.fk_commande = c.rowid";
if ($conf->livraison->enabled) $sql.=" AND e.rowid = l.fk_expedition";
$result = $this->db->query($sql) ;
@ -206,6 +209,10 @@ class Expedition
$this->ref = $obj->ref;
$this->statut = $obj->fk_statut;
$this->commande_id = $obj->fk_commande;
if ($conf->livraison->enabled)
{
$this->livraison_id = $obj->livraison_id;
}
$this->user_author_id = $obj->fk_user_author;
$this->date = $obj->date_expedition;
$this->entrepot_id = $obj->fk_entrepot;

2
htdocs/expedition/fiche.php
View File

@ -353,7 +353,7 @@ else
$hselected = $h;
$h++;
if ($conf->livraison->enabled)
if ($conf->livraison->enabled && $expedition->livraison_id)
{
$head[$h][0] = DOL_URL_ROOT."/livraison/fiche.php?id=".$expedition->livraison_id;
$head[$h][1] = $langs->trans("DeliveryCard");