2
0
forked from Wavyzz/dolibarr
Commit Graph

3880 Commits

Author SHA1 Message Date
Andrea Volani
6769cf29d7 Merge branch '17.0' of https://github.com/avolani/dolibarr into 17.0 2023-09-04 09:13:42 +02:00
Andrea Volani
07d821b52c Return correct content type based on the call used. 2023-09-04 09:11:57 +02:00
Laurent Destailleur
92fd69b84b Fix warnings 2023-09-03 18:06:38 +02:00
Laurent Destailleur
f7300eeaa4 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-31 00:10:26 +02:00
avolani
c2e292d1d4 Return right content type
Revert content type to html (no json here, ajax calls fails)
2023-08-30 08:34:09 +02:00
Laurent Destailleur
75d8c2c49a Fix warnings 2023-08-29 21:35:59 +02:00
Laurent Destailleur
6efcc79553 css 2023-08-29 21:30:53 +02:00
HENRY Florian
97042001f6 Merge branch 'develop' into dev_change_notetaskivoice 2023-08-28 15:14:42 +02:00
Frédéric France
961c03269d fix phpstan 2023-08-25 18:10:50 +02:00
Laurent Destailleur
59d8909d4b Fix warnings 2023-08-23 19:29:14 +02:00
Laurent Destailleur
134cd1ca51 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-16 18:29:11 +02:00
Laurent Destailleur
6a41c806f5 Fix trans 2023-08-16 16:30:31 +02:00
Laurent Destailleur
aea21bc413 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-15 15:54:55 +02:00
Laurent Destailleur
020dd911de Debug v18 2023-08-15 13:51:17 +02:00
Laurent Destailleur
2e5a895eed Merge pull request #25578 from FliyFly/feature#25044
New|NEW(#25044) new option visibility parameter
2023-08-11 14:20:23 +02:00
Laurent Destailleur
08e428b46d Fix missing param 2023-08-09 18:00:31 +02:00
Laurent Destailleur
04b7b0aaa6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-08-09 15:02:34 +02:00
UT from dolibit
e532b1a894 Update comment.php (#25539) 2023-08-09 13:15:36 +02:00
UT from dolibit
5c926d9876 Update comment.php (#25540) 2023-08-09 13:15:22 +02:00
UT from dolibit
60dfe4b60e Update element.php (#25541)
sorting of   

if (isModEnabled(' ')) {
	require_once

merged two 'stock' entries
2023-08-09 13:14:50 +02:00
FLIO
fb51b4555a edit the select for 0 assigned and 1 everyone 2023-08-04 18:12:02 +02:00
FLIO
7472316779 New|NEW(#25044) new option for choose project visibility 2023-08-04 17:38:59 +02:00
Laurent Destailleur
36eef9d106 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-04 04:07:47 +02:00
Laurent Destailleur
39c02afb76 Debug v18 2023-08-02 18:03:47 +02:00
Laurent Destailleur
6277cb836f Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-07-31 02:44:26 +02:00
Laurent Destailleur
cfaa9b7971 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-07-30 18:38:37 +02:00
John BOTELLA
6388ddeb6f Fix column display (#25490) 2023-07-27 17:55:34 +02:00
Laurent Destailleur
b1b2736116 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-07-24 23:21:50 +02:00
onhairech
facd492222 qodana fix 5 : missing returns (#25347)
* qodana fix 5 : missing returns

* correcting return

* correcting a mistake
2023-07-24 19:42:31 +02:00
Laurent Destailleur
d8815660c7 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-07-22 16:28:32 +02:00
Laurent Destailleur
1e443e060c Debug v18 2023-07-22 16:17:06 +02:00
Laurent Destailleur
2c835002bd Test CI 2023-07-09 13:48:34 +02:00
Laurent Destailleur
671a534a1c Merge pull request #25305 from vmaury/fix-25302
Fix #25302 Sum of tasks time spent on project referrers page
2023-07-09 13:38:21 +02:00
mc2rcanarslan
92f6536459 fix: project status bug when PROJECT_CREATE_NO_DRAFT is set 2023-07-09 13:31:21 +02:00
mc2rcanarslan
f6206770bd fix: project status bug when PROJECT_CREATE_NO_DRAFT is set 2023-07-07 15:24:12 +00:00
vmaury
d47f004759 Fix #25302 Sum of tasks time spent on project referrers page (projet/element.php) 2023-07-07 16:16:55 +02:00
Laurent Destailleur
f18fae5271 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-07-06 22:24:35 +02:00
Laurent Destailleur
86864b4d53 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-07-06 22:22:26 +02:00
Laurent Destailleur
4c37cefac4 Merge pull request #25285 from mc2contributor/fixUnknownColumn
fix: Unknown column 'fk_projet' in 'field list' when trying to link...
2023-07-06 00:00:22 +02:00
Can Arslan
7d0cdd67e9 fix: Unknown column 'fk_projet' in 'field list' when trying to link... 2023-07-05 13:27:11 -06:00
Frédéric FRANCE
810a2ec650 fix no various payment in project overview
test was inverted here edf79382bf
2023-07-05 09:54:45 +02:00
Laurent Destailleur
4580889241 Debug v18 2023-07-01 16:43:59 +02:00
Laurent Destailleur
0397211a93 Fix warning 2023-07-01 12:49:54 +02:00
Laurent Destailleur
a3e4d8fe3a Debug v18 2023-06-29 16:30:34 +02:00
Laurent Destailleur
b4c448a420 Debug v18 2023-06-29 15:54:09 +02:00
Laurent Destailleur
c2a5e834e1 Merge pull request #25216 from frederic34/20230627
use isModEnabled
2023-06-28 16:18:53 +02:00
Laurent Destailleur
e14a86a756 Merge pull request #25218 from frederic34/202306271
doc
2023-06-28 16:17:45 +02:00
Laurent Destailleur
693c48460e Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-06-28 15:43:33 +02:00
Laurent Destailleur
ef64e1dcfc Debug v18 2023-06-28 11:50:28 +02:00
Frédéric France
1776fd55d1 doc 2023-06-27 21:46:52 +02:00