From caf556a64b2b2607e11262bd13e585b3a52d792d Mon Sep 17 00:00:00 2001 From: sparkyx Date: Tue, 11 Dec 2007 19:43:48 +0000 Subject: [PATCH] Permit formula in OOCalc --- contrib/document_test/facture-calc.ods | Bin 0 -> 12079 bytes include/class_document.php | 4 +++- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 contrib/document_test/facture-calc.ods diff --git a/contrib/document_test/facture-calc.ods b/contrib/document_test/facture-calc.ods new file mode 100644 index 0000000000000000000000000000000000000000..372b52f144e92ffa58eb18b68652753adab75067 GIT binary patch literal 12079 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 CD83i~ literal 0 HcmV?d00001 diff --git a/include/class_document.php b/include/class_document.php index 63d2b56db..c46eb152e 100644 --- a/include/class_document.php +++ b/include/class_document.php @@ -228,7 +228,7 @@ class Document $buffer=fgets($h); // search in the buffer the magic << and >> // while ereg finds something to replace - while ( ereg ($regex,$buffer,$f) ) + while ( eregi ($regex,$buffer,$f) ) { echo_debug('class_document',__LINE__,'var_export '.var_export( $f,true)); @@ -470,6 +470,7 @@ class Document */ function Replace($p_tag) { + $p_tag=strtoupper($p_tag); $r="Tag inconnu"; static $counter=0; switch ($p_tag) @@ -665,6 +666,7 @@ class Document case 'TVA_AMOUNT': + case 'VEN_TVA': extract ($_POST); $qt='e_quant'.$counter; $price='e_march'.$counter.'_sell' ;