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

Fix: Corrections sur les rapports rsultats

Browse Source
This commit is contained in:
Laurent Destailleur 2005-04-15 23:50:38 +00:00
parent 62354c4907
commit b56569a33d
2 changed files with 87 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/compta/resultat/clientfourn.php
View File

@ -39,7 +39,7 @@ $modecompta = $conf->compta->mode;
if ($_GET["modecompta"]) $modecompta=$_GET["modecompta"]; if ($_GET["modecompta"]) $modecompta=$_GET["modecompta"];
print_fiche_titre("Résultat exercice, par client/fournisseur",($year?"&nbsp; <a href='clientfourn.php?year=".($year-1)."'>".img_previous()."</a> Année $year <a href='clientfourn.php?year=".($year+1)."'>".img_next()."</a>":"")); print_fiche_titre("Résultat exercice, par client/fournisseur",($year?"&nbsp; <a href='clientfourn.php?year=".($year-1)."&modecompta=".$modecompta."'>".img_previous()."</a> Année $year <a href='clientfourn.php?year=".($year+1)."&modecompta=".$modecompta."'>".img_next()."</a>":""));
print '<br>'; print '<br>';
print "Cet état permet de faire un bilan des recettes et dépenses:<br>"; print "Cet état permet de faire un bilan des recettes et dépenses:<br>";

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

@ -55,12 +55,12 @@ if ($_GET["modecompta"]) $modecompta=$_GET["modecompta"];
$title="Résultat exercice, résumé annuel"; $title="Résultat exercice, résumé annuel";
$lien=($year_start?"<a href='index.php?year_start=".($year_start-1)."'>".img_previous()."</a> <a href='index.php?year_start=".($year_start+1)."'>".img_next()."</a>":""); $lien=($year_start?"<a href='index.php?year_start=".($year_start-1)."&modecompta=".$modecompta."'>".img_previous()."</a> <a href='index.php?year_start=".($year_start+1)."&modecompta=".$modecompta."'>".img_next()."</a>":"");
print_fiche_titre($title,$lien); print_fiche_titre($title,$lien);
print '<br>'; print '<br>';
// Affiche règles de calcul // Affiche règles de calcul
print "Ce rapport présente la balance entre les recettes et les dépenses facturées aux clients ou fournisseurs:<br>\n"; print "Cet état permet de faire un bilan des recettes et dépenses:<br>\n";
if ($modecompta=="CREANCES-DETTES") if ($modecompta=="CREANCES-DETTES")
{ {
print $langs->trans("RulesResultDue"); print $langs->trans("RulesResultDue");
@ -152,6 +152,90 @@ else {
} }
/*
* Charges sociales non déductibles
*/
if ($modecompta == 'CREANCES-DETTES') {
$sql = "SELECT c.libelle as nom, sum(s.amount) as amount";
$sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c, ".MAIN_DB_PREFIX."chargesociales as s";
$sql .= " WHERE s.fk_type = c.id AND c.deductible=0";
if ($year) {
$sql .= " AND s.date_ech between '$year-01-01 00:00:00' and '$year-12-31 23:59:59'";
}
$sql .= " GROUP BY c.libelle";
}
else {
$sql = "SELECT c.libelle as nom, sum(p.amount) as amount";
$sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c, ".MAIN_DB_PREFIX."chargesociales as s, ".MAIN_DB_PREFIX."paiementcharge as p";
$sql .= " WHERE p.fk_charge = s.rowid AND s.fk_type = c.id AND c.deductible=0";
if ($year) {
$sql .= " AND p.datep between '$year-01-01 00:00:00' and '$year-12-31 23:59:59'";
}
$sql .= " GROUP BY c.libelle";
}
$result=$db->query($sql);
if ($result) {
$num = $db->num_rows($result);
$var=false;
$i = 0;
if ($num) {
while ($i < $num) {
$obj = $db->fetch_object($result);
$decaiss[$row->dm] += $row->amount_ht;
$decaiss_ttc[$row->dm] += $row->amount_ttc;
$i++;
}
}
} else {
dolibarr_print_error($db);
}
/*
* Charges sociales déductibles
*/
if ($modecompta == 'CREANCES-DETTES') {
$sql = "SELECT c.libelle as nom, sum(s.amount) as amount";
$sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c, ".MAIN_DB_PREFIX."chargesociales as s";
$sql .= " WHERE s.fk_type = c.id AND c.deductible=1";
if ($year) {
$sql .= " AND s.date_ech between '$year-01-01 00:00:00' and '$year-12-31 23:59:59'";
}
$sql .= " GROUP BY c.libelle DESC";
}
else {
$sql = "SELECT c.libelle as nom, sum(p.amount) as amount";
$sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c, ".MAIN_DB_PREFIX."chargesociales as s, ".MAIN_DB_PREFIX."paiementcharge as p";
$sql .= " WHERE p.fk_charge = s.rowid AND s.fk_type = c.id AND c.deductible=1";
if ($year) {
$sql .= " AND p.datep between '$year-01-01 00:00:00' and '$year-12-31 23:59:59'";
}
$sql .= " GROUP BY c.libelle";
}
$result=$db->query($sql);
if ($result) {
$num = $db->num_rows($result);
$var=false;
$i = 0;
if ($num) {
while ($i < $num) {
$obj = $db->fetch_object($result);
$decaiss[$row->dm] += $row->amount_ht;
$decaiss_ttc[$row->dm] += $row->amount_ttc;
$i++;
}
}
} else {
dolibarr_print_error($db);
}
/* /*
* Affiche tableau * Affiche tableau