[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 06/19: Create invoice : New version of libreo
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 06/19: Create invoice : New version of libreoffice use the numeric in another way |
Date: |
Sat, 21 Jul 2018 07:47:38 -0400 (EDT) |
sparkyx pushed a commit to tag r700-currency-005
in repository noalyss.
commit d4579aca324772132ebac8880faee3224f055701
Author: Dany De Bontridder <address@hidden>
Date: Sat Apr 21 02:35:14 2018 +0200
Create invoice : New version of libreoffice use the numeric in another way
---
include/class/document.class.php | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/include/class/document.class.php b/include/class/document.class.php
index 22cdb9d..03258cf 100644
--- a/include/class/document.class.php
+++ b/include/class/document.class.php
@@ -272,9 +272,14 @@ class Document
*/
if ( is_numeric($value) && $p_type=='OOo')
{
-
$searched='/office:value-type="string"><text:p>'.$pattern.'/';
+ // For libreOffice <=4
+
$searched='/office:value-type="string"><text:p>'.$pattern.'/i';
$replaced='office:value-type="float"
office:value="'.$value.'"><text:p>'.$pattern;
$buffer=preg_replace($searched, $replaced,
$buffer,1);
+ // For libreOffice >=4
+ $searched='/office:value-type="string"
calcext:value-type="string"><text:p>'.$pattern.'/i';
+ $replaced='office:value-type="float"
office:value="'.$value.'" calcext:value-type="float"><text:p>'.$pattern;
+ $buffer=preg_replace($searched, $replaced,
$buffer,1);
}
// replace into the $buffer
// take the position in the buffer
- [Noalyss-commit] [noalyss] tag r700-currency-005 created (now 457290f), Dany De Bontridder, 2018/07/21
- [Noalyss-commit] [noalyss] 03/19: Update documentation, Dany De Bontridder, 2018/07/21
- [Noalyss-commit] [noalyss] 01/19: typo, Dany De Bontridder, 2018/07/21
- [Noalyss-commit] [noalyss] 05/19: New version of libreoffice use the numeric in another way, Dany De Bontridder, 2018/07/21
- [Noalyss-commit] [noalyss] 06/19: Create invoice : New version of libreoffice use the numeric in another way,
Dany De Bontridder <=
- [Noalyss-commit] [noalyss] 09/19: integrate fix for bug in insert_quant_purchase which cannot save private fee Conflicts: include/sql/patch/upgrade128.sql, Dany De Bontridder, 2018/07/21
- [Noalyss-commit] [noalyss] 10/19: Fix todo_list : if list empty , gets an error in php 7.2, Dany De Bontridder, 2018/07/21
- [Noalyss-commit] [noalyss] 13/19: Security fix : f_id is a number, Dany De Bontridder, 2018/07/21
- [Noalyss-commit] [noalyss] 15/19: Task #1619 : CFGLED change label for "Donner ici la fiche du compte en banque", Dany De Bontridder, 2018/07/21
- [Noalyss-commit] [noalyss] 02/19: Task #448 : add currency to card -> history + export CSV, Dany De Bontridder, 2018/07/21
- [Noalyss-commit] [noalyss] 14/19: Security fix : f_id is a number, Dany De Bontridder, 2018/07/21
- [Noalyss-commit] [noalyss] 16/19: translation, Dany De Bontridder, 2018/07/21
- [Noalyss-commit] [noalyss] 11/19: Security : direct injection, Dany De Bontridder, 2018/07/21
- [Noalyss-commit] [noalyss] 19/19: Merge branch 'master' into r700-currency, Dany De Bontridder, 2018/07/21
- [Noalyss-commit] [noalyss] 17/19: CFGLED : security fix : remove $_REQUEST, Dany De Bontridder, 2018/07/21