Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
142,956 Commits 35 Branches 179 Tags 1.7 GiB
develop
Commit Graph

134 Commits

Author SHA1 Message Date
Thomas Negre
a00331c478 Inline comment 2022-11-16 12:07:07 +01:00
Thomas Negre
b0548213b9 copyright and doc 2022-11-16 11:44:46 +01:00
Thomas Negre
a0ef602297 Fix ODT generation : htmlspecialchars() was run too many times on some strings. 2022-11-16 11:25:08 +01:00
Laurent Destailleur
9180e9a5c6 Clean code 2022-01-26 14:42:26 +01:00
Laurent Destailleur
bd9d3bb4ab Clean code 2021-11-08 18:10:35 +01:00
Laurent Destailleur
6b1fc48bd0 Fix var not initialized 2021-08-08 18:22:09 +02:00
Laurent Destailleur
671baa261d Fix var not defined 2021-08-08 12:57:00 +02:00
Laurent Destailleur
0b7b9aae79 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-05 23:07:56 +02:00
Laurent Destailleur
2a5699a9a2 Merge 2021-07-05 23:07:40 +02:00
Laurent Destailleur
185ed5ceeb Code comment 2021-07-05 22:52:37 +02:00
Laurent Destailleur
ebc3210308 FIX #16343 2021-03-02 01:58:36 +01:00
Laurent Destailleur
52ee530e70 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-09 22:03:38 +01:00
Laurent Destailleur
3a9cf8eb7a FIX: ODT generation very slow 2021-02-09 22:02:48 +01:00
Laurent Destailleur
a4c0459c1e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/user/list.php
 2021-01-27 21:09:01 +01:00
Laurent Destailleur
0de06b7ef4 Fix odttopdf generation 2021-01-26 16:49:54 +01:00
Laurent Destailleur
23c0a30263 Use a better temp directory 2021-01-26 16:40:57 +01:00
Laurent Destailleur
69344a7170 Fix create temp dir 2021-01-26 16:33:47 +01:00
Laurent Destailleur
8bc639fe02 Fix too many logs 2021-01-26 16:10:27 +01:00
Laurent Destailleur
c10072ccef Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-01-11 13:07:31 +01:00
Laurent Destailleur
243b227c33 Fix prerequisites 2021-01-08 15:09:49 +01:00
Laurent Destailleur
24c926b32f Update doc 2021-01-08 15:09:16 +01:00
Laurent Destailleur
5b37ff0bfd Html entities use now HTML5. Enhance the Dolibarr WAF. More PHPUnit 
tests.
 2020-10-15 19:36:08 +02:00
Rüdiger Hahn
3b7b4312cb
Fix for #14957 and probably a lot of other issues 
Convert special characters for a valid use in xml documents
 2020-10-09 11:13:11 +02:00
Rüdiger Hahn
5510f1feef
Fix for #14957 and probably a lot of other issues 
Convert special characters for a valid use in xml documents
 2020-10-09 10:59:06 +02:00
Laurent Destailleur
14e6d38fe8
Merge pull request #14860 from Tim-Otte/fix-missing-styles-in-lines 
FIX: Added support for styling in lines in odt documents
 2020-09-29 14:11:25 +02:00
Tim Otte
4611333ee6 Added support for styling in lines 2020-09-29 12:17:25 +02:00
Tim Otte
f5c0cd25e2 Fixed html to odt converter 2020-09-17 13:19:31 +02:00
Laurent Destailleur
36e6dd9d8e
Merge pull request #13254 from Tim-Otte/add-odt-converter 
NEW Support some HTML contents into ODT documents
 2020-03-11 16:49:39 +01:00
Tim Otte
26deae9dbc Fixed the regex string used to extract the attributes from the html tag 2020-03-09 15:37:23 +01:00
Tim Otte
1472a24371 Added missing line break replacement when the values do not contain html tags 2020-03-05 09:41:22 +01:00
Tim Otte
6b3fdfbcd8 Moved the HtmlToOdtConverter class into the odf class 2020-03-04 08:54:49 +01:00
Laurent Destailleur
1ee52d4c63 Enhancement of #13240 2020-03-03 23:19:05 +01:00
Tim Otte
8ce1f5f360 Fixed a few bugs 
Added custom font-families
 2020-03-03 10:19:05 +01:00
