Commit Graph

115818 Commits

Author SHA1 Message Date
Laurent Destailleur
8f9ffc5791
Merge pull request #23024 from OPEN-DSI/develop_fix_recruitment_odt_template
FIX: fix recruitment ODT template
2022-11-29 00:06:07 +01:00
Laurent Destailleur
043b81e6fa
Merge pull request #23026 from Hystepik/develop#2
Fix : Missing closing of a div
2022-11-29 00:05:24 +01:00
Laurent Destailleur
56dd5e0563
Merge pull request #23031 from Hystepik/develop#4
fix : php8.1 warnings
2022-11-28 23:59:10 +01:00
Laurent Destailleur
590fac0345 Can also disable WAF for PHP_SELF 2022-11-28 20:18:12 +01:00
Laurent Destailleur
3b0d44c435 Debug v17 2022-11-28 19:14:12 +01:00
Laurent Destailleur
dc0d9e1b94 Fix regression 2022-11-28 19:05:51 +01:00
Laurent Destailleur
5cfe40a4bc FIX Can use the WAF of HTML content (dol_htmlwithnojs) for output too 2022-11-28 18:42:59 +01:00
Laurent Destailleur
db6ee9f75f Fix against SMTP injection 2022-11-28 16:57:06 +01:00
Laurent Destailleur
ba4e5ef245 Enhance phpunit 2022-11-28 16:54:34 +01:00
hystepik
e2b2b30320 fix : php8.1 warnings 2022-11-28 16:49:58 +01:00
Laurent Destailleur
75de251402 FIX #yogosha13687 2022-11-28 15:37:38 +01:00
hystepik
95f0881ddc Fix : Missing closing of a div 2022-11-28 15:07:25 +01:00
Laurent Destailleur
117a0b4971 css 2022-11-28 13:00:15 +01:00
kkhelifa
745d95e48d FIX: fix recruitment ODT template 2022-11-28 12:15:21 +01:00
Laurent Destailleur
bb46cdb0af Fix regression sql error 2022-11-27 21:10:37 +01:00
Laurent Destailleur
6dd0f7850f
Merge pull request #23017 from Hystepik/develop#1
Fix : php 8.1 warnings
2022-11-27 20:36:04 +01:00
hystepik
c1b355fcac Fix : php 8.1 warnings 2022-11-27 00:44:05 +01:00
Laurent Destailleur
fb11f24fae
Merge pull request #23000 from ibuiv/patch-2
Fix #20533 Dispatch Tab Quantity
2022-11-26 16:54:11 +01:00
Laurent Destailleur
496f9f5466
Merge pull request #23007 from fappels/17_fix_negative_consume
FIX Negative consumption in MO creates additional goods issue #21343
2022-11-26 16:12:37 +01:00
Laurent Destailleur
7904c1b83e
Merge pull request #23013 from Delthair/patch-1
Fix #22998 Disabled module before delete (modulebuilder)
2022-11-26 12:42:33 +01:00
Laurent Destailleur
d9d401069c
Merge pull request #23015 from Hystepik/develop#2
Fix : fatal error in adherent/agenda.php
2022-11-26 12:31:50 +01:00
hystepik
4a0822ef2c Fix : fatal error in adherent/agenda.php 2022-11-26 12:21:50 +01:00
stickler-ci
c8090a0361 Fixing style errors. 2022-11-26 10:13:48 +00:00
Laurent Destailleur
db7d88e675
Merge pull request #20694 from Easya-Solutions/new-contract-list-filter-category-customer
NEW customer category filter on contract list
2022-11-26 10:46:00 +01:00
lvessiller-opendsi
864b49677b
Update list.php 2022-11-26 10:45:01 +01:00
Laurent Destailleur
7f44d1f915
Merge pull request #20695 from Easya-Solutions/new-project-list-filter-category-customer
NEW customer category filter on project list
2022-11-26 10:43:25 +01:00
lvessiller-opendsi
ecccbd3cab
Update list.php
rename MAIN_SEARCH_CATEGORY_CUSTOMER_ON_LISTS
2022-11-26 10:41:58 +01:00
Laurent Destailleur
732d13f798
Merge pull request #20776 from Easya-Solutions/new-task-list-filter-category-customer
NEW customer category filter on task list
2022-11-26 10:39:38 +01:00
lvessiller-opendsi
126a29ec02
Update list.php
rename const MAIN_SEARCH_CATEGORY_CUSTOMER_ON_LISTS
2022-11-26 10:38:36 +01:00
Laurent Destailleur
aebb3bf84c
Merge pull request #22995 from evarisk-micka/develop
Fix #22935 parse_str need 2 arguments
2022-11-26 10:30:37 +01:00
Laurent Destailleur
ab970d049f
Merge pull request #23006 from rycks/dev_project_to_invoice_user_rights
fix #23005: change lire to creer (rights)
2022-11-26 10:26:43 +01:00
Laurent Destailleur
e77aa31e47
Merge pull request #23009 from atm-maxime/fix_count_in_lists
Fix count in lists
2022-11-26 10:21:29 +01:00
Delthair
60257cec09
Fix #22998 Disabled module before delete (modulebuilder)
Ensure that the module is disabled before delete
2022-11-26 10:06:39 +01:00
Laurent Destailleur
25e1f88e18 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-11-26 02:07:13 +01:00
Laurent Destailleur
c8e5ca9691 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-11-26 01:54:53 +01:00
Laurent Destailleur
096bd39ae7 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-11-26 01:54:17 +01:00
Maxime Kohlhaas
eb7222227d Fix : use count() in lists - part 3 2022-11-26 01:53:18 +01:00
Laurent Destailleur
860f2414c4 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-11-26 01:46:37 +01:00
Laurent Destailleur
63541d1515 Fix phpcs 2022-11-26 01:45:58 +01:00
Laurent Destailleur
c62c7e3805 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/accountancy/bookkeeping/list.php
	htdocs/accountancy/bookkeeping/listbyaccount.php
	htdocs/accountancy/bookkeeping/listbysubaccount.php
2022-11-26 01:43:09 +01:00
Francis Appels
7a8c35baa7 FIX Negative consumption in MO creates additional goods issue #21343 2022-11-26 01:33:11 +01:00
Eric
bafa1a1ee8
Update time.php 2022-11-26 01:29:36 +01:00
Eric Seigne
89101a2862 fix #23005: change lire to creer (rights) 2022-11-26 01:26:58 +01:00
Maxime Kohlhaas
fb310de0aa Fix : use count() in lists - part 2 2022-11-26 01:23:45 +01:00
Laurent Destailleur
bc0990ab6d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-11-26 01:22:59 +01:00
Laurent Destailleur
a6bec59e98 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-11-26 01:22:12 +01:00
Laurent Destailleur
b231bcb64a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/accountancy/bookkeeping/list.php
	htdocs/accountancy/bookkeeping/listbyaccount.php
	htdocs/accountancy/bookkeeping/listbysubaccount.php
2022-11-26 01:21:51 +01:00
Laurent Destailleur
1921d427e9 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-11-26 01:14:09 +01:00
Laurent Destailleur
85e9ac1e40 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-11-26 01:13:58 +01:00
Laurent Destailleur
c09236e15a Fix #22592 #22992 2022-11-26 01:13:31 +01:00