From e8aff4dfb4b876086b5bc2536cc7d5759ee98bd0 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Thu, 1 Jun 2006 10:46:35 +0000 Subject: [PATCH] bugfix --- htdocs/commande/fiche.php | 4 ++-- htdocs/compta/commande/fiche.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index 13f342559e8..1ea8d356b53 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -1493,7 +1493,7 @@ else /* * Liste des expéditions */ - $sql = 'SELECT e.rowid,e.ref,'.$db->pdate('e.date_expedition').' as de'; + $sql = 'SELECT e.rowid as expedition_id, e.ref,'.$db->pdate('e.date_expedition').' as de'; if ($conf->livraison->enabled) $sql .= ", l.rowid as livraison_id, l.ref as livraison_ref"; $sql .= ' FROM '.MAIN_DB_PREFIX.'expedition as e'; if ($conf->livraison->enabled) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."livraison as l ON l.fk_expedition = e.rowid"; @@ -1521,7 +1521,7 @@ else $objp = $db->fetch_object($result); $var=!$var; print ''; - print ''.img_object($langs->trans('ShowSending'),'sending').' '.$objp->ref.''; + print ''.img_object($langs->trans('ShowSending'),'sending').' '.$objp->ref.''; if ($conf->livraison->enabled) { if ($objp->livraison_id) diff --git a/htdocs/compta/commande/fiche.php b/htdocs/compta/commande/fiche.php index c66997f838d..724d71954ca 100644 --- a/htdocs/compta/commande/fiche.php +++ b/htdocs/compta/commande/fiche.php @@ -585,7 +585,7 @@ if ($_GET["id"] > 0) /* * Liste des expéditions */ - $sql = "SELECT e.rowid,e.ref,".$db->pdate("e.date_expedition")." as de"; + $sql = "SELECT e.rowid as expedition_id, e.ref,".$db->pdate("e.date_expedition")." as de"; if ($conf->livraison->enabled) $sql .= ", l.rowid as livraison_id, l.ref as livraison_ref"; $sql .= " FROM ".MAIN_DB_PREFIX."expedition as e"; if ($conf->livraison->enabled) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."livraison as l ON l.fk_expedition = e.rowid"; @@ -613,7 +613,7 @@ if ($_GET["id"] > 0) $objp = $db->fetch_object($result); $var=!$var; print ""; - print ''.img_object($langs->trans("ShowSending"),"sending").' '.$objp->ref.''; + print ''.img_object($langs->trans("ShowSending"),"sending").' '.$objp->ref.''; if ($conf->livraison->enabled) { if ($objp->livraison_id)