Tim Otte
d5671f1c42 Fixed a few bugs 2020-03-02 16:08:06 +01:00
Tim Otte
598d6d63b0 Added HtmlToOdtConverter class 
Implemented the converter in the odf setVars() function
 2020-03-02 10:18:38 +01:00
Alex Ludwig
6ad477a08c
Resolve Error if dolibarr is running in docker container 
If dolibarr is running in docker containers with alpine-linux it will fail because it has wrong environment variables. This pull request resolve the issue. It was found by dolichicken in the german user forum: https://www.dolibarr.de/forum/howto-hilfe/52509-anleitung-odt-nach-pdf-konvertieren#57583
 2020-03-01 17:14:31 +01:00
Frédéric FRANCE
47ee03acdc Update odf.php 2020-01-10 00:26:46 +01:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Laurent Destailleur
663998bab1 Fix scrutinizer errors 2019-06-18 20:15:04 +02:00
Laurent Destailleur
3c90461502 Better error message in convert odt to pdf 2019-04-27 17:31:14 +02:00
Gerhard Stephan
520f581481 Don't check for windows/linux, just call soffice (without the extension) will work on windows too. 2018-02-15 14:38:21 +01:00
Laurent Destailleur
9965a25eaa Code comment 2018-02-15 13:23:13 +01:00
Laurent Destailleur
0172ecb425 Code comment 2018-02-15 13:21:58 +01:00
Laurent Destailleur
d547d1a9cf Suggest better change for #8196. To be tested. 2018-02-15 13:16:54 +01:00
Gerhard Stephan
51028c845d Export to PDF using LibreOffice 5 command line 2018-02-15 10:15:27 +01:00
Laurent Destailleur
d404d8be9f Debug to make MAIN_ODT_AS_PDF workign with unoconv 2017-10-10 18:54:30 +02:00
Laurent Destailleur
05fe0d7fcd Fix doxygen 2017-04-29 01:01:12 +02:00
Laurent Destailleur
9fabfe029b Remove debug logs 2016-07-29 16:31:29 +02:00
Laurent Destailleur
b85bb8c0f8 Merge remote-tracking branch 'origin/3.9' into 4.0 
Conflicts:
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
 2016-07-29 16:24:02 +02:00
Laurent Destailleur
00749b2a65 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/imports/import.php
	htdocs/includes/odtphp/odf.php
	htdocs/product/stock/product.php
	htdocs/projet/list.php
 2016-06-22 20:22:22 +02:00
Laurent Destailleur
f514400d87 FIX a case of corrupted ODT by Word that insert <text:s> when it should 
not.
 2016-06-22 20:08:29 +02:00
Laurent Destailleur
80e10158a5 Add code comment 2016-03-25 15:57:29 +01:00
Laurent Destailleur
91caea5707 Code was corrupted with very bad commits. I restore files manually. 2016-03-25 15:53:44 +01:00
Laurent Destailleur
dd26ede0ef Add code comment 2016-03-22 19:24:48 +01:00
Jean-Pierre Morfin
0cb9cc2213 Correct pattern to match all odt var tags 
some vars like {object_total_vat_local_x.y} or {object_total_vat_local_x,y} could not be tested to know if they were existing with [!-- IF {xxx} --] syntax
 2015-11-12 09:24:04 +01:00
Laurent Destailleur
d0d4c5e7f8 NEW The conditional IF into ODT templates works also on not defined var 
so we can show data only if defined. Close #3819
 2015-11-02 15:44:47 +01:00
Laurent Destailleur
7926fd8083 NEW ODT generators can set meta properties of ODT file 2015-09-05 00:47:06 +02:00
alainabbas
efd3c4d863 Correct bug #3050 
when a piece is in draft and odt2pdf.sh is used, the filename is not corrected escaped for the shell
 2015-06-25 20:57:01 +02:00
