diff --git a/html/bilan.php b/html/bilan.php
index 24df77077..a0747d0f1 100644
--- a/html/bilan.php
+++ b/html/bilan.php
@@ -25,6 +25,7 @@ include_once("ac_common.php");
include_once("impress_inc.php");
include_once("postgres.php");
require_once ('header_print.php');
+require_once ('class_bilan.php');
include ('class_user.php');
require_once('class_dossier.php');
@@ -49,101 +50,19 @@ if ( $User->admin == 0 ) {
}
-// A rtf file is generated
-header('Content-type: application/rtf');
-
- // It will be called downloaded.pdf
-header('Content-Disposition: attachment; filename="bilan.rtf"');
-
+$bilan=new Bilan($cn);
+$bilan->get_request_get();
+$bilan->load();
+/*\!bug the headers shouldn't be sent here, but it doesn't work
+ * a html header is send before, to fix asap */
+if ( $bilan->b_type=='odt')
+ {
+ header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+ header("Cache-Control: must-revalidate");
+ header('Content-type: "application/vnd.oasis.opendocument.text"');
+ header('Content-Disposition: attachment;filename="'.$bilan->b_name.'.odt"',FALSE);
+ header("Accept-Ranges: bytes");
-// Variable
-// Start periode
-$start=( isset ($_POST['from_periode']))?$_POST['from_periode']:-1;
-$end=( isset ($_POST['to_periode']))?$_POST['to_periode']:-1;
-
-// Variable if ok ?
-if ( $start*$end < 0 ) {
- echo_error("Missing Variable start = $start end=$end");
- exit (-1);
- }
-// Open forms
-$bnb_form=fopen('document/fr_be/bnb.form','r');
-if ( $bnb_form == false) {
- echo 'Cannot Open';
- exit();
- }
-$col=array();
-
-// read forms line per line
-while (! feof ($bnb_form)) {
- $buffer=trim(fgets($bnb_form));
- echo_debug(__FILE__.":".__LINE__." get buffer = ",$buffer);
- // $a=(CheckFormula($buffer) == true)?"$buffer ok
":''.'Pas ok '.$buffer."
";
- // echo $a;
- // blank line are skipped
- if (strlen(trim($buffer))==0)
- continue;
-
- // buffer contains a formula A$=....
- // We need to eval it
- //ereg("\\$[a-zA-Z]+[0-9]*=",$buffer,$e);
- // echo $e[0];
- //echo "
".$form;
- $a=ParseFormula($cn,"$buffer",$buffer,$start,$end,false);
- $b=str_replace("$","\$",$a);
- echo_debug(__FILE__.":".__LINE__." evaluate ",$b);
-
- eval("$b;");
-
- }// end read form line per line
-// echo "