From 8af8f17ed30e00e209b1b5d33da89bd2aa569de1 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <dany@alchimerys.be>
Date: Wed, 5 Jan 2011 13:41:50 +0000
Subject: [PATCH] Merged revisions 3879,3883-3886,3894-3897,3899 via svnmerge
 from file:///home/developper/svn/phpcompta/branches/rel530
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

........
  r3895 | danydb | 2011-01-04 18:44:05 +0100 (Tue, 04 Jan 2011) | 1 line

  In legder unpaid, we add the CSS class print to the form in order to be printable
........
  r3896 | danydb | 2011-01-04 18:56:48 +0100 (Tue, 04 Jan 2011) | 2 lines

  Comptabilité-> Achat (ou vente) unpaid are not printed
........
  r3897 | danydb | 2011-01-05 14:30:45 +0100 (Wed, 05 Jan 2011) | 1 line

  remove useless tag
........
---
 html/index.php             | 1 -
 include/class_forecast.php | 4 ++--
 include/compta_ach.inc.php | 2 +-
 include/compta_ven.inc.php | 4 ++--
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/html/index.php b/html/index.php
index 4c1ef8b88..9743c7d9a 100644
--- a/html/index.php
+++ b/html/index.php
@@ -258,4 +258,3 @@ echo '
 </body>
 </html>
 
-?>
diff --git a/include/class_forecast.php b/include/class_forecast.php
index 7122b858b..e70a34e35 100644
--- a/include/class_forecast.php
+++ b/include/class_forecast.php
@@ -147,8 +147,8 @@ class Forecast
       $new=$this->cn->get_value($sql,array($this->f_id));
 
       /* save into forecast_cat */
-      $sql="insert into forecast_cat(fc_desc,f_id,fc_order)  select fc_desc,$new,fc_order from forecast_cat where f_id=$1 returning fc_id" ;
-      $array=$this->cn->get_array($sql,array($this->f_id));
+      $sql="insert into forecast_cat(fc_desc,f_id,fc_order)  select fc_desc,$1,fc_order from forecast_cat where f_id=$2 returning fc_id" ;
+      $array=$this->cn->get_array($sql,array($new,$this->f_id));
 
       $old=$this->cn->get_array("select fc_id from forecast_cat where f_id=$1",array($this->f_id));
       /* save into forecast_item */
diff --git a/include/compta_ach.inc.php b/include/compta_ach.inc.php
index 237d43d3f..47152477d 100644
--- a/include/compta_ach.inc.php
+++ b/include/compta_ach.inc.php
@@ -310,7 +310,7 @@ if ( $def == 2 )
     $bar=jrn_navigation_bar($offset,$max_line,$step,$page);
 
 
-    echo '<form method="GET" id="fpaida" action="'.$href.'">';
+    echo '<form method="GET" id="fpaida" class="print" action="'.$href.'">';
     echo HtmlInput::hidden("sa","l");
     echo HtmlInput::hidden("p_action","ach");
     echo dossier::hidden();
diff --git a/include/compta_ven.inc.php b/include/compta_ven.inc.php
index 6be118732..da98622d7 100644
--- a/include/compta_ven.inc.php
+++ b/include/compta_ven.inc.php
@@ -331,7 +331,7 @@ if ( $def == 2 )
     $bar=jrn_navigation_bar($offset,$max_line,$step,$page);
 
 
-    echo '<form method="GET" id="fpaidv" action="'.$href.'">';
+    echo '<form method="GET" id="fpaidv" class="print" action="'.$href.'">';
     echo HtmlInput::hidden("sa","l");
     echo HtmlInput::hidden("p_action","ven");
     echo dossier::hidden();
@@ -394,7 +394,7 @@ if ( $def==3 )
     $bar=jrn_navigation_bar($offset,$max_line,$step,$page);
 
 
-    echo '<form method="GET" id="fpaidv" action="'.$href.'">';
+    echo '<form method="GET" id="fpaidv" class="print" action="'.$href.'">';
     echo HtmlInput::hidden("sa","lnp");
     echo HtmlInput::hidden("p_action","ven");
     echo dossier::hidden();