2
0
forked from Wavyzz/dolibarr
Commit Graph

4625 Commits

Author SHA1 Message Date
ldestailleur
2a7b9a2466 WIP mail layout 2025-04-17 00:27:52 +02:00
Frédéric FRANCE
de763b4b43 clean code of order (#33880)
* clean code of order

* clean code of order

* clean code of order

* clean code of order
2025-04-16 21:09:45 +02:00
ldestailleur
b333f656c9 Replace option with param 2025-04-01 22:32:31 +02:00
kkhelifa-opendsi
0029e14fb6 NEW: Add globale MAIN_DISABLE_PDF_AUTO_DOWNLOAD_AFTER_CONVERT_FROM_ODT for disable the auto download after auto convert odt to pdf (#33511) 2025-04-01 22:30:03 +02:00
ldestailleur
8efa60f4b0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2025-04-01 13:53:52 +02:00
ldestailleur
5e990ff7de Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-04-01 11:58:46 +02:00
ldestailleur
2100f3ba43 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-04-01 11:49:07 +02:00
Marc de Lima Lucio
733fbecd45 FIX: tcpdf: prevent error with 'data:' URLs (backport of https://github.com/tecnickcom/TCPDF/pull/552) (#33682) 2025-04-01 11:40:02 +02:00
ldestailleur
d2b6fb83b7 Fix php warning 2025-03-25 20:43:33 +01:00
Mathieu Schiffmann
b9946cef4a NEW #33506 Add a constant to apply a ratio to resize images in ODT templates (#33543)
* CLOSE #33506 add a constant holding the ratio to resize images in ODT templates

A new Dolibarr constant 					MAIN_DOC_ODT_IMAGE_RATIO
is taken in consideration for ODT templates.
This constant holds a number that is multiplied when computing the size of images in ODT templates.
All doc_generic_*_odt_modules.php files have been updated to call the setImage Method with a new parameter $ratio
The method setImage in the file odt.php has been modified to have a new parameter $ratio and use it to compute the image size

* FIX #33506 wrong branch

some other files needed to be changed in the develop branch

* FIX #33506 PR errors fixed

* FIX #33506 codesniffer errors fixed

* QUAL #33506 completed method comment
2025-03-24 16:41:00 +01:00
ldestailleur
39c2de721a Fix warnings 2025-03-19 15:17:34 +01:00
ldestailleur
7098a8e611 Fix warnings 2025-03-19 15:14:33 +01:00
ldestailleur
5ebd1921ed NEW Upgrade TCPDI 1.0 into TCPDI 1.1 + custom fixes 2025-03-03 05:11:14 +01:00
Laurent Destailleur (aka Eldy)
30dc853bb7 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-20 15:09:16 +01:00
Laurent Destailleur (aka Eldy)
fa9fe2efa7 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-01-20 15:02:37 +01:00
Laurent Destailleur (aka Eldy)
c9ab22782e Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-01-20 14:57:45 +01:00
Laurent Destailleur (aka Eldy)
1f360ca498 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-01-20 12:28:49 +01:00
Frédéric France
da7675c822 fix phpstan 2025-01-11 17:45:29 +01:00
Frédéric France
74b445ac31 fix phpstan 2025-01-09 21:38:06 +01:00
Frédéric France
1ba37602bc fix phpstan 2025-01-09 21:27:13 +01:00
Frédéric France
ba956df9c6 fix phpstan 2025-01-09 21:18:21 +01:00
Frédéric France
8ad5751d91 fix phpstan 2025-01-09 21:11:26 +01:00
tnegre
7e82f70c77 add case when HTML tags contain attributes 2025-01-09 11:05:45 +01:00
tnegre
78bf506790 fix tests in error 2025-01-06 09:44:04 +01:00
tnegre
b31962f7e2 fix 2025-01-06 09:44:04 +01:00
Laurent Destailleur (aka Eldy)
757d1b2998 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-01-05 18:40:05 +01:00
Laurent Destailleur (aka Eldy)
1cfa3b5803 Fix warning 2025-01-05 18:34:01 +01:00
Frédéric France
eb4e059683 fix 2025-01-05 17:29:46 +01:00
Frédéric France
51de37712b fix 2025-01-04 16:24:17 +01:00
Frédéric FRANCE
23e14b7779 fix phpstan 2024-12-16 11:12:42 +01:00
Frédéric FRANCE
ae69785f4f fix phpstan 2024-12-16 10:50:04 +01:00
Laurent Destailleur (aka Eldy)
c8a7c09033 Fix logs and protection for infinit loop 2024-12-14 18:38:48 +01:00
Laurent Destailleur
7d5e6e9f72 FIX PHP 7.0 compatibility 2024-11-17 15:04:00 +01:00
Laurent Destailleur
aa40cbce98 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-11-13 22:29:08 +01:00
Laurent Destailleur
427e1ec26d Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-11-13 22:28:45 +01:00
accellier-dev
c845cc337c Fixed: #30976 (#30979)
* Fixed: #30976

* Update odf.php

---------

Co-authored-by: Pratush Raj <pratushraj0@gmail.com>
2024-11-13 22:27:31 +01:00
Laurent Destailleur
3c10ef7acf Debug v21 2024-11-13 18:54:04 +01:00
Laurent Destailleur
aacecf4569 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-11-13 16:41:41 +01:00
Laurent Destailleur
a64f4327c7 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-11-13 16:40:21 +01:00
Laurent Destailleur
b9c628413e Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-11-13 16:37:31 +01:00
Laurent Destailleur
a039a00277 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-11-13 16:35:07 +01:00
Laurent Destailleur
d30a0ea066 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2024-11-13 16:32:54 +01:00
Laurent Destailleur
ab6c74ae88 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2024-11-13 16:29:18 +01:00
Laurent Destailleur
fbca98ec2a Merge 2024-11-13 16:25:00 +01:00
thomas-Ngr
93f23fe452 ODF : fix : escape specials chars in IF ELSE ENDIF $key (#31796)
* ODF : fix : escape specials chars in IF ELSE ENDIF $key

* fix missing brackets

* add delimiter to preg_quote

---------

Co-authored-by: Brice Werry <bwerry@open-dsi.fr>
2024-11-13 16:18:08 +01:00
Laurent Destailleur
eb64a1a3f6 Debug v21 2024-11-09 16:57:23 +01:00
Laurent Destailleur
13ce7cfd04 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-11-06 20:17:14 +01:00
Laurent Destailleur
ce7a364d2f Add option to test fix of #31696 2024-11-06 17:16:36 +01:00
Laurent Destailleur
50d50825cf Removed depracated modules and doc html filesof external libs. 2024-10-30 18:39:18 +01:00
Laurent Destailleur
c34ea09c2c Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-10-30 18:17:59 +01:00