Laurent Destailleur
79353a6cbb
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0
2024-04-22 14:17:06 +02:00
Florian Mortgat
54caae51e0
FIX 16.0 - the e-mail templates configured in the notification module are not used if the recipient is a fixed e-mail address ( #29407 )
2024-04-20 22:44:26 +01:00
Laurent Destailleur
e407588231
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0
2024-04-04 17:54:31 +02:00
Laurent Destailleur
65f2425902
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
2024-04-04 17:51:55 +02:00
Laurent Destailleur
28075f7cf8
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2024-04-04 17:51:37 +02:00
Regis Houssin
cb9a93d97e
FIX syntax error (but same result) :-)
2024-04-04 16:32:24 +02:00
Regis Houssin
9e638ccc12
FIX avoid to delete "lock" and "unlock" files
2024-04-04 16:22:31 +02:00
x
c583102364
FIX Accolad
2024-04-03 15:19:53 +02:00
x
81adb15eb0
FIX PDF Translations Extrafields
2024-04-03 15:04:30 +02:00
Laurent Destailleur
615a80835a
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0
2024-03-01 19:00:32 +01:00
Laurent Destailleur
284fb49f60
Try a better fix for #28526
2024-02-29 19:35:34 +01:00
Laurent Destailleur
4c116e1577
Doc
2024-02-29 17:59:17 +01:00
Florian Mortgat
6e5fd5eb58
FIX: notification module: for supplier orders (any of the 3 triggers), user can choose an e-mail template in conf, but the conf is not used when sending the notification ( #28216 )
2024-02-18 16:31:12 +01:00
William Mead
92afb654db
Fixed default value for radio extrafield ( #27066 )
2024-02-10 01:58:36 +01:00
Laurent Destailleur
2f1eecd709
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0
2024-02-09 19:04:06 +01:00
Frédéric FRANCE
b92b8c443d
fix cunits.class.php (backport) ( #28068 )
2024-02-08 13:09:39 +01:00
Laurent Destailleur
5a756ffc4c
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
...
Conflicts:
htdocs/takepos/invoice.php
2024-02-07 17:44:39 +01:00
Laurent Destailleur
7b178844e8
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0
2024-02-01 12:16:50 +01:00
Laurent Destailleur
07d0093fbc
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
2024-02-01 12:14:30 +01:00
Laurent Destailleur
ab585b6efc
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2024-02-01 12:11:25 +01:00
Eric Seigne
8d9ddf4a51
fix comment about datehour -> datetime
2024-01-30 21:35:19 +01:00
atm-florian
101c5a2dca
FIX 17.0 - php8 warnings: test for $field existence before checking if it is null or empty
2024-01-30 16:21:51 +01:00
Laurent Destailleur
0cc66bbed6
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0
2024-01-15 14:35:18 +01:00
Laurent Destailleur
2de0c09e8e
Try a better fix for #27477
2024-01-13 15:44:37 +01:00
MDW
72210dc19b
Fix: discount - add missing db parameter to dol_print_error ( #27337 )
...
# Fix: discount - add missing db parameter to dol_print_error
dol_print_error requires the db instance to be the first parameter
2024-01-10 16:57:10 +01:00
Florian HENRY
053e0981ad
fix: pregmatch all always return empty array, muxt be tested like in findHtmlImages
2024-01-04 11:49:10 +01:00
Florian HENRY
43fceaf468
fix: pregmatch all always return empty array, muxt be tested like in findHtmlImages
2024-01-04 11:47:43 +01:00
Florian HENRY
06037295c4
Merge branch '17.0' of https://github.com/Dolibarr/dolibarr into 17_fix_img_in_mail
2023-12-13 11:34:41 +01:00
Florian HENRY
67ad440381
typo
2023-12-13 11:33:18 +01:00
Florian HENRY
6bb952bf9a
typo
2023-12-13 11:32:48 +01:00
Florian HENRY
82c49e62d1
add unit test for image in email with src=../media/ or src=base64
2023-12-13 11:31:42 +01:00
Laurent Destailleur
ea0c97a5d5
FIX #26735 FIX #26994
2023-12-06 15:10:30 +01:00
Florian HENRY
9bbd285c3a
fix: feature MAIN_MAIL_ADD_INLINE_IMAGES_IF_IN_MEDIAS was broken
2023-12-02 15:53:22 +01:00
Laurent Destailleur
4129813564
Fix missing parameter $filter
2023-11-21 17:07:10 +01:00
Florian Mortgat
564d930d33
FIX escape HTML tags in return value of getFullName() ( #26735 )
2023-11-18 23:55:25 +01:00
Laurent Destailleur
3a0b3fd8a8
Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0
2023-11-17 12:02:36 +01:00
Laurent Destailleur
6ea48ac22a
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0
2023-11-17 12:02:21 +01:00
HENRY Florian
102356d2c4
fix: When sendmail failed it return false, result is KO, need to say it to user ( #26631 )
...
* fix: When sendmail failed it return false, need to be tested as is
* fix: When sendmail failed it return false, so >=0 do not trigger error
* fix: When sendmail failed it return false, so >=0 do not trigger error
* Update CMailFile.class.php
* Update actions_sendmails.inc.php
* Update actions_sendmails.inc.php
* Update CMailFile.class.php
---------
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr >
2023-11-17 12:01:03 +01:00
Laurent Destailleur
7c68dc3d1e
Fix phpcs
2023-11-17 01:17:23 +01:00
Laurent Destailleur
144be811fc
Fix phpcs
2023-11-17 00:54:15 +01:00
MDW
c4542895d7
Fix recurrent supplier invoice generation (title) ( #26601 )
2023-11-16 15:43:48 +01:00
Regis Houssin
56e9df9091
FIX avoid warning : Cannot use a scalar value as an array ( #26437 )
2023-11-07 18:53:37 +01:00
am97
ee3bd43473
FIX user creation when LDAP is configured ( #26332 )
2023-10-23 18:39:22 +02:00
Laurent Destailleur
793922d468
Fix for compatibility
2023-10-09 09:20:37 +02:00
Noé Courtier
06bbb9517b
FIX: Use of line->insert instead of line->create
2023-10-06 17:02:26 +02:00
Laurent Destailleur
4298150413
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
...
Conflicts:
htdocs/core/class/commonobject.class.php
htdocs/core/lib/signature.lib.php
2023-10-04 10:22:33 +02:00
Laurent Destailleur
5e76fea64d
Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0
2023-10-01 15:53:36 +02:00
Laurent Destailleur
5560aab98e
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
2023-10-01 15:50:25 +02:00
Laurent Destailleur
b0b3d0e1e0
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2023-10-01 15:43:40 +02:00
Regis Houssin
9eb4c93c1c
FIX add warning in the changelog
2023-09-27 09:44:58 +02:00
