Commit Graph

2964 Commits

Author SHA1 Message Date
Yoan Mollard
840437d312 Fixed labels for permission errors 2022-07-19 23:55:55 +02:00
Laurent Destailleur
76e3c10c06
Revert "fix page titles" 2022-07-06 15:56:04 +02:00
stickler-ci
23d948cec4 Fixing style errors. 2022-06-27 10:56:08 +00:00
Christian Foellmann
89d1389e2d fix page titles 2022-06-27 12:48:04 +02:00
NASDAMI Quatadah
3d0a8dd595 running phpcs one last time 2022-06-09 13:29:49 +02:00
stickler-ci
7b3fe948a0 Fixing style errors. 2022-06-09 11:20:59 +00:00
NASDAMI Quatadah
7f86c53b3e fixing bug 20500 2022-06-09 13:15:40 +02:00
Laurent Destailleur
6106d54632 css 2022-05-13 09:54:10 +02:00
Laurent Destailleur
0c82ce1b69 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-04-14 23:04:36 +02:00
Laurent Destailleur
031669493d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-04-14 23:03:35 +02:00
Laurent Destailleur
27ef6840d5 # WARNING: head commit changed in the meantime
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2022-04-14 23:01:49 +02:00
Laurent Destailleur
c4f80b4e71
Merge pull request #19424 from marc-dll/12.0_FIX_employee_tab_holiday_length
FIX: user employee tab: offset in open days messes up holiday length calculation
2022-04-14 22:59:20 +02:00
Laurent Destailleur
3ac268c200 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/core/lib/security.lib.php
	htdocs/holiday/card.php
	htdocs/user/card.php
2022-04-11 21:14:51 +02:00
Laurent Destailleur
b8d1acaff7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/holiday/card.php
	htdocs/user/card.php
2022-04-11 20:57:16 +02:00
Laurent Destailleur
974fb46fda Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/user/card.php
2022-04-11 20:43:20 +02:00
Florian HENRY
798c7a8a0b try with tzserver 2022-04-06 14:09:44 +02:00
Laurent Destailleur
947b6008c8
Merge pull request #20308 from frederic34/patch-1
Fix do not modify entity on group edit
2022-03-23 16:55:55 +01:00
Laurent Destailleur
ed631b2b06 Fix doxygen, missing error message 2022-03-18 16:14:20 +01:00
Frédéric FRANCE
53909828f9
Update card.php 2022-03-17 10:56:14 +01:00
Frédéric FRANCE
3dfd92e9c0
Fix do not modify entity on group edit
https://www.dolibarr.fr/forum/t/etoile-globalgroup-dans-les-groupes-dutilisateurs-quelle-signification-quel-usage/38772/26
2022-03-08 21:19:29 +01:00
Laurent Destailleur
32f2eb8c94 Debug v15 2022-02-28 12:13:06 +01:00
Laurent Destailleur
b0f538387e Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/accountancy/class/bookkeeping.class.php
	htdocs/core/modules/import/import_csv.modules.php
	htdocs/core/modules/import/import_xlsx.modules.php
2022-02-18 21:50:08 +01:00
Romain DESCHAMPS
5eb4d3408c Update param_ihm.php 2022-02-18 19:31:42 +01:00
Laurent Destailleur
31ca78acda Sync transifex.
Fix install.
2022-02-07 14:25:20 +01:00
stickler-ci
adac1d3dbb Fixing style errors. 2022-01-28 09:34:52 +00:00
Anthony Berton
8c38125e79
Update vcard.php 2022-01-28 10:30:41 +01:00
Laurent Destailleur
d560483875 Fix permission from group not found 2022-01-24 18:32:29 +01:00
Laurent Destailleur
00eabded6d Fix phpunit 2022-01-24 12:43:42 +01:00
Laurent Destailleur
053b402202 Fix for notes standardization #19835 2022-01-23 19:20:13 +01:00
Laurent Destailleur
82305d7dd4 Fix bad position sorting of permission list 2022-01-21 16:34:09 +01:00
Laurent Destailleur
482efec536 Fix missing column 2022-01-21 15:40:37 +01:00
Laurent Destailleur
accc413596 Fix error management 2022-01-21 15:26:54 +01:00
Laurent Destailleur
60b90056c4 Fix #yogosha8450 2022-01-19 15:20:10 +01:00
Laurent Destailleur
744296a43a FIX Permission on holiday and expensereport. 2022-01-14 13:52:08 +01:00
Laurent Destailleur
f04a07b6a7 FIX Pb with permission on holiday and expense report 2022-01-14 13:42:38 +01:00
Laurent Destailleur
13510b9929 Clean sortfield, sortorder 2022-01-13 11:17:25 +01:00
lvessiller
400f6b244b FIX user actions rights when mulit-company transverse mode is enabled 2022-01-11 17:29:02 +01:00
Laurent Destailleur
5b8d6e60e4 Debug v15 2022-01-05 10:43:05 +01:00
Laurent Destailleur
956288081c Fix phpunit 2022-01-04 13:45:18 +01:00
Laurent Destailleur
f8a97ef928 FIX a lot of problem with rules for password validation 2022-01-03 16:09:08 +01:00
Laurent Destailleur
72998cd8fe Debug v15 2022-01-03 12:26:57 +01:00
Laurent Destailleur
e76c85bc8d Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-12-21 16:32:45 +01:00
Laurent Destailleur
856b010a45 FIX #19651 2021-12-21 15:56:59 +01:00
Laurent Destailleur
0387b9922e FIX error message on sqlfilter in API 2021-12-20 20:49:32 +01:00
Laurent Destailleur
b6cfc3a3e0 Clean code 2021-12-19 17:25:11 +01:00
Laurent Destailleur
40a3f70eb3 FIx #19638 2021-12-19 17:12:01 +01:00
Laurent Destailleur
e2e2e69379 Fix bad link 2021-12-19 03:54:04 +01:00
Laurent Destailleur
f8e6befe35 Fix link on user 2021-12-16 16:47:11 +01:00
Laurent Destailleur
bb1d5daa82 css 2021-12-12 23:47:40 +01:00
Laurent Destailleur
7ea8b7851a Code comment 2021-12-09 11:56:54 +01:00