Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-21 08:51:24 +01:00
Code Issues Packages Projects Releases Wiki Activity
136,827 Commits 36 Branches 190 Tags
9b35f083670c4a0d5f14b45c929a09004d4d1ee4
Commit Graph

13992 Commits

Author SHA1 Message Date
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
Frédéric FRANCE
702cca1502 fix $action is unknown (#30148) 
dafbefdc74
 2024-06-24 22:15:56 +02:00
Laurent Destailleur
57414242bd Debug v20 2024-06-24 15:55:45 +02:00
Laurent Destailleur
10e0f6f2ab Debug v20 - popup of combo go out of screen 2024-06-24 15:08:16 +02:00
Laurent Destailleur
c54a97e923 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-06-24 01:47:18 +02:00
Laurent Destailleur
e8c5115068 Debug v20 2024-06-23 23:35:00 +02:00
Laurent Destailleur
86341f110c Debug v20 2024-06-23 21:31:44 +02:00
Christian Humpel
dafbefdc74 NEW: Hook do actions or check input after changing a extrafield in commonobject.class.php (#30128) 
* Integration Textbausteine weiter...

* fix typo.
 2024-06-23 18:00:44 +02:00
boudet jean pascal
da4f526f77 test status contact (#30098) 
* test status contact

* Update notify.class.php

Signed-off-by: Laurent Destailleur <eldy@destailleur.fr>

---------

Signed-off-by: Laurent Destailleur <eldy@destailleur.fr>
Co-authored-by: jpb <jean-pascal.boudet@atm-consulting>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-06-22 16:07:46 +02:00
Alexandre SPANGARO
82d144c057 Situation invoice #29897 - CommonObject (#30118) 2024-06-22 15:57:38 +02:00
Laurent Destailleur
9bc84fdd4e Debug v20 2024-06-22 15:20:11 +02:00
Laurent Destailleur
e60982b5ce Code comment 2024-06-21 13:18:50 +02:00
Laurent Destailleur
a618bf2ae6 Debug v20 2024-06-18 09:54:11 +02:00
Laurent Destailleur
9adb439c03 Look and feel v20 2024-06-17 14:13:25 +02:00
Laurent Destailleur
4af3e82922 Fix warnings 2024-06-17 14:06:21 +02:00
Laurent Destailleur
5037067cdc Fix hooks cache was broken by the sorting on priotity 2024-06-17 10:14:39 +02:00
Laurent Destailleur
bd2bad2ea5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-06-16 13:17:21 +02:00
Frédéric FRANCE
4372f329b8 phpstan ignore unused method in evalmath.class.php (#30048) 2024-06-16 12:56:42 +02:00
Laurent Destailleur
4532866f0f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-06-16 12:12:03 +02:00