Commit Graph

602 Commits

Author SHA1 Message Date
Frédéric France
8e66b7207e replace ! empty by !empty 2022-08-31 22:14:20 +02:00
Laurent Destailleur
b846072e9d
Merge branch 'develop' into new_branch_17_08_2022 2022-08-22 13:40:11 +02:00
Philippe GRAND
5bf8b3ceb0 FIX php8 compatibility 2022-08-17 22:17:38 +02:00
Philippe GRAND
afce73281e FIX php8 compatibility 2022-08-16 16:57:52 +02:00
Laurent Destailleur
95b1b3f990 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/propal/card.php
	htdocs/commande/card.php
	htdocs/emailcollector/class/emailcollector.class.php
	htdocs/index.php
	htdocs/website/index.php
2022-08-10 13:16:02 +02:00
stickler-ci
e51732682a Fixing style errors. 2022-08-09 09:06:20 +00:00
Philippe GRAND
fb386faf94 update code for PHP8 compliance 2022-08-09 11:05:49 +02:00
Anthony Berton
3185821806
Update index.php 2022-08-03 09:06:52 +02:00
atm-steve
4c306b958c wip: popin with new fileds 2022-07-29 16:24:46 +02:00
Laurent Destailleur
f66dfb1c08 phpv8 2022-07-29 11:08:04 +02:00
Laurent Destailleur
dd392143e1 Fix conf->projet conf->project 2022-06-14 17:53:17 +02:00
Frédéric France
3fdbce7a31 use isModEnabled function 2022-06-11 09:46:28 +02:00
Frédéric France
400afc937f use isModEnabled function 2022-06-09 22:16:48 +02:00
Laurent Destailleur
423a4ea104 Debug v15 2022-01-09 19:48:38 +01:00
Laurent Destailleur
39b8916215 css 2021-11-08 14:01:15 +01:00
Laurent Destailleur
4247275465 css 2021-11-07 17:27:37 +01:00
Scrutinizer Auto-Fixer
5567310e44 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2021-10-25 20:07:31 +00:00
Laurent Destailleur
673a2982a5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/opensurvey/card.php
2021-09-30 16:32:40 +02:00
Laurent Destailleur
a495d5e982 Fix translation 2021-09-29 17:14:37 +02:00
Laurent Destailleur
875b93aff2
Merge branch 'develop' into 15a8 2021-09-09 19:26:01 +02:00
Laurent Destailleur
4d314d557d Doc 2021-09-05 01:14:42 +02:00
Alexandre SPANGARO
a1d3e21e77 NEW IHM - Include new options to manage dashboard 2021-08-22 05:25:13 +02:00
Frédéric FRANCE
9fd06537b7
move admin warnings on top instead bottom 2021-06-21 10:42:20 +02:00
Laurent Destailleur
73a1119b26 Clean code 2021-06-11 15:21:24 +02:00
Laurent Destailleur
1605564d5e Clean code 2021-06-11 14:54:18 +02:00
Laurent Destailleur
dbd7292cd6 Replace doubleval into floatval 2021-05-20 09:22:55 +02:00
Laurent Destailleur
9a474602a8 Fix #yogosha5644 2021-03-16 11:58:03 +01:00
Frédéric FRANCE
909dd63482
fix php8 warning 2021-03-14 08:50:17 +01:00
Frédéric FRANCE
c8d1410e33
Merge remote-tracking branch 'upstream/develop' into boxindex 2021-01-16 21:06:12 +01:00
Laurent Destailleur
7f04307adf
Merge branch 'develop' into develop#2 2021-01-13 17:40:21 +01:00
Frédéric FRANCE
1e8362575a
Merge remote-tracking branch 'upstream/develop' into boxindex 2021-01-06 21:05:59 +01:00
lmarcouiller
6aa2241617 Merge remote-tracking branch 'doligithub/develop' into develop#2 2021-01-05 18:07:34 +01:00
Regis Houssin
ec6c14beb8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0 2021-01-05 09:41:52 +01:00
Frédéric FRANCE
8454100e7a
Merge remote-tracking branch 'upstream/develop' into boxindex 2021-01-04 17:45:36 +01:00
Frédéric FRANCE
6fad38db57
can add box on member index page 2021-01-02 20:04:40 +01:00
Frédéric FRANCE
ad3bc649af
doxygen 2021-01-02 16:23:09 +01:00
Regis Houssin
6e0832fb38 FIX WIP avoid warning with php 8.0 2020-12-29 15:59:39 +01:00
Hystepik
3d674abfae
Merge branch 'develop' into develop#2 2020-12-08 09:01:20 +01:00
Laurent Destailleur
613ed8bcfa FIX No use of $_SESSION into master.inc.php 2020-12-04 23:50:55 +01:00
Hystepik
4830f4a3b4
Merge branch 'develop' into develop#2 2020-12-03 11:05:00 +01:00
Laurent Destailleur
ea1c55cf1e Fix widgets that has disappeared 2020-12-02 15:16:20 +01:00
lmarcouiller
6b5125fed0 dev widget state_board, add in user class and clean index 2020-12-01 14:50:12 +01:00
Scrutinizer Auto-Fixer
6df4954b20 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-12-01 01:41:19 +00:00
Laurent Destailleur
fab9b3d50c Fix warning 2020-11-28 18:34:13 +01: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
Laurent Destailleur
a24071492e Start fix for php8 compatibility 2020-10-30 05:56:07 +01:00
Laurent Destailleur
4adaf67d47 Hide setup we don't need if email are disabled globally
CSS
2020-10-27 11:40:30 +01:00
Laurent Destailleur
1bb2fc0db4 css 2020-10-22 22:45:27 +02:00
Laurent Destailleur
3e977bc5d6 Fix css 2020-09-21 12:55:06 +02:00
Laurent Destailleur
216b3c885d Fix escaping 2020-09-20 01:30:36 +02:00
Laurent Destailleur
ead320642e Fix removed some non used sql requests on widgets 2020-09-12 00:58:06 +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
9d79e984dd Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/product/stock/tpl/stockcorrection.tpl.php
2020-08-06 02:15:04 +02:00
Laurent Destailleur
fb5b29a32b FIX Restore the links on late badge 2020-08-05 19:39:38 +02:00
Laurent Destailleur
b6c1cdad7c Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/projet/element.php
2020-06-24 09:59:08 +02:00
Laurent Destailleur
d05c60baf0 Fix css 2020-06-23 14:33:34 +02:00
Laurent Destailleur
6f12488e30 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/filefunc.inc.php
2020-06-07 19:55:48 +02:00
Laurent Destailleur
04f68d25cd css 2020-06-07 01:34:26 +02:00
Laurent Destailleur
2836368017 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/extrafields.class.php
	htdocs/filefunc.inc.php
	htdocs/takepos/css/phone.css
	htdocs/takepos/invoice.php
