Commit Graph

287 Commits

Author SHA1 Message Date
Laurent Destailleur
c96e3bdddf PHP v8 compatibility 2022-04-30 19:50:20 +02:00
Laurent Destailleur
2113a944ce Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-04-14 23:14:56 +02:00
Laurent Destailleur
0c82ce1b69 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-04-14 23:04:36 +02:00
Laurent Destailleur
02a3cfbb5f
Update paymentsalary.class.php 2022-04-14 21:43:55 +02:00
kevin
f4023b4e44 Add missing entity on salary's payment 2022-04-12 11:08:50 +02:00
Laurent Destailleur
e2a957c738 Clean some trigger names 2022-04-02 16:08:04 +02:00
Laurent Destailleur
99277ddb15
Merge pull request #20406 from atm-GregM/DolGetButtonAction_Salaries
FIX: replacing to dolGetButtonAction on Salaries card
2022-03-25 15:07:30 +01:00
Laurent Destailleur
38439603be Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-24 13:23:04 +01:00
Frédéric FRANCE
e157dc117d
replace debug 2022-03-24 10:51:01 +01:00
Laurent Destailleur
3e6e67680c Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-23 13:02:22 +01:00
Laurent Destailleur
8ad310c8a0 FIX Bad filter on date on salary list 2022-03-23 13:01:24 +01:00
GregM
457c760177 clean 2022-03-18 16:57:42 +01:00
GregM
4c4d18ebd6 clean 2022-03-18 16:28:25 +01:00
GregM
84ef951a99 replacing to dolGetButtonAction on Salaries card 2022-03-18 16:12:38 +01:00
Laurent Destailleur
358f21f06e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/html.formother.class.php
	htdocs/core/customreports.php
2022-03-01 16:48:29 +01:00
Laurent Destailleur
2a48dd349e Fix #hunterb03d4415-d4f9-48c8-9ae2-d3aa248027b5 2022-03-01 16:38:06 +01:00
Laurent Destailleur
e96061dd18 Fix phpunit SecurityTest 2022-02-22 23:46:57 +01:00
Frédéric FRANCE
a613553f37
Merge branch 'hookgetnomurl' into patch-1 2022-02-15 18:44:06 +01:00
Laurent Destailleur
19fdf3dc18 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-07 10:07:30 +01:00
Laurent Destailleur
e8acb551f9 Fix section of attached files for salaries 2022-02-07 09:50:07 +01:00
Laurent Destailleur
30811e9b1a
Merge branch 'develop' into NEW_Add_Hooks_salaries_sociales 2022-01-25 14:45:51 +01:00
Adrien Raze
c131bdcbd3 NEW : Add hooks on salaries and sociales card 2022-01-24 16:06:02 +01:00
Laurent Destailleur
60b90056c4 Fix #yogosha8450 2022-01-19 15:20:10 +01:00
Laurent Destailleur
ef56631c80 FIX #yogosha8186 2022-01-03 18:15:19 +01:00
Laurent Destailleur
72998cd8fe Debug v15 2022-01-03 12:26:57 +01:00
Laurent Destailleur
adec35d4b1 Debug v15 2022-01-02 15:46:28 +01:00
Laurent Destailleur
49dae0aed2 Look and feel v15 2022-01-01 18:41:26 +01:00
Laurent Destailleur
6886cca1fa CSS 2021-12-07 02:35:46 +01:00
Laurent Destailleur
055cb5c0c9
Merge pull request #18526 from cfoellmann/PR/deprecated-html
deprecated html attributes
2021-11-30 14:27:12 +01:00
Laurent Destailleur
8b15741840 Fix button to close as paid 2021-11-29 19:46:43 +01:00
Laurent Destailleur
5cebaae235 Fix can close a salary if paid partially. 2021-11-29 19:39:03 +01:00
Christian Foellmann
6608f5f0d8 update all script tags to be uniform. language="javascript" removed
https://developer.mozilla.org/en-US/docs/web/html/element/script#attr-language
2021-11-29 15:09:18 +01:00
Frédéric FRANCE
dc3bfcfb87
can modify tooltip by reference 2021-11-22 19:57:26 +01:00
Laurent Destailleur
92b0fde4ca Debug v15 2021-11-18 21:37:33 +01:00
Laurent Destailleur
d891dd8ddc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/en_US/stocks.lang
	htdocs/product/stats/card.php
	htdocs/projet/element.php
	htdocs/salaries/card.php
2021-10-31 16:19:10 +01:00
Laurent Destailleur
e6e440e573 Fix #19257 error in the page Overview of a project 2021-10-31 15:14:15 +01:00
Laurent Destailleur
fe7e1d4118 Look and feel v15 2021-10-29 09:40:38 +02:00
Laurent Destailleur
ad2e567571 Fix bug huntr.dev 2021-10-25 15:32:10 +02:00
Laurent Destailleur
f2cd7a7a56 Removed the div class="ficheaddleft" 2021-10-24 00:37:37 +02:00
Frédéric FRANCE
4fa050bd1a
Update salaries.php 2021-10-23 07:42:29 +02:00
Laurent Destailleur
dd0809b528 Fix trans labels status 2021-10-16 19:37:57 +02:00
Laurent Destailleur
f8010dfcbc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	htdocs/reception/list.php
	htdocs/takepos/pay.php
2021-10-16 13:01:03 +02:00
lvessiller
be4a00213c FIX optional visibility on create card 2021-10-08 15:58:08 +02:00
Frédéric FRANCE
7bf07395c6
doxygen
https://doxygen.dolibarr.org/develop/doxygen-warnings.log
2021-10-02 13:37:41 +02:00
Laurent Destailleur
01c8bbedbf Look and feel v15 2021-09-28 19:40:41 +02:00
Laurent Destailleur
37603b451a Fix token in url 2021-09-27 12:24:01 +02:00
Laurent Destailleur
d760686239 Fix case of newtoken() 2021-09-18 22:24:00 +02:00
Laurent Destailleur
0749d01c5a Fix add action delete* as sensitive action 2021-09-18 22:04:41 +02:00
Laurent Destailleur
8bdc53f469 Fix Add action classify as sensitive actions 2021-09-18 20:49:24 +02:00
Laurent Destailleur
62b721a904 Add deletecontact as sentitive action
Replace dol_buildpath with DOL_URL_ROOT
2021-09-18 19:34:46 +02:00