Commit graph

151292 commits

Author SHA1 Message Date
yannis
f7f7532665 feat: show tokens from all entities if in master entity in admin 2025-07-01 16:18:00 +02:00
yannis
ec79241dc2 feat: multicompany display for token list 2025-07-01 16:09:12 +02:00
yannis
0814fb0201 feat: multicompany display for admin token list 2025-07-01 16:04:07 +02:00
yannis
61601c43d6 feat: multicompany display for token card 2025-07-01 15:56:10 +02:00
Laurent Destailleur
e2c2f73e9c Fix CI 2025-07-01 15:39:16 +02:00
Laurent Destailleur
2941cf1c19 Fix CI 2025-07-01 15:29:15 +02:00
Frédéric FRANCE
453b289346
fix ajax product with multiprices (#34672) 2025-07-01 16:13:57 +03:00
yannis
df3e872d3a feat: disable display when multicompany is not enable 2025-07-01 14:48:53 +02:00
yannis
d57ca1f2a7 feat: mass delete from admi token list 2025-07-01 14:46:13 +02:00
yannis
74acc59da5 feat: create token for choosen user as admin 2025-07-01 14:39:27 +02:00
yannis
40f838ba58 refactor: remove useless missing translation 2025-07-01 12:15:56 +02:00
yannis
2a452876b3 refactor: clean query and add missing filter 2025-07-01 12:11:37 +02:00
yannis
79d8b9a63e feat: all users token list tab in api admin page 2025-07-01 12:03:22 +02:00
yannis
f401767cc7 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new-api-rest-tokens-sql 2025-07-01 10:07:56 +02:00
yannis
833bba723c refactor: change table name in sql query for pre-commit 2025-07-01 10:06:53 +02:00
yannis
c2ef82645a feat: protection from perm in token that user don't have 2025-07-01 09:56:24 +02:00
yannis
3d9a7fa894 feat: tokens list massaction delete 2025-07-01 09:33:12 +02:00
yannis
e67d3095ed Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new-api-rest-tokens 2025-07-01 09:10:41 +02:00
Laurent Destailleur
e5aae4d7e3 Debug v22 2025-06-30 17:39:38 +02:00
yannis
deea6c174e feat: check if duplicate token key 2025-06-30 17:32:13 +02:00
yannis
61e24d82fc feat: query to import old user token to new implement with perms 2025-06-30 16:49:52 +02:00
Laurent Destailleur
495c45fde0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-30 16:26:46 +02:00
Charlène Benke
c0b4af32be
FIX some error on donation list (#34666)
* fix some error on donation list

* Update list.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-06-30 17:25:44 +03:00
Laurent Destailleur
8c8a45a191 Doc 2025-06-30 15:49:20 +02:00
Laurent Destailleur
fae0093b51 Debug v22 2025-06-30 15:47:49 +02:00
Laurent Destailleur
f974c49fcc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-30 15:14:31 +02:00
Laurent Destailleur
00ff8d490a Debug v22 2025-06-30 15:14:09 +02:00
github-actions[bot]
1d37671c67
PHPStan > Update baseline (#34664)
Co-authored-by: Dolibot <dolibarr-bot@users.noreply.github.com>
2025-06-30 15:35:03 +03:00
atm-lena
5253346fca
Delete entity filter in user fetch (#34348)
* Delete entity filter in user fetch

* Fetch without entity if fetch by id

---------

Co-authored-by: atm-lena <lena.papazian@atm-consulting.fr>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-06-30 14:21:03 +02:00
Charlène Benke
95027c5dfd
php error on takepos admin (#34660) 2025-06-29 12:45:52 +02:00
Alexandre SPANGARO
621b91097a
Translate term Incoterm (#34661) 2025-06-29 12:45:29 +02:00
Alexandre SPANGARO
0d00a27a1c
QUAL Use GetDolGlobalString (#34662)
* Typo comment

* Use getGlobalString
2025-06-29 12:43:14 +02:00
ldestailleur
38b752f367 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-28 18:57:10 +02:00
ldestailleur
27479f41c5 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-06-28 18:56:46 +02:00
ldestailleur
29c953bd37 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-06-28 18:56:26 +02:00
ldestailleur
9d30492846 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-06-28 18:55:40 +02:00
ldestailleur
2bef534e60 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2025-06-28 18:55:06 +02:00
ldestailleur
c0161ccead Fix CI 2025-06-28 18:54:53 +02:00
ldestailleur
1be67fee52 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2025-06-28 18:54:33 +02:00
ldestailleur
4a88509cdf Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2025-06-28 18:54:19 +02:00
ldestailleur
a4b1700bae Merge branch '16.0' of git@github.com:/Dolibarr/dolibarr.git into 17.0 2025-06-28 18:53:25 +02:00
ldestailleur
f5cb64afaa Fix CI 2025-06-28 18:53:12 +02:00
ldestailleur
2cbb6d9e1e Trans 2025-06-28 18:38:59 +02:00
ldestailleur
320364b364 Trans 2025-06-28 18:38:03 +02:00
ldestailleur
202f152a13 Trans 2025-06-28 18:36:00 +02:00
ldestailleur
bb0be51ad5 Better demo link 2025-06-28 18:24:26 +02:00
Marc de Lima Lucio
4841a8d2ce
FIX: pre-send mail mass action: keep __EMAIL__ substitution (#34522)
* FIX: pre-send mail mass action: keep __EMAIL__ substitution

* FIX: comment

* test github workflows

* test github workflow for 18

* test v18 pr workflow

* FIX: massaction email tpl: keep preset

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-06-28 17:58:07 +02:00
ldestailleur
e82e451248 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-28 17:56:39 +02:00
ldestailleur
9d2cb0d078 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-06-28 17:56:12 +02:00
ldestailleur
74898efb5b Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-06-28 17:55:53 +02:00