diff --git a/htdocs/compta/fiche.php b/htdocs/compta/fiche.php index a8d1441bb32..38e678bbbb6 100644 --- a/htdocs/compta/fiche.php +++ b/htdocs/compta/fiche.php @@ -25,6 +25,7 @@ require("../contact.class.php"); require("../lib/webcal.class.php"); require("../cactioncomm.class.php"); require("../actioncomm.class.php"); +require("../facture.class.php"); /* * Sécurité accés client @@ -239,7 +240,7 @@ if ($socid > 0) { print ''; $var=!$var; - $sql = "SELECT s.nom, s.idp, f.facnumber, f.amount, ".$db->pdate("f.datef")." as df, f.paye, f.rowid as facid "; + $sql = "SELECT s.nom, s.idp, f.facnumber, f.amount, ".$db->pdate("f.datef")." as df, f.paye as paye, f.fk_statut as statut, f.rowid as facid "; $sql .= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f WHERE f.fk_soc = s.idp AND s.idp = ".$objsoc->idp." ORDER BY f.datef DESC"; if ( $db->query($sql) ) @@ -248,7 +249,7 @@ if ($socid > 0) if ($num > 0) { print ""; - print ""; + print ""; } while ($i < $num && $i < 5) @@ -266,9 +267,9 @@ if ($socid > 0) print "\n"; } print "\n"; - $paye[1] = "payée"; - $paye[0] = "impayée"; - print "\n"; + + $fac = new Facture($db); + print "\n"; print "\n"; $i++; } diff --git a/htdocs/facture.class.php b/htdocs/facture.class.php index 7f79c052cb5..b1a9278b5ce 100644 --- a/htdocs/facture.class.php +++ b/htdocs/facture.class.php @@ -429,16 +429,7 @@ class Facture */ Function get_libstatut() { - if (! $this->paye) - { - if ($this->statut == 0) return 'Brouillon (à valider)'; - if ($this->statut == 3) return 'Annulée'; - return 'Validée (à payer)'; - } - else - { - return 'Payée'; - } + return $this->LibStatut($this->paye,$this->statut); } /** @@ -845,6 +836,7 @@ class Facture return -1; } } + /** * RODO TODO * @@ -853,6 +845,23 @@ class Facture { } - + + /** + * Renvoi un libellé du statut + * + */ + Function LibStatut($paye,$statut) + { + if (! $paye) + { + if ($statut == 0) return 'Brouillon (à valider)'; + if ($statut == 3) return 'Annulée'; + return 'Validée (à payer)'; + } + else + { + return 'Payée'; + } + } } ?>
idp\">liste des factures ($num)
idp\">Liste des factures ($num)
!!!".number_format($objp->amount, 2, ',', ' ')."".$paye[$objp->paye]."".($fac->LibStatut($objp->paye,$objp->statut))."