Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
126,919 Commits 36 Branches 189 Tags
cb15d8c7beb0db960202c0207fe164e65e59349c
Commit Graph

3880 Commits

Author SHA1 Message Date
Laurent Destailleur
39b6b34820 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2023-10-09 09:36:30 +02:00
Laurent Destailleur
ffbb05167a Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-09 09:28:51 +02:00
Dev2a
fcd4c4e429 Fix: Change access to $conf->global to function getDolGlobal (automatique) 2023-10-08 23:19:49 +02:00
Laurent Destailleur
e82b0fd0aa Removed useless title 2023-10-08 17:43:16 +02:00
Alexandre SPANGARO
5f6a4bb785 Merge branch 'develop' into 19a8 2023-10-03 03:27:46 +02:00
Alexandre SPANGARO
16a0025e93 NEW Project - List - use select2 multiselect for status 2023-10-02 22:57:53 +02:00
Laurent Destailleur
d3dc6615db Remove deprecated use of ->modelpdf (good is ->model_pdf) 2023-10-02 21:49:08 +02:00
Laurent Destailleur
2a49ebb114 CSS 2023-10-01 16:23:06 +02:00
Laurent Destailleur
10ba3743c1 NEW Can upload/delete ODT template for project and tasks 2023-10-01 15:35:51 +02:00
Laurent Destailleur
f7ac851c50 Merge pull request #26047 from TheRealBeef/develop 
FIX #26033 Stock Movement associated with project doesn't show up in Project / Overview window
 2023-09-30 11:03:34 +02:00
Laurent Destailleur
e25ffc5fef NEW Add the picto phone of thirdparty on the kanban view of projects 2023-09-29 12:04:18 +02:00
Laurent Destailleur
7bbc3bab05 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-27 17:17:41 +02:00
Beef
5bdad9aa25 Merge branch 'Dolibarr:develop' into develop 2023-09-27 10:56:33 +02:00
TheRealBeef
45bf2cd9a8 Updated to display the Advanced Stock Transfers 
Regular stock transfers can not be associated with projects in normal use, so the previous functionality was depreciated.
 2023-09-27 10:52:39 +02:00
Laurent Destailleur
b9336c024a Merge pull request #25566 from hansemschnokeloch/rest-extra 
Add filter to restrict the data returned
 2023-09-27 00:56:51 +02:00
pascal
80f060c771 fix tab indentation 2023-09-26 18:43:25 +02:00
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