Commit Graph

4465 Commits

Author SHA1 Message Date
pascal
871f896962 implementation of properties filter 2023-09-26 18:04:48 +02:00
Frédéric FRANCE
97cc6a48ec phpstan 2023-09-26 09:58:51 +02:00
Frédéric FRANCE
419332718a phpstan 2023-09-26 09:57:55 +02:00
Frédéric FRANCE
0298fb3b40 phpstan 2023-09-26 09:54:51 +02:00
Laurent Destailleur
55b91f00d2 Look and feel v19 2023-09-25 11:44:46 +02:00
Francis Appels
34b6d05bad Fix Générer intervention #26000.
date and datehour already converted by setVarsFromFetchObj
2023-09-23 15:57:23 +02:00
Laurent Destailleur
08ac0e9ee4 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-21 12:38:41 +02:00
Laurent Destailleur
11cc0a61da Fix cast of int 2023-09-20 11:59:57 +02:00
Laurent Destailleur
4122d14b43 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-18 18:43:46 +02:00
Laurent Destailleur
c3ae66fc51 Fix contract 2023-09-18 18:05:21 +02:00
Laurent Destailleur
811bc1fb25 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-18 13:22:37 +02:00
Laurent Destailleur
fe82a50248 Fix notes not visible 2023-09-17 13:30:58 +02:00
Laurent Destailleur
c51d0a8e9f Fix bad link 2023-09-17 12:55:03 +02:00
Laurent Destailleur
9b1dca59a6 Fix css 2023-09-17 12:48:57 +02:00
Laurent Destailleur
2c6f8c18a4 FIX Edition of line on the list of timespent for all projects 2023-09-17 12:38:05 +02:00
Laurent Destailleur
65a2761a83 FIX Deletion of time spent line from the full list 2023-09-17 12:32:21 +02:00
Laurent Destailleur
d02c615f40 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-09-16 15:14:22 +02:00
Laurent Destailleur
4634c0ccd9 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-09-15 15:05:29 +02:00
Laurent Destailleur
4e58a34c78 Fix css 2023-09-15 15:04:40 +02:00
Laurent Destailleur
6c5bef8294 FIX #25894 2023-09-13 18:16:31 +02:00
Florian HENRY
365c1c7da6 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_change_notetaskivoice 2023-09-11 10:34:00 +02:00
Laurent Destailleur
91fa48199a Fix warnings 2023-09-10 17:41:22 +02:00
Florian HENRY
060b27285b Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_change_notetaskivoice 2023-09-07 13:21:36 +02:00
Laurent Destailleur
f8e5bcdb62 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-06 15:12:21 +02:00
Laurent Destailleur
b65b8d7bcb FIX Navigation to/from a project from page of projects of a thirdparty 2023-09-06 15:08:54 +02:00
Laurent Destailleur
5f5e4738a5 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-05 22:38:39 +02:00
Laurent Destailleur
6d20175d08 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-09-05 21:38:43 +02:00
Laurent Destailleur
9e617abd43 Fix warning 2023-09-05 21:37:53 +02:00
Laurent Destailleur
150de687bf Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-05 20:13:38 +02:00
Laurent Destailleur
f43ef55b26 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
Conflicts:
	htdocs/modulebuilder/template/class/myobject.class.php
	htdocs/modulebuilder/template/core/boxes/mymodulewidget1.php
	htdocs/modulebuilder/template/core/modules/modMyModule.class.php
	htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
	htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
	htdocs/modulebuilder/template/myobject_agenda.php
	htdocs/modulebuilder/template/myobject_list.php
2023-09-05 19:38:45 +02:00
Florian HENRY
d0fb3839c3 reveiw 2023-09-05 19:15:43 +02:00
Florian HENRY
0b6297b5c5 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_change_notetaskivoice 2023-09-05 19:14:12 +02:00
Laurent Destailleur
3a84d84e65 Fix phpcs 2023-09-04 19:47:38 +02:00
Andrea Volani
4de001b43c No need to enforce check on param 'htmlname' 2023-09-04 09:40:53 +02:00
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