Laurent Destailleur
4781707fa4 Fix jodconverter can't work without the wrapper jodconverter. 2015-02-22 16:01:01 +01:00
BENKE Charles
5586893ca2 Update odf.php 
add new fonction getvalue (valuename)
return value inside [valuename][/valuename] tag
 2014-11-01 21:00:28 +01:00
Laurent Destailleur
7bfbc4cbf3 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/modules/modExpedition.class.php
	htdocs/projet/class/project.class.php
 2014-05-07 19:30:19 +02:00
Laurent Destailleur
ac27884b88 Fix: [ bug #1366 ] Special characters are HTML encoded with WYSIWYG 
module.
 2014-05-07 19:13:02 +02:00
cam.lafit
1229842dc6 Provide a new constant about odt2pdf mangement : Don't remove odt source 
* MAIN_ODT_AS_PDF_DEL_SOURCE by default disable
* If set then initial behaviour is conserved, odt file is removed
 2014-01-06 20:07:15 +01:00
Florian Henry
306a51f6bd remove useless code (the tag replacement into footer and header is 
already done by SetVar method)
 2013-11-20 13:54:53 +01:00
Florian Henry
dc5db0c137 fix ODT to PDF script path 2013-06-18 09:07:53 +02:00
Florian Henry
7cc7e8392d Fix ODT to PDF exec scripts path 2013-06-17 11:58:59 +02:00
fhenry
ee4839c92e Better management for ODT to PDF 2013-04-22 15:50:26 +02:00
fhenry
e6f9c567d9 Fix odt as PDF generation 2013-04-22 12:08:35 +02:00
fhenry
ffb97010c9 Better file name management 2013-04-20 11:03:23 +02:00
fhenry
96126d9c99 Save PDF file 2013-04-20 10:54:11 +02:00
fhenry
413ee7ec78 Add hidden option MAIN_ODT_AS_PDF to save ODT as PDF (only if 
libreoffice/jodconverter/exec shell right)
 2013-04-20 10:44:01 +02:00
fhenry
629ef78dc8 Add subtitution inside header and fotter document 2013-04-11 18:38:50 +02:00
fhenry
af40d27eb5 Remove require_once from odf.php because it cause regression. 2013-04-11 17:26:49 +02:00
Stephen L
6e1e41e8b5 update: Sync odtphp lib (fix a lot of bugs and add a few functionalities) 
Ref: b4e02a1306

Signed-off-by: Stephen L. <lrq3000@gmail.com>
 2013-04-07 17:27:35 +02:00
Stephen L
087cf0bb91 Add conditional substitution IF/ELSEIF/ENDIF for ODT 
Signed-off-by: Stephen L. <lrq3000@gmail.com>
 2012-08-16 17:30:32 +02:00
Laurent Destailleur
ec542f5ee5 New: Support tags into header and footer into ODT templates 2012-03-28 20:12:25 +02:00
Regis Houssin
03711cf6f2 Fix: remove obsolete tags 2011-08-27 19:15:14 +00:00
Laurent Destailleur
4c8e2c7e32 Add warning on a bug 2011-08-14 13:13:00 +00:00
Laurent Destailleur
03064edc59 New: Can add information on current user on odt generation 2011-01-23 18:04:53 +00:00
Laurent Destailleur
dbaaa179c0 Works on odt generation 2010-05-12 17:15:02 +00:00
Laurent Destailleur
1959dbb13a Fix in odt library 2010-03-13 17:38:48 +00:00
Laurent Destailleur
ed19e89531 A lot of fix in phpOdt module 2010-03-13 16:05:36 +00:00
Laurent Destailleur
337ebafceb Work on generic odt generation 2010-02-28 22:49:06 +00:00
Laurent Destailleur
09b6b7a6f0 New: Add OdtPHP to generate documents from odt models. 2010-02-15 22:39:13 +00:00