Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
126,990 Commits 36 Branches 189 Tags
c2c99ab2b86b8ee4ee252a67ecf8a01d0b1cf80d
Commit Graph

277 Commits

Author SHA1 Message Date
Laurent Destailleur
705ebea947 Fix php-cs-fixer 2023-12-04 12:36:57 +01:00
Laurent Destailleur
a136f304a6 Fix php8.2 warnings 2023-11-27 11:46:58 +01:00
Laurent Destailleur
4f4ede2e32 Fix php8.2 warnings 2023-10-15 18:14:14 +02:00
Laurent Destailleur
c32fe8dc5f QUAL: Use dol_clone with parameter 2 for ->oldcopy 2023-10-11 19:10:24 +02:00
Laurent Destailleur
3cb78be3ac Clean code 2023-09-29 16:27:07 +02:00
Laurent Destailleur
7bbc3bab05 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-27 17:17:41 +02:00
Laurent Destailleur
a758eaa086 FIX Expense report is created on the wrong entity 2023-09-22 13:43:16 +02:00
Alban Durrheimer
954320422c Fix holiday mail with halfday == 0 2023-09-11 14:56:54 +02:00
Laurent Destailleur
11ad17bcf3 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-09 15:00:52 +02:00
Laurent Destailleur
f843ec2de0 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-08-09 14:55:25 +02:00
Laurent Destailleur
97b084cf3a Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-08-09 13:52:05 +02:00
atm-greg
bf51e493dd fix error seteventmessage on white screen (#25523) 
* fix error seteventmessage on white screen

* Update card.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2023-08-09 13:16:58 +02:00
Alban Durrheimer
c86b608a41 NEW Add more information to holiday mailings (#25461) 
* Add more information to holiday mailings

* Fix leave type in mailings
 2023-07-25 23:17:09 +02:00
Laurent Destailleur
7697458cef Debug v18 2023-06-24 01:18:31 +02:00
Laurent Destailleur
d58e439df1 Fix removed qodana warnings 2023-05-22 21:37:14 +02:00
Frédéric FRANCE
97d372c54d adc pictos 2023-05-04 08:55:18 +02:00
Frédéric FRANCE
ec8c550f37 use isModEnabled 2023-04-19 13:52:21 +02:00
Laurent Destailleur
1be9364971 Look and feel v18 2023-03-30 19:47:48 +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
Laurent Destailleur
ba582963d6 Fix typo 2022-12-06 19:56:49 +01:00
Laurent Destailleur
0a9381f2d1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-11-16 20:35:29 +01:00
Laurent Destailleur
de8f115f95 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-11-15 19:49:15 +01:00
Frédéric FRANCE
8cb7b7e8ef fix extrafields create in holiday card 2022-11-10 10:03:51 +01:00
Nicolas SILOBRE
5fc293d408 Unable to refuse leave #22752 
update date refuse
 2022-11-05 15:47:50 +01:00
Laurent Destailleur
dc03355315 FIX Separation of date_valid and date approval for leaves 2022-09-22 19:10:20 +02:00
Laurent Destailleur
ecf599e4ad Fix token 2022-09-22 18:42:17 +02:00
Laurent Destailleur
9048c99478 FIX User approver not visible on holiday 2022-09-22 18:38:55 +02:00
Frédéric France
8d33953142 add comment 2022-09-07 20:08:59 +02:00
lmarcouiller
c6349ce51a Fix : Yogosha report 12245 bad field verification 2022-09-06 11:06:48 +02:00
Laurent Destailleur
11b9314023 Split fk_user_valid that was used for 2 purpose in fk_user_valid/approve 2022-08-29 00:04:12 +02:00
Laurent Destailleur
60dd3577ec Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-26 13:15:37 +02:00
Laurent Destailleur
c42eaaf16c Clean code 2022-07-26 13:14:12 +02:00
Laurent Destailleur
da2641bcb2 Clean code 2022-07-26 12:54:19 +02:00
Laurent Destailleur
7c37774dba Fix injection 2022-07-26 12:42:59 +02:00
Laurent Destailleur
ca323f99ba Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-22 19:37:55 +02:00
Laurent Destailleur
16c087e04c Clean htmlentities 2022-07-22 19:25:15 +02:00
kevin
1779b5ddb6 FIX permissions création d'absence 2022-07-08 09:29:08 +02:00
Laurent Destailleur
1838baaa5c Debug v16 2022-06-08 21:20:12 +02:00
lmarcouiller
0bad3664fb fix: php8.0 warnings 2022-06-02 11:14:35 +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
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
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