Commit Graph

2503 Commits

Author SHA1 Message Date
Laurent Destailleur
8cb9bdd852 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0
Conflicts:
	htdocs/comm/action/list.php
	htdocs/compta/facture/list.php
	htdocs/modulebuilder/template/myobject_list.php
	htdocs/product/stock/movement_list.php
	htdocs/product/stock/productlot_list.php
	htdocs/ticket/list.php
2023-12-17 22:06:48 +01:00
Laurent Destailleur
21b7d68f49 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
Conflicts:
	htdocs/comm/action/list.php
	htdocs/compta/facture/list.php
	htdocs/modulebuilder/template/myobject_list.php
	htdocs/product/stock/movement_list.php
	htdocs/product/stock/productlot_list.php
2023-12-17 21:49:08 +01:00
Marc de Lima Lucio
786ea1029e FIX: more correctly parse the select part to be replaced in sql queries, part 2 2023-11-18 12:40:10 +01:00
Marc de Lima Lucio
a3fa8b82fa FIX: more correctly parse the select part to be replaced in sql queries 2023-11-09 17:04:13 +01:00
Laurent Destailleur
8d91ffcd22 Fix separator 2023-07-02 21:15:29 +02:00
Laurent Destailleur
9743bbde60 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-05-16 19:46:09 +02:00
Laurent Destailleur
7e6666038c Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-05-16 19:43:23 +02:00
Laurent Destailleur
685995cf01 Debug v17 2023-05-12 13:06:36 +02:00
stickler-ci
d25b226796 Fixing style errors. 2023-05-11 09:50:17 +00:00
Noé Courtier
4ad585facc FIX: Add Missing rights check on holiday calendar 2023-05-11 11:41:58 +02:00
Laurent Destailleur
3af71d5ded Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-04-08 14:44:01 +02:00
Adrien Raze
1d59cdc41b FIX : Add the possibility to events oxwner to check their events from the list when the perm "Read the actions (events or tasks) of others" is not active 2023-04-03 10:13:11 +02:00
Laurent Destailleur
5ba48f9746 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-03-27 18:08:51 +02:00
Laurent Destailleur
520280479c Merge pull request #24197 from glu000/16.0-issue-23966-2
FIX  #[23799] - External users are not able to create events - correction
2023-03-27 08:30:41 +02:00
Laurent Destailleur
80678cfcb9 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-03-13 10:30:37 +01:00
Guenter Lukas
914096bd0a update 2023-03-13 08:45:29 +01:00
Laurent Destailleur
f6b8cd0208 Merge branch '16.0' into 16.0-issue-23799 2023-03-12 17:47:02 +01:00
Laurent Destailleur
925cd10cee Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-03-03 13:30:02 +01:00
Laurent Destailleur
51a890bf1a Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-03-03 12:30:02 +01:00
Laurent Destailleur
59f2644d46 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-03-03 12:29:35 +01:00
Nicolas
50d4f2d90f FIX select for task in event card 2023-03-03 12:00:24 +01:00
Laurent Destailleur
7994825086 Update list.php 2023-03-02 13:39:08 +01:00
Laurent Destailleur
8612a88a2f Sync transifex
Debug v17
2023-03-02 10:38:45 +01:00
Regis Houssin
4877c80c36 FIX missing "authorid" for getNomUrl link right access 2023-02-28 16:44:32 +01:00
Laurent Destailleur
f23de55809 FIX #24041 2023-02-26 19:28:11 +01:00
Laurent Destailleur
cbb6ca071a Fix #yogosha15157 2023-02-25 19:51:05 +01:00
Laurent Destailleur
643c05116f Debug v17 2023-02-21 13:37:27 +01:00
Laurent Destailleur
95b306ba84 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-02-07 00:19:54 +01:00
Guenter Lukas
3a8fbd3aa8 update 2023-02-06 10:32:54 +01:00
Laurent Destailleur
b52203b4e0 Update peruser.php 2023-02-06 00:05:06 +01:00
Laurent Destailleur
a0f8a2454b Update peruser.php 2023-02-06 00:04:19 +01:00
stickler-ci
d2a6d89fca Fixing style errors. 2023-02-05 10:48:29 +00:00
Guenter Lukas
edb81d1955 update 2023-02-05 11:43:09 +01:00
Laurent Destailleur
16ca0ab801 Debug v17 2023-01-31 05:02:26 +01:00
Laurent Destailleur
36fd6e6870 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-01-19 13:24:46 +01:00
Laurent Destailleur
28139689ff Debug v17 2023-01-19 03:51:49 +01:00
Laurent Destailleur
d3c4255e0e Fix bad test 2023-01-19 01:28:48 +01:00
Laurent Destailleur
6d8851d1e4 Merge pull request #23468 from FHenry/16_fix_reminder_type_label
fix: reminder type label on Actioncomm Card
2023-01-18 23:41:18 +01:00
Laurent Destailleur
cd5009d8a4 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-01-18 21:21:49 +01:00
Laurent Destailleur
283ad1abcf Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-01-18 20:54:16 +01:00
Laurent Destailleur
2a299068ad Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-01-18 20:45:44 +01:00
stickler-ci
4ee0ede6d8 Fixing style errors. 2023-01-18 08:53:28 +00:00
Noé Courtier
d344e108c9 FIX: Errors Handling for CreateFrom Hooks 2023-01-18 09:44:23 +01:00
Laurent Destailleur
48161b8400 Debug v17. Bad param for selection of project 2023-01-17 13:50:23 +01:00
Florian HENRY
6c373c9381 fix: reminder type label 2023-01-09 15:50:55 +01:00
Laurent Destailleur
751f79b672 Debug v17 2022-12-31 14:21:16 +01:00
Laurent Destailleur
5b31882ce3 Merge pull request #23167 from Hystepik/develop#2
Fix : php 8.1 warnings
2022-12-10 16:15:40 +01:00
Laurent Destailleur
a07193ef4b Fix php8 2022-12-09 15:57:18 +01:00
hystepik
d8ce58811a Fix : php 8.1 warnings 2022-12-09 14:27:43 +01:00
Laurent Destailleur
48f7d20e83 Fix warning 2022-12-02 16:34:56 +01:00