diff --git a/htdocs/compta/facture.php3 b/htdocs/compta/facture.php3 index 2a934d481ad..11c43c4e399 100644 --- a/htdocs/compta/facture.php3 +++ b/htdocs/compta/facture.php3 @@ -227,7 +227,7 @@ if ($action == 'create') print "Client :$obj->nom"; - print ''; + print ''; print ''; if ($propalid) @@ -246,13 +246,7 @@ if ($action == 'create') } else { - print 'Montant HT :'; - print ''; - print ''; - - print 'Remise :'; - print ''; - print ''; + } print ""; @@ -742,7 +736,7 @@ else $sql .= " AND date_format(f.datef, '%Y') = $year"; } - $sql .= " ORDER BY f.fk_statut, f.paye, f.datef DESC, f.facnumber DESC "; + $sql .= " ORDER BY f.datef DESC, f.facnumber DESC "; $result = $db->query($sql); if ($result) { @@ -754,7 +748,7 @@ else print "Numéro"; print_liste_field_titre("Société",$PHP_SELF,"s.nom"); print "DateMontant"; - + print ' '; print "\n"; if ($num > 0) { @@ -762,28 +756,17 @@ else while ($i < $num) { $objp = $db->fetch_object( $i); $var=!$var; - - if ($objp->paye && !$sep) { - print ""; - print " "; - print "Sous Total : ".price($total).""; - - print ''; - print "Numéro"; - print_liste_field_titre("Société",$PHP_SELF,"s.nom"); - print "DateMontant"; - - $sep = 1 ; $j = 0; - $subtotal = 0; - } - + print ""; print "facid\">"; - if ($objp->paye) { - print $objp->facnumber; - } else { - print ''.$objp->facnumber.''; - } + if ($objp->paye) + { + print $objp->facnumber; + } + else + { + print ''.$objp->facnumber.''; + } print "\n"; print "idp\">$objp->nom\n"; @@ -802,6 +785,15 @@ else } print "".price($objp->amount)."\n"; + + if (! $objp->paye) + { + print 'impayée'; + } + else + { + print ' '; + } $total = $total + $objp->amount; $subtotal = $subtotal + $objp->amount; @@ -815,11 +807,11 @@ else } if ($i == 0) { $i=1; } if ($j == 0) { $j=1; } print "$j factures "; - print "Sous Total : ".price($subtotal).""; - + print "Sous Total : ".price($subtotal).""; + print ' '; print "$i factures "; - print "Total (euros HT): ".price($total).""; - + print "Total (euros HT): ".price($total).""; + print ' '; print ""; $db->free(); } else {