Commit graph

154516 commits

Author SHA1 Message Date
Laurent Destailleur
73f2cfb9b4 Log 2026-06-09 02:15:06 +02:00
Laurent Destailleur
af14b68e55 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2026-06-09 01:28:00 +02:00
Laurent Destailleur
92c279c026 ci 2026-06-09 01:27:33 +02:00
Laurent Destailleur
730a546ec6 CI 2026-06-09 01:22:56 +02:00
Balowser
34ec74d373
Fix OAuth2 token refresh by using CurlClient for HTTP requests (#38616)
When refreshing an expired OAuth2 access token (XOAUTH2 auth mode),
the default HTTP client used by \OAuth\ServiceFactory may not work
in environments where stream-based HTTP calls are restricted (e.g.
Docker containers with allow_url_fopen disabled or limited outbound
stream access).

Explicitly set CurlClient as the HTTP client for the ServiceFactory
in both the SMTPS and SwiftMailer send paths so that token refresh
requests reliably use cURL, which is available and functional in
standard PHP environments.

Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2026-06-09 01:18:41 +02:00
dzprod
72db2adf53
fix: correct wrong constant name for PayPal payment type in donation block (#38632) 2026-06-09 01:17:46 +02:00
Milamber
8239d94cc4
Fix MEMBER_NEWFORM_FORCECOUNTRYCODE ignored when set to a country ISO code (#38649)
When MEMBER_NEWFORM_FORCECOUNTRYCODE is set to a country code string (e.g. 'ET'),
getDolGlobalInt() converts it to 0 and silently ignores the fallback GETPOSTINT('country_id'),
causing a "Country is required" validation error even though the constant is defined.

Also fix the view section which used getCountry() mode '2' (returns ISO code string)
instead of mode '3' (returns rowid integer), making select_country() unable to pre-select
the forced country.

Both cases now use getCountry(..., '3', ...) which correctly resolves both ISO codes
and numeric IDs to a rowid.

Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-06-09 01:16:58 +02:00
Laurent Destailleur
8a598b2f5a ci 2026-06-09 01:09:47 +02:00
Laurent Destailleur
405ce809b6 Fix ci 2026-06-09 01:02:47 +02:00
Frederic
5498feaf78
Implement customer-specific discount handling (#38648)
* Implement customer-specific discount handling

Add logic to handle customer-specific discount retrieval.

* Update objectline_create.tpl.php
2026-06-09 00:47:44 +02:00
Laurent Destailleur
c7b0f1e10e Automated merge from 23.0 to develop 2026-06-09 00:27:55 +02:00
Laurent Destailleur
e1eb9de6ef Automated merge from 22.0 to 23.0 by tool pullmerge.sh 2026-06-09 00:11:42 +02:00
Laurent Destailleur
5acee1b470 Automated merge from 21.0 to 22.0 by tool pullmerge.sh 2026-06-09 00:04:20 +02:00
Laurent Destailleur
276f1eb406 Automated merge from 20.0 to 21.0 by tool pullmerge.sh 2026-06-08 23:44:30 +02:00
Laurent Destailleur
b784031f7c Automated merge from 19.0 to 20.0 by tool pullmerge.sh 2026-06-08 23:43:03 +02:00
Laurent Destailleur
de1a5811e5 Automated merge from 18.0 to 19.0 by tool pullmerge.sh 2026-06-08 23:43:00 +02:00
Laurent Destailleur
f5335ff849 Automated merge from 17.0 to 18.0 by tool pullmerge.sh 2026-06-08 23:42:56 +02:00
Laurent Destailleur
4c0edc7695 Automated merge from 16.0 to 17.0 by tool pullmerge.sh 2026-06-08 23:42:42 +02:00
Laurent Destailleur
96a724d89e Automated merge from 15.0 to 16.0 by tool pullmerge.sh 2026-06-08 23:40:35 +02:00
Laurent Destailleur
b9145e6592 Automated merge from 14.0 to 15.0 by tool pullmerge.sh 2026-06-08 23:40:28 +02:00
Laurent Destailleur
0118b2c912 Merge branch '23.0' of github.com:Dolibarr/dolibarr into 23.0 2026-06-08 22:54:49 +02:00
Laurent Destailleur
b0f2411d84 Test 2026-06-08 22:27:02 +02:00
Laurent Destailleur
c1ad1e4e32 Test 2026-06-08 22:27:01 +02:00
Alexandre SPANGARO
b81a2efdd7
Merge pull request #38613 from aspangaro/23_fixclosure
FIX Accountancy - Closure - Income and deficit accounts should not prevent the closing process if they contain data
2026-06-08 22:19:55 +02:00
Alexandre SPANGARO
f7068dc934 Merge branch '23.0' into 23_fixclosure 2026-06-08 21:59:59 +02:00
Laurent Destailleur
4a409d7519 Fix balance of td with subtotal 2026-06-08 18:53:10 +02:00
Laurent Destailleur
b9961d2cdb Merge branch '23.0' of github.com:Dolibarr/dolibarr into 23.0 2026-06-08 18:25:37 +02:00
Laurent Destailleur
7208ac5e6c Fix setup color of subtotal lines 2026-06-08 18:18:43 +02:00
Laurent Destailleur
247a076ebd Doc 2026-06-08 18:18:02 +02:00
Laurent Destailleur
791b1e4a3f Version 2026-06-08 12:54:46 +02:00
Laurent Destailleur
979a95e7c7 Clean code 2026-06-08 12:06:19 +02:00
Laurent Destailleur
664b41de32 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2026-06-08 11:42:27 +02:00
Laurent Destailleur
cbb51a406a Look and feel v24 2026-06-08 11:42:07 +02:00
Zakaria Boushaba
9418653f3c
Fix missing drag and drop file upload on invoice, supplier order, contract, intervention and expense report cards (#38585)
Co-authored-by: Zakaria Boushaba <z.boushaba@vold.africa>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2026-06-08 01:58:00 +02:00
Balowser
4028b5df1a
Fix: email_tocc and email_tobcc not mapped in getEMailTemplate() (#38617)
Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2026-06-08 01:36:30 +02:00
Laurent Destailleur
0a8474ef8e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2026-06-08 01:35:44 +02:00
Laurent Destailleur
f86cf0bad5 Restore code that seemsto have been disabled by error. 2026-06-08 01:35:16 +02:00
atm-jonathan
b8b4a2cfbb
FIX: Invoice clone ignores target entity when multicompany sharing is enabled (#38587)
When cloning an invoice from one entity to another via the multicompany
entity selector, the cloned invoice was always created in the source entity.

The multicompany module correctly displays an entity selector in the clone
confirmation dialog (formConfirm hook), but the core handler for
'confirm_clone' in card.php never read the posted 'entity' parameter.
Additionally, Facture::createFromClone() had no 'forceentity' parameter,
unlike Propal::createFromClone() which already handled this correctly.

Fix:
- Add $forceentity = null parameter to Facture::createFromClone()
- Apply forceentity to the cloned object after fetch, before create()
- Pass GETPOST('entity') from card.php confirm_clone handler to createFromClone()
2026-06-08 01:20:20 +02:00
MDW
fc48006717
# FIX #36258: Do not format qty from barcode (#38624)
# FIX #36258: Do not format qty from barcode

When a barcode contains a quantity (e.g., 0.275 from qu=0 and qd=275),
the quantity is already in international format (using '.' as decimal separator).
However, when this qty is passed to invoice.php, it uses GETPOSTFLOAT('qty')
which defaults to option=2, meaning it treats the value as local user format.

In Spanish/Argentinian locale (thousand separator=., decimal separator=,),
price2num with option=2 incorrectly treats 0.275 as a number with thousand separator
and converts it to 275.

## Solution:

1. Add a 'qty_std' parameter to the URL when calling invoice.php from barcode
2. In invoice.php, use GETPOSTFLOAT('qty', '', 1) when qty_std is set
3. Option=1 tells price2num that the value is NOT in local user format

This way, qty from barcode (already in international format) is not converted,
while qty from user input (in local format) continues to be converted correctly.

Changes:
- htdocs/takepos/index.php: Add qty_std parameter to ClickProduct and pass it through to invoice.php
- htdocs/takepos/invoice.php: Use GETPOSTFLOAT with option=1 when qty_std is set

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2026-06-08 01:18:21 +02:00
sonikf
588fa88a8c
Enhance confirmation handling and error messages (#38625) 2026-06-08 01:13:30 +02:00
Jon Bendtsen
9f06f87fab
Qual remove several uncommented presend lines (#38623)
Co-authored-by: Jon Bendtsen <jonbendtsen@jonb.dk>
2026-06-08 01:09:58 +02:00
Laurent Destailleur
313dbe91ae CI 2026-06-08 00:53:30 +02:00
Laurent Destailleur
11e8976d38 Fix ci 2026-06-08 00:44:19 +02:00
Laurent Destailleur
3647e02562 Log 2026-06-08 00:40:47 +02:00
Laurent Destailleur
f323918447 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2026-06-08 00:21:56 +02:00
Laurent Destailleur
caa1cf3c29 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2026-06-07 23:45:09 +02:00
Laurent Destailleur
943097b35b css 2026-06-07 19:28:29 +02:00
Laurent Destailleur
6f1b850ccb Better error message 2026-06-07 17:45:48 +02:00
Laurent Destailleur
96ae7bf09b CSS 2026-06-07 15:45:24 +02:00
Laurent Destailleur
8a0427937b Better comment, and keep source when doing credit note 2026-06-07 15:29:00 +02:00