Laurent Destailleur (aka Eldy)
c3f06059cb
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2025-01-07 19:12:54 +01:00
Frédéric France
fa2be8a553
fix phpstan
2025-01-07 18:54:08 +01:00
Frédéric France
b6fc9f4d86
fix phpstan
2025-01-07 18:30:27 +01:00
Frédéric FRANCE
af9efd8608
Merge branch 'develop' into loan_schedule
2025-01-07 18:02:05 +01:00
Laurent Destailleur (aka Eldy)
e5bb7e48db
Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop
2025-01-07 17:20:06 +01:00
Laurent Destailleur
1d8f9fd24b
Update interface_50_modNotification_Notification.class.php
2025-01-07 16:00:31 +01:00
Laurent Destailleur
fc54c837fa
Update interface_50_modNotification_Notification.class.php
2025-01-07 15:59:07 +01:00
Laurent Destailleur (aka Eldy)
c3dddfc96e
Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0
2025-01-07 13:34:50 +01:00
Laurent Destailleur (aka Eldy)
6b94a458c0
Fix warning
2025-01-07 13:34:33 +01:00
Florian HENRY
daa18360d7
fix: manage error in Notification triggers
2025-01-07 13:16:32 +01:00
Laurent Destailleur
75c2c93d3b
Prepare v21
2025-01-07 11:44:59 +01:00
Joachim Kueter
259088c280
Update functions.lib.php
...
fixed typo...
2025-01-07 09:35:37 +01:00
Joachim Kueter
7689e0b210
Update functions.lib.php
...
solve indentation
2025-01-07 09:28:17 +01:00
Joachim Kueter
dd41f3f47d
Update functions.lib.php
...
trying to solve whitespace/indentation issues
2025-01-07 09:25:00 +01:00
Joachim Kueter
48a3393264
Update functions.lib.php
...
trying to solve indentation
2025-01-07 09:21:46 +01:00
Joachim Kueter
0158b2b832
Update functions.lib.php
...
trying to solve indentation issue
2025-01-07 09:17:00 +01:00
Joachim Kueter
21607b4f28
Update functions.lib.php
2025-01-07 09:11:01 +01:00
Joachim Kueter
886abc96d1
handle property for delivery date (named differently in different objects))
2025-01-07 09:03:17 +01:00
Frédéric France
7b1c4e11e4
fix phpstan
2025-01-06 21:10:21 +01:00
Frédéric France
e2a6a94a52
fix phpstan
2025-01-06 21:02:02 +01:00
Frédéric France
ef103e55dd
Merge remote-tracking branch 'upstream/develop' into fix_phpstan_2025_01_05_01
2025-01-06 20:45:37 +01:00
Laurent Destailleur
bd8a839d3e
Merge pull request #32549 from Easya-Solutions/develop_odt_dimensions_substitutions
...
NEW Add 4 substitutions for ODTs.
2025-01-06 20:22:59 +01:00
Frédéric France
86e1625793
fix phpstan
2025-01-06 18:27:30 +01:00
Frédéric France
62a230b047
Merge remote-tracking branch 'upstream/develop' into fix_phpstan_2025_01_05_01
2025-01-06 18:09:12 +01:00
Frédéric FRANCE
0828579216
Merge branch 'develop' into loan_schedule
2025-01-06 18:05:49 +01:00
Laurent Destailleur (aka Eldy)
935e7e6d31
Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop
2025-01-06 17:44:06 +01:00
tnegre
81298d6787
fix Phpstan
2025-01-06 17:09:45 +01:00
tnegre
86913a7681
Add 4 substitutions for ODTs. Reuse logic from PDF generator, but reformat to make it clearer.
2025-01-06 17:02:43 +01:00
Alexis Thietard
b7cb799af0
FIX #21294 Stock import sql query
...
To respect the PostgreSQL update statement syntax, cf.
https://www.postgresql.org/docs/17/sql-update.html
```
column_name
The name of a column in the table named by table_name. The column name can
be qualified with a subfield name or array subscript, if needed. Do not
include the table's name in the specification of a target column — for
example, UPDATE table_name SET table_name.col = 1 is invalid.
```
Signed-off-by: Alexis Thietard <alexis.thietard@rtone.fr >
2025-01-06 14:36:50 +01:00
Laurent Destailleur (aka Eldy)
b9f15e4c93
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2025-01-06 12:56:38 +01:00
Laurent Destailleur (aka Eldy)
3bfd6c1e30
Debug MAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY
2025-01-06 12:56:24 +01:00
Laurent Destailleur
c850581ad8
Debug v21 - Fix import
2025-01-06 02:47:32 +01:00
Laurent Destailleur
fde52c9ae7
FIX #32113
2025-01-06 01:28:01 +01:00
Frédéric FRANCE
c0f4ad3729
Merge branch 'develop' into loan_schedule
2025-01-05 20:30:23 +01:00
Laurent Destailleur
1cba827ceb
Merge pull request #32290 from Hystepik/new-regroup-2-tabs-bank
...
New regroup report bank tabs
2025-01-05 19:17:13 +01:00
Laurent Destailleur (aka Eldy)
7da0580b68
Fix INVOICE_HIDE_LINKED_OBJECT
2025-01-05 19:06:28 +01:00
Laurent Destailleur
edf137c92d
Merge pull request #32305 from nat-itopie/develop
...
NEW Adds the option of not displaying linked objects in the left header on the Sponge invoice template
2025-01-05 19:05:11 +01:00
Frédéric France
57b440677a
Merge remote-tracking branch 'upstream/develop' into fix_phpstan_2025_01_05_01
2025-01-05 19:02:46 +01:00
Frédéric France
9eb58c9ce9
fix phpstan
2025-01-05 19:02:28 +01:00
Laurent Destailleur
b05958fb25
Merge pull request #32322 from FHenry/dev_new_default_email_template_ticket
...
new: if default template for ticket exist we use it avec if there is email template 'all'
2025-01-05 19:01:42 +01:00
Laurent Destailleur
5ae9d1bd13
Merge pull request #32335 from Hystepik/New-add-replace-for-memcached-module
...
NEW add replace for memecached and filecache
2025-01-05 18:58:59 +01:00
Laurent Destailleur (aka Eldy)
981f291765
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2025-01-05 18:57:35 +01:00
Laurent Destailleur (aka Eldy)
6681979596
NEW Option MAIN_RESTRICTHTML_ONLY_VALID_HTML and
...
MAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY are on by default
2025-01-05 18:57:18 +01:00
Frédéric France
2977a1af0e
fix phpstan
2025-01-05 18:55:59 +01:00
Laurent Destailleur
6312b646b5
Merge pull request #32337 from Hystepik/Fix-#32193
...
Fix #32193 Add verification on extension file for upload
2025-01-05 18:52:16 +01:00
Laurent Destailleur (aka Eldy)
49f5eabc22
Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop
2025-01-05 18:44:56 +01:00
Frédéric France
4187e87dc4
fix phpstan
2025-01-05 18:44:12 +01:00
Laurent Destailleur (aka Eldy)
1d194efc3d
Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0
2025-01-05 18:43:15 +01:00
Laurent Destailleur (aka Eldy)
2c2ac2a48f
Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop
2025-01-05 18:38:48 +01:00
Laurent Destailleur (aka Eldy)
1cfa3b5803
Fix warning
2025-01-05 18:34:01 +01:00
