Commit graph

145227 commits

Author SHA1 Message Date
Frédéric FRANCE
409bccb4f0
fix phan api_workstations.class.php (#30169)
* fix api_workstations.class.php

* Update api_workstations.class.php

* Update api_workstations.class.php

* Update api_workstations.class.php

* Update html.formwebsite.class.php
2024-06-27 16:39:15 +02:00
Laurent Destailleur
1104b95137 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-06-27 13:47:27 +02:00
Laurent Destailleur
de4ebc34cc Debug v20 FIX emailcollector error mngt and support special char 2024-06-27 13:45:44 +02:00
Laurent Destailleur
4b7fb72760 FIX error management of emailcollector + support special chars in dirs 2024-06-27 13:35:33 +02:00
Laurent Destailleur
0a15655720 Debug v20 2024-06-27 10:41:55 +02:00
Laurent Destailleur
a333aa2137 Debug v20 2024-06-27 09:43:49 +02:00
Laurent Destailleur
902065406b Debug v20 2024-06-27 09:20:04 +02:00
Laurent Destailleur
dad3e549c1 Hack for dolibarr foundation to solve multipayment modes 2024-06-27 03:43:22 +02:00
Laurent Destailleur
769240d5bb Debug v20 2024-06-27 03:26:35 +02:00
Laurent Destailleur
34aea4b5bc Debug v20 2024-06-27 00:49:50 +02:00
Laurent Destailleur
dec8342bb7 Debug v20 2024-06-27 00:30:26 +02:00
Laurent Destailleur
cf5daf7c25 Removed useless option. Default dolibarr behaviour is to be open. 2024-06-27 00:29:51 +02:00
Laurent Destailleur
ee9d9a9d75 Debug emailcollector 2024-06-27 00:00:24 +02:00
Laurent Destailleur
2099631231 Fix detection of existing trackid 2024-06-26 23:22:08 +02:00
Laurent Destailleur
0a1680610e Log 2024-06-26 22:43:41 +02:00
Laurent Destailleur
12c7019c99 Add logs 2024-06-26 22:40:23 +02:00
Laurent Destailleur
cfaadbaa7c Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-06-26 21:50:14 +02:00
Laurent Destailleur
04f64714f1 Debug v20 2024-06-26 21:45:36 +02:00
lamrani abdelwadoud
16ffc39735
New update for templateMail by creating files (#30151)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-06-26 18:01:00 +02:00
Laurent Destailleur
31dc647191 Add migration v20 to v21 2024-06-26 17:57:59 +02:00
Laurent Destailleur
33d5dea17b Debug v20 2024-06-26 17:49:23 +02:00
Laurent Destailleur
d2a2e1a7e7 Fix octopus template must be visible if INVOICE_USE_SITUATIONis 2 only. 2024-06-26 17:39:01 +02:00
Alexandre SPANGARO
0cb82b4035
Situation invoice #29897 - Add specific model Octopus (#30116)
* Situation invoice #29897 - Add specific model Octopus

* Fix phan

* Comment translation

* Fix phan

* add fix to octopus

* add fix to octopus

* Add fix octopus

* fix phan

fix phan

fix phan

fix phan

* fix phan

fix phan

fix phan

fix phan

* fix phan

* fix phan

* fix phan

* fix phan

* fix phan

* fix phan

* fix phan

* fix phan

* fix phan

* fix phan

* fix phan

* fix phan

* fix phan

* fix phan

* Cancel fix (compatibility php 8.x only)

* Add fix octopus

* Fix phan

* Fix phan

---------

Co-authored-by: Frédéric France <frederic.france@free.fr>
2024-06-26 17:25:15 +02:00
lamrani abdelwadoud
6f40e309f1
Fix display all news of all website (#30146)
* Fix display all news of all website

* fix type of variable

* Update page-sample-news.html

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-06-26 17:12:31 +02:00
Anthony Berton
44d4abd6a1
FIX - Online Sign pos on last page (#30158)
Co-authored-by: Anthony Berton <anthony.berton@bb2a.fr>
2024-06-26 17:06:08 +02:00
Christian Humpel
64f53fcc67
New: Add REST Api functionality for workstations (#30154) 2024-06-26 17:05:42 +02:00
Lucas Marcouiller
2cf322184e
Fix php 8.3 warnings (#30160)
* Fix php 8.3 warnings

* fix deprecation

---------

Co-authored-by: Hystepik <lmarcouiller@nltechno.com>
2024-06-26 17:04:05 +02:00
Laurent Destailleur
b113a386b5 Add migration to 21 in win ci 2024-06-26 16:50:07 +02:00
Laurent Destailleur
920cf5f70f Debug v20 2024-06-26 13:47:19 +02:00
Laurent Destailleur
0fbaaffa57 Fix link to setup pages 2024-06-26 13:33:22 +02:00
Laurent Destailleur
22b50b2172 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-06-26 13:26:37 +02:00
Laurent Destailleur
0e4246eeb6 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-06-25 17:05:44 +02:00
Laurent Destailleur
e8cb2a0be7 CSS v20 2024-06-25 15:59:41 +02:00
Lucas Marcouiller
32ea86c62f
Fix reply-to filter for email collector (#30152)
Co-authored-by: Hystepik <lmarcouiller@nltechno.com>
2024-06-25 15:19:26 +02:00
Laurent Destailleur
bd2a0b9e55 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-06-25 15:13:51 +02:00
Frédéric FRANCE
e57e99fe19
fix warning with pgsql DoliDB.class.php (#30153) 2024-06-25 15:12:03 +02:00
Laurent Destailleur
8f5b98be43 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-06-25 13:50:27 +02:00
Laurent Destailleur
a2971da463 Debug v20 2024-06-25 13:49:55 +02:00
Laurent Destailleur
398b8b7166 Use tooltip to show explanation of info 2024-06-25 12:49:09 +02:00
Laurent Destailleur
4374ecebad Fix CSRF = 3 for cancel and clone 2024-06-25 12:31:24 +02:00
boudet jean pascal
028e5fd1d3
FIX add token in link validate and clone button uri generate an error wi… (#30144)
* add token in link validate and clone  button uri generate an error with MAIN_SECURITY_CSRF_WITH_TOKEN to 3

* remove dot

---------

Co-authored-by: jpb <jean-pascal.boudet@atm-consulting>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-06-25 12:14:48 +02:00
Laurent Destailleur
92bc6c9102 Eclude some phan warnings 2024-06-25 12:10:47 +02:00
Laurent Destailleur
c0d2632171 css 2024-06-25 12:03:36 +02:00
Laurent Destailleur
562886a71e Fix phan 2024-06-25 11:59:32 +02:00
Laurent Destailleur
306402f402 Try to fix phan 2024-06-25 11:52:56 +02:00
Laurent Destailleur
628f635145 Doc 2024-06-25 11:47:53 +02:00
Laurent Destailleur
aa9057a26c Clean code - Move into integration-resources project 2024-06-25 11:42:14 +02:00
Laurent Destailleur
db5ade973c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2024-06-25 11:18:31 +02:00
Laurent Destailleur
20d71bd381 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-06-25 11:17:05 +02:00
Laurent Destailleur
fc5c3d2e35 Doc 2024-06-25 11:16:45 +02:00