Commit Graph

393 Commits

Author SHA1 Message Date
Laurent Destailleur
a0e53a402d Fix reponsive 2022-12-02 19:23:12 +01:00
Laurent Destailleur
a36ed6a3c4 Debug v17 2022-11-23 10:43:09 +01:00
stickler-ci
c689ce1c52 Fixing style errors. 2022-11-21 16:08:00 +00:00
Gauthier PC portable 024
b5688427ab NEW : Now we can edit amount on vat and salaries clone action 2022-11-21 16:59:36 +01:00
Frédéric FRANCE
754881a6ef strftime is deprecated in php 8.1 2022-10-31 10:42:40 +01:00
Laurent Destailleur
5d5310d212 css 2022-10-13 18:31:45 +02:00
Laurent Destailleur
ae4f8b23d5 Standardize code for action buttons Delete 2022-10-10 11:39:50 +02:00
Laurent Destailleur
5e93a09f6a css 2022-10-04 08:44:43 +02:00
Laurent Destailleur
d314ed380b NEW Can edit property css, cssview, csslist on extrafields 2022-09-22 13:01:11 +02:00
Laurent Destailleur
4566342d59 FIX #yogosha12439 Remove define('NOCSRFCHECK', '1') 2022-09-12 11:47:06 +02:00
Frédéric France
da8617e3ff Merge remote-tracking branch 'upstream/develop' into loaddolibarrenv 2022-09-08 18:59:23 +02:00
Laurent Destailleur
ee05abaa27 Clean code 2022-09-08 15:13:16 +02:00
Frédéric France
8d33953142 add comment 2022-09-07 20:08:59 +02:00
Laurent Destailleur
cfd3eeb245 NEW All ajax pages have now a top_httphead() 2022-09-03 20:08:13 +02:00
Laurent Destailleur
a5c18ea776 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-08-31 17:57:14 +02:00
Alexandre SPANGARO
ebc9581dde CSS 2022-08-30 16:37:29 +02:00
Alexandre SPANGARO
e2fdc64666 Typo 2022-08-29 10:56:06 +02:00
Alexandre SPANGARO
4184e416aa Use isModEnabled 2022-08-29 10:53:24 +02:00
Alexandre SPANGARO
47d96b6dca Use isModEnabled 2022-08-29 10:53:19 +02:00
Alexandre SPANGARO
114bb31ac9 Use isModEnabled 2022-08-29 10:53:15 +02:00
Alexandre SPANGARO
233326ff60 Use isModEnabled 2022-08-29 10:53:11 +02:00
Alexandre SPANGARO
b00ce99bc4 Use isModEnabled 2022-08-29 10:53:05 +02:00
Alexandre SPANGARO
eae6118d40 Use isModEnabled 2022-08-29 10:53:01 +02:00
Alexandre SPANGARO
ccea57423a Use isModEnabled 2022-08-29 10:52:57 +02:00
Alexandre SPANGARO
6fe80c3031 Use isModEnabled 2022-08-29 10:52:53 +02:00
Alexandre SPANGARO
be043fb088 Use isModEnabled 2022-08-29 10:52:45 +02:00
Alexandre SPANGARO
78c2d859f4 Use isModEnabled 2022-08-29 10:52:37 +02:00
Frédéric France
4bef0f5745 use isModEnabled 2022-08-23 20:01:34 +02:00
Laurent Destailleur
da2641bcb2 Clean code 2022-07-26 12:54:19 +02:00
Laurent Destailleur
24dc936000 Revert "default to create on card.php if $action is empty"
This reverts commit e0b664066b.
2022-07-11 00:05:50 +02:00
Christian Foellmann
e0b664066b default to create on card.php if $action is empty 2022-07-11 00:01:42 +02:00
Laurent Destailleur
9036ab94ab Fix contextpage 2022-07-07 17:14:21 +02:00
Laurent Destailleur
4c4e081997 Debug v16 2022-06-28 13:09:53 +02:00
Laurent Destailleur
264f8ab4ce
Merge pull request #21342 from frederic34/useismodenabled
Use getDolGlobalString
2022-06-23 09:55:31 +02:00
Frédéric France
9f32100fef Merge remote-tracking branch 'upstream/develop' into useismodenabled 2022-06-21 20:27:57 +02:00
Frédéric France
1f7fc7a2ae getDolGlobalString 2022-06-21 20:25:25 +02:00
Alexandre SPANGARO
6a23c6265e Fix PHP8 2022-06-20 04:24:32 +02:00
Alexandre SPANGARO
295bda4806 Fix PHP8 2022-06-20 03:56:09 +02:00
Alexandre SPANGARO
e792b07154 Fix PHP8 2022-06-20 03:55:57 +02:00
Alexandre SPANGARO
ba43459b28 Fix PHP8 2022-06-20 03:55:50 +02:00
Laurent Destailleur
6fb75f3268
Merge pull request #21249 from fboitel/fboitel-dev-scrutinizer-007
BUG FIX Class Salary does not contain attribute salary but amount instead
2022-06-17 15:19:01 +02:00
stickler-ci
fddb6a08b4 Fixing style errors. 2022-06-15 09:19:14 +00:00
Faustin
7d02cdeb62 Declared attribute salary in class Salary 2022-06-15 11:18:27 +02:00
Laurent Destailleur
4eebfc5874
Merge pull request #21248 from fboitel/fboitel-dev-scrutinizer-006
BUG FIX Attribute socid doesnt exist on class Salary, so we use -1 on form
2022-06-14 18:45:43 +02:00
Laurent Destailleur
dd392143e1 Fix conf->projet conf->project 2022-06-14 17:53:17 +02:00
Faustin
c9900666e8 Class Salary does not contain attribute salary but amount instead 2022-06-13 16:02:25 +02:00
Faustin
9f82a0c2d8 attribute socid doesnt exist on class Salary, so we use -1 on form 2022-06-13 15:47:44 +02:00
Laurent Destailleur
cd041c9ea1 Clean code 2022-06-03 02:41:00 +02:00
Laurent Destailleur
8bacb6c755 Fix name of var 2022-05-22 17:09:08 +02:00
Laurent Destailleur
e1c2968ae7 Look and feel v16 2022-05-18 23:11:59 +02:00
Laurent Destailleur
4de50da0dd Repare code to forbidden var_dump() into code 2022-05-17 14:55:38 +02:00
Laurent Destailleur
2dc97ac3ae Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/en_US/errors.lang
2022-05-10 17:16:11 +02:00
Laurent Destailleur
7b21e0b6ff Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-05-10 16:06:32 +02:00
Laurent Destailleur
bb6f73136a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/html.form.class.php
2022-05-06 12:46:26 +02:00
Gauthier PC portable 024
2256f8811d FIX : in salary stats and payment list, we must check right perms as well as salary list 2022-05-06 11:24:53 +02:00
Laurent Destailleur
05e22fb8bc css 2022-05-04 20:36:59 +02:00
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