lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
109,623 Commits 43 Branches 150 Tags 886 MiB
develop
Commit Graph

887 Commits

Author SHA1 Message Date
Laurent Destailleur
ef4468153d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/tpl/extrafields_list_search_sql.tpl.php
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2021-08-11 22:07:13 +02:00
Laurent Destailleur
0cf2164260 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2021-08-11 21:15:30 +02:00
Marc de Lima Lucio
864a8b4b3e FIX: holiday card: hooks uninitialized 2021-08-06 16:22:19 +02:00
Maxime Kohlhaas
803722e323 Fix : we only want employee users for holidays 2021-08-04 14:48:10 +02:00
lmarcouiller
1cef6d31e8 Close #18302 : Mass action leave requests 2021-08-02 15:45:55 +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
Marc de Lima Lucio
4d6372dda1 FIX: holiday balances: revert part of commit 1e7df0ba9 to still increment on page visit 2021-07-16 12:10:25 +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
Laurent Destailleur
4dd29af555 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-07-06 15:24:37 +02:00
Laurent Destailleur
a345d38320 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-07-06 15:24:01 +02:00
Marc de Lima Lucio
eea90cef56 FIX: holiday: balances not updated correctly with pgsql because of case sensitivity 2021-07-05 16:31:33 +02:00
Laurent Destailleur
8a3b92a32d Fix filter 2021-07-03 18:30:58 +02:00
Marc de Lima Lucio
97938f489e FIX: holiday: status filter parameter has been renamed but not in links it was used 2021-07-02 11:35:26 +02:00
Marc de Lima Lucio
084abe4547 FIX: holiday: also block if balance is negative at request update, validation and approval 2021-06-22 16:27:43 +02:00
Laurent Destailleur
3ff4f7c722
Merge pull request #17959 from dolibit-ut/patch-360 
Update month_report.php
 2021-06-17 13:30:15 +02:00
Laurent Destailleur
378184564a
Merge pull request #17957 from dolibit-ut/patch-358 
Update define_holiday.php
 2021-06-17 13:30:03 +02:00
Laurent Destailleur
70309d8a3e
Merge pull request #17956 from dolibit-ut/patch-357 
Update card.php
 2021-06-17 13:29:52 +02:00
Laurent Destailleur
2f4f8648af
Merge pull request #17960 from dolibit-ut/patch-361 
Update view_log.php
 2021-06-17 13:29:09 +02:00
UT from dolibit
23b24c589e
Update view_log.php 
$title
 2021-06-17 09:15:24 +02:00
UT from dolibit
789a2744f2
Update month_report.php 
$title
 2021-06-17 09:13:54 +02:00
UT from dolibit
c1297d561d
Update document.php 2021-06-17 09:11:07 +02:00
UT from dolibit
e62e6d9696
Update define_holiday.php 
$title
 2021-06-17 09:08:59 +02:00
UT from dolibit
053f8f8338
Update card.php 2021-06-17 09:07:17 +02:00
Laurent Destailleur
f6274b8418 Fix nb of holidays can be float 2021-06-15 16:29:42 +02:00
Laurent Destailleur
988dbd25b3 Fix sql syntax error 2021-06-14 14:24:18 +02:00
Laurent Destailleur
5cc86d2319 Fix #yogosha6370 2021-06-14 13:51:09 +02:00
Marc de Lima Lucio
30e0471451 NEW: leave requests: add field into type dictionary to block request if balance is negative 2021-06-10 23:04:56 +02:00
Marc de Lima Lucio
1e7df0ba9f NEW: holiday: handle monthly updates with cronjob 2021-06-10 21:53:06 +02:00
Laurent Destailleur
1bf63c7862 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/core/lib/functions.lib.php
 2021-06-10 16:53:09 +02:00
Laurent Destailleur
24f8b6386e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2021-06-10 16:47:45 +02:00
Laurent Destailleur
fb46ece906 Fix yogosha 6347 2021-06-09 15:36:47 +02:00
Marc de Lima Lucio
5d9aa40065 FIX: holiday list: bad right for mass deletion 2021-06-09 12:40:34 +02:00
Laurent Destailleur
fa4786a3f6 Fix permission 2021-06-08 16:19:21 +02:00
Laurent Destailleur
e5ab721660 Fix sanitize 2021-06-04 12:30:46 +02:00
Laurent Destailleur
08b44b3348
Merge pull request #17755 from frederic34/patch-17 
fix warning
 2021-06-04 11:54:58 +02:00
Laurent Destailleur
2586fcd1a3 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/commandestats.class.php
	htdocs/core/actions_massactions.inc.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/holiday/month_report.php
	htdocs/product/class/product.class.php
	htdocs/product/stock/class/mouvementstock.class.php
	htdocs/societe/list.php
 2021-06-04 11:20:38 +02:00
Laurent Destailleur
6c8341a43f
Merge pull request #17787 from Hystepik/develop#5 
Fix #17726 : holliday with advanced perms works
 2021-06-04 09:37:32 +02:00
Gauthier PC portable 024
093705a1b5 FIX : field name is search_status and not search_statut 2021-06-03 11:32:41 +02:00
Laurent Destailleur
1468761073 Fix select 2021-06-02 16:29:38 +02:00
Laurent Destailleur
da7d821a3e css 2021-06-02 15:32:39 +02:00
lmarcouiller
af509742e6 Fix #17726 : holliday with advanced perms works 2021-06-01 16:34:39 +02:00
Frédéric FRANCE
0b6457d83f
fix warning 2021-05-27 22:44:05 +02:00
Laurent Destailleur
421681cda4 FIX Navigation in list of holiday 
Conflicts:
	htdocs/holiday/view_log.php
 2021-05-26 15:25:44 +02:00
Laurent Destailleur
48945533e4 Clean code 2021-05-26 15:22:56 +02:00
Laurent Destailleur
7c41be7f0a FIX Navigation in list of holiday 2021-05-26 15:22:49 +02:00
Anthony Berton
a612831e28 next_change 2021-04-14 14:45:55 +02:00
Laurent Destailleur
358bb87ae2 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/payments.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/projet/card.php
	htdocs/public/payment/newpayment.php
	htdocs/societe/list.php
	htdocs/ticket/document.php
 2021-04-13 20:19:05 +02:00
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