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

Uniformisation du code

Browse Source
This commit is contained in:
Laurent Destailleur 2005-04-09 12:18:30 +00:00
parent 4684f8928c
commit 833cb77b76
1 changed files with 91 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

172
htdocs/compta/recap-client.php
View File

@ -151,103 +151,113 @@ if ($socid > 0)
* *
*/ */
print "</td></tr></table>\n"; print "</td></tr></table>\n";
print '<br>';
print '</div>'; print '</div>';
if ($conf->facture->enabled && $user->rights->facture->lire) if ($conf->facture->enabled && $user->rights->facture->lire)
{ {
// Factures
print_fiche_titre("Bills");
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
$sql = "SELECT s.nom, s.idp, f.facnumber, f.amount, ".$db->pdate("f.datef")." as df"; $sql = "SELECT s.nom, s.idp, f.facnumber, f.amount, ".$db->pdate("f.datef")." as df";
$sql .= " , f.paye as paye, f.fk_statut as statut, f.rowid as facid "; $sql .= " , 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"; $sql .= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
$sql .= " WHERE f.fk_soc = s.idp AND s.idp = ".$societe->id; $sql .= " WHERE f.fk_soc = s.idp AND s.idp = ".$societe->id;
$sql .= " ORDER BY f.datef DESC"; $sql .= " ORDER BY f.datef DESC";
if ( $db->query($sql) ) $resql=$db->query($sql);
{ if ($resql)
$var=true; {
$num = $db->num_rows(); $i = 0; $var=true;
if ($num > 0) $num = $db->num_rows($resql);
if ($num > 0)
{ {
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";
print '<td colspan="2">&nbsp;</td>'; print '<td colspan="2">&nbsp;</td>';
print '<td align="right">'.$langs->trans("Debit").'</td>'; print '<td align="right">'.$langs->trans("Debit").'</td>';
print '<td align="right">'.$langs->trans("Credit").'</td>'; print '<td align="right">'.$langs->trans("Credit").'</td>';
print '<td align="right">'.$langs->trans("Solde").'</td>'; print '<td align="right">'.$langs->trans("Solde").'</td>';
print '</tr>'; print '</tr>';
} }
else
while ($i < $num) {
{ print $langs->trans("NoBills");
$objp = $db->fetch_object(); }
$facs[$i] = $objp->facid;
$i++; $i = 0;
} while ($i < $num)
$db->free(); {
$objp = $db->fetch_object($resql);
$facs[$i] = $objp->facid;
$solde = 0; $i++;
}
for ($i = 0 ; $i < $num ; $i++) $db->free($resql);
{
$var=!$var;
$solde = 0;
$fac = new Facture($db);
$fac->fetch($facs[$i]); // Boucle sur chaque facture
for ($i = 0 ; $i < $num ; $i++)
print "<tr $bc[$var]>"; {
$var=!$var;
print "<td align=\"right\">".dolibarr_print_date($fac->date)."</td>\n";
print "<td><a href=\"../compta/facture.php?facid=$fac->id\">".img_object($langs->trans("ShowBill"),"bill")." ".$fac->ref."</a></td>\n"; $fac = new Facture($db);
$fac->fetch($facs[$i]);
print '<td align="right">'.number_format($fac->total_ttc, 2, ',', ' ')."</td>\n";
$solde = $solde + $fac->total_ttc; print "<tr $bc[$var]>";
print '<td align="right">&nbsp;</td>'; print "<td align=\"right\">".dolibarr_print_date($fac->date)."</td>\n";
print '<td align="right">'.number_format($solde, 2, ',', ' ')."</td>\n"; print "<td><a href=\"../compta/facture.php?facid=$fac->id\">".img_object($langs->trans("ShowBill"),"bill")." ".$fac->ref."</a></td>\n";
print "</tr>\n";
print '<td align="right">'.number_format($fac->total_ttc, 2, ',', ' ')."</td>\n";
$solde = $solde + $fac->total_ttc;
$sql = "SELECT p.rowid,".$db->pdate("p.datep")." as dp, pf.amount, p.statut";
print '<td align="right">&nbsp;</td>';
$sql .= " FROM ".MAIN_DB_PREFIX."paiement as p"; print '<td align="right">'.number_format($solde, 2, ',', ' ')."</td>\n";
$sql .= ", ".MAIN_DB_PREFIX."paiement_facture as pf"; print "</tr>\n";
$sql .= " WHERE pf.fk_paiement = p.rowid";
$sql .= " AND pf.fk_facture = ".$fac->id; // Paiements
$sql = "SELECT p.rowid,".$db->pdate("p.datep")." as dp, pf.amount, p.statut";
$result = $db->query($sql);
$sql .= " FROM ".MAIN_DB_PREFIX."paiement as p";
if ($result) $sql .= ", ".MAIN_DB_PREFIX."paiement_facture as pf";
{ $sql .= " WHERE pf.fk_paiement = p.rowid";
$nump = $db->num_rows(); $sql .= " AND pf.fk_facture = ".$fac->id;
$j = 0;
$resql = $db->query($sql);
while ($j < $nump) if ($resql)
{ {
$objp = $db->fetch_object(); $nump = $db->num_rows($resql);
//$var=!$var; $j = 0;
print "<tr $bc[$var]>";
print '<td align="right">'.dolibarr_print_date($objp->dp)."</td>\n"; while ($j < $nump)
print '<td><a href="paiement/fiche.php?id='.$objp->rowid.'">'.img_file().' Paiement '.$objp->rowid.'</td>'; {
print "<td>&nbsp;</td>\n"; $objp = $db->fetch_object($resql);
print '<td align="right">'.price($objp->amount).'</td>'; //$var=!$var;
$solde = $solde - $objp->amount; print "<tr $bc[$var]>";
print '<td align="right">'.number_format($solde, 2, ',', ' ')."</td>\n"; print '<td align="right">'.dolibarr_print_date($objp->dp)."</td>\n";
print '</tr>'; print '<td><a href="paiement/fiche.php?id='.$objp->rowid.'">'.img_file().' Paiement '.$objp->rowid.'</td>';
print "<td>&nbsp;</td>\n";
$j++; print '<td align="right">'.price($objp->amount).'</td>';
} $solde = $solde - $objp->amount;
} print '<td align="right">'.number_format($solde, 2, ',', ' ')."</td>\n";
} print '</tr>';
}
$j++;
}
}
}
}
else else
{ {
dolibarr_print_error($db); dolibarr_print_error($db);
} }
print "</table>"; print "</table>";
} }
} }
else else
{ {