Commit graph

155173 commits

Author SHA1 Message Date
Laurent Destailleur
c1bc4c7298 Debug v24 2026-07-03 18:35:07 +02:00
Laurent Destailleur
92f6c22280 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2026-07-03 15:53:11 +02:00
Laurent Destailleur
3d3d20ca03 Debug v24 2026-07-03 15:53:01 +02:00
Alexandre SPANGARO
f39941b339
Merge pull request #39040 from aspangaro/24_fix38905
FIX : thirdparty url in draft interventions widget may be incorrect
2026-07-03 06:23:56 +02:00
Alexandre SPANGARO
31a0738d2b FIX : thirdparty url in draft interventions widget may be incorrect 2026-07-03 06:17:31 +02:00
Laurent Destailleur
8c0e088e0a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2026-07-03 02:34:29 +02:00
Laurent Destailleur
291beedc71 Debug v24 2026-07-03 02:34:16 +02:00
Frédéric FRANCE
efd0c8db05
fix phpstan (#39039)
* fix phpstan

* fix phpstan

* fix phpstan
2026-07-03 02:23:09 +02:00
Laurent Destailleur
e1f8396215 Debug v24 2026-07-02 15:06:03 +02:00
Laurent Destailleur
3e86e7af72 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2026-07-02 15:02:30 +02:00
Laurent Destailleur
e425bc01f8 debug 2026-07-02 15:02:20 +02:00
hansemschnokeloch
872b7adc51
Fix typo in message (#39028) 2026-07-02 12:50:19 +02:00
Laurent Destailleur
0ffa7cf839 Merge branch '23.0' of git@github.com:Dolibarr/dolibarr.git into develop 2026-07-02 12:49:14 +02:00
Laurent Destailleur
b60984aa19 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into 23.0 2026-07-02 12:48:16 +02:00
Laurent Destailleur
850f53b11b Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2026-07-02 12:39:49 +02:00
Laurent Destailleur
5bb3714ef7 Fix: use the same condition everywhere 2026-07-02 12:39:23 +02:00
Laurent Destailleur
c7ab6d6ba7 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2026-07-02 12:25:50 +02:00
Laurent Destailleur
77bee2a81c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2026-07-02 12:25:33 +02:00
reachsanjivbhagat-gif
dc2a01ff28
FIX #32909 Restrict salary/HR field edit to authorized users (#39033)
* FIX #32909 Restrict salary/HR field edit to authorized users

On the user card, a user with only "modify own info" (user->self->write)
could edit thm, tjm, salary, salaryextra and weeklyhours, even though the
display of these fields is gated on salaries->readall / hrm->employee->read.
Guard the write of these fields with the same permission used for display,
so self-service users can no longer change compensation data they are not
allowed to see.

Signed-off-by: Sanjiv Kumar Bhagat <reach.sanjiv.bhagat@gmail.com>

* Update card.php

* Update salary edit permissions logic

---------

Signed-off-by: Sanjiv Kumar Bhagat <reach.sanjiv.bhagat@gmail.com>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2026-07-02 12:25:04 +02:00
Laurent Destailleur
f4fa390886 css 2026-07-02 12:21:41 +02:00
Frédéric FRANCE
dd172b34b2
add new test (#39001)
* add new test

* fix

* Update commonobject.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2026-07-01 19:22:08 +02:00
Laurent Destailleur
4d313cfd6a Fix warning 2026-07-01 17:10:37 +02:00
Laurent Destailleur
2fbfbdce75 Fix to edit tmpout 2026-07-01 16:57:21 +02:00
Laurent Destailleur
36cd4860ca Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2026-07-01 16:53:52 +02:00
Laurent Destailleur
0a923fd739 Clean code 2026-07-01 16:53:30 +02:00
MDW
d72d2583b9
Qual: Update LanguageOfCommentsSniff to avoid PHP7 incompatibility (#39032)
# Qual: Update LanguageOfCommentsSniff to avoid PHP7 incompatibility

Variable length negative lookbehind is not available on older PHP version, used in Travis CI.

Updated the regex to use only negative lookahead.
2026-07-01 16:44:17 +02:00
Laurent Destailleur
cf580471fd clean code 2026-07-01 15:57:24 +02:00
Laurent Destailleur
7be1113be5 Doc 2026-07-01 14:43:54 +02:00
Laurent Destailleur
aa634155f2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2026-07-01 14:36:58 +02:00
Laurent Destailleur
4981404a1a Debug v24 2026-07-01 14:24:54 +02:00
MDW
519455449b
Qual: Generate phan specific changed php files list (#39027)
# Qual: Generate phan specific changed php files list

Uses multiple parts of the Phan configuration to select and exclude files
for phan analysis.
2026-07-01 12:28:47 +02:00
MDW
ee3875eb4e
Qual: Fix french comments and improve detector (#39026)
* Qual: Generate phan specific changed php files list

# Qual: Generate phan specific changed php files list

Uses multiple parts of the Phan configuration to select and exclude files
for phan analysis.

* avoid catching special characters in regexes as indicators of french

* Qual: Translate french to english
2026-07-01 12:26:51 +02:00
Laurent Destailleur
0c50fd0223 Fix dir 2026-07-01 12:24:59 +02:00
Laurent Destailleur
2b0caabc7d Try to complete stubs 2026-06-30 18:13:41 +02:00
Frédéric FRANCE
8649be5413
fix french comments (#39025)
* fix french comments

* FIX: Translate French code comments to English in productlot and reception dispatch
2026-06-30 18:02:35 +02:00
MDW
7cb6f8253c
Ignore changed files as phan does to avoid PR notices (#39023)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2026-06-30 16:51:19 +02:00
lvessiller-opendsi
135a95d3c7
FIX keep check holiday when week changed in agenda page per user (#39021) 2026-06-30 12:26:01 +02:00
Frédéric FRANCE
57ab98c673
fix french comments (#39019)
* fix french comments

* Update LangTest.php

* Update originproductline.tpl.php

* Update LanguageOfCommentsSniff.php

* Update LanguageOfCommentsSniff.php

* FIX: Suppress Phan undeclared test-framework warnings in LangTest

* FIX: Correct testTrans return type and non-nullable params in LangTest

* FIX: Declare MoLine::fk_bom_child transient property
2026-06-30 12:25:04 +02:00
Laurent Destailleur
f8d674f324 Test disable consumming task 2026-06-30 02:05:02 +02:00
Laurent Destailleur
08e69b581d Merge branch '23.0' of git@github.com:Dolibarr/dolibarr.git into 23.0 2026-06-30 02:04:38 +02:00
Laurent Destailleur
d39bb3a3be Test disable consumming task 2026-06-30 02:04:22 +02:00
Laurent Destailleur
5ac50994e6 CI 2026-06-30 01:58:40 +02:00
Laurent Destailleur
5d49fe740f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2026-06-30 00:37:10 +02:00
Laurent Destailleur
7831dd0147 CSS 2026-06-30 00:36:56 +02:00
tcesar
2d7a3d2a66
Fix: mass createbills could invoice canceled or already-billed orders (#39015)
* Fix: mass createbills could invoice canceled or already-billed orders

* Update orders.lang

* fix indent
2026-06-29 20:27:37 +02:00
tcesar
9f50160528
Fix: mass createbills success message showed draft PROV ref instead … (#39013)
* Fix: mass createbills success message showed draft PROV ref instead of final ref

Extended description (corps de la PR)

  When creating an invoice from several orders at once via the order list
  mass action ("Create invoice for this customer"), with the "Validate
  generated invoices" option set to "yes", the success message and its link
  displayed the temporary draft reference (PROVxxxx) instead of the final
  validated invoice reference.

  Root cause:
  In htdocs/commande/list.php, during the confirm_createbills action, $lastref
  is captured right after $objecttmp->create($user), at which point the invoice
  is still a draft (PROVxxxx). When the "validate invoices" option is enabled,
  each invoice is then validated through $objecttmp->validate($user), which
  assigns the definitive reference to the object. However $lastref was never
  refreshed afterwards, so the "BillXCreated" message (single-invoice case) kept
  showing the draft ref.

  Fix:
  Refresh $lastref from the object inside the validation loop, after a successful
  validate(), so the success message links to and displays the final reference.

  Only the single-invoice success message exposes a reference, so this is the only
  case affected; the multi-invoice message only shows a counter.

  Steps to reproduce:
  1. Go to the orders list.
  2. Select several orders (or one), and choose the "Create invoice for this
     customer" mass action.
  3. Set "Validate generated invoices" to "Yes".
  4. Confirm.
  => Before: the success message links to the draft ref PROVxxxx.
  => After: the success message links to the final validated invoice ref.

* Fix indent
2026-06-29 20:26:29 +02:00
Nathan
a2dd70fe3e
Fix #39005 keep UTF-8 body extraction values (#39011)
Signed-off-by: Nathan Pixodeo <nathan@pixodeo.net>
2026-06-29 20:24:02 +02:00
Frédéric FRANCE
282e7dac6a
don't take care of some french comments and fix false positive (#39007)
* don't take care of some french comments

* Update LanguageOfCommentsSniff.php

* test a file

* Update doc_generic_asset_odt.modules.php

* Update auxaccount.php

* FIX: Translate French code comments to English in societe module

* fix phan

* fix phan
2026-06-29 19:28:28 +02:00
dependabot[bot]
841c859227
Bump actions/cache from 5 to 6 (#39008)
Bumps [actions/cache](https://github.com/actions/cache) from 5 to 6.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/v5...v6)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2026-06-29 19:27:30 +02:00
Nathan
7a1a209ed6
FIX #39003 Fix radio field id and default selection (#39009) 2026-06-29 19:27:15 +02:00