2020-05-28 20:20:39 +02:00
Laurent Destailleur
2afcfa8463 Fix missing stat on products 2020-05-28 12:01:19 +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
Frédéric FRANCE
5aa84c64d0
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-23 18:54:33 +02:00
Laurent Destailleur
b4223dbdec
Merge branch '12.0' into fix_board_expensereport_toapprove 2020-05-23 14:32:12 +02:00
Maxime Kohlhaas
6b1eef9827 Fix board exepense report to approve 2020-05-22 00:50:13 +02:00
Maxime Kohlhaas
6434f255c3 Fix load_state_board doesn't take parameters 2020-05-22 00:32:55 +02:00
Laurent Destailleur
76823d3e39 Clean CSS, clean code 2020-05-21 20:59:02 +02:00
Frédéric FRANCE
b58060f899
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-21 13:29:43 +02:00
Laurent Destailleur
8a481b297c Clean CSS, clean code 2020-05-21 13:06:36 +02:00
Frédéric FRANCE
416e6dd90d
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-21 01:11:45 +02:00
Frédéric FRANCE
4be4f975b0
add new rule 2020-05-21 01:03:03 +02:00
Laurent Destailleur
d66f54d06d Clean home page 2020-05-20 22:45:43 +02:00
Laurent Destailleur
9a8e9bdc99 Position of fields 2020-05-14 14:30:43 +02:00
Laurent Destailleur
4a65b629ee Position of fields 2020-05-14 14:29:14 +02:00
Laurent Destailleur
4606b9fd9f Fix name of class Service (already used by APIs) 2020-05-02 03:29:33 +02:00
Laurent Destailleur
52fc149faa Fix permissions 2020-04-28 01:04:37 +02:00
Laurent Destailleur
99f445962b Fix regression 2020-04-25 03:38:12 +02:00
Laurent Destailleur
4dc8e59e7f Fix order of thumbs 2020-04-25 03:34:31 +02:00
Laurent Destailleur
3ed11f374a Look and feel v12 2020-04-24 23:56:57 +02:00
Laurent Destailleur
8d59ce2e03 Look and feel v12 2020-04-20 02:48:05 +02:00
Laurent Destailleur
fa056e59df Look and feel v12 2020-04-20 02:14:43 +02:00
Laurent Destailleur
72623f88df Fix phpcs 2020-04-12 22:54:39 +02:00
Laurent Destailleur
549b126eff Look and feel v12 2020-04-12 21:36:57 +02:00
Laurent Destailleur
7d430c08d0 Look and feel v12 2020-04-12 16:36:25 +02:00
Laurent Destailleur
5e71366ff2 css 2020-02-06 18:06:36 +01:00
Scrutinizer Auto-Fixer
9781c20f84 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-02-02 18:34:09 +00:00
Laurent Destailleur
a88e1ac605 Better translation 2020-01-28 21:35:03 +01:00
stickler-ci
1c26139789 Fixing style errors. 2020-01-28 20:29:17 +00:00
ptibogxiv
3a4ee6417c
NEW: add member to validate on dashboard 2020-01-28 21:25:32 +01:00
Laurent Destailleur
68f5aee432 Fix global stats for holiday 2020-01-26 19:38:19 +01:00
ptibogxiv
2db062a429
fix php error message
check array before action in array
2019-12-17 11:03:49 +01:00
Laurent Destailleur
c00bdca31b CSS Use var in theme for picto warning 2019-12-15 20:58:44 +01:00
Scrutinizer Auto-Fixer
f197196719 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-14 11:09:46 +00: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
8f6d38ee82
clean indent 2019-10-27 17:01:23 +01:00
Laurent Destailleur
fb3d20107c Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	htdocs/exports/export.php
	htdocs/filefunc.inc.php
2019-10-15 03:51:57 +02:00
Alexandre SPANGARO
499eb87173 lang file for holidays is holiday 2019-10-13 08:20:37 +02:00