Laurent Destailleur
|
6063b02bf4
|
Fix #ygosha5698
|
2021-03-22 12:47:23 +01:00 |
|
Laurent Destailleur
|
15440917b1
|
Fix #ygosha5698
|
2021-03-22 11:30:18 +01:00 |
|
Frédéric FRANCE
|
64a0666a3e
|
fix php8 warning
$notooltip not defined
|
2021-03-14 20:51:02 +01:00 |
|
Laurent Destailleur
|
cc10106a21
|
Fix protection on int
|
2021-03-14 12:20:23 +01:00 |
|
Laurent Destailleur
|
12f50a76d7
|
Fix yogosha #5627
|
2021-03-14 11:48:39 +01:00 |
|
Frédéric FRANCE
|
5f1d7ee763
|
code syntax ftp holiday directory
|
2021-02-26 17:59:31 +01:00 |
|
Laurent Destailleur
|
524b28d8c3
|
Fix missing tab info on holiday
|
2021-02-04 12:15:31 +01:00 |
|
Laurent Destailleur
|
efc3bad7c6
|
Merge pull request #15678 from frederic34/fk_element
doxygen
|
2020-12-07 22:31:08 +01:00 |
|
Laurent Destailleur
|
de61a7cfd3
|
Fix cleaning html tags with trans and with GETPOST.
|
2020-12-06 17:30:27 +01:00 |
|
Frédéric FRANCE
|
4e18f46f28
|
doxygen
|
2020-12-05 23:53:55 +01:00 |
|
Laurent Destailleur
|
6d4d3c618d
|
FIX #15369 and standardize permission "readall"
|
2020-11-13 09:55:53 +01:00 |
|
Laurent Destailleur
|
4535d81964
|
Fix CSS for holiday. Fix #15266
|
2020-11-05 19:09:58 +01:00 |
|
Laurent Destailleur
|
40e18741b3
|
Fix look and feel v13
|
2020-11-04 18:05:48 +01:00 |
|
Laurent Destailleur
|
c6c13e48dc
|
Revert "cut fonction in two parts"
|
2020-11-02 11:46:28 +01:00 |
|
Frédéric FRANCE
|
4578411c23
|
cut fonction in two parts
|
2020-11-01 21:28:06 +01:00 |
|
Scrutinizer Auto-Fixer
|
ab25e047c0
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-10-31 17:51:30 +00:00 |
|
Scrutinizer Auto-Fixer
|
7f52920716
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-10-31 13:32:18 +00:00 |
|
Laurent Destailleur
|
f57b4fd2fd
|
Fix escaping
|
2020-09-20 02:30:53 +02:00 |
|
Laurent Destailleur
|
4e2aff2cdc
|
Fix sql injection when forging requests with IN
|
2020-09-18 17:28:02 +02:00 |
|
Laurent Destailleur
|
64b28020c8
|
Look and feel v13
|
2020-09-11 13:14:14 +02:00 |
|
Frédéric FRANCE
|
e5402988d9
|
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
|
2020-05-24 17:58:18 +02:00 |
|
Laurent Destailleur
|
6056ed2755
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/holiday/class/holiday.class.php
htdocs/index.php
|
2020-05-24 01:02:08 +02:00 |
|
Laurent Destailleur
|
7bfbf3c88b
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
htdocs/holiday/class/holiday.class.php
htdocs/index.php
|
2020-05-23 20:20:53 +02:00 |
|
Laurent Destailleur
|
45ddde6940
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/expensereport/class/expensereport.class.php
htdocs/holiday/class/holiday.class.php
htdocs/index.php
|
2020-05-23 20:18:10 +02:00 |
|
Maxime Kohlhaas
|
fb0f31c142
|
Fix board filters for expense report and holiday
|
2020-05-22 00:33:30 +02:00 |
|
Frédéric FRANCE
|
b41ac00b98
|
add new rule
|
2020-05-21 15:05:19 +02:00 |
|
Frédéric FRANCE
|
f5688b2eec
|
add new rule
|
2020-05-21 01:52:25 +02:00 |
|
Scrutinizer Auto-Fixer
|
444c293c01
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-04-10 08:59:32 +00:00 |
|
Laurent Destailleur
|
7866f89585
|
Merge pull request #13260 from atm-quentin/FIX_ecm_files
FIX ecm_files didnt match cause document ref contained "/"
|
2020-03-03 23:09:02 +01:00 |
|
atm-quentin
|
9446138951
|
FIX ecm_files didnt match cause document ref contained "/"
|
2020-03-03 12:07:18 +01:00 |
|
Laurent Destailleur
|
1fe9783760
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/holiday/class/holiday.class.php
htdocs/product/index.php
|
2020-02-05 14:38:19 +01:00 |
|
Laurent Destailleur
|
a36cf1f86b
|
Fix phpunit
|
2020-02-05 14:08:13 +01:00 |
|
Laurent Destailleur
|
334c69841a
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
|
2020-02-05 13:41:30 +01:00 |
|
Laurent Destailleur
|
9100b8a548
|
FIX SQL request and phpunit
|
2020-02-05 13:41:10 +01:00 |
|
Laurent Destailleur
|
c101c3dd55
|
Update holiday.class.php
|
2020-02-05 13:27:22 +01:00 |
|
Laurent Destailleur
|
d35994e5db
|
Update holiday.class.php
|
2020-02-05 13:25:51 +01:00 |
|
Regis Houssin
|
e74e63941d
|
FIX use "usergroup" instead "user"
|
2020-02-03 11:55:55 +01:00 |
|
Regis Houssin
|
bc3a210d12
|
FIX compatibility with multicompany (avoid duplicate data)
|
2020-02-03 11:46:18 +01:00 |
|
Laurent Destailleur
|
b06c281178
|
Fix error with postgresql
|
2019-11-26 12:39:31 +01:00 |
|
Laurent Destailleur
|
d34f487c65
|
Decode subject by emailcollector
|
2019-11-24 21:30:00 +01:00 |
|
Laurent Destailleur
|
19fb6bfd17
|
FIX Use PROV as temporary ID for leaves
|
2019-11-24 18:25:55 +01:00 |
|
Scrutinizer Auto-Fixer
|
ddcc14dc16
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-14 11:09:15 +00:00 |
|
Frédéric FRANCE
|
872f58f261
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-11-03 21:48:24 +01:00 |
|
Laurent Destailleur
|
25e64b0610
|
Merge branch 'develop' into socid
|
2019-11-02 12:01:06 +01:00 |
|
Laurent Destailleur
|
68691ddd8a
|
Merge pull request #12265 from grandoc/new_branch_30_10_2019
add comment
|
2019-11-02 11:49:28 +01:00 |
|
Frédéric FRANCE
|
dbed10a701
|
Merge remote-tracking branch 'upstream/develop' into socid
|
2019-11-01 21:39:20 +01:00 |
|
Laurent Destailleur
|
e3b5be7475
|
All properties 'libstatut', 'labelstatut', 'labelstatus' were renamed
into 'labelStatus'.
All properties 'labelstatusshort' and 'labelstatut_short' were renamed
into 'labelStatusShort'.
|
2019-11-01 12:52:03 +01:00 |
|
Laurent Destailleur
|
e684c1c450
|
Look and feel v11
|
2019-11-01 12:11:29 +01:00 |
|
Frédéric FRANCE
|
e93aaa2a75
|
replace deprecated user->societe_id by user->socid
|
2019-10-31 20:46:31 +01:00 |
|
Frédéric FRANCE
|
f7747ed00a
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-30 20:06:43 +01:00 |
|
stickler-ci
|
345a060bbe
|
Fixing style errors.
|
2019-10-30 08:36:59 +00:00 |
|
Philippe GRAND
|
1963e5c959
|
add comment
|
2019-10-30 09:35:45 +01:00 |
|
Frédéric FRANCE
|
b2b057e9b5
|
clean indent
|
2019-10-27 09:51:15 +01:00 |
|
Frédéric FRANCE
|
f4540dddb8
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-17 20:24:04 +02:00 |
|
Frédéric FRANCE
|
e75f7d448c
|
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
|
2019-10-16 20:00:01 +02:00 |
|
Frédéric FRANCE
|
e443538f71
|
wip
|
2019-10-03 17:23:50 +02:00 |
|
Alexandre SPANGARO
|
91b3bf76fd
|
Merge branch 'develop' into 11.0_https
|
2019-10-01 06:11:43 +02:00 |
|
Laurent Destailleur
|
b3c49f2ec8
|
End of dev for extrafields on holiday
|
2019-09-24 16:26:15 +02:00 |
|
Laurent Destailleur
|
7b3e64d67f
|
NEW Support of Extrafields on Leave requests.
|
2019-09-24 12:01:18 +02:00 |
|
Alexandre SPANGARO
|
02dbc11f98
|
Move Gnu.org to https
|
2019-09-23 21:55:30 +02:00 |
|
Laurent Destailleur
|
8d5105e29c
|
Remove deprecated field
|
2019-09-05 13:41:29 +02:00 |
|
John Botella
|
b4c4e5a662
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_dashboard
|
2019-08-02 14:52:01 +02:00 |
|
John Botella
|
9b84987cc1
|
prepare new dashboard
|
2019-08-01 12:33:19 +02:00 |
|
Laurent Destailleur
|
34f78c555d
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-07-30 20:55:35 +02:00 |
|
Laurent Destailleur
|
192fb45ce7
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/accountancy/bookkeeping/card.php
htdocs/accountancy/bookkeeping/list.php
htdocs/adherents/card.php
htdocs/compta/sociales/list.php
htdocs/compta/sociales/payments.php
htdocs/core/modules/import/import_csv.modules.php
htdocs/core/modules/import/import_xlsx.modules.php
htdocs/holiday/class/holiday.class.php
htdocs/viewimage.php
|
2019-07-30 20:55:15 +02:00 |
|
Laurent Destailleur
|
5f2439bf0a
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-07-30 20:37:44 +02:00 |
|
Laurent Destailleur
|
0ab16b739a
|
Add more log and phpunit
|
2019-07-30 20:37:07 +02:00 |
|
Laurent Destailleur
|
ea92ba2a78
|
Update holiday.class.php
|
2019-07-30 20:11:43 +02:00 |
|
Laurent Destailleur
|
00a4359508
|
FIX list of balance of leaves
|
2019-07-30 19:56:10 +02:00 |
|
Maxime Kohlhaas
|
37ad5308e6
|
Fix holiday counter auto update
|
2019-07-27 19:19:13 +02:00 |
|
Laurent Destailleur
|
adb3062a9f
|
Work on nblignes -> nblines
|
2019-06-29 16:38:14 +02:00 |
|
Laurent Destailleur
|
2bbb04085e
|
Merge branch '9.0' of https://github.com/dolibarr/dolibarr into develop
Conflicts:
htdocs/core/menus/standard/eldy.lib.php
htdocs/modulebuilder/template/class/myobject.class.php
|
2019-05-19 02:15:01 +02:00 |
|
Laurent Destailleur
|
32485c2782
|
Fix phpcs
|
2019-05-19 01:45:33 +02:00 |
|
Laurent Destailleur
|
3e3ed6f9e7
|
Fix phpcs
|
2019-05-18 20:11:51 +02:00 |
|
Maxime Kohlhaas
|
4f64250ad6
|
Fix menu links for holidays
|
2019-05-18 17:12:25 +02:00 |
|
Maxime Kohlhaas
|
ea1efa5e88
|
Fix missing dashboard stats for holidays
|
2019-05-18 17:06:33 +02:00 |
|
Laurent Destailleur
|
d075e97ba6
|
Remove warnings
|
2019-03-15 18:09:44 +01:00 |
|
Frédéric FRANCE
|
bd2e541fd6
|
add visibility
|
2019-03-01 18:28:51 +01:00 |
|
Frédéric FRANCE
|
1c07006015
|
wip
|
2019-02-25 21:36:27 +01:00 |
|
Laurent Destailleur
|
7f9d995c9c
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/holiday/card.php
|
2019-02-08 14:54:31 +01:00 |
|
Laurent Destailleur
|
2e1201b7b0
|
FIX Transaction on leave approval and decrease ko if setup not complete
|
2019-02-08 14:47:03 +01:00 |
|
Frédéric FRANCE
|
b10558bacd
|
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
|
2019-01-27 23:23:38 +01:00 |
|
Frédéric FRANCE
|
f0cdf300d1
|
Squiz.Functions.FunctionDeclarationArgumentSpacing
|
2019-01-27 15:20:16 +01:00 |
|
Frédéric FRANCE
|
7ee086b402
|
PSR2 space after comma in function call
|
2019-01-27 11:55:16 +01:00 |
|
Regis Houssin
|
89389baeac
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email
|
2018-11-09 15:37:29 +01:00 |
|
Laurent Destailleur
|
773e2da4cc
|
Fix example of number for holiday
|
2018-11-09 11:41:27 +01:00 |
|
Regis Houssin
|
569d59d251
|
FIX change my deprecated email
|
2018-10-27 14:43:12 +02:00 |
|
Laurent Destailleur
|
0e464ea4f5
|
Merge pull request #9866 from frederic34/emptylines
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose
|
2018-10-26 15:31:24 +02:00 |
|
Frédéric FRANCE
|
52b7d60a0f
|
use strict compare with boolean
|
2018-10-26 08:11:27 +02:00 |
|
Laurent Destailleur
|
8b601bd7fd
|
Fix numbering of holidays
|
2018-10-25 18:50:53 +02:00 |
|
Laurent Destailleur
|
25a374bd9a
|
NEW Notification module support expense report+holiday validation and
approval event.
|
2018-10-25 12:45:13 +02:00 |
|
Frédéric FRANCE
|
86d854f3f4
|
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose
|
2018-10-24 23:04:26 +02:00 |
|
Philippe GRAND
|
dd515c9cac
|
Standardize and update code
|
2018-10-11 09:22:03 +02:00 |
|
Philippe GRAND
|
596dba9ce1
|
Standardize code
|
2018-10-06 12:14:47 +02:00 |
|
Philippe GRAND
|
74c86f477c
|
Standardize code
|
2018-10-06 12:01:00 +02:00 |
|
Philippe GRAND
|
d2ec703b51
|
Standardize and update code
|
2018-10-04 09:24:57 +02:00 |
|
Frédéric FRANCE
|
2b62c4ca8f
|
Merge remote-tracking branch 'upstream/develop' into camelCaps2
|
2018-09-08 10:50:27 +02:00 |
|
Laurent Destailleur
|
aa562c9c69
|
Merge pull request #9420 from frederic34/patch-5
Update holiday.class.php
|
2018-09-07 19:32:36 +02:00 |
|
Frédéric FRANCE
|
5a618c6808
|
Update holiday.class.php
|
2018-09-05 21:14:15 +02:00 |
|
Frédéric FRANCE
|
65b74ad30f
|
Merge remote-tracking branch 'upstream/develop' into camelCaps2
|
2018-09-04 20:48:35 +02:00 |
|