lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
110,976 Commits 43 Branches 150 Tags 886 MiB
cd6bd2ae4e
Commit Graph

910 Commits

Author SHA1 Message Date
jpb
ac53c0c454 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/Collective_group_leave 2022-06-24 11:42:37 +02:00
Frédéric France
b7e539a90a remove unused code 2022-06-22 13:31:35 +02:00
jpb
09c5b8be79 add comment 2022-06-13 10:38:49 +02:00
jpb
d7ca52f4ef remove $this on sanitize 2022-06-13 09:17:19 +02:00
jpb
af0846e2f7 add sanitize to sql 2022-06-13 09:09:19 +02:00
jpb
2209d31b2c add comment on function 2022-06-13 08:51:49 +02:00
jpb
0e72085be6 add trads on form fields 2022-06-13 08:36:17 +02:00
jpb
606b887fee Merge branch 'NEW/Collective_group_leave' of github.com:atm-jpb/dolibarr into NEW/Collective_group_leave 2022-06-11 14:03:27 +02:00
jpb
74d23cccd8 remove seteventMessage * 
precheck automail on selected auto validation
 2022-06-11 14:01:54 +02:00
jpb
e97334848c Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW/Collective_group_leave 2022-06-11 13:11:58 +02:00
stickler-ci
1af3b6ccbd Fixing style errors. 2022-06-11 08:23:08 +00:00
jpb
fabbd6032f Merge branch 'NEW/Collective_group_leave' of github.com:atm-jpb/dolibarr into NEW/Collective_group_leave 2022-06-11 10:17:22 +02:00
jpb
19cb81e3ea change filter array method on users selection from groups 2022-06-11 10:16:04 +02:00
Laurent Destailleur
1838baaa5c Debug v16 2022-06-08 21:20:12 +02:00
stickler-ci
189d918181 Fixing style errors. 2022-06-08 15:14:18 +00:00
jpb
bf10e8f687 add js behaviour on auvalidation and automail 
remove todo
 2022-06-08 17:08:05 +02:00
jpb
40bd04bc3f Merge branch 'NEW/Collective_group_leave' of github.com:atm-jpb/dolibarr into NEW/Collective_group_leave 2022-06-08 10:10:18 +02:00
jpb
7df97d1f3d rename autovalidation 2022-06-08 10:09:30 +02:00
stickler-ci
c87c6ad042 Fixing style errors. 2022-06-08 07:26:00 +00:00
jpb
8c607b8101 add todo 2022-06-07 19:20:53 +02:00
jpb
bf0650900d remove useless code 2022-06-07 19:16:57 +02:00
jpb
02a4e10fd3 add todo for some jquery 2022-06-07 19:12:40 +02:00
jpb
c434e9cffe add card and feature 2022-06-07 19:01:57 +02:00
lmarcouiller
0bad3664fb fix: php8.0 warnings 2022-06-02 11:14:35 +02:00
Laurent Destailleur
396d1411e5 Fix default order 2022-05-30 19:13:03 +02:00
Laurent Destailleur
c02e3f959f
Merge pull request #20899 from atm-gauthier/NEW/sortorder_on_holiday_type_dictionnary 
New/sortorder on holiday type dictionnary
 2022-05-21 00:43:52 +02:00
Gauthier PC portable 024
1e0972f0a1 NEW : sortorder on holiday type dictionnary 2022-05-19 12:34:05 +02:00
Laurent Destailleur
86d34af4b0 Fix deprecated code 2022-05-18 11:38:56 +02:00
Laurent Destailleur
4de50da0dd Repare code to forbidden var_dump() into code 2022-05-17 14:55:38 +02:00
Laurent Destailleur
720a09dacb Fix regression 2022-05-09 15:57:10 +02:00
Laurent Destailleur
6592eb5d73 Debug for php 8.1 2022-05-08 18:25:22 +02:00
Laurent Destailleur
c96e3bdddf PHP v8 compatibility 2022-04-30 19:50:20 +02:00
Laurent Destailleur
cb15a21e41 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/tpl/originproductline.tpl.php
	htdocs/fourn/facture/card.php
	htdocs/install/mysql/migration/14.0.0-15.0.0.sql
	htdocs/user/card.php
 2022-04-11 21:22:27 +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
baa4608812 Debug v16 2022-04-07 18:16:06 +02:00
Marc de Lima Lucio
de737b6b23 FIX: holiday/leave requests: write status change emails in HTML 2022-04-07 18:07:30 +02:00
Laurent Destailleur
ac22b1ce81 # WARNING: head commit changed in the meantime 
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
 2022-03-16 21:31:08 +01:00
Laurent Destailleur
d8bb5c2040 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-03-16 21:27:59 +01:00
Laurent Destailleur
4ad6425d76 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-03-16 21:27:34 +01:00
Laurent Destailleur
143660799b Clean code using dolGetFirstLineOfText() 2022-03-16 21:22:03 +01:00
Marc de Lima Lucio
8a8462bf57 FIX: holiday monthly report: html entity codes showing in description with WYSIWYG activated 2022-03-16 09:47:57 +01:00
Marc de Lima Lucio
9514062868 FIX: holiday monthly report: wrong 'Employee' and holiday type translations 2022-03-16 09:40:31 +01:00
Laurent Destailleur
2142440b6c Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/langs/en_US/errors.lang
 2022-03-07 13:23:47 +01:00
Laurent Destailleur
f4cb5810a7 FIX list of visible type of event was not correctly filtered 
FIX Error management on mass action "Approve holiday"
 2022-03-07 12:01:34 +01:00
Laurent Destailleur
409da7f091 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-25 19:17:41 +01:00
Laurent Destailleur
f8a5749fc4 # WARNING: head commit changed in the meantime 
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
 2022-02-25 19:00:10 +01:00
Laurent Destailleur
e96061dd18 Fix phpunit SecurityTest 2022-02-22 23:46:57 +01:00
stickler-ci
19dbed1804 Fixing style errors. 2022-02-22 16:10:56 +00:00
lmarcouiller
65ecd2f3ef Fix : fix error of permission in holiday 2022-02-22 17:06:10 +01:00