lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Le statut des factures ne s'affichait pas correctement dans la fiche client.

Browse Source
This commit is contained in:
Laurent Destailleur 2004-04-22 20:11:25 +00:00
parent 69ba76425a
commit ce7e2cb454
2 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
htdocs/compta/fiche.php
View File

@ -25,6 +25,7 @@ require("../contact.class.php");
require("../lib/webcal.class.php"); require("../lib/webcal.class.php");
require("../cactioncomm.class.php"); require("../cactioncomm.class.php");
require("../actioncomm.class.php"); require("../actioncomm.class.php");
require("../facture.class.php");
/* /*
* Sécurité accés client * Sécurité accés client
@ -239,7 +240,7 @@ if ($socid > 0)
{ {
print '<table class="border" width="100%" cellspacing="0" cellpadding="1">'; print '<table class="border" width="100%" cellspacing="0" cellpadding="1">';
$var=!$var; $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"; $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) ) if ( $db->query($sql) )
@ -248,7 +249,7 @@ if ($socid > 0)
if ($num > 0) if ($num > 0)
{ {
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";
print "<td colspan=\"4\"><a href=\"facture.php?socidp=$objsoc->idp\">liste des factures ($num)</td></tr>"; print "<td colspan=\"4\"><a href=\"facture.php?socidp=$objsoc->idp\">Liste des factures ($num)</td></tr>";
} }
while ($i < $num && $i < 5) while ($i < $num && $i < 5)
@ -266,9 +267,9 @@ if ($socid > 0)
print "<TD align=\"right\"><b>!!!</b></TD>\n"; print "<TD align=\"right\"><b>!!!</b></TD>\n";
} }
print "<TD align=\"right\">".number_format($objp->amount, 2, ',', ' ')."</TD>\n"; print "<TD align=\"right\">".number_format($objp->amount, 2, ',', ' ')."</TD>\n";
$paye[1] = "payée";
$paye[0] = "<b>impayée</b>"; $fac = new Facture($db);
print "<TD align=\"center\">".$paye[$objp->paye]."</TD>\n"; print "<TD align=\"center\">".($fac->LibStatut($objp->paye,$objp->statut))."</TD>\n";
print "</TR>\n"; print "</TR>\n";
$i++; $i++;
} }

31
htdocs/facture.class.php
View File

@ -429,16 +429,7 @@ class Facture
*/ */
Function get_libstatut() Function get_libstatut()
{ {
if (! $this->paye) return $this->LibStatut($this->paye,$this->statut);
{
if ($this->statut == 0) return 'Brouillon (à valider)';
if ($this->statut == 3) return 'Annulée';
return 'Validée (à payer)';
}
else
{
return 'Payée';
}
} }
/** /**
@ -845,6 +836,7 @@ class Facture
return -1; return -1;
} }
} }
/** /**
* RODO TODO * 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';
}
}
} }
?> ?>