Commit Graph

3421 Commits

Author SHA1 Message Date
ldestailleur
e1e47034d5 FIX webportal must not use resources out public dir neither external
files.
2025-09-15 13:26:47 +02:00
Lucas Marcouiller
d0b7e27ca5 NEW Feature to merge duplicate members (#35308)
* New merge members

* fix fields

* add trans

* fix CI

* fix Ci

* fix Ci

* fix CI

* Fix CI

---------

Co-authored-by: Lucas Marcouiller <lmarcouiller@dolicloud.com>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-09-12 15:14:45 +02:00
ldestailleur
92ffba11ca Remove old lang files that are too small (moved into other lang files) 2025-09-11 13:31:34 +02:00
ldestailleur
b5de7be8a8 Clean code 2025-09-02 17:32:38 +02:00
ldestailleur
ae20554a4d Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-08-28 16:40:48 +02:00
ldestailleur
088856ad50 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-08-28 16:40:14 +02:00
ldestailleur
8631c1722f FIX #35115 2025-08-28 15:20:59 +02:00
ldestailleur
5fe445c0da Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-08-25 21:53:35 +02:00
Regis Houssin
595582b1d0 FIX user socid is fk_soc (#35046) 2025-08-22 22:33:08 +02:00
ldestailleur
27ceadeaf6 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-08-20 17:17:03 +02:00
ldestailleur
dea330b52d FIX ##35005 FIX #35006 SQL error when using external user 2025-08-20 17:14:03 +02:00
ldestailleur
924204ac29 LEFT JOIN syntax 2025-08-20 17:09:43 +02:00
ldestailleur
1d8b31b06c Clean code 2025-08-18 16:35:01 +02:00
ldestailleur
9ccede6c90 Removed the deprecated array $MAP_ID_TO_CODE that was a duplicate of
array "array_flip($categ->MAP_ID)"
2025-08-17 03:45:36 +02:00
ldestailleur
273e82a566 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-08-16 22:14:23 +02:00
ldestailleur
677e5a7cb9 Fix css and missing replyto into the banner 2025-08-16 21:59:41 +02:00
ldestailleur
feeaf19e6d Debug the signature feature (broken) for shipment 2025-08-14 16:24:53 +02:00
Yamil Esteban Garcia
2823b9d0d6 Modifications made to allow search by EAN even when selecting in the product variants module to hide product variants #34567 (#34612)
* Error: When creating an invoice for a supplier order with a negative value #30516

Error: When creating an invoice for a supplier order with a negative value #30516

* Update html.form.class.php

Modifications made related to the issue
Search for variants by EAN #34567

* Update html.form.class.php

I change :

if(getDolGlobalString('SEARCH_VARIANTS_OF_EAN13')){
with
if (getDolGlobalString('SEARCH_VARIANTS_OF_EAN13')) {

and 

SEARCH_VARIANTS_OF_EAN13
into
PRODUIT_ATTRIBUTES_HIDECHILD_BUT_ALLOW_SEARCH_IN_EAN13

* Update html.form.class.php

* Update html.form.class.php

* Update html.form.class.php

* Update html.form.class.php

* Update html.form.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-08-10 10:31:26 +02:00
ldestailleur
dea09e6e36 Clean code 2025-08-08 01:03:34 +02:00
ldestailleur
a8173ff888 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2025-08-06 12:39:32 +02:00
ldestailleur
eab3227ea0 Fix title missing in click tooltip 2025-08-05 00:08:56 +02:00
ldestailleur
3b8df77a86 Clean code 2025-08-04 13:54:40 +02:00
ldestailleur
974039423a Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-07-30 14:51:31 +02:00
ldestailleur
4392ce01fc Debug v22 2025-07-30 12:58:54 +02:00
ldestailleur
7ea3c419aa Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-07-25 17:00:22 +02:00
ldestailleur
d8eebcafda Fix regression 2025-07-24 15:39:37 +02:00
ldestailleur
de76f65fba Fix combo too heavy of information 2025-07-24 14:54:29 +02:00
ldestailleur
fa12e7ddeb Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-07-21 18:47:46 +02:00
ldestailleur
2e47121024 Debug v22 2025-07-21 14:25:48 +02:00
ldestailleur
a800af3b91 Debug v22 2025-07-21 10:47:45 +02:00
Clément
1e6b70a09a NEW Customized step in duration select (#34652)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-07-15 15:41:23 +02:00
Laurent Destailleur
24e3f31ba1 Fix CI 2025-07-01 20:32:31 +02:00
Laurent Destailleur
ac892efb42 Fix CI 2025-07-01 16:22:21 +02:00
ldestailleur
d1ddf4314e Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-28 13:18:15 +02:00
ldestailleur
c6a5bf3836 Fix CI 2025-06-27 21:30:37 +02:00
ldestailleur
1a5d71319e Fix check on entity is a different security check than check on external
user so code must not be nested.
2025-06-27 16:43:16 +02:00
Florian Mortgat
094dd3a9d1 FIX 21.0: $height and $width can be ints, but also 'auto' (#34636)
* FIX 21.0: $height and $width can be ints, but also 'auto' (which is commonly used), so check for this special value before typecasting

* Update html.form.class.php

* Update html.form.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-06-27 00:30:00 +02:00
ldestailleur
497d774a21 Fix the selectForFormsList was not using correctly the
ismultientitymanaged. Replace a join with and exists.
2025-06-27 00:21:50 +02:00
ldestailleur
d828828bef CSS 2025-06-25 12:15:17 +02:00
HENRY Florian
931384db35 fix: manage correctly external module object link with myobject@mymodule element type (#34530)
* fix: manage correctly external module object link with myobject@mymodule element type

* add more doc in template module builder

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-06-21 16:09:54 +02:00
ldestailleur
703d4358a5 Debug v22 2025-06-20 12:34:10 +02:00
ldestailleur
06a5b4947d Fix CI 2025-06-18 15:59:28 +02:00
ldestailleur
8208b1d40f Debug v22 2025-06-17 01:13:09 +02:00
Laurent Destailleur
13f483d7a9 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2025-06-14 16:03:56 +02:00
Laurent Destailleur
8d7a5e9945 Debug v22 2025-06-14 15:59:13 +02:00
IC-Nicolas
6474c7fbdd FIX display error (#34494)
* FIX display error

* FIX CI
2025-06-14 11:57:58 +02:00
ldestailleur
81ea4aaa8c Try to fix CI 2025-06-04 16:18:03 +02:00
ldestailleur
6d16d2298c Try fix ci 2025-06-04 15:58:01 +02:00
ldestailleur
36b00c5951 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-02 14:59:18 +02:00
ldestailleur
78d261916f Debug v22 2025-06-02 14:22:47 +02:00