430 Commits

Author SHA1 Message Date
Charlène Benke
47ae685061 NEW Update holiday class to handle date_create field (#36918)
* Update holiday class to handle date_create field

Add conditional logic to include date_create in SQL update.

* Update holiday.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2026-01-21 01:41:03 +01:00
Charlène Benke
eeaa02390e Rename expense report to holiday in API class (#36920) 2026-01-19 19:10:20 +01:00
Frédéric FRANCE
d770d37e29 add phpcs rule extension (#36561)
* add phpcs rule extension

* add phpcs rule extension

* add phpcs rule extension

* add phpcs rule extension

* add phpcs rule extension

* add phpcs rule extension

* add phpcs rule extension

* add phpcs rule extension

* add phpcs rule extension

* add phpcs rule extension

* add phpcs rule extension

* add phpcs rule extension

* add phpcs rule extension

* add phpcs rule extension

* add phpcs rule extension

* add phpcs rule extension

* add phpcs rule extension

* add phpcs rule extension

* add phpcs rule extension

* add phpcs rule extension

* add phpcs rule extension

* add phpcs rule extension

* test

* test

* test

* test

* test

* test

* fix

* fix

* fix

* fix

* fix

* fix

* fix translations

* fix translations

* translate

* translate

* translate

* translate

* translate

* translate

* translate

* Update propal.class.php
2026-01-15 16:05:06 +01:00
Charlène Benke
d37d84b66e add user table on api holiday index (#36862)
added a join to the user table in the SQL query.

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2026-01-15 03:14:24 +01:00
Laurent Destailleur
8abeb47da1 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-12-22 16:06:05 +01:00
Laurent Destailleur
3d55a7a792 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-12-22 15:11:32 +01:00
ATM-Lucas
c6a6d14627 False balance 2025-12-22 12:08:00 +01:00
Laurent Destailleur
da39a6a394 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-12-16 01:33:36 +01:00
Laurent Destailleur
bb7502d880 Fix condition check for negative balance 2025-12-16 01:10:28 +01:00
ATM-Lucas
e40c6b7c5f user num open day 2025-12-15 15:57:24 +01:00
Laurent Destailleur
454eb415ca Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-12-15 15:43:55 +01:00
Laurent Destailleur
dc14e43e5d Fix for #36144 2025-12-15 15:41:23 +01:00
ATM-Lucas
89f254eb35 Can Validated Holidays When Negative Balance 2025-12-15 15:21:57 +01:00
Laurent Destailleur
fe123327bc Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-12-11 01:58:16 +01:00
Laurent Destailleur
c892df2d40 Update api_holidays.class.php 2025-12-11 01:19:20 +01:00
Laurent Destailleur
365c5b1015 Fix test on negative balance 2025-12-11 00:50:37 +01:00
Charlène Benke
f9dbe91c3f Update api_holidays.class.php 2025-12-10 17:38:42 +01:00
Charlène Benke
34f78f581b Set holiday status to approved before approval 2025-12-10 17:33:10 +01:00
Charlène Benke
da6dfebc70 Remove unnecessary blank lines in api_holidays.class.php 2025-12-10 16:52:52 +01:00
Charlène Benke
3dc2731e0e Set holiday status to validated on specific actions 2025-12-10 16:36:34 +01:00
Charlène Benke
9289383cfa Change permission check from 'write' to 'approve' 2025-12-10 16:17:00 +01:00
Charlène Benke
8ef1b5756b add new route on api holiday (and change since in comment) 2025-12-10 16:09:42 +01:00
Charlène Benke
5149d567e1 Update holiday api methods from setValidate/setApproved to validate/approve 2025-12-05 11:47:40 +01:00
Frédéric FRANCE
46d6714fe0 clean code (#36317)
* clean code

* clean code

* clean doc

* clean doc

* clean doc

* clean doc

* fix

* fix

* fix

* fix

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-11-20 01:47:46 +01:00
Laurent Destailleur
33f3fb5dbb Better implementation for #35929 2025-11-08 15:52:06 +01:00
Laurent Destailleur
dfbf173b17 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-11-07 19:25:42 +01:00
Laurent Destailleur
ff1e31d239 Merge 2025-11-07 18:53:37 +01:00
Laurent Destailleur
88bc1ea328 Keep same behaviour by default. 2025-11-07 18:50:34 +01:00
atm-adrien
817e7a826c FIX : Can approuve holidays when negative balance (#36144)
* FIX : Can approuve holidays when negative balance

* FIX : PR returns
2025-11-07 18:48:58 +01:00
Laurent Destailleur
1a8d91eee2 Fix CI 2025-10-30 00:07:50 +01:00
Laurent Destailleur
4c84650e39 NEW Add API for Holidays/Leaves 2025-10-29 18:58:06 +01:00
Frédéric FRANCE
d6dce86061 clean code (#35379)
* clean code

* clean code

* clean code

* clean code
2025-09-18 11:08:06 +02:00
Frédéric FRANCE
e81d5378cd clean code contract class (#35245)
* clean code contract class

* clean code contract class

* clean code contract class

* clean code contract class

* clean code contract class

* clean code contract class

* clean code contract class

* clean code contract class

* clean code contract class

* clean code contract class

* clean code contract class

* clean code contract class

* clean code contract class

* clean code contract class

* clean code contract class

* clean code

* clean code

* clean code

* clean code

* clean code

* fix typo

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix
2025-09-10 11:13:18 +02:00
Frédéric FRANCE
4aeda8adcf add doc (#35185)
* add doc

* add doc

* add doc

* add doc

* add doc

* add doc
2025-09-02 22:55:29 +02:00
Charlène Benke
4ed8630c3f Change permission checks from 'expensereport' to 'holiday' (#35062)
error on class holiday
2025-08-24 20:23:11 +02:00
Charlène Benke
8a3b0d3eda Change permission checks from 'expensereport' to 'holiday' (#35062)
error on class holiday
2025-08-24 20:22:46 +02:00
ldestailleur
924204ac29 LEFT JOIN syntax 2025-08-20 17:09:43 +02:00
ldestailleur
040393abe5 Debug v22 2025-06-22 22:50:56 +02:00
Laurent Destailleur
408b42d712 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-04 22:47:41 +02:00
Laurent Destailleur
f4fc5e179c Fix add a protection against very long loop 2025-06-04 22:30:14 +02:00
MDW
928402c847 Qual: Fix phan (project-1) 2025-02-11 00:22:39 +01:00
MDW
2cd13853d5 Qual: Fix phan notices (ftp, holiday)
# Qual: Fix phan notices (ftp, holiday)
2025-02-03 16:06:02 +01:00
Laurent Destailleur (aka Eldy)
b024b95948 Fix typo 2025-01-09 19:35:01 +01:00
Laurent Destailleur (aka Eldy)
56710ce9b7 FIX CVE-2024-55227 and CVE-2024-55228 CSRF when
MAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY is
on (hidden option not on by default)
2025-01-09 19:35:01 +01:00
Laurent Destailleur (aka Eldy)
de321e8f01 Fix typo 2025-01-09 02:01:49 +01:00
Laurent Destailleur (aka Eldy)
c0250e4c91 FIX CVE-2024-55227 CSRF when MAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY is
on (hidden option not on by default)
2025-01-08 17:41:45 +01:00
Laurent Destailleur
e6f1d4835f Clean sql code 2024-10-29 02:58:20 +01:00
Laurent Destailleur
046166f483 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-10-14 21:38:12 +02:00
Laurent Destailleur
916014707d Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-10-14 21:18:24 +02:00
Laurent Destailleur
b099e103b3 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-10-14 21:00:26 +02:00