Commit graph

121986 commits

Author SHA1 Message Date
Laurent Destailleur
f3fc48c999 Fix bad closing div on export page 2023-06-09 16:39:56 +02:00
Laurent Destailleur
394c8f64d2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-06-09 11:26:45 +02:00
Laurent Destailleur
6e7aab7c81 Fix background of virtual card on dark mode 2023-06-09 11:26:28 +02:00
Laurent Destailleur
cc229d2530
Merge pull request #24987 from mc2contributor/fixStateClass
Fix cstate class for use by custom modules
2023-06-09 09:35:52 +02:00
Laurent Destailleur
6def470ec7
Merge pull request #25014 from Hystepik/develop#1
Fix : migration upgrade error
2023-06-09 09:30:12 +02:00
hystepik
f7a28b9e5c Fix : migration error 2023-06-09 09:14:08 +02:00
Laurent Destailleur
b9b52099a4
Merge pull request #24994 from Hystepik/develop#1
Fix : fields switched in establishement creation
2023-06-09 01:22:07 +02:00
Laurent Destailleur
56262b9028
Merge pull request #24995 from Hystepik/develop#2
Fix : javascript fatal error on dolgraph
2023-06-09 01:20:01 +02:00
Laurent Destailleur
a7b26fd7ae
Merge pull request #25002 from Hystepik/develop#3
fix php 8.1 warnings with strict  mode
2023-06-09 01:12:02 +02:00
Laurent Destailleur
1f904a0d58
Merge pull request #25004 from Hystepik/develop#4
Fix : webhook object creation
2023-06-08 23:54:45 +02:00
Laurent Destailleur
04a0d25af2
Merge pull request #25006 from FHenry/dev_fix_php8
getDol rather than $conf->global
2023-06-08 23:52:29 +02:00
Laurent Destailleur
1e74635ff6
Merge pull request #25009 from atm-maxime/fix_mails_template_list
Fix mails template list colspan when no records
2023-06-08 23:50:46 +02:00
Laurent Destailleur
a26fa9b32d
Merge pull request #25010 from Delthair/patch-4
Fix #25005 Invalid Security Key when opening the Public Attendee Subs…
2023-06-08 23:49:10 +02:00
Laurent Destailleur
aca0bd1ef1
Merge branch 'develop' into patch-4 2023-06-08 23:48:47 +02:00
Laurent Destailleur
e6390d629a Fix link for secure key 2023-06-08 23:45:55 +02:00
Delthair
4d4a4e8bc0
Fix #25005 Invalid Security Key when opening the Public Attendee Subscription Global Page
Call to global encoding for creating the security key
2023-06-08 23:44:29 +02:00
Laurent Destailleur
e1169091e1 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/js/lib_head.js.php
2023-06-08 23:33:45 +02:00
Laurent Destailleur
d070d2ab48 Fix mysqldump 2023-06-08 23:24:16 +02:00
Maxime Kohlhaas
cf58bd27ea Fix mails template list colspan when no records 2023-06-08 23:16:05 +02:00
Laurent Destailleur
57d7fc6455 Debug v18 2023-06-08 22:43:15 +02:00
Florian HENRY
ce10c68d31 getDol rather than ->global 2023-06-08 22:38:11 +02:00
hystepik
158d0458df Fix : webhook object creation 2023-06-08 22:04:07 +02:00
hystepik
180b3a6315 fix php 8.1 warnings with strict mode 2023-06-08 21:34:19 +02:00
hystepik
1946b6ac8a Fix : javascript fatal error on dolgraph 2023-06-08 17:21:13 +02:00
hystepik
ddec6c20e0 Fix : fields switched in establishement creation 2023-06-08 16:37:51 +02:00
Laurent Destailleur
88175964f9 Fix regression 2023-06-08 10:35:06 +02:00
Laurent Destailleur
d853a8f220 Fix phpcs 2023-06-08 10:16:58 +02:00
Laurent Destailleur
31d6df0dcd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/adherents/subscription/card.php
2023-06-08 09:58:36 +02:00
Laurent Destailleur
d28fcdafff Debug v18 2023-06-08 09:55:08 +02:00
Can Arslan
648f0ce892 Fix cstate class for use by custom modules 2023-06-07 13:55:36 -06:00
Laurent Destailleur
134b9c7d72
Merge pull request #24907 from mc2contributor/fix_element
Fix undefined and invalid access issues
2023-06-07 20:54:47 +02:00
Laurent Destailleur
c7e9993733
Merge branch 'develop' into fix_element 2023-06-07 20:53:46 +02:00
Laurent Destailleur
da85ee4406
Merge pull request #24909 from mc2contributor/filterChildProjects
Filter child projects out of project list.
2023-06-07 20:44:10 +02:00
Laurent Destailleur
f12327cb0b
Merge pull request #24956 from Hystepik/develop#1
Fix : php 8.1 warnings
2023-06-07 20:03:58 +02:00
Laurent Destailleur
1bb3eb6766 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-06-07 19:33:20 +02:00
Laurent Destailleur
a43bfcb8a7 Merge branch 'lamrani002-AddApiUrl' into develop 2023-06-07 19:32:22 +02:00
Laurent Destailleur
f939b34501
Merge pull request #24904 from Easya-Solutions/fix-productlot-card-action-on-error
FIX set action after error on product lot card
2023-06-07 19:30:16 +02:00
Laurent Destailleur
5525cfcab2
Merge branch 'develop' into AddApiUrl 2023-06-07 19:14:26 +02:00
Laurent Destailleur
b810dcc8a3
Merge pull request #24958 from FliyFly/editfactclientattribute
fixing the total ttc in the multicurrency section
2023-06-07 18:54:30 +02:00
Laurent Destailleur
9fa0439d3e
Merge pull request #24961 from frederic34/2023_06_05
use user hasRight
2023-06-07 18:53:51 +02:00
Laurent Destailleur
b27e6ba02c
Merge pull request #24962 from FliyFly/editsupplierpattribute
fixing the total ttc in the multicurrency section
2023-06-07 18:51:20 +02:00
Laurent Destailleur
d703e01314
Merge pull request #24963 from FliyFly/editcommandeattribute
fixing the total ttc in the multicurrency section
2023-06-07 18:50:37 +02:00
Laurent Destailleur
7b61be46db
Merge pull request #24983 from AmazingBeu/develop
[Agenda] Fix summary encoding of holidays events for the exports
2023-06-07 18:45:56 +02:00
Laurent Destailleur
8dc6793f07
Merge pull request #24960 from declic3000/patch-1
Rectif bug dans l'api documents
2023-06-07 18:44:59 +02:00
Laurent Destailleur
f6dc8131b7
Merge pull request #24964 from FliyFly/editpropalattributes
fixing the total ttc in the multicurrency section
2023-06-07 18:42:59 +02:00
Laurent Destailleur
cfdac9fcb9
Merge pull request #24969 from Hystepik/develop_v17#1
Fix #20303 : add browsing ckeditor knowledgemanagment
2023-06-07 18:18:12 +02:00
Laurent Destailleur
e81d4bc10f
Merge pull request #24970 from mc2contributor/fixUndefined4
Fix undefined property errors and use getDolGlobalString()
2023-06-07 18:16:28 +02:00
Laurent Destailleur
9aa82ed707
Merge pull request #24973 from frederic34/patch-1
clean code
2023-06-07 18:10:59 +02:00
Beu
2d6013a488 fix summary encoding of holidays events 2023-06-07 18:10:28 +02:00
Laurent Destailleur
697b376009
Merge pull request #24974 from mc2contributor/fixQuerySelector
Fix query selector for array name
2023-06-07 18:07:49 +02:00