Alexandre SPANGARO
|
4b9bf40a8f
|
move include_once to include when it's a tpl
|
2021-04-12 21:25:58 +02:00 |
|
Laurent Destailleur
|
8a62d97b89
|
Remove one thousand of useless files
|
2021-04-12 15:57:16 +02:00 |
|
Laurent Destailleur
|
be6bb3a756
|
FIX #yogosha5746 - next step (work in progress)
|
2021-03-30 19:12:07 +02:00 |
|
Laurent Destailleur
|
6063b02bf4
|
Fix #ygosha5698
|
2021-03-22 12:47:23 +01:00 |
|
Laurent Destailleur
|
6a0e0f4c06
|
Fix #ygosha5698
|
2021-03-22 12:10:51 +01:00 |
|
Laurent Destailleur
|
15440917b1
|
Fix #ygosha5698
|
2021-03-22 11:30:18 +01:00 |
|
UT from dolibit
|
373e225dd0
|
Update card.php
translations of comments (fr->en)
----------------------------------------------------
insert:
$help_url = 'EN:Module_Holiday';
llxHeader('', $langs->trans('CPTitreMenu'), $help_url);
--------------------------------------------------------------------
start creatrion of
https://wiki.dolibarr.org/index.php/Module_Holiday
|
2021-03-17 18:17:03 +01:00 |
|
Frédéric FRANCE
|
dc39a68b58
|
fix php8
|
2021-03-16 17:50:43 +01:00 |
|
Laurent Destailleur
|
1495630254
|
Fix #yogosha5645
|
2021-03-16 10:59:01 +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 |
|
Laurent Destailleur
|
9ed128c6fa
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/admin/account.php
htdocs/core/class/html.formaccounting.class.php
htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
htdocs/langs/en_US/errors.lang
htdocs/product/card.php
|
2021-03-10 15:35:09 +01:00 |
|
Laurent Destailleur
|
28f54eeb75
|
Fix translation
|
2021-03-09 19:55:47 +01:00 |
|
Laurent Destailleur
|
67f5837072
|
Fix permission to create a holiday when advanced permissions are set
|
2021-03-09 19:51:11 +01:00 |
|
stickler-ci
|
629efe7d5a
|
Fixing style errors.
|
2021-02-26 17:14:26 +00:00 |
|
Frédéric FRANCE
|
5f1d7ee763
|
code syntax ftp holiday directory
|
2021-02-26 17:59:31 +01:00 |
|
Laurent Destailleur
|
2be6992916
|
Fix include_once into include for inc.php file. See comment in #16338
|
2021-02-19 16:10:19 +01:00 |
|
lmarcouiller
|
a140625a8a
|
Fix search by statut in list of holiday module
|
2021-02-08 15:03:58 +01:00 |
|
lmarcouiller
|
13b83e3150
|
Fix search by statut in list of holiday module
|
2021-02-08 09:47:43 +01:00 |
|
Laurent Destailleur
|
524b28d8c3
|
Fix missing tab info on holiday
|
2021-02-04 12:15:31 +01:00 |
|
Laurent Destailleur
|
eca010937f
|
FIX Trigger on expense report was not fired
FIX Bad dates on info tabs
|
2021-02-04 11:56:53 +01:00 |
|
Laurent Destailleur
|
d65dc85a10
|
FIX for php 8
|
2020-12-23 19:16:25 +01:00 |
|
Laurent Destailleur
|
4dbdcd1475
|
Fix missing the section with last event on a holiday record
|
2020-12-17 13:42:20 +01:00 |
|
Laurent Destailleur
|
bb6f23d81b
|
CSS
|
2020-12-08 19:32:43 +01:00 |
|
Laurent Destailleur
|
efc3bad7c6
|
Merge pull request #15678 from frederic34/fk_element
doxygen
|
2020-12-07 22:31:08 +01:00 |
|
Laurent Destailleur
|
7ad5a89a16
|
FIX A service email must always be sent using the service email
|
2020-12-07 16:40:20 +01:00 |
|
Laurent Destailleur
|
e18035c0fc
|
Fix bad permission on module holiday
|
2020-12-07 14:46:33 +01:00 |
|
Laurent Destailleur
|
936699786a
|
Fix translation
|
2020-12-07 14:44:20 +01:00 |
|
Laurent Destailleur
|
2457d07d1a
|
Fix permission on creation of leave requests
|
2020-12-07 14:29:51 +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
|
2e5ac9b40a
|
CSS
|
2020-12-04 15:36:14 +01:00 |
|
Laurent Destailleur
|
e7306625f0
|
Fix look and feel v13
|
2020-12-04 15:28:12 +01:00 |
|
Laurent Destailleur
|
6d4a90b543
|
Clean code
|
2020-12-04 14:53:52 +01:00 |
|
Givriz
|
dca4cf5987
|
Feature : ajout de la class "button-cancel"
Ajout de la class "button-cancel" suite à l'issue #3756 et achèvement de ma tâche Dolibarr.
|
2020-11-23 15:12:52 +01:00 |
|
Givriz
|
c48129e279
|
Ajout de la class "button-save"
Ajout de cette class sur les boutons pour pour cloturer une issue ouverte (feature)
|
2020-11-19 20:23:38 +01:00 |
|
Laurent Destailleur
|
2529448f1b
|
Fix path to files
|
2020-11-18 12:37:18 +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
|
38f1431534
|
HOLIDAY_HIDE_FOR_NON_SALARIES replaces !HOLIDAY_FOR_NON_SALARIES_TOO
|
2020-11-05 19:01:00 +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 |
|
Frédéric FRANCE
|
5a3780e062
|
end of dol_fiche_end
|
2020-10-27 18:19:31 +01:00 |
|
Frédéric FRANCE
|
9a470fa42d
|
replace deprecated
|
2020-10-22 22:50:03 +02:00 |
|
Laurent Destailleur
|
0b619f63f3
|
Fix error management on HR modules
|
2020-10-10 16:35:30 +02:00 |
|
Laurent Destailleur
|
b36b9170b2
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-10-10 15:45:22 +02:00 |
|
Laurent Destailleur
|
437eead694
|
Fix bad permission
|
2020-10-10 15:45:04 +02:00 |
|
Laurent Destailleur
|
fbd9229f9b
|
Fix: no formatting when storing into memory. Formatting when forging sql
|
2020-10-08 20:03:16 +02:00 |
|
stickler-ci
|
f4c3d9d7bb
|
Fixing style errors.
|
2020-10-08 08:38:28 +00:00 |
|
Sekan, Tobias
|
7e3a3a4cf3
|
Add more filter for leave log view
|
2020-10-08 10:30:09 +02:00 |
|
Laurent Destailleur
|
45762ecccb
|
Use ajax select2 beautifier in select component of type of holiday
|
2020-10-07 15:28:19 +02:00 |
|
Laurent Destailleur
|
400146bed4
|
Merge pull request #14953 from TobiasSekan/MoreFilterOnMonthlyStatementList
NEW Add more filters on monthly statement list
|
2020-10-07 15:23:47 +02:00 |
|
Sekan, Tobias
|
a119a75fe0
|
add more filter on monthly statement list
|
2020-10-07 14:00:32 +02:00 |
|
Laurent Destailleur
|
7b3a7c9921
|
Add token on all url with action=delete
|
2020-10-01 10:50:54 +02:00 |
|
Tobias Sekan
|
a72519f353
|
Merge branch 'develop' into PreselectThirpartyOnNewFromList
|
2020-09-23 09:09:42 +02:00 |
|
Laurent Destailleur
|
f57b4fd2fd
|
Fix escaping
|
2020-09-20 02:30:53 +02:00 |
|
Laurent Destailleur
|
b6c6473cce
|
Fix sql injection when forging requests with IN
|
2020-09-18 17:47:40 +02:00 |
|
Laurent Destailleur
|
4e2aff2cdc
|
Fix sql injection when forging requests with IN
|
2020-09-18 17:28:02 +02:00 |
|
Laurent Destailleur
|
2d38644ae1
|
Sanitize sortfield
|
2020-09-18 17:13:01 +02:00 |
|
Tobias Sekan
|
b2a953ed5b
|
Merge branch 'develop' into PreselectThirpartyOnNewFromList
|
2020-09-18 12:21:41 +02:00 |
|
Sekan, Tobias
|
eac9e54e0b
|
fix more different button visibility
|
2020-09-18 11:48:53 +02:00 |
|
Laurent Destailleur
|
aa3f906370
|
Standardize code
|
2020-09-18 04:53:43 +02:00 |
|
Laurent Destailleur
|
c4b5f5a249
|
Maxi clean of code
|
2020-09-18 01:29:17 +02:00 |
|
Laurent Destailleur
|
9a758b7edd
|
FIX #yogosha4483
|
2020-09-17 14:31:25 +02:00 |
|
Laurent Destailleur
|
0bf0312d50
|
FIX #yogosha4448
|
2020-09-17 12:30:14 +02:00 |
|
Laurent Destailleur
|
bfbb217607
|
Fix GETPOST on 'action'
|
2020-09-16 19:39:50 +02:00 |
|
Laurent Destailleur
|
64b28020c8
|
Look and feel v13
|
2020-09-11 13:14:14 +02:00 |
|
Scrutinizer Auto-Fixer
|
c263c8a76c
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-09-08 19:27:28 +00:00 |
|
Scrutinizer Auto-Fixer
|
b78ff67d7e
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-09-07 08:18:17 +00:00 |
|
Laurent Destailleur
|
ad87e753b4
|
Clean trim on GETPOST (already included inside GETPOST when not 'none'
|
2020-08-28 21:27:50 +02:00 |
|
Laurent Destailleur
|
0381cf5665
|
Merge branch '12.0' of https://github.com/dolibarr/dolibarr into develop
Conflicts:
htdocs/core/modules/modPaymentByBankTransfer.class.php
htdocs/filefunc.inc.php
|
2020-08-14 11:08:53 +02:00 |
|
Laurent Destailleur
|
4855b49698
|
css
|
2020-08-07 19:44:49 +02:00 |
|
Laurent Destailleur
|
91a50038ff
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/compta/prelevement/create.php
htdocs/compta/prelevement/fiche-stat.php
|
2020-07-27 19:35:34 +02:00 |
|
Laurent Destailleur
|
b82b6736d1
|
Look and feel
|
2020-07-24 18:13:01 +02:00 |
|
Laurent Destailleur
|
b35550a3dd
|
Merge pull request #14122 from TobiasSekan/CommonListForLeaveLog
New: Common list behavior for leave log
|
2020-06-28 21:30:49 +02:00 |
|
stickler-ci
|
a8ad21c011
|
Fixing style errors.
|
2020-06-26 08:59:50 +00:00 |
|
Tobias Sekan
|
2bb8efa86f
|
Common behavior for monthly leave list view
|
2020-06-26 10:54:27 +02:00 |
|
stickler-ci
|
adb3cc72f9
|
Fixing style errors.
|
2020-06-25 12:44:57 +00:00 |
|
Tobias Sekan
|
289886cd29
|
missing update
|
2020-06-25 14:37:09 +02:00 |
|
Tobias Sekan
|
22f708b95a
|
Add search, sort, select for leave log view
|
2020-06-25 14:36:42 +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 |
|
Laurent Destailleur
|
4584fa1aa6
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/asset/list.php
htdocs/compta/bank/list.php
htdocs/contrat/services_list.php
htdocs/core/lib/date.lib.php
htdocs/expensereport/list.php
htdocs/fichinter/list.php
htdocs/holiday/list.php
htdocs/projet/tasks/list.php
htdocs/supplier_proposal/list.php
htdocs/user/list.php
|
2020-05-11 19:43:06 +02:00 |
|
Maxime Kohlhaas
|
1a9afe6b20
|
Fix missing hook params for printFieldListValue
|
2020-05-08 01:40:25 +02:00 |
|
Laurent Destailleur
|
0cd05887ce
|
FIX count of open day when date and start are not open should be 0
|
2020-05-07 17:21:27 +02:00 |
|
Laurent Destailleur
|
6c8d302dd9
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/prelevement/list.php
htdocs/compta/prelevement/rejets.php
htdocs/fourn/commande/index.php
|
2020-05-07 12:03:49 +02:00 |
|
Laurent Destailleur
|
2afd38e2f6
|
FIX Combo list of available users to filter on the list of leaves.
|
2020-05-04 21:59:31 +02:00 |
|
Laurent Destailleur
|
16e46c672c
|
Clean code
|
2020-04-20 15:06:27 +02:00 |
|
Laurent Destailleur
|
2bf36bff6d
|
Fix restore dir at good place
|
2020-04-13 04:19:25 +02:00 |
|
Laurent Destailleur
|
3740d59848
|
Look and feel v12
|
2020-04-13 04:14:28 +02:00 |
|
Laurent Destailleur
|
92b6b1a042
|
Look and feel v12
|
2020-04-12 18:13:43 +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
|
6a60678186
|
Look and feel v12
|
2020-04-09 16:36:39 +02:00 |
|
Frédéric FRANCE
|
fc34b5a4cb
|
compress png with zopflipng
|
2020-04-06 19:03:48 +02:00 |
|
Laurent Destailleur
|
33c5db9cc3
|
Prepare code for the new pagination possibility
|
2020-03-13 13:07:11 +01: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
|
1875b6a49b
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/company.lib.php
htdocs/core/lib/security2.lib.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
htdocs/core/modules/facture/doc/pdf_sponge.modules.php
htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
htdocs/core/modules/propale/doc/pdf_cyan.modules.php
htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
htdocs/core/modules/supplier_order/pdf/pdf_cornas.modules.php
htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
|
2020-02-05 14:53:47 +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 |
|
Scrutinizer Auto-Fixer
|
8744f6ab7b
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-01-18 15:17:07 +00:00 |
|
AdrianDominik
|
5fb15ff0f8
|
FIX: add traslate from remains holidays
|
2020-01-16 14:01:41 +01:00 |
|
Laurent Destailleur
|
3bd95c205d
|
Tooltip to understand the new dictionary of holidays
|
2020-01-15 14:54:17 +01:00 |
|
Laurent Destailleur
|
141ca20269
|
Trans
|
2020-01-15 14:44:53 +01:00 |
|
Laurent Destailleur
|
f44b85f557
|
Fix $_SESSION['newtoken'] must be newToken()
|
2019-12-18 23:12:31 +01:00 |
|
Laurent Destailleur
|
92070fa491
|
Fix name of variable $trigger_name into $triggersendname
|
2019-12-02 09:38:16 +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 |
|
Laurent Destailleur
|
171b94fc5c
|
Merge pull request #12429 from Dolibarr/scrutinizer-patch-5
Scrutinizer Auto-Fixes
|
2019-11-14 08:50:24 +01:00 |
|
Scrutinizer Auto-Fixer
|
ac40dd8bbe
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-13 18:35:39 +00:00 |
|
Scrutinizer Auto-Fixer
|
8a527631a0
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-13 18:35:02 +00:00 |
|
Scrutinizer Auto-Fixer
|
c85e54b08c
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-12 08:46:08 +00:00 |
|
Laurent Destailleur
|
b5e47e05f4
|
Merge pull request #12348 from frederic34/patch-11
add info for tooltip
|
2019-11-07 11:28:41 +01:00 |
|
Frédéric FRANCE
|
361e8eb822
|
add info for tooltip
|
2019-11-05 21:44:32 +01:00 |
|
Frédéric FRANCE
|
35751a80ab
|
100% centpercent
|
2019-11-05 21:24:41 +01:00 |
|
Laurent Destailleur
|
94bd0f71d9
|
Fix pb with permission
|
2019-11-05 19:41:30 +01:00 |
|
Laurent Destailleur
|
1aef1c60dd
|
Merge pull request #11867 from frederic34/socialnetworks
NEW add socialnetworks dictionary
|
2019-11-04 21:10:22 +01:00 |
|
Laurent Destailleur
|
11500fb8d9
|
FIX confusion between permto... and permisstionto...
|
2019-11-04 15:33:49 +01: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
|
537f678268
|
Merge pull request #12285 from frederic34/patch-13
Update define_holiday.php
|
2019-11-02 11:51:38 +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
|
7bd88f33a0
|
Update define_holiday.php
|
2019-11-01 22:22:07 +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
|
b19593bb8e
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/holiday/card.php
|
2019-11-01 21:30:19 +01:00 |
|
Laurent Destailleur
|
cf2ee892ee
|
FIX security check. A user can see holiday with link without permissions
|
2019-11-01 21:27:19 +01:00 |
|
Laurent Destailleur
|
2d9135b6ad
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/expedition/card.php
htdocs/holiday/list.php
|
2019-11-01 21:06:06 +01:00 |
|
Laurent Destailleur
|
4616519dcf
|
FIX Search on leave request ref
|
2019-11-01 20:52:30 +01:00 |
|
Laurent Destailleur
|
a3a326b25e
|
FIX Search on leave request ref
|
2019-11-01 20:52:11 +01:00 |
|
Laurent Destailleur
|
83cc9ea643
|
FIX Search on leave request ref
|
2019-11-01 20:48:46 +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
|
78c1e8dfbe
|
Update define_holiday.php
|
2019-11-01 08:25:58 +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 |
|
Alexandre SPANGARO
|
499eb87173
|
lang file for holidays is holiday
|
2019-10-13 08:20:37 +02:00 |
|
Frédéric FRANCE
|
367ef4acaf
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-11 16:44:25 +02:00 |
|
Laurent Destailleur
|
d9e434965a
|
Update list.php
|
2019-10-11 16:29:44 +02:00 |
|
Frédéric FRANCE
|
6f7e4fd15c
|
Update list.php
|
2019-10-09 22:02:58 +02:00 |
|
Frédéric FRANCE
|
f253315c8d
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-08 18:30:58 +02:00 |
|
Laurent Destailleur
|
43a70e5548
|
Clean code to use the new $extrafields->attributes array
|
2019-10-08 09:28:50 +02:00 |
|
Frédéric FRANCE
|
b78187c1eb
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-08 00:07:27 +02:00 |
|
Laurent Destailleur
|
76aef85ee4
|
Merge pull request #12015 from atm-maxime/new_validators
NEW expense request and holiday validator fields
|
2019-10-07 13:31:20 +02:00 |
|
Laurent Destailleur
|
c3ae87816f
|
Merge pull request #12049 from frederic34/holidayz
lang file for holidays is holiday
|
2019-10-07 10:21:36 +02:00 |
|
Frédéric FRANCE
|
ec8569dd85
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-06 15:56:21 +02:00 |
|
Laurent Destailleur
|
866dcf18fe
|
Look and feel v11
|
2019-10-06 15:34:22 +02:00 |
|
Laurent Destailleur
|
2b66282b61
|
NEW Code for extrafields uses the new array $extrafields->attributes
|
2019-10-06 14:41:52 +02:00 |
|
Frédéric FRANCE
|
8a9f08d5a3
|
lang file for holidays is holiday
|
2019-10-06 11:29:24 +02:00 |
|
Maxime Kohlhaas
|
2068692f40
|
Merge branch 'develop' of github.com:atm-maxime/dolibarr into new_validators
|
2019-10-05 22:25:06 +02:00 |
|
Laurent Destailleur
|
1f3e250053
|
Update card.php
|
2019-10-03 17:58:07 +02:00 |
|
Frédéric FRANCE
|
e443538f71
|
wip
|
2019-10-03 17:23:50 +02:00 |
|
Laurent Destailleur
|
d8a8c4fbe6
|
Look and feel v11. Picto are fontawesome.
|
2019-10-02 18:36:36 +02:00 |
|
Maxime Kohlhaas
|
6d4f3f308e
|
NEW expense request and holiday validator fields
|
2019-10-02 08:43:40 +02:00 |
|
Alexandre SPANGARO
|
91b3bf76fd
|
Merge branch 'develop' into 11.0_https
|
2019-10-01 06:11:43 +02:00 |
|
Laurent Destailleur
|
6966651d51
|
Standardize code to use dolSqlDateFilter
|
2019-09-28 13:22:05 +02:00 |
|
Laurent Destailleur
|
b3c49f2ec8
|
End of dev for extrafields on holiday
|
2019-09-24 16:26:15 +02:00 |
|
Laurent Destailleur
|
961f2b5165
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/categories/viewcat.php
htdocs/fourn/class/fournisseur.product.class.php
htdocs/takepos/invoice.php
|
2019-09-24 14:25:02 +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
|
24cb1390e4
|
FIX Update of leave request when CSRF with token is on
FIX Export of leave request show the number of open days
|
2019-09-17 13:17:25 +02:00 |
|
Laurent Destailleur
|
09d6826e62
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/supplier_order.php
htdocs/langs/en_US/admin.lang
|
2019-09-06 14:27:01 +02:00 |
|
Laurent Destailleur
|
9a823f1c64
|
Fix bad perm
|
2019-09-05 22:51:26 +02:00 |
|
Laurent Destailleur
|
e91b6f7843
|
FIX Can't delete a draft leave even if it should
|
2019-09-05 22:48:33 +02:00 |
|
Laurent Destailleur
|
e7e663a27e
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-09-05 17:57:41 +02:00 |
|
Laurent Destailleur
|
8d5105e29c
|
Remove deprecated field
|
2019-09-05 13:41:29 +02:00 |
|
Laurent Destailleur
|
a3d417a40f
|
Fix can't change approver of a leave request in some cases
|
2019-09-04 11:21:41 +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
|
a6fc75fed2
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/expensereport/card.php
|
2019-06-23 18:12:30 +02:00 |
|
Laurent Destailleur
|
0854984a08
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/holiday/card.php
|
2019-06-23 18:09:49 +02:00 |
|