From eaee0a952ddf1aa5aa4a963600fa037a324b6853 Mon Sep 17 00:00:00 2001 From: ATM-Lucas Date: Mon, 2 Feb 2026 12:05:11 +0100 Subject: [PATCH 1/6] Fix doc preview in comm card --- htdocs/comm/card.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php index e49beb53e0d..8e61102083c 100644 --- a/htdocs/comm/card.php +++ b/htdocs/comm/card.php @@ -887,7 +887,7 @@ if ($object->id > 0) { } } $relativepath = dol_sanitizeFileName($objp->ref).'/'.dol_sanitizeFileName($objp->ref).'.pdf'; - print $formfile->showPreview($file_list, $propal_static->element, $relativepath, 0); + print $formfile->showPreview($file_list, $propal_static->element, $relativepath, 0, '&entity=' . $objp->entity); } // $filename = dol_sanitizeFileName($objp->ref); // $filedir = $conf->propal->multidir_output[$objp->entity].'/'.dol_sanitizeFileName($objp->ref); @@ -999,7 +999,7 @@ if ($object->id > 0) { } } $relativepath = dol_sanitizeFileName($objp->ref).'/'.dol_sanitizeFileName($objp->ref).'.pdf'; - print $formfile->showPreview($file_list, $commande_static->element, $relativepath, 0, $param); + print $formfile->showPreview($file_list, $commande_static->element, $relativepath, 0, '&entity=' . $objp->entity); } // $filename = dol_sanitizeFileName($objp->ref); // $filedir = $conf->order->multidir_output[$objp->entity].'/'.dol_sanitizeFileName($objp->ref); @@ -1093,7 +1093,7 @@ if ($object->id > 0) { } } $relativepath = dol_sanitizeFileName($objp->ref).'/'.dol_sanitizeFileName($objp->ref).'.pdf'; - print $formfile->showPreview($file_list, $sendingstatic->element, $relativepath, 0, $param); + print $formfile->showPreview($file_list, $sendingstatic->element, $relativepath, 0, '&entity=' . $objp->entity); } // $filename = dol_sanitizeFileName($objp->ref); // $filedir = $conf->expedition->multidir_output[$objp->entity].'/'.dol_sanitizeFileName($objp->ref); @@ -1199,7 +1199,7 @@ if ($object->id > 0) { } } $relativepath = dol_sanitizeFileName($objp->ref).'/'.dol_sanitizeFileName($objp->ref).'.pdf'; - print $formfile->showPreview($file_list, $contrat->element, $relativepath, 0); + print $formfile->showPreview($file_list, $contrat->element, $relativepath, 0, '&entity=' . $objp->entity); } } // $filename = dol_sanitizeFileName($objp->ref); @@ -1290,7 +1290,7 @@ if ($object->id > 0) { } } $relativepath = dol_sanitizeFileName($objp->ref).'/'.dol_sanitizeFileName($objp->ref).'.pdf'; - print $formfile->showPreview($file_list, $fichinter_static->element, $relativepath, 0); + print $formfile->showPreview($file_list, $fichinter_static->element, $relativepath, 0, '&entity=' . $objp->entity); } // $filename = dol_sanitizeFileName($objp->ref); // $filedir = $conf->fichinter->multidir_output[$objp->entity].'/'.dol_sanitizeFileName($objp->ref); @@ -1490,7 +1490,7 @@ if ($object->id > 0) { } } $relativepath = dol_sanitizeFileName($objp->ref).'/'.dol_sanitizeFileName($objp->ref).'.pdf'; - print $formfile->showPreview($file_list, $facturestatic->element, $relativepath, 0); + print $formfile->showPreview($file_list, $facturestatic->element, $relativepath, 0, '&entity=' . $objp->entity); } // $filename = dol_sanitizeFileName($objp->ref); // $filedir = $conf->facture->multidir_output[$objp->entity].'/'.dol_sanitizeFileName($objp->ref); From ba8ab407fe31feae8485f58787060f16392a87f0 Mon Sep 17 00:00:00 2001 From: ATM-Lucas Date: Thu, 26 Feb 2026 10:10:09 +0100 Subject: [PATCH 2/6] delete & --- htdocs/comm/card.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php index 8e61102083c..5d71b079bcd 100644 --- a/htdocs/comm/card.php +++ b/htdocs/comm/card.php @@ -887,7 +887,7 @@ if ($object->id > 0) { } } $relativepath = dol_sanitizeFileName($objp->ref).'/'.dol_sanitizeFileName($objp->ref).'.pdf'; - print $formfile->showPreview($file_list, $propal_static->element, $relativepath, 0, '&entity=' . $objp->entity); + print $formfile->showPreview($file_list, $propal_static->element, $relativepath, 0, 'entity=' . $objp->entity); } // $filename = dol_sanitizeFileName($objp->ref); // $filedir = $conf->propal->multidir_output[$objp->entity].'/'.dol_sanitizeFileName($objp->ref); @@ -1199,7 +1199,7 @@ if ($object->id > 0) { } } $relativepath = dol_sanitizeFileName($objp->ref).'/'.dol_sanitizeFileName($objp->ref).'.pdf'; - print $formfile->showPreview($file_list, $contrat->element, $relativepath, 0, '&entity=' . $objp->entity); + print $formfile->showPreview($file_list, $contrat->element, $relativepath, 0, 'entity=' . $objp->entity); } } // $filename = dol_sanitizeFileName($objp->ref); @@ -1290,7 +1290,7 @@ if ($object->id > 0) { } } $relativepath = dol_sanitizeFileName($objp->ref).'/'.dol_sanitizeFileName($objp->ref).'.pdf'; - print $formfile->showPreview($file_list, $fichinter_static->element, $relativepath, 0, '&entity=' . $objp->entity); + print $formfile->showPreview($file_list, $fichinter_static->element, $relativepath, 0, 'entity=' . $objp->entity); } // $filename = dol_sanitizeFileName($objp->ref); // $filedir = $conf->fichinter->multidir_output[$objp->entity].'/'.dol_sanitizeFileName($objp->ref); @@ -1490,7 +1490,7 @@ if ($object->id > 0) { } } $relativepath = dol_sanitizeFileName($objp->ref).'/'.dol_sanitizeFileName($objp->ref).'.pdf'; - print $formfile->showPreview($file_list, $facturestatic->element, $relativepath, 0, '&entity=' . $objp->entity); + print $formfile->showPreview($file_list, $facturestatic->element, $relativepath, 0, 'entity=' . $objp->entity); } // $filename = dol_sanitizeFileName($objp->ref); // $filedir = $conf->facture->multidir_output[$objp->entity].'/'.dol_sanitizeFileName($objp->ref); From c5b4d149b5dd579578275c78e7da87b9d4f7531b Mon Sep 17 00:00:00 2001 From: ATM-Lucas Date: Thu, 26 Feb 2026 14:11:00 +0100 Subject: [PATCH 3/6] delete more & --- htdocs/comm/card.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php index 5d71b079bcd..65a21665fc5 100644 --- a/htdocs/comm/card.php +++ b/htdocs/comm/card.php @@ -999,7 +999,7 @@ if ($object->id > 0) { } } $relativepath = dol_sanitizeFileName($objp->ref).'/'.dol_sanitizeFileName($objp->ref).'.pdf'; - print $formfile->showPreview($file_list, $commande_static->element, $relativepath, 0, '&entity=' . $objp->entity); + print $formfile->showPreview($file_list, $commande_static->element, $relativepath, 0, 'entity=' . $objp->entity); } // $filename = dol_sanitizeFileName($objp->ref); // $filedir = $conf->order->multidir_output[$objp->entity].'/'.dol_sanitizeFileName($objp->ref); @@ -1093,7 +1093,7 @@ if ($object->id > 0) { } } $relativepath = dol_sanitizeFileName($objp->ref).'/'.dol_sanitizeFileName($objp->ref).'.pdf'; - print $formfile->showPreview($file_list, $sendingstatic->element, $relativepath, 0, '&entity=' . $objp->entity); + print $formfile->showPreview($file_list, $sendingstatic->element, $relativepath, 0, 'entity=' . $objp->entity); } // $filename = dol_sanitizeFileName($objp->ref); // $filedir = $conf->expedition->multidir_output[$objp->entity].'/'.dol_sanitizeFileName($objp->ref); From e0492228779700d23bc1aaecac41c78e7f8a5fd4 Mon Sep 17 00:00:00 2001 From: Eric Seigne Date: Thu, 5 Mar 2026 09:55:51 +0100 Subject: [PATCH 4/6] github.event_name is pull_request_target not pull_request --- .github/workflows/pr-18.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/pr-18.yaml b/.github/workflows/pr-18.yaml index 39e34ae88f3..4c06d591ead 100644 --- a/.github/workflows/pr-18.yaml +++ b/.github/workflows/pr-18.yaml @@ -60,7 +60,7 @@ jobs: # 3) Add the label to the PR (PR events only) # -> tolerant to errors: log on failure but do not fail the job - name: Add label to PR (pull_request events only) - if: ${{ github.event_name == 'pull_request' }} + if: ${{ github.event_name == 'pull_request_target' }} env: GH_TOKEN: ${{ steps.generate-token.outputs.token }} PR_NUMBER: ${{ github.event.pull_request.number }} @@ -74,7 +74,7 @@ jobs: -H "Accept: application/vnd.github+json" \ "https://api.github.com/repos/${REPO}/issues/${PR_NUMBER}/labels" \ -d "{\"labels\": [\"${V18_LABEL}\"]}") - + if [ "$response" -eq 200 ]; then echo "Label added successfully." else @@ -83,7 +83,7 @@ jobs: # 4) Compute final reviewers list excluding the PR author - name: Compute reviewers (exclude PR author) - if: ${{ github.event_name == 'pull_request' }} + if: ${{ github.event_name == 'pull_request_target' }} id: set-reviewers run: | set -euo pipefail @@ -113,7 +113,7 @@ jobs: # - fail the step only if none could be added # - succeed if at least one was added (but log failures) - name: Assign reviewers on PR (per-reviewer, tolerant errors) - if: ${{ github.event_name == 'pull_request' && steps.set-reviewers.outputs.reviewers != '' }} + if: ${{ github.event_name == 'pull_request_target' && steps.set-reviewers.outputs.reviewers != '' }} env: GH_TOKEN: ${{ steps.generate-token.outputs.token }} PR_NUMBER: ${{ github.event.pull_request.number }} @@ -135,7 +135,7 @@ jobs: -H "Accept: application/vnd.github+json" \ "https://api.github.com/repos/${REPO}/pulls/${PR_NUMBER}/requested_reviewers" \ -d "{\"reviewers\": [\"${r_trimmed}\"]}") - + if [ "$response" -eq 201 ] || [ "$response" -eq 200 ]; then echo "Added reviewer: $r_trimmed" SUCCESS=$((SUCCESS+1)) From a7afc55fde87ec7b983493b7821640af9e39b9c6 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 5 Mar 2026 23:57:07 +0100 Subject: [PATCH 5/6] CI --- dev/tools/codespell/codespell-lines-ignore.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/tools/codespell/codespell-lines-ignore.txt b/dev/tools/codespell/codespell-lines-ignore.txt index d0c0498ad4c..feb1f084ef2 100644 --- a/dev/tools/codespell/codespell-lines-ignore.txt +++ b/dev/tools/codespell/codespell-lines-ignore.txt @@ -97,7 +97,7 @@ $sql .= " AND cs.periode >= '".$db->idate($search_date_limit_start)."'"; $sql .= " OR (cs.periode IS NULL AND cs.date_ech between '".$db->idate(dol_get_first_day($year))."' AND '".$db->idate(dol_get_last_day($year))."')"; $sql .= " SET reponses = '".$db->escape($nouveauchoix)."'"; - $sql .= " cs.rowid, cs.libelle, cs.fk_type as type, cs.periode as period, cs.date_ech, cs.amount as total,"; + $sql .= " cs.rowid, cs.libelle as label, cs.fk_type as type, cs.periode as period, cs.date_ech, cs.amount as total,"; $sql.= " ".MAIN_DB_PREFIX."notify_def as nd,"; $sql.= " AND nd.fk_action = ad.rowid"; $sql.= " WHERE u.rowid = nd.fk_user"; From f4278b2c6f377672df1b4818be095ec8ac8e643e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 6 Mar 2026 00:04:06 +0100 Subject: [PATCH 6/6] Add missing user modif in import --- htdocs/core/modules/modProjet.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/modules/modProjet.class.php b/htdocs/core/modules/modProjet.class.php index ad0352b7ca7..d9ee8894482 100644 --- a/htdocs/core/modules/modProjet.class.php +++ b/htdocs/core/modules/modProjet.class.php @@ -316,7 +316,7 @@ class modProjet extends DolibarrModules } } // End add extra fields - $this->import_fieldshidden_array[$r] = array('t.fk_user_creat'=>'user->id', 'extra.fk_object'=>'lastrowid-'.MAIN_DB_PREFIX.'projet'); // aliastable.field => ('user->id' or 'lastrowid-'.tableparent) + $this->import_fieldshidden_array[$r] = array('t.fk_user_creat'=>'user->id', 't.fk_user_modif'=>'user->id', 'extra.fk_object'=>'lastrowid-'.MAIN_DB_PREFIX.'projet'); // aliastable.field => ('user->id' or 'lastrowid-'.tableparent) $this->import_convertvalue_array[$r] = array( 't.ref' => array( 'rule' => 'getrefifauto',