Commit Graph

3474 Commits

Author SHA1 Message Date
Laurent Destailleur
6871c63090 Manual merge for #24883 2023-10-12 19:39:11 +02:00
Laurent Destailleur
f1330e5998 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-12 15:01:26 +02:00
Laurent Destailleur
7bc0e6d58c Code comment 2023-10-12 15:00:57 +02:00
Laurent Destailleur
6311200b36 FIX #26170 2023-10-12 14:31:54 +02:00
Laurent Destailleur
43b60b87c3 Debug v19 2023-10-11 03:02:47 +02:00
Laurent Destailleur
a7ac0a248f Debug v19 2023-10-11 00:39:38 +02:00
thibdrev
985c9b0219 fix #22501 (#22502)
* Update functions.lib.php

Add NAF/APE formatting option to dol_print_profids().

* Update card.php

Format NAF/APE code with a point as separator (such as "69.20Z")

* Fixing style errors.

* Update card.php

* Fixing style errors.

* Update functions.lib.php

* Update card.php

* Update functions.lib.php

* Update functions.lib.php

---------

Co-authored-by: stickler-ci <support@stickler-ci.com>
2023-10-09 14:44:29 +02:00
Laurent Destailleur
39b6b34820 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-10-09 09:36:30 +02:00
Dev2a
fcd4c4e429 Fix: Change access to $conf->global to function getDolGlobal (automatique) 2023-10-08 23:19:49 +02:00
Laurent Destailleur
5bcd89d66c Debug v19 2023-10-03 19:39:22 +02:00
Pascal Hubrecht
86850e05c6 Merge branch 'Dolibarr:develop' into fix-25127 2023-10-02 11:15:16 +02:00
pascal
c6803b5c10 Add console log message 2023-10-02 11:08:55 +02:00
Laurent Destailleur
b8bd760e28 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-01 16:06:58 +02:00
Regis Houssin
6e27a6517a FIX avoid excess line breaks 2023-10-01 03:20:37 +02:00
pascal
1a10894e88 FIX #25127 2023-09-30 17:51:14 +02:00
Laurent Destailleur
f5bf4a6ec4 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-30 11:54:12 +02:00
Laurent Destailleur
c1b74f9338 Fix phpunit regression 2023-09-29 17:04:11 +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
Regis Houssin
c616251b61 FIX missing 'overwrite_trans' for $addzero (Multicompany) 2023-09-28 07:09:21 +02:00
Alexandre SPANGARO
0fd8123606 NEW FontAwesome - Add possibility to select another version 2023-09-26 21:49:15 +02:00
Laurent Destailleur
55b91f00d2 Look and feel v19 2023-09-25 11:44:46 +02:00
Frédéric FRANCE
f008bf5021 phpstan remove duplicate
::error file=htdocs/core/lib/functions.lib.php,line=4139,col=0::Array has 2 duplicate keys with value 'int' ('int', 'int').
2023-09-20 21:15:51 +02:00
Laurent Destailleur
9148d7540e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-09-20 03:09:10 +02:00
Laurent Destailleur
f7af03308a NEW Add a public page to list all open surveys 2023-09-20 02:48:35 +02:00
Laurent Destailleur
4fa60709d5 NEW Add a button to re-encrypt data of a dolcrypt extrafield password 2023-09-19 16:07:45 +02:00
Laurent Destailleur
c07abcc67c NEW Add different picto for each type of extrafields (date, string, ...) 2023-09-19 13:24:03 +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
9c1e3fc6a0 Look and feel v19 - message view use the action type icon 2023-09-18 18:41:52 +02:00
Laurent Destailleur
691d5418e5 Code comment 2023-09-18 18:08:06 +02:00
Laurent Destailleur
6c87f0acce css 2023-09-17 02:20:20 +02:00
Laurent Destailleur
86ab16b697 Fix bad name convetion for intervention 2023-09-13 18:29:58 +02:00
Alexandre SPANGARO
4b6a3fcf01 Fix travis 2023-09-10 21:27:34 +02:00
Laurent Destailleur
58d7531048 Fix warning 2023-09-10 20:39:22 +02:00
Laurent Destailleur
d45c70a8dc Fix phpunit 2023-09-10 20:27:57 +02:00
Laurent Destailleur
150c2baee7 Fix warning 2023-09-10 19:34:30 +02:00
Laurent Destailleur
b2ae9ea888 Fix warnings 2023-09-10 15:23:32 +02:00
Laurent Destailleur
33288ee66a Try to fix phpunit on dol_eval 2023-09-08 19:10:44 +02:00
Laurent Destailleur
aab30d7638 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-08 15:33:04 +02:00
Laurent Destailleur
99406caa3a Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-09-08 15:26:21 +02:00
Laurent Destailleur
803aca262e Fix edit colors with html5 component 2023-09-08 15:25:50 +02:00
Laurent Destailleur
c379420d86 Fix regression in dol_eval 2023-09-08 14:12:12 +02:00
Laurent Destailleur
e9787451a8 Disallow more use of parenthesis into dol_eval 2023-09-08 05:51:06 +02:00
Laurent Destailleur
7819b9586d Exclude more exec functions 2023-09-08 04:28:09 +02:00
Laurent Destailleur
c2f8c4f47c Sec: param onlysimplestring is always 1 or 2 2023-09-08 02:29:20 +02:00
Laurent Destailleur
32837761b5 Sec: Increase list of not allowed function in dol_eval 2023-09-08 01:59:57 +02:00
Laurent Destailleur
0c588ccd60 Sec: Increase list of not allowed function in dol_eval 2023-09-08 01:59:09 +02:00
Laurent Destailleur
684c0b88b5 Sec: More robust call for dol_eval (with param '2') for computed fields 2023-09-08 01:57:47 +02:00
Laurent Destailleur
9ed7bb77cd Sec: Increase list of not allowed function in dol_eval 2023-09-08 01:36:26 +02:00
Laurent Destailleur
3073a98563 Fix creation of subdir for website 2023-09-08 01:28:11 +02:00
Laurent Destailleur
46919d1ac6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-05 21:39:15 +02:00