From 4eebad93e65b0acaa8da926a1105e851b925bf4e Mon Sep 17 00:00:00 2001
From: sparkyx <dany118@gmail.com>
Date: Tue, 29 May 2007 19:56:10 +0000
Subject: [PATCH] Fix bug with misc ledger

---
 include/user_action_ods.php | 9 +++++----
 include/user_common.php     | 2 +-
 include/user_form_ods.php   | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/include/user_action_ods.php b/include/user_action_ods.php
index 90bc00941..868b31f08 100644
--- a/include/user_action_ods.php
+++ b/include/user_action_ods.php
@@ -53,15 +53,16 @@ if ( $action == 'new' ) {
     $submit='<INPUT TYPE="SUBMIT" NAME="add_item" VALUE="Ajout poste">
                     <INPUT TYPE="SUBMIT" NAME="view_invoice" VALUE="Confirmer">';
     // add a one-line calculator
+    $prop=GetJrnProp($_SESSION['g_dossier'],$_GET['p_jrn']);
+    $line=$prop['jrn_deb_max_line'];
+    $r=FormODS($cn,$_GET['p_jrn'],$User->GetPeriode(),$submit,null,false,$line);
 
-    
-    $r=FormODS($cn,$_GET['p_jrn'],$User->GetPeriode(),$submit,null,false);
-    echo '<div class="u_redcontent">';
+     echo '<div class="u_redcontent">';
     echo $r;
     echo "<div><h4>On-line calculator</h4>".JS_CALC_LINE."<div>";
     echo "</div>";
 	  
-    
+
   }
 
 	// Add an item
diff --git a/include/user_common.php b/include/user_common.php
index 7c6b34536..33f96100f 100644
--- a/include/user_common.php
+++ b/include/user_common.php
@@ -209,7 +209,7 @@ function ComputeVat($p_cn,	$p_fiche,$p_quant,$p_price,$p_vat )
       $a=$a_vat['tva_id'];
       $vat_amount=$p_price*$a_vat['tva_rate']*$p_quant;
     } 
-  echo_debug('user_common',__LINE__,'return '.round($vat_amount,2));
+  echo_debug('user_common',__LINE__,'return tva'.round($vat_amount,2));
   return round($vat_amount,2);
   
   
diff --git a/include/user_form_ods.php b/include/user_form_ods.php
index a2a0ae58a..5c80c8fec 100644
--- a/include/user_form_ods.php
+++ b/include/user_form_ods.php
@@ -143,7 +143,7 @@ function FormODS($p_cn,$p_jrn,$p_periode,$p_submit,$p_array=null,$pview_only=tru
     }
     // code
     // Do we need a filter ?
-    $l_line=GetJrnProp($p_cn,$p_jrn);
+    $l_line=GetJrnProp($_SESSION['g_dossier'],$p_jrn);
     if(  strlen(trim ($l_line['jrn_def_class_cred']) ) > 0 or
 	 strlen(trim ($l_line['jrn_def_class_deb']) ) > 0 ) {
       $filter=1;