diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php index 3f0138ff226..df47bc3ffa4 100644 --- a/htdocs/fourn/commande/fiche.php +++ b/htdocs/fourn/commande/fiche.php @@ -643,12 +643,13 @@ else if ($num) { print ''; - print ''.$langs->trans("Description").''; - print ''.$langs->trans("VAT").''; - print ''.$langs->trans("Qty").''; - print ''.$langs->trans("ReductionShort").''; - print ''.$langs->trans("PriceU").''; - print '  '; + print ''.$langs->trans('Description').''; + print ''.$langs->trans('VAT').''; + print ''.$langs->trans('PriceUHT').''; + print ''.$langs->trans('Qty').''; + print ''.$langs->trans('ReductionShort').''; + print ''.$langs->trans('AmountHT').''; + print ' '; print "\n"; } $var=false; @@ -662,8 +663,9 @@ else print ' - '.$objp->label; if ($objp->description) print '
'.nl2br($objp->description); print ""; - print ''.vatrate($objp->tva_tx).'%'; - print ''.$objp->qty.''; + print ''.vatrate($objp->tva_tx).'%'; + print ''.price($objp->subprice)."\n"; + print ''.$objp->qty.''; if ($objp->remise_percent > 0) { print ''.$objp->remise_percent."%\n"; @@ -672,14 +674,14 @@ else { print ' '; } - print ''.price($objp->subprice)."\n"; + print ' '; if ($commande->statut == 0 && $user->rights->fournisseur->commande->creer && $_GET["action"] <> 'valid' && $_GET["action"] != 'editline') { - print 'rowid.'#'.$objp->rowid.'">'; + print 'rowid.'#'.$objp->rowid.'">'; print img_edit(); print ''; - print 'rowid.'">'; + print 'rowid.'">'; print img_delete(); print ''; } @@ -701,7 +703,7 @@ else print ''; $html->select_tva('tva_tx',$objp->tva_tx); print ''; - print ''; + print ''; print '%'; print ''; print ''; @@ -729,20 +731,20 @@ else print ''; print ''; - print ''.$langs->trans("Description").''; - print ''.$langs->trans("VAT").''; - print ''.$langs->trans("Qty").''; - print ''.$langs->trans("ReductionShort").''; - print ''.$langs->trans("PriceU").''; - print '  '."\n"; + print ''.$langs->trans('Description').''; + print ''.$langs->trans('VAT').''; + print ''.$langs->trans('PriceUHT').''; + print ''.$langs->trans('Qty').''; + print ''.$langs->trans('ReductionShort').''; + print ' '; + print ''; $var=false; - print "".''; + print "".''; $html->select_produits_fournisseurs($commande->fourn_id,'','idprodfournprice',$filtre); print ''; - print ''; - print '%'; - print ' '; + print ''; + print '%'; print ''; print "\n";