Laurent Destailleur
ebe68c9075
Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
2024-02-18 17:06:36 +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
Laurent Destailleur
2e620c9a43
Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
2024-02-12 03:33:09 +01:00
Laurent Destailleur
65533360a2
Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
...
Conflicts:
htdocs/main.inc.php
2024-02-12 03:32:58 +01:00
William Mead
92afb654db
Fixed default value for radio extrafield ( #27066 )
2024-02-10 01:58:36 +01:00
Laurent Destailleur
31816168da
Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
2024-02-09 19:05:49 +01:00
Laurent Destailleur
d07b7dc72e
Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
2024-02-09 19:05:41 +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
lvessiller-opendsi
62632893ad
FIX avoid from re-initializing result on nested hook getEntity ( #27799 )
...
* FIX avoid from re-initializing result on nested hook getEntity
* FIX uses local resPrint instead of cloning hookmanager for nested hooks
2024-02-09 18:15:35 +01:00
Frédéric FRANCE
b92b8c443d
fix cunits.class.php (backport) ( #28068 )
2024-02-08 13:09:39 +01:00
Laurent Destailleur
4b60b3d991
Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
...
Conflicts:
htdocs/core/class/commonobject.class.php
2024-02-07 18:11:36 +01:00
Laurent Destailleur
e6b165003f
Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
...
Conflicts:
htdocs/core/class/commonobject.class.php
2024-02-07 18:01:11 +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
9dd1646818
Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
2024-02-01 12:20:12 +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
VESSILLER
26a05d3046
FIX update price extrafield on propal card
2024-01-19 10:15:42 +01:00
Laurent Destailleur
e6c3c5993d
Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
2024-01-15 17:14:27 +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
Laurent Destailleur
64fb9d0db7
Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
2024-01-11 13:45:16 +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
Laurent Destailleur
f3911bccc8
Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
2024-01-10 15:11:40 +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
Laurent Destailleur
d2b3920684
Merge
2023-12-29 16:51:05 +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
8be16aea52
Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0
2023-12-06 15:20:00 +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
Laurent Destailleur
6eec24a2c4
Fix CSS
2023-11-21 16:33:42 +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
be509634a4
Fix phpunit
2023-11-18 02:13:49 +01:00
Laurent Destailleur
05f6575abe
Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
2023-11-18 01:21:35 +01:00
Laurent Destailleur
29e3386e6f
Fix #26584 Fix #26673
2023-11-18 01:21:17 +01:00
Frédéric FRANCE
5ae8da372a
fix phpcs ( #26697 )
2023-11-18 00:42:52 +01:00
Saami PERDRIX
57eb6136a4
Trigger on update note ( #26666 )
...
* ajout trigger sur update_note
* nom des triggers adapté selon objet
2023-11-17 14:14:28 +01:00
Laurent Destailleur
042d583070
Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
2023-11-17 12:03:38 +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
