admingit/altocompta
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

For the bilan, fix partially a bug in the html headers for OOo document and allowed the use of the numeric format in ods document (from Bertrand)

Browse source
This commit is contained in:
Dany De Bontridder 2009-09-04 19:44:42 +00:00
parent f470fa589a
commit 5fd2185d2a
3 changed files with 56 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

4
html/bilan.php
View file

@ -52,7 +52,7 @@ 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-type: application/vnd.oasis.opendocument.text');
header('Content-Disposition: attachment;filename="'.$bilan->b_name.'.odt"',FALSE);
header("Accept-Ranges: bytes");
@ -61,7 +61,7 @@ if ( $bilan->b_type=='ods')
{
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
header("Cache-Control: must-revalidate");
header('Content-type: "application/vnd.oasis.opendocument.spreadsheet"');
header('Content-type: application/vnd.oasis.opendocument.spreadsheet');
header('Content-Disposition: attachment;filename="'.$bilan->b_name.'.ods"',FALSE);
header("Accept-Ranges: bytes");

96
include/class_acc_bilan.php
View file

@ -395,10 +395,18 @@ class Acc_Bilan {
$a=$this->$f2_value;
}
if ( $a=='-0' ) $a=0;
echo_debug(__FILE__.':'.__LINE__.'- $a =',$a);
$line_rtf=str_replace($f2_str,$a,$line_rtf);
/* allow numeric cel in ODT for the formatting and formula */
if ( is_numeric($a) ) {
echo_debug(__FILE__,__LINE__," a is numeric $a");
$searched='office:value-type="string"><text:p>'.$f2_str;
$replaced='office:value-type="float" office:value="'.$a.'"><text:p>'.$f2_str;
$line_rtf=str_replace($searched, $replaced, $line_rtf);
}
echo_debug(__FILE__.':'.__LINE__.'- $a =',$a);
$line_rtf=str_replace($f2_str,$a,$line_rtf);
}// foreach end
} // while ereg
@ -509,49 +517,51 @@ class Acc_Bilan {
break;
case 'odt':
case 'ods':
$result=$this->generate_odt($templ);
$this->send($result);
break;
$result=$this->generate_odt($templ);
$this->send($result);
break;
}
fclose($templ);
}
/*!\brief send the result of generate plain to the browser
* \param $p_result is the string returned by generate_...
*/
function send($p_result) {
switch ($this->b_type) {
case 'rtf':
// A rtf file is generated
header('Content-type: application/rtf');
header('Content-Disposition: attachment; filename="'.$this->b_name.'.rtf"');
echo $p_result;
break;
}
fclose($templ);
}
/*!\brief send the result of generate plain to the browser
* \param $p_result is the string returned by generate_...
*/
function send($p_result) {
switch ($this->b_type) {
case 'rtf':
// A rtf file is generated
header('Content-type: application/rtf');
header('Content-Disposition: attachment; filename="'.$this->b_name.'.rtf"');
echo $p_result;
break;
case 'txt':
// A txt file is generated
header('Content-type: application/txt');
header('Content-Disposition: attachment; filename="'.$this->b_name.'.txt"');
case 'txt':
// A txt file is generated
header('Content-type: application/txt');
header('Content-Disposition: attachment; filename="'.$this->b_name.'.txt"');
echo $p_result;
break;
case 'html':
// A txt file is generated
header('Content-type: application/html');
header('Content-Disposition: attachment; filename="'.$this->b_name.'.html"');
echo $p_result;
break;
case 'html':
// A txt file is generated
header('Content-type: application/html');
header('Content-Disposition: attachment; filename="'.$this->b_name.'.html"');
echo $p_result;
break;
case 'odt':
case 'ods':
/* header("Pragma: public");
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="'.$this->b_name.'.odt"',FALSE);
header("Accept-Ranges: bytes");
*/
echo $p_result;
break;
case 'odt':
case 'ods':
/* header("Pragma: public");
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
header("Cache-Control: must-revalidate");
if ( $this->b_type == 'odt' )
header('Content-type: application/vnd.oasis.opendocument.text');
if ( $this->b_type == 'ods' )
header('Content-type: application/vnd.oasis.opendocument.spreadsheet');
header('Content-Disposition: attachment;filename="'.$this->b_name.'.odt"',FALSE);
header("Accept-Ranges: bytes");
*/
ob_start();
// save the file in a temp folder
// create a temp directory in /tmp to unpack file and to parse it

2
include/class_document.php
View file

@ -730,7 +730,7 @@ class Document
|| strlen(trim($qt)) ==0)
return "";
$a_tva=GetTvaRate($this->db,${$tva});
echo_debug('class_document',__LINE__,'Tva :'.var_eanalyticxport($a_tva,true));
echo_debug('class_document',__LINE__,'Tva :'.var_export($a_tva,true));
// if no vat returns 0
if ( sizeof($a_tva) == 0 ) return "";
$r=round(${$price},2)*${$qt}*$a_tva['tva_rate'];