vignesh/dolibarr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse source
This commit is contained in:
Laurent Destailleur 2026-07-15 00:03:29 +02:00
commit 29f4ddcdf1
4 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/pre-commit.yml vendored
View file

@ -157,7 +157,7 @@ jobs:
ls -l ~/.cache/pre-commit/
- name: Convert Raw Log to Annotations
uses: mdeweerd/logToCheckStyle@v2025.11.2
uses: mdeweerd/logToCheckStyle@v2026.7.1
if: ${{ failure() }}
with:
in: ${{ env.RAW_LOG }}

2
.github/workflows/windows-ci.yml vendored
View file

@ -192,7 +192,7 @@ jobs:
for /f "tokens=2 delims==" %%A in ('doskey /m:err') do EXIT /B %%A
- name: Convert Raw Log to Annotations
uses: mdeweerd/logToCheckStyle@v2025.11.2
uses: mdeweerd/logToCheckStyle@v2026.7.1
if: ${{ failure() }}
with:
in: ${{ env.PHPUNIT_LOG }}

7
dev/tools/phan/baseline.txt
View file

@ -11,7 +11,7 @@ return [
// # Issue statistics:
// PhanUndeclaredProperty : 370+ occurrences
// PhanTypeMismatchArgument : 25+ occurrences
// PhanUndeclaredGlobalVariable : 25+ occurrences
// PhanUndeclaredGlobalVariable : 20+ occurrences
// PhanTypeMismatchProperty : 15+ occurrences
// PhanTypeInvalidDimOffset : 10+ occurrences
// PhanTypeMismatchDimFetch : 10+ occurrences
@ -103,7 +103,6 @@ return [
'htdocs/core/tpl/objectline_view.tpl.php' => ['PhanUndeclaredProperty'],
'htdocs/core/tpl/passwordreset.tpl.php' => ['PhanUndeclaredGlobalVariable'],
'htdocs/core/tpl/resource_view.tpl.php' => ['PhanUndeclaredProperty'],
'htdocs/core/triggers/interface_99_modAgenda_ActionsAuto.class.php' => ['PhanUndeclaredProperty'],
'htdocs/delivery/class/delivery.class.php' => ['PhanUndeclaredProperty'],
'htdocs/emailcollector/class/emailcollector.class.php' => ['PhanUndeclaredProperty'],
'htdocs/eventorganization/class/conferenceorboothattendee.class.php' => ['PhanUndeclaredMethod', 'PhanUndeclaredProperty'],
@ -139,7 +138,6 @@ return [
'htdocs/loan/payment/payment.php' => ['PhanUndeclaredProperty'],
'htdocs/mrp/tpl/linkedobjectblock.tpl.php' => ['PhanUndeclaredProperty'],
'htdocs/multicurrency/class/multicurrency.class.php' => ['PhanTypeExpectedObjectPropAccess'],
'htdocs/opensurvey/results.php' => ['PhanUndeclaredGlobalVariable'],
'htdocs/partnership/class/partnership.class.php' => ['PhanUndeclaredProperty'],
'htdocs/partnership/core/modules/partnership/mod_partnership_advanced.php' => ['PhanUndeclaredProperty'],
'htdocs/partnership/partnership_card.php' => ['PhanUndeclaredGlobalVariable'],
@ -161,7 +159,6 @@ return [
'htdocs/product/stock/stocktransfer/class/stocktransferline.class.php' => ['PhanUndeclaredProperty'],
'htdocs/product/stock/tpl/stockcorrection.tpl.php' => ['PhanUndeclaredProperty'],
'htdocs/projet/admin/project.php' => ['PhanTypeMismatchArgumentProbablyReal'],
'htdocs/projet/card.php' => ['PhanUndeclaredGlobalVariable'],
'htdocs/projet/tasks.php' => ['PhanTypeMismatchArgument'],
'htdocs/projet/tasks/time.php' => ['PhanTypeInvalidDimOffset', 'PhanUndeclaredProperty'],
'htdocs/projet/tasks/tpl/linkedobjectblock.tpl.php' => ['PhanUndeclaredProperty'],
@ -171,7 +168,7 @@ return [
'htdocs/public/project/viewandvote.php' => ['PhanUndeclaredGlobalVariable'],
'htdocs/public/recruitment/view.php' => ['PhanUndeclaredGlobalVariable'],
'htdocs/public/webportal/tpl/menu.tpl.php' => ['PhanUndeclaredProperty'],
'htdocs/reception/card.php' => ['PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
'htdocs/reception/card.php' => ['PhanUndeclaredProperty'],
'htdocs/reception/class/reception.class.php' => ['PhanUndeclaredProperty'],
'htdocs/reception/list.php' => ['PhanUndeclaredProperty'],
'htdocs/recruitment/class/recruitmentcandidature.class.php' => ['PhanUndeclaredProperty'],

11
htdocs/compta/facture/class/facture.class.php
View file

@ -619,12 +619,11 @@ class Facture extends CommonInvoice
$this->note_private = trim($this->note_private);
$this->note_private = dol_concatdesc($this->note_private, $langs->trans("GeneratedFromRecurringInvoice", $_facrec->ref));
// Keep POSTed extrafields if the caller already populated array_options
// (htdocs/compta/facture/card.php:1235 calls setOptionalsFromPost before
// create()). Falling back to the template values when nothing was POSTed
// preserves cron behavior for auto-generated recurring invoices (#37775).
if (empty($this->array_options)) {
$this->array_options = $_facrec->array_options;
// Use template extra fields as fallback only - form values (already set) take precedence
foreach ($_facrec->array_options as $key => $val) {
if (!isset($this->array_options[$key]) || $this->array_options[$key] === '') {
$this->array_options[$key] = $val;
}
}
if (!$this->mode_reglement_id) {