';
echo $r;
echo "
On-line calculator
".JS_CALC_LINE."
";
echo "
";
-
+
}
// 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;