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

Suppression du filtre sur les annees

Browse Source
This commit is contained in:
Rodolphe Quiedeville 2003-10-28 16:49:34 +00:00
parent 841135eac2
commit 75b171a994
1 changed files with 8 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
htdocs/compta/resultat/index.php
View File

@ -34,19 +34,17 @@ td.border { border: 1px solid #000000}
<?PHP <?PHP
print_titre("Résultat $year"); print_titre("Résultat");
print "<TABLE border=\"0\" width=\"100%\" cellspacing=\"0\" cellpadding=\"4\">"; print "<TABLE border=\"0\" width=\"100%\" cellspacing=\"0\" cellpadding=\"4\">";
print '<TR class="liste_titre">'; print '<TR class="liste_titre">';
print '<td width="10%">&nbsp;</td><TD>Elément</TD>'; print '<td width="10%">&nbsp;</td><TD>Elément</TD>';
print "<TD align=\"center\">Montant</TD><td align=\"right\">Solde</td>"; print "<TD align=\"right\">Montant</td>";
print "</TR>\n"; print "</tr>\n";
$sql = "SELECT s.nom,sum(f.amount) as amount"; $sql = "SELECT s.nom,sum(f.amount) as amount";
$sql .= " FROM llx_societe as s,llx_facture as f WHERE f.fk_soc = s.idp"; $sql .= " FROM llx_societe as s,llx_facture as f WHERE f.fk_soc = s.idp";
if ($year > 0) {
$sql .= " AND date_format(f.datef, '%Y') = $year";
}
$sql .= " GROUP BY s.nom ASC"; $sql .= " GROUP BY s.nom ASC";
print '<tr><td colspan="4">Factures</td></tr>'; print '<tr><td colspan="4">Factures</td></tr>';
@ -69,8 +67,6 @@ if ($result) {
print "<TD align=\"right\">".price($objp->amount)."</TD>\n"; print "<TD align=\"right\">".price($objp->amount)."</TD>\n";
$total = $total + $objp->amount; $total = $total + $objp->amount;
print "<TD align=\"right\">".price($total)."</TD>\n";
print "</TR>\n"; print "</TR>\n";
$i++; $i++;
} }
@ -85,11 +81,9 @@ print '<tr><td colspan="3" align="right">'.price($total).'</td></tr>';
* *
* *
*/ */
$sql = "SELECT s.nom,sum(f.amount) as amount"; $sql = "SELECT s.nom,sum(f.total_ht) as amount";
$sql .= " FROM llx_societe as s,llx_facture_fourn as f WHERE f.fk_soc = s.idp"; $sql .= " FROM llx_societe as s,llx_facture_fourn as f WHERE f.fk_soc = s.idp";
if ($year > 0) {
$sql .= " AND date_format(f.datef, '%Y') = $year";
}
$sql .= " GROUP BY s.nom ASC"; $sql .= " GROUP BY s.nom ASC";
print '<tr><td colspan="4">Frais</td></tr>'; print '<tr><td colspan="4">Frais</td></tr>';
@ -112,8 +106,6 @@ if ($result) {
$total = $total - $objp->amount; $total = $total - $objp->amount;
$subtotal = $subtotal + $objp->amount; $subtotal = $subtotal + $objp->amount;
print "<TD align=\"right\">".price($total)."</TD>\n";
print "</TR>\n"; print "</TR>\n";
$i++; $i++;
} }
@ -134,9 +126,7 @@ print '<tr><td colspan="4">Prestations d
$sql = "SELECT c.libelle as nom, sum(s.amount) as amount"; $sql = "SELECT c.libelle as nom, sum(s.amount) as amount";
$sql .= " FROM c_chargesociales as c, llx_chargesociales as s"; $sql .= " FROM c_chargesociales as c, llx_chargesociales as s";
$sql .= " WHERE s.fk_type = c.id AND c.deductible=1"; $sql .= " WHERE s.fk_type = c.id AND c.deductible=1";
if ($year > 0) {
$sql .= " AND date_format(s.periode, '%Y') = $year";
}
$sql .= " GROUP BY c.libelle DESC"; $sql .= " GROUP BY c.libelle DESC";
if ( $db->query($sql) ) { if ( $db->query($sql) ) {
@ -153,7 +143,6 @@ if ( $db->query($sql) ) {
print "<tr $bc[$var]><td>&nbsp</td>"; print "<tr $bc[$var]><td>&nbsp</td>";
print '<td>'.$obj->nom.'</td>'; print '<td>'.$obj->nom.'</td>';
print '<td align="right">'.price($obj->amount).'</td>'; print '<td align="right">'.price($obj->amount).'</td>';
print "<TD align=\"right\">".price($total)."</TD>\n";
print '</tr>'; print '</tr>';
$i++; $i++;
} }
@ -173,9 +162,7 @@ print '<tr><td colspan="4">Prestations NON d
$sql = "SELECT c.libelle as nom, sum(s.amount) as amount"; $sql = "SELECT c.libelle as nom, sum(s.amount) as amount";
$sql .= " FROM c_chargesociales as c, llx_chargesociales as s"; $sql .= " FROM c_chargesociales as c, llx_chargesociales as s";
$sql .= " WHERE s.fk_type = c.id AND c.deductible=0"; $sql .= " WHERE s.fk_type = c.id AND c.deductible=0";
if ($year > 0) {
$sql .= " AND date_format(s.periode, '%Y') = $year";
}
$sql .= " GROUP BY c.libelle DESC"; $sql .= " GROUP BY c.libelle DESC";
if ( $db->query($sql) ) { if ( $db->query($sql) ) {
@ -192,7 +179,6 @@ if ( $db->query($sql) ) {
print "<tr $bc[$var]><td>&nbsp</td>"; print "<tr $bc[$var]><td>&nbsp</td>";
print '<td>'.$obj->nom.'</td>'; print '<td>'.$obj->nom.'</td>';
print '<td align="right">'.price($obj->amount).'</td>'; print '<td align="right">'.price($obj->amount).'</td>';
print "<TD align=\"right\">".price($total)."</TD>\n";
print '</tr>'; print '</tr>';
$i++; $i++;
} }