Commit Graph

15844 Commits

Author SHA1 Message Date
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
Frédéric FRANCE
1bbbd96690 clean code (#35317)
* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code
2025-09-12 15:12:55 +02:00
ldestailleur
8b57bb2e41 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-09-12 13:30:12 +02:00
ldestailleur
13407fe5ee Prepare code for Loi Finance 2025-09-12 13:29:19 +02:00
Bradley Jarvis
89dda279a0 FIX: setShippingMethod tigger throwing error (#35320)
* FIX: setShippingMethod tigger throwing error

* Update commonobject.class.php

---------

Co-authored-by: brad <brad@endurotags.com.au>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-09-12 02:49:58 +02:00
Frédéric FRANCE
554d2baa32 clean code adherent (member) class (#35259)
* clean code adherent (member) class

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* fix

* fix

* fix

* fix

* fix

* fix

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-09-12 02:40:35 +02:00
Frédéric FRANCE
e4cafd3428 fix missing translation (#35314) 2025-09-12 01:52:18 +02:00
ldestailleur
e3de2dddb7 Fix spellcheck 2025-09-11 16:43:59 +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
Frédéric FRANCE
e81d5378cd clean code contract class (#35245)
* clean code contract class

* clean code contract class

* clean code contract class

* clean code contract class

* clean code contract class

* clean code contract class

* clean code contract class

* clean code contract class

* clean code contract class

* clean code contract class

* clean code contract class

* clean code contract class

* clean code contract class

* clean code contract class

* clean code contract class

* clean code

* clean code

* clean code

* clean code

* clean code

* fix typo

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix
2025-09-10 11:13:18 +02:00
Frédéric FRANCE
03fe13d93d fix template and fix CI (#35254)
* fix adminnotification

* Update notify.class.php

* Update html.formmail.class.php

* fix

* fix

* fix
2025-09-09 19:17:32 +02:00
ldestailleur
e2c317a7cd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-09-08 12:15:20 +02:00
ldestailleur
8fb71ef010 Clean setup page 2025-09-08 12:15:01 +02:00
Frédéric FRANCE
0e1478206a clean code (#35229)
* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-09-08 01:48:52 +02:00
ldestailleur
97d5025c08 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-09-07 18:51:58 +02:00
ldestailleur
0f08412e7a CSS 2025-09-05 15:31:21 +02:00
ldestailleur
0d51fd9b6f Add link to category edit page from picto 2025-09-05 15:20:50 +02:00
ldestailleur
80eb325a91 Trans 2025-09-05 15:13:37 +02:00
ldestailleur
2dbc0db9dd Clean code 2025-09-05 14:54:01 +02:00
ldestailleur
d7204bbb19 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-09-04 17:32:58 +02:00
ldestailleur
f82283a22e Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-09-04 17:32:04 +02:00
ldestailleur
5832cfc198 Fix CI 2025-09-04 15:36:54 +02:00
ldestailleur
d0a4541b28 Fix CI 2025-09-04 15:00:47 +02:00
ldestailleur
68544e9bf7 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-09-04 14:39:08 +02:00
ldestailleur
d33682e9b4 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-09-04 14:37:49 +02:00
ldestailleur
83f27af4c7 Fix CI 2025-09-04 14:19:56 +02:00
Frédéric FRANCE
006a12d191 fix CI (#35215)
* fix CI

* Update fournisseur.commande.class.php
2025-09-04 13:22:32 +02:00
ldestailleur
8a1ec5634f Clean code between subprice/pu_ht and subprice_ttc/pu_ttc 2025-09-03 22:29:36 +02:00
ldestailleur
b62c6fa8a9 Fix CI 2025-09-03 19:27:50 +02:00
ldestailleur
7fbbb99ef8 Fix trans 2025-09-03 19:00:25 +02:00
ldestailleur
61a10cf58d NEW Can view/list/edit the dispute status of an invoice 2025-09-03 18:27:40 +02:00
Frédéric FRANCE
a1d7b11324 fix doc (#35196) 2025-09-03 12:54:17 +02:00
Frédéric FRANCE
568c65568a clean code (#35175)
* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code
2025-09-02 22:51:34 +02:00
Frédéric FRANCE
24bd6d918a clean code (#35183)
* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* clean code
2025-09-02 22:46:55 +02:00
ldestailleur
b5de7be8a8 Clean code 2025-09-02 17:32:38 +02:00
ldestailleur
49ef8e87ea Fix HTML escaping 2025-09-01 21:26:02 +02:00
lvessiller-opendsi
e818bf732d FIX extra field list depend on parent list when editing a card (#35165) 2025-09-01 19:55:00 +02:00
ldestailleur
dd09cb5f69 Fix CI 2025-09-01 19:29:28 +02:00
ldestailleur
f729d33dcc Clean setup of antivirus 2025-08-30 17:14:57 +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
68baff6630 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-08-28 14:53:56 +02:00
ldestailleur
affaa5da9b FIX #35071 2025-08-28 14:50:44 +02:00
Frédéric FRANCE
7d04067b4e fix CI (Travis) (#35099)
* fix test

* fix test

* fix test

* fix test

* fix test

* fix

* fix

* fix
2025-08-28 02:15:41 +02:00
Frédéric FRANCE
aa8ddce4d8 can use DOL_DATA_ROOT in geoipmaxmind config (#35085) 2025-08-27 03:10:23 +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
ldestailleur
b3d3a7176f Clean code 2025-08-25 14:27:07 +02:00
ldestailleur
7c30968ed1 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-08-24 22:16:14 +02:00
ldestailleur
a21e896dbe Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-08-24 22:10:12 +02:00