Commit Graph

380 Commits

Author SHA1 Message Date
Laurent Destailleur
99774022a5 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-11-19 03:36:44 +01:00
Laurent Destailleur
c5ebc9b7bd Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2024-11-19 03:33:15 +01:00
Mathieu Moulin
348981a419 Fix show payment URL in massaction context when not one email per recipient (#31927) 2024-11-16 00:06:15 +01:00
Laurent Destailleur
1dbb3f1f34 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
Conflicts:
	htdocs/product/stock/stockatdate.php
2023-11-12 22:58:23 +01:00
Laurent Destailleur
0ec22fb228 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-10-20 13:32:13 +02:00
Laurent Destailleur
492bdd4a0e Merge 2023-10-20 13:14:10 +02:00
Laurent Destailleur
ff03e34103 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-10-20 03:59:46 +02:00
Laurent Destailleur
f542b1de38 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-10-20 03:33:46 +02:00
Eric
e4987c8f3b fix #26244 todelete could contains dupplicate val (#26245) 2023-10-18 03:05:05 +02:00
Laurent Destailleur
8d254e341b Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-09-16 14:11:26 +02:00
Laurent Destailleur
72f5fc8586 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-09-16 13:59:19 +02:00
Laurent Destailleur
5bb0f42c5a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-09-16 13:51:36 +02:00
Laurent Destailleur
fe329cfc26 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-09-16 13:30:42 +02:00
Quentin VIAL-GOUTEYRON
ed4a8e88c0 FIX : bad from and to 2023-09-14 10:21:16 +02:00
Quentin VIAL-GOUTEYRON
3dad9d0899 FIX : bad check return for sendfile 2023-09-14 10:03:28 +02:00
Florian HENRY
a2c0eac09b on going 2023-06-09 11:53:39 +02:00
Laurent Destailleur
476f95c4f6 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/adherents/subscription/list.php
	htdocs/comm/action/index.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
	htdocs/cron/class/cronjob.class.php
	htdocs/eventorganization/class/conferenceorbooth.class.php
	htdocs/modulebuilder/template/myobject_list.php
	htdocs/public/ticket/list.php
	htdocs/supplier_proposal/list.php
	htdocs/ticket/class/ticket.class.php
2023-05-17 00:57:17 +02:00
Laurent Destailleur
1685233004 FIX pb in sending email when mail contains data src image. 2023-05-11 21:36:09 +02:00
Laurent Destailleur
c6cb29381e Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-05-11 19:09:19 +02:00
Laurent Destailleur
2f6b95c073 FIX Sending email from attendee list 2023-05-11 18:42:56 +02:00
Laurent Destailleur
7a781840ca Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-05-03 04:54:49 +02:00
Laurent Destailleur
a1d6e55189 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-05-03 02:40:32 +02:00
Laurent Destailleur
9acf635551 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-05-03 02:38:05 +02:00
Laurent Destailleur
8b63f7e296 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-05-03 02:06:11 +02:00
VESSILLER
99206d5570 FIX special chars in generated file name from build doc mass action 2023-04-24 12:08:45 +02:00
Laurent Destailleur
4068b1db87 Fix link for read or unsubscribe must use a unique hash 2023-02-23 21:19:01 +01:00
Laurent Destailleur
870ac42082 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-20 16:20:49 +01:00
Laurent Destailleur
767b1d60d9 Debug v17 2023-02-20 00:16:02 +01:00
Laurent Destailleur
d89ccaeaad Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-19 18:18:38 +01:00
Laurent Destailleur
2b8b389bcf Fix regression 2023-02-19 17:00:40 +01:00
Laurent Destailleur
2cafd2cbc4 Debug v17 2023-02-19 16:42:01 +01:00
Laurent Destailleur
c3da1554a7 Debug v17 2023-02-19 16:28:04 +01:00
Laurent Destailleur
0b4cacd291 Use dolChmod 2023-02-17 20:01:53 +01:00
Laurent Destailleur
a6daba61ce Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-01-26 02:32:08 +01:00
Laurent Destailleur
d96b2f9ae3 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-01-26 02:21:27 +01:00
Laurent Destailleur
f6004d1b01 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-01-26 02:16:32 +01:00
Laurent Destailleur
3c9ba08369 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-01-26 02:10:54 +01:00
VESSILLER
b2ac7a72be FIX simple quote in generated file name from build doc mass action 2023-01-24 11:21:59 +01:00
Laurent Destailleur
3bac52d053 Merge pull request #23143 from milenmk/massaction-delete-project-tasks
NEW|New [Bulk delete Project tasks]
2023-01-13 23:29:19 +01:00
Laurent Destailleur
bd276970a7 Merge pull request #22873 from Easya-Solutions/new-massaction-contact-list
NEW presend mass action in contact list
2022-12-27 00:31:07 +01:00
Laurent Destailleur
6019bbcbc5 Merge pull request #23132 from milenmk/17-holidays-list-error-message
FIX|Fix[#23117]
2022-12-07 17:13:52 +01:00
Milen Karaganski
3757760d77 Put back error counter $nbignored++; 2022-12-07 17:10:43 +02:00
Milen Karaganski
2a16198981 Put back error counter $nbignored++; 2022-12-07 17:09:54 +02:00
Milen Karaganski
6b6cfb1339 Add mass action to clone selected tasks to another project 2022-12-07 16:57:22 +02:00
Laurent Destailleur
6b7f1a32f9 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-12-07 13:32:23 +01:00
Milen Karaganski
9b8940ac15 FIX|Fix[#23117]
Error message not displayed, when trying to mass-delete validated OR approved holiday requests
2022-12-07 00:13:11 +02:00
Milen Karaganski
1a6342bb2a FIX|Fix[#23117]
Error message not displayed, when trying to mass-delete validated OR approved holiday requests
2022-12-06 23:51:28 +02:00
Laurent Destailleur
ba582963d6 Fix typo 2022-12-06 19:56:49 +01:00
kkhelifa
cf02d33ab0 NEW: Replace event title by the email subject if option activated 2022-12-05 11:11:18 +01:00
hystepik
efc1697c62 fix : php8.1 warnings 2022-11-25 15:34:38 +01:00