diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index 9c9532ababe..0300e641a18 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -259,31 +259,38 @@ if ($conf->commande->enabled && $user->rights->commande->lire) print '
| '.$langs->trans("OrdersToBill").' ('.$num.') | '; - print ''.$langs->trans("AmountHT").' | '.$langs->trans("AmountTTC").' | '.$langs->trans("AmountHT").' | '; + print ''.$langs->trans("AmountTTC").' | '; + print ''.$langs->trans("ToBill").' | '; + print ''; $var = True; $tot_ht=0; $tot_ttc=0; while ($i < $num) { - $var=!$var; - $obj = $db->fetch_object($resql); - if ($obj->total_ht-$obj->tot_fht) - { - print "
| rowid\">".img_object($langs->trans("ShowOrder"),"order").' '; - print "rowid\">".$obj->ref.' | '; - - print ''.img_object($langs->trans("ShowCompany"),"company").' '; - print ''.$obj->nom.' | '; - print ''.price($obj->total_ht-$obj->tot_fht).' | '; - print ''.price($obj->total_ttc-$obj->tot_fttc).' | |
| rowid\">".img_object($langs->trans("ShowOrder"),"order").' '; + print "rowid\">".$obj->ref.' | '; + + print ''.img_object($langs->trans("ShowCompany"),"company").' '; + print ''.$obj->nom.' | '; + print ''.price($obj->total_ht).' | '; + print ''.price($obj->total_ttc).' | '; + print ''.price($obj->total_ttc-$obj->tot_fttc).' |
| '.$langs->trans("Total").' (Reste à facturer : '.price($tot_ttc).') | '.price($tot_ht)." | ".price($tot_ttc)." | ||