Commit graph

378 commits

Author SHA1 Message Date
Laurent Destailleur
4679c736ed Automated merge from 24.0 to develop 2026-08-13 17:54:41 +02:00
Laurent Destailleur
defa8b2f2d Debug v24 2026-08-13 01:06:24 +02:00
Laurent Destailleur
491601af9b Typo 2026-08-13 00:32:09 +02:00
Laurent Destailleur
f2baa10140
Revert "/imports/index.php wrongly shows access refused (#39379)" (#39386)
This reverts commit 9d4844009f.
2026-08-04 22:23:57 +02:00
bomuux
9d4844009f
/imports/index.php wrongly shows access refused (#39379)
htdocs/imports/index.php wrongly shows access refused when both modules import an export enabled but user only have rights on one of them.
2026-08-04 16:18:47 +02:00
Lucas Marcouiller
624d9c97e5
Fix member subscription with empty date valid (#39310)
* NEW : Add support of customer discount of the invoice in the sell journal

* Correction phpstan

* Correction phpstan

* Correction phpstan

* Correction phan

* Correction phan

* Correction phan

* Correction phan

* FIX #39146 : add SQL structure in llx_societe_perentity

* FIX phpstan: Societe::$client (int<0,3>) does not accept -1 (#39244)

Societe::$client is annotated @var int<0,3> (domain 0=no customer,
1=customer, 2=prospect, 3=both) in societe.class.php, but the create
form in societe/card.php pre-set it to -1 as a transient "nothing
pre-selected" placeholder, tripping PHPStan level 10 on develop.

The value is never persisted (save paths compute 0..3) and the only
reader, the switch() building the form, treats -1 and 0 identically via
its default case. Use 0 (the property's own default) so the assignment
matches the declared type. No behavior change.

Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>

* NEW Accountancy - FEC export - Add constant ACCOUNTING_EXPORT_FEC_ADD_TIMESTAMP to add a timestamp in export file name

* The test on dolibarr_main_restrict_os_commands was moved into
dumpDatabase()

* Fix missing extrafields propagation and object links when creating supplier credit note (#39285)

Co-authored-by: Zakaria Boushaba <z.boushaba@vold.africa>

* NEW Filecheck can show diff of modified files (#39022)

* NEW: Show diff against original file in filecheck integrity report

* NEW: Compare against develop branch for alpha/beta versions in filecheck diff

* NEW: Improve filecheck diff granularity on large files with anchor-based split

* Update version.inc.php

* Fix member subscription with empty date valid

* Create migration script 24.0.0-25.0.0.sql

* FIX #39146: Fos thirdparties, Manage fk_account, payment method and payment term per entity if MAIN_COMPANY_PERENTITY_SHARED is set.

* Missign migration file

* Update paymentok.php

---------

Co-authored-by: Kamel Khelifa <kkhelifa@open-dsi.fr>
Co-authored-by: tnegre <tnegre@open-dsi.fr>
Co-authored-by: Jam Balaya <jambalaya.pyoncafe@outlook.jp>
Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
Co-authored-by: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Co-authored-by: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Co-authored-by: Zakaria Boushaba <48571684+Boushabazakaria@users.noreply.github.com>
Co-authored-by: Zakaria Boushaba <z.boushaba@vold.africa>
Co-authored-by: Frédéric FRANCE <frederic34@users.noreply.github.com>
2026-07-30 18:03:44 +02:00
MDW
dd5df7d121
Qual: Rename $from as $from_line (filecheck_diff.php) (#39319)
# Qual: Rename $from as $from_line (filecheck_diff.php)

SqlInjectionPlugin is configured to consider that '$from' is an SQL expression
and requires that assignments to it are protected from Sql Injection.

Renaming '$from' fixes false positives.
2026-07-30 17:05:49 +02:00
Frédéric FRANCE
991de9fb39
NEW Filecheck can show diff of modified files (#39022)
* NEW: Show diff against original file in filecheck integrity report

* NEW: Compare against develop branch for alpha/beta versions in filecheck diff

* NEW: Improve filecheck diff granularity on large files with anchor-based split
2026-07-27 13:50:06 +02:00
Laurent Destailleur
b2db25bdf0 Trans 2026-06-23 01:41:25 +02:00
MDW
9fde9fae8e
Fix: CI - PHPStan notices, functions.lib.php formatting (#38965)
* Qual: Remove redundant tests

# Qual: Remove redundant tests

Remove redundant tests as reported by PHPStan

* Qual: Fix missing initialisation

# Qual: Fix missing initialisation

In case of catched exception, $hmac_encoded_secret_key was not defined

* Fix: search parameter re-encoding

# Fix: search parameter re-encoding

* Fix: Add new chain initialization in securitycore.lib.php

# Fix: Add new chain initialization in securitycore.lib.php

- Initialize `$newchain` variable before the loop to avoid potential undefined variable issues

* Qual: Fix formatting in functions.lib.php

- Fixed formatting and spacing issues

* Qual: Cast nullable variable to string

# Qual: Cast nullable variable to string

preg_replace requires a string, ensured by casting nullable to string.

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2026-06-22 23:37:54 +02:00
Nathan
cc8585133d
FIX: #38618 Add application update responsibility notice (#38953) 2026-06-22 13:17:36 +02:00
Laurent Destailleur
c4de36f7a5 Try fix CI 2026-06-21 19:16:53 +02:00
Laurent Destailleur
2dc4faaff4 CI 2026-06-20 16:30:50 +02:00
Laurent Destailleur
cb225df001 Add debug info 2026-06-20 08:07:21 +02:00
Laurent Destailleur
49f72314a4 CI 2026-06-20 01:32:18 +02:00
Laurent Destailleur
28357945db phpunit 2026-06-20 01:28:52 +02:00
Laurent Destailleur
83d1720ef8 Move file securitycore.lib.php into blockedlog directory. 2026-06-19 22:07:57 +02:00
Laurent Destailleur
484ee5433f FIX #38913 2026-06-19 21:43:02 +02:00
Laurent Destailleur
3384bcd8bc FIX #38912 2026-06-19 21:36:46 +02:00
Laurent Destailleur
00675ea965 Debug v24 2026-06-19 14:26:06 +02:00
Laurent Destailleur
09c8f86be2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2026-06-19 14:15:29 +02:00
Laurent Destailleur
73b86d073e Debug v24 2026-06-19 14:14:28 +02:00
Laurent Destailleur
1290b4eeb6 ci 2026-06-19 04:27:19 +02:00
Laurent Destailleur
7596dff855 CI 2026-06-19 04:26:09 +02:00
Laurent Destailleur
e952bf41ed ci 2026-06-19 04:16:57 +02:00
Laurent Destailleur
0233c8355f Debug v24 2026-06-19 00:28:16 +02:00
Laurent Destailleur
c7f4ddff24 Debug v24 2026-06-18 23:14:20 +02:00
Laurent Destailleur
115ce840a3 FIX The .end flag is now in db 2026-06-18 23:09:26 +02:00
Laurent Destailleur
b428dfc9e9 Debug v24 2026-06-18 20:53:27 +02:00
Laurent Destailleur
6eebb7f3d7 Doc 2026-06-18 19:40:33 +02:00
Laurent Destailleur
d10b9f95b6 Debug v24 2026-06-18 18:40:07 +02:00
Laurent Destailleur
7e7b0a3245 Debug 2026-06-18 17:28:14 +02:00
Laurent Destailleur
c6d20def6e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2026-06-18 16:43:12 +02:00
Laurent Destailleur
dab4bfe128 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2026-06-18 16:37:47 +02:00
Laurent Destailleur
d0d3c2fa27 Clean code 2026-06-18 16:37:37 +02:00
Laurent Destailleur
c6b91f7f64 Debug 2026-06-18 16:13:36 +02:00
Laurent Destailleur
dd7609b325 CI 2026-06-18 15:47:33 +02:00
Laurent Destailleur
4f5585eddf CI 2026-06-18 15:38:52 +02:00
Laurent Destailleur
00d5dfd971 WIP Show total for all and for POS. 2026-06-18 13:40:58 +02:00
Laurent Destailleur
aecb1c3205 Prepare support for multikey 2026-06-18 03:01:47 +02:00
Laurent Destailleur
aac128ddc3 WIP LNE 2026-06-18 00:22:28 +02:00
Laurent Destailleur
1d75cdc96e WIP LNE 2026-06-17 23:07:16 +02:00
Laurent Destailleur
22e090eee5 Work on head flag 2026-06-17 17:39:31 +02:00
Laurent Destailleur
fe205ae0ae Doc 2026-06-17 00:11:35 +02:00
Laurent Destailleur
0cdceee937 Debug v24 2026-06-16 23:49:32 +02:00
Laurent Destailleur
92e9a07617 More robust code. Save the .head file. 2026-06-16 23:20:00 +02:00
Laurent Destailleur
bae299df95 Debug v24 2026-06-16 18:44:30 +02:00
Laurent Destailleur
b6924ae570 Debug v24 2026-06-16 17:06:46 +02:00
Laurent Destailleur
7e49cc12d3 CI 2026-06-16 04:10:41 +02:00
Laurent Destailleur
77feb6e23f ci 2026-06-16 03:48:29 +02:00