From 974bd6b727fe65e5a4c03c86086c32a369b77878 Mon Sep 17 00:00:00 2001
From: Rodolphe Quiedeville <rodolphe@quiedeville.org>
Date: Sat, 9 Dec 2006 22:10:14 +0000
Subject: [PATCH] =?UTF-8?q?Filtre=20sur=20l'ann=E9e=20en=20cours?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scripts/cron/fournisseur-calcul-ca_genere.php | 29 ++++++++++++++++---
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/scripts/cron/fournisseur-calcul-ca_genere.php b/scripts/cron/fournisseur-calcul-ca_genere.php
index 06b07037ca4..3364f113981 100644
--- a/scripts/cron/fournisseur-calcul-ca_genere.php
+++ b/scripts/cron/fournisseur-calcul-ca_genere.php
@@ -108,9 +108,11 @@ $ca_products = array();
 $ca_fourns = array();
 foreach($real_products as $key => $value)
 {
-  $sql = "SELECT sum(total_ht) ";
-  $sql.= " FROM ".MAIN_DB_PREFIX."facturedet";
-  $sql.= " WHERE fk_product ='".$key."';";
+  $sql = "SELECT sum(fd.total_ht) ";
+  $sql.= " FROM ".MAIN_DB_PREFIX."facturedet as fd, ".MAIN_DB_PREFIX."facture as f";
+  $sql.= " WHERE fk_product ='".$key."'";
+  $sql.= " AND f.rowid = fd.fk_facture";
+  $sql .=" AND date_format(f.datef,'%Y') = '".$year."';";
   
   $resql = $db->query($sql) ;
 
@@ -128,7 +130,10 @@ foreach($real_products as $key => $value)
       print $sql;
     }
 }
-
+/*
+ * Mets a jour la table fournisseur
+ *
+ */
 foreach($ca_fourns as $key => $value)
 {
   $sqld = "DELETE FROM ".MAIN_DB_PREFIX."fournisseur_ca";
@@ -141,5 +146,21 @@ foreach($ca_fourns as $key => $value)
   
   $resqli = $db->query($sqli);
 }
+/*
+ * Mets a jour la table produit
+ *
+ */
+foreach($ca_products as $key => $value)
+{
+  $sqld = "DELETE FROM ".MAIN_DB_PREFIX."product_ca";
+  $sqld .= " WHERE year = $year AND fk_societe=$key;";
+  
+  $resqld = $db->query($sqld);
+
+  $sqli = "INSERT INTO ".MAIN_DB_PREFIX."product_ca";
+  $sqli .= " VALUES ($key,now(),$year,'".str_replace(',','.',$value)."');";
+  
+  $resqli = $db->query($sqli);
+}
 
 ?>