diff --git a/htdocs/expedition/commande.php b/htdocs/expedition/commande.php index dd5db01a680..5b901d79b67 100644 --- a/htdocs/expedition/commande.php +++ b/htdocs/expedition/commande.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2003-2006 Rodolphe Quiedeville * Copyright (C) 2005 Laurent Destailleur * Copyright (C) 2005-2006 Regis Houssin * @@ -147,17 +147,6 @@ if ($_GET["id"] > 0) print ''.$soc->getNomUrl(1).''; print ''; - // Ligne info remises tiers - print ''.$langs->trans('Discounts').''; - if ($soc->remise_client) print $langs->trans("CompanyHasRelativeDiscount",$soc->remise_client); - else print $langs->trans("CompanyHasNoRelativeDiscount"); - $absolute_discount=$soc->getCurrentDiscount(); - print '. '; - if ($absolute_discount) print $langs->trans("CompanyHasAbsoluteDiscount",$absolute_discount,$langs->trans("Currency".$conf->monnaie)); - else print $langs->trans("CompanyHasNoAbsoluteDiscount"); - print '.'; - print ''; - // Date print ''.$langs->trans('Date').''; print ''.dolibarr_print_date($commande->date,'%A %d %B %Y').''; @@ -306,7 +295,7 @@ if ($_GET["id"] > 0) */ echo ''; - $sql = "SELECT l.fk_product, l.description, l.price, l.qty, l.rowid, l.tva_tx, l.remise_percent, l.subprice"; + $sql = "SELECT l.fk_product, l.description, l.price, l.qty, l.rowid, l.tva_tx, l.subprice"; $sql.= " FROM ".MAIN_DB_PREFIX."commandedet as l "; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON l.fk_product = p.rowid"; $sql.= " WHERE l.fk_commande = ".$commande->id;