2
0
forked from Wavyzz/dolibarr
Commit Graph

739 Commits

Author SHA1 Message Date
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