Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
130,797 Commits 36 Branches 189 Tags
a2c92f183cc54c35013469638780c28e65df0b51
Commit Graph

351 Commits

Author SHA1 Message Date
Laurent Destailleur
dc03355315 FIX Separation of date_valid and date approval for leaves 2022-09-22 19:10:20 +02:00
Laurent Destailleur
a5c18ea776 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-08-31 17:57:14 +02:00
Laurent Destailleur
4d46da9514 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-08-31 17:23:03 +02:00
Laurent Destailleur
d0e08818e1 Merge pull request #21931 from grandoc/new_branch_27_08_2022 
FIX php8 compatibility
 2022-08-29 01:09:49 +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
6526cd413e Clean code 2022-08-28 23:36:17 +02:00
Laurent Destailleur
ec5af6cd23 Doc 2022-08-28 23:32:36 +02:00
Philippe GRAND
dd00484a9c FIX php8 compatibility 2022-08-28 14:13:33 +02:00
Laurent Destailleur
5903a9f87f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-07-26 12:24:24 +02:00
Laurent Destailleur
20be7b71c5 Doc 2022-07-26 10:12:40 +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
Laurent Destailleur
1838baaa5c Debug v16 2022-06-08 21:20:12 +02:00
jpb
c434e9cffe add card and feature 2022-06-07 19:01:57 +02:00
Gauthier PC portable 024
1e0972f0a1 NEW : sortorder on holiday type dictionnary 2022-05-19 12:34:05 +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
Frédéric FRANCE
a613553f37 Merge branch 'hookgetnomurl' into patch-1 2022-02-15 18:44:06 +01:00
Frédéric FRANCE
0ba912b1e5 add missing global 2022-02-15 18:14:44 +01:00
Laurent Destailleur
494e9a2745 Merge branch 'develop' into develop_NEW_block_leave_if_negative_balance 2021-12-16 19:12:06 +01:00
Laurent Destailleur
1db52532ff FIX: do not update holiday for closed users 2021-12-03 01:50:17 +01:00
Frédéric FRANCE
dc3bfcfb87 can modify tooltip by reference 2021-11-22 19:57:26 +01:00
Marc de Lima Lucio
fbb1fbf08e Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_NEW_block_leave_if_negative_balance 2021-10-28 17:09:50 +02:00
Laurent Destailleur
6ad9eb8ef1 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/class/api_products.class.php
	htdocs/recruitment/recruitmentcandidature_list.php
	htdocs/recruitment/recruitmentjobposition_list.php
 2021-10-24 00:02:15 +02:00
stickler-ci
87b4805bc0 Fixing style errors. 2021-10-22 13:35:30 +00:00
atm-lena
fa21b27ced Validate Holiday : keep files 2021-10-22 15:27:16 +02:00
Laurent Destailleur
8e68f452ed Merge branch 'develop' into develop_NEW_block_leave_if_negative_balance 2021-10-20 14:48:06 +02:00
Laurent Destailleur
4bb1774568 Update holiday.class.php 2021-10-20 14:43:47 +02:00
Laurent Destailleur
901bab2ca2 Update holiday.class.php 2021-10-20 14:33:22 +02:00
Laurent Destailleur
dd0809b528 Fix trans labels status 2021-10-16 19:37:57 +02:00
Laurent Destailleur
0cf18ded80 Merge pull request #18866 from marc-dll/14.0_FIX_holiday_increments_pgsql 
FIX: postgresql compatibility with camelcase fields
 2021-10-06 13:26:57 +02:00
Marc de Lima Lucio
fdb6ebe80e FIX: postgresql: rename the oly column with uppercase characters to lowercase 2021-10-05 16:18:56 +02:00
Marc de Lima Lucio
2a85a32659 FIX: postgresql compatibility with camelcase fields 2021-09-30 18:30:22 +02:00
Marc de Lima Lucio
7c8fb4a5fb FIX: leave request blocking when balance negative: don't check when creating, check only when updating not in draft 2021-09-30 17:48:20 +02:00
Marc de Lima Lucio
5f826f78a1 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_NEW_block_leave_if_negative_balance 2021-09-30 17:41:38 +02:00
Laurent Destailleur
11b6259130 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/holiday/class/holiday.class.php
	htdocs/langs/en_US/admin.lang
 2021-09-10 11:40:45 +02:00
Laurent Destailleur
b8b5b97d78 Code comment 2021-09-09 19:47:15 +02:00
Laurent Destailleur
8b58de50d5 Clean code 2021-09-09 03:21:41 +02:00
Laurent Destailleur
3b6559b1a6 Clean code by adding cast int. 2021-08-27 18:53:45 +02:00
Laurent Destailleur
4460206709 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-23 16:04:16 +02:00
Laurent Destailleur
d3de81fecb Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/holiday/card.php
	htdocs/holiday/class/holiday.class.php
 2021-08-22 19:34:13 +02:00
Laurent Destailleur
ae3a0fce71 Fix phpcs 2021-08-18 02:16:30 +02:00
Laurent Destailleur
4d9fc36ff2 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-18 00:14:55 +02:00
Laurent Destailleur
57c9649b50 FIX bad approver shown on holiday once approved 2021-08-18 00:12:25 +02:00
Laurent Destailleur
33b9787ea1 Clean code 2021-08-18 00:10:48 +02:00
Maxime Kohlhaas
803722e323 Fix : we only want employee users for holidays 2021-08-04 14:48:10 +02:00
Laurent Destailleur
079b014b14 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-26 00:41:35 +02:00
Laurent Destailleur
4c505619e3 FIX look and field v14 2021-07-23 00:02:14 +02:00
Laurent Destailleur
2fc8a80070 Merge pull request #17883 from marc-dll/develop_NEW_holiday_cron 
NEW: holiday: handle monthly balance updates with cronjob
 2021-07-16 12:48:12 +02:00
Laurent Destailleur
b552c6b4fe Fix status color 2021-07-14 14:32:05 +02:00
Laurent Destailleur
37801184c0 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/holiday/class/holiday.class.php

Fix case of newByMonth
 2021-07-06 15:35:17 +02:00