Commit Graph

13910 Commits

Author SHA1 Message Date
Laurent Destailleur
483a30078d Try to avoid to reload token when not necessary. 2024-08-01 11:55:49 +02:00
Laurent Destailleur
66da3d7f9b Debug v20 - Fix use of oauth for alternative send email setup 2024-08-01 11:46:54 +02:00
Laurent Destailleur
d24631de7e Debug v20 2024-07-30 12:06:59 +02:00
Laurent Destailleur
21dd677e28 Fix var_dump 2024-07-28 15:45:20 +02:00
Laurent Destailleur
75d1fbc49f Debug v20 - fix cond to show dict, several fix in public ticket gui 2024-07-28 15:02:08 +02:00
Laurent Destailleur
07079fc239 Fix bad position of selected option 2024-07-27 19:33:28 +02:00
Laurent Destailleur
6b076821e3 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-07-25 18:20:01 +02:00
Laurent Destailleur
f4611fcec9 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-07-25 18:06:37 +02:00
Laurent Destailleur
966ac2cdbc Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-07-25 18:04:42 +02:00
Laurent Destailleur
385d98b3e0 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2024-07-25 18:04:17 +02:00
Laurent Destailleur
c1b8197b8b Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2024-07-25 18:02:04 +02:00
Laurent Destailleur
d5004258db Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2024-07-25 18:00:55 +02:00
HENRY Florian
517e5e732c fix: load translation for extrafields in PDF (#30461) 2024-07-25 14:29:12 +02:00
Laurent Destailleur
4d23ea1229 Try to fix phan 2024-07-24 20:36:02 +02:00
Laurent Destailleur
db7dbfb9d3 Fix phan 2024-07-24 18:37:44 +02:00
Sébastien NASSIET
ad80e86f10 Bad variables used in updateExtrafield for replacement categorie in categories (#30457) 2024-07-24 17:31:34 +02:00
Laurent Destailleur
0a07681332 Fix label of type of event not consistent between screen 2024-07-23 11:49:06 +02:00
Laurent Destailleur
deee0ab320 Fix bad param of constructor 2024-07-23 09:25:23 +02:00
Laurent Destailleur
12f85b7501 Fix missing param in constructor 2024-07-23 09:23:12 +02:00
Laurent Destailleur
8a257ac93f Fix permission to edit email template - Debug v20 2024-07-23 02:12:46 +02:00
Laurent Destailleur
403fcd234e Debug v20 2024-07-22 21:49:47 +02:00
Laurent Destailleur
21d1c9b3d2 Fix filter on contact combo fails when 2 strings. 2024-07-22 21:01:01 +02:00
Laurent Destailleur
3633762298 Fix dolPrintHTML when MAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY is off 2024-07-22 16:36:24 +02:00
MaximilienR-easya
30f1d4f18b Backport fix from develop (#30421) 2024-07-20 18:24:01 +02:00
Bahfir Abbes
c4b21bf741 Fix: position of select key is 2 not 4 (#30374)
Fix: position of select key is 2 not 4
2024-07-16 13:01:08 +02:00
Laurent Destailleur
78ac402856 Fix css for etrafields text 2024-07-15 18:50:26 +02:00
Laurent Destailleur
2588406898 FIX Use of cache for file in filemanager was broken 2024-07-14 19:56:55 +02:00
Laurent Destailleur
29fbbca010 Debug v20 2024-07-14 18:41:24 +02:00
Laurent Destailleur
8a4f550d64 Debug v20 2024-07-09 17:33:27 +02:00
Laurent Destailleur
8712c1c900 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0
Conflicts:
	htdocs/product/card.php
2024-07-06 14:04:23 +02:00
John BOTELLA
ac136ec1ae Fix inconsistant link element (#30258) 2024-07-04 08:56:39 +02:00
Laurent Destailleur
e72d22b1ed Debug v20 2024-07-03 18:02:11 +02:00
Laurent Destailleur
8b69f7dd94 Debug v20 2024-07-03 15:59:59 +02:00
Laurent Destailleur
b56d325624 Debug v20 2024-07-03 15:40:22 +02:00
Laurent Destailleur
27a98f0f39 FIX mysql error during dump "/*!999999\- enable the sandbox mode */" 2024-07-03 15:25:48 +02:00
Laurent Destailleur
373e4da329 Debug v20 2024-07-02 23:41:07 +02:00
Laurent Destailleur
25971c3e6f Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-07-02 13:41:32 +02:00
Laurent Destailleur
d6480594af Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-07-02 02:09:25 +02:00
Laurent Destailleur
6259d02042 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-07-02 02:08:10 +02:00
noec764
96a5479e9e FIX: Error mesg show untranslated extrafield name (#30227)
Co-authored-by: Noé <noe@scopen.fr>
2024-07-02 01:56:45 +02:00
Laurent Destailleur
896bfeb050 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-06-30 14:57:01 +02:00
Laurent Destailleur
bde5687890 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-06-30 11:59:25 +02:00
Laurent Destailleur
d7c2e78239 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0
Conflicts:
	htdocs/core/class/html.formmail.class.php
	htdocs/core/tpl/card_presend.tpl.php
2024-06-30 03:50:02 +02:00
Regis Houssin
fdf5fe0f26 FIX broken pdf preview when multicompany sharing (#30188)
* FIX broken pdf preview when multicompany sharing

* Update html.formmail.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-06-29 19:28:30 +02:00
Laurent Destailleur
2f4c84f4b5 Debug v20 2024-06-29 13:23:05 +02:00
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
902065406b Debug v20 2024-06-27 09:20:04 +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
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
John BOTELLA
322bbd934b fix : 19.0 fix inconsistent link validation (#30141)
* Dirty fix for inconcistant link psedo langage

* add todo

* Update commonobject.class.php

* Update commonobject.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-06-24 22:53:43 +02:00