diff --git a/htdocs/compta/commande/fiche.php b/htdocs/compta/commande/fiche.php index cd374db7924..ed6e9767d57 100644 --- a/htdocs/compta/commande/fiche.php +++ b/htdocs/compta/commande/fiche.php @@ -284,7 +284,7 @@ if ($id > 0 || ! empty($ref)) print ''; } - // Conditions et modes de r�glement + // Conditions et modes de reglement print '
| '; print $langs->trans('PaymentConditionsShort'); diff --git a/htdocs/lib/sendings.lib.php b/htdocs/lib/sendings.lib.php index e461af411ea..4093b58ff90 100644 --- a/htdocs/lib/sendings.lib.php +++ b/htdocs/lib/sendings.lib.php @@ -130,9 +130,9 @@ function show_list_sending_receive($origin='commande',$origin_id,$filter='') //if ($conf->livraison_bon->enabled) $sql .= " l.rowid as livraison_id, l.ref as livraison_ref, ".$db->pdate("l.date_delivery")." as date_delivery, ld.qty as qty_received,"; $sql.= ' p.label as product, p.ref, p.fk_product_type, p.rowid as prodid,'; $sql.= ' p.description as product_desc'; - $sql.= " FROM (".MAIN_DB_PREFIX."expeditiondet as ed,"; - $sql.= " ".MAIN_DB_PREFIX.$origin."det as obj,"; - $sql.= " ".MAIN_DB_PREFIX."expedition as e)"; + $sql.= " FROM ".MAIN_DB_PREFIX."expeditiondet as ed"; + $sql.= ", ".MAIN_DB_PREFIX."expedition as e"; + $sql.= ", ".MAIN_DB_PREFIX.$origin."det as obj"; //if ($conf->livraison_bon->enabled) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."livraison as l ON l.fk_expedition = e.rowid LEFT JOIN ".MAIN_DB_PREFIX."livraisondet as ld ON ld.fk_livraison = l.rowid AND obj.rowid = ld.fk_origin_line"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON obj.fk_product = p.rowid"; $sql.= " WHERE obj.fk_".$origin." = ".$origin_id; |