From b56569a33de6d28febd01289c78dc535ead0323f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Fri, 15 Apr 2005 23:50:38 +0000
Subject: [PATCH] =?UTF-8?q?Fix:=20Corrections=20sur=20les=20rapports=20r?=
 =?UTF-8?q?=E9sultats?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/compta/resultat/clientfourn.php |  2 +-
 htdocs/compta/resultat/index.php       | 88 +++++++++++++++++++++++++-
 2 files changed, 87 insertions(+), 3 deletions(-)

diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php
index 0dbf657d23c..d3b72be9fb3 100644
--- a/htdocs/compta/resultat/clientfourn.php
+++ b/htdocs/compta/resultat/clientfourn.php
@@ -39,7 +39,7 @@ $modecompta = $conf->compta->mode;
 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 "Cet état permet de faire un bilan des recettes et dépenses:<br>";
diff --git a/htdocs/compta/resultat/index.php b/htdocs/compta/resultat/index.php
index fe8487c8dc2..dc69a4955ae 100644
--- a/htdocs/compta/resultat/index.php
+++ b/htdocs/compta/resultat/index.php
@@ -55,12 +55,12 @@ if ($_GET["modecompta"]) $modecompta=$_GET["modecompta"];
 
 
 $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 '<br>';
 
 // 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")
 {
     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