Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-08 00:52:01 +01:00
Code Issues 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
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("../cactioncomm.class.php");
require("../actioncomm.class.php");
require("../facture.class.php");
/*
* S<>curit<69> acc<63>s client
@@ -239,7 +240,7 @@ if ($socid > 0)
{
print '<table class="border" width="100%" cellspacing="0" cellpadding="1">';
$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 "<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)
@@ -266,9 +267,9 @@ if ($socid > 0)
print "<TD align=\"right\"><b>!!!</b></TD>\n";
}
print "<TD align=\"right\">".number_format($objp->amount, 2, ',', ' ')."</TD>\n";
$paye[1] = "pay<EFBFBD>e";
$paye[0] = "<b>impay<61>e</b>";
print "<TD align=\"center\">".$paye[$objp->paye]."</TD>\n";
$fac = new Facture($db);
print "<TD align=\"center\">".($fac->LibStatut($objp->paye,$objp->statut))."</TD>\n";
print "</TR>\n";
$i++;
}

31
htdocs/facture.class.php
View File

@@ -429,16 +429,7 @@ class Facture
*/
Function get_libstatut()
{
if (! $this->paye)
{
if ($this->statut == 0) return 'Brouillon (<28> valider)';
if ($this->statut == 3) return 'Annul<75>e';
return 'Valid<69>e (<28> payer)';
}
else
{
return 'Pay<61>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<6C> du statut
*
*/
Function LibStatut($paye,$statut)
{
if (! $paye)
{
if ($statut == 0) return 'Brouillon (<28> valider)';
if ($statut == 3) return 'Annul<75>e';
return 'Valid<69>e (<28> payer)';
}
else
{
return 'Pay<61>e';
}
}
}
?>