From 40e4a6959f82f58379cca715ee31c27cb2d34428 Mon Sep 17 00:00:00 2001 From: ldestailleur Date: Wed, 1 Oct 2025 19:17:22 +0200 Subject: [PATCH 1/5] Fix CI --- .github/workflows/pr-18.yaml | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr-18.yaml b/.github/workflows/pr-18.yaml index 45b5507f870..23f53665925 100644 --- a/.github/workflows/pr-18.yaml +++ b/.github/workflows/pr-18.yaml @@ -19,13 +19,16 @@ on: permissions: pull-requests: write - + issues: write jobs: - pr18: + assign-and-label-v18: runs-on: ubuntu-latest steps: + #- name: Install GitHub CLI + # run: sudo apt-get install gh + - name: Generate a token id: generate-token uses: actions/create-github-app-token@v2 @@ -45,3 +48,11 @@ jobs: gh pr edit "${{env.url}}" --add-reviewer rycks gh pr edit "${{env.url}}" --add-reviewer lvessiller-opendsi #gh pr edit "${{env.url}}" --add-reviewer eldy + gh pr edit "${{env.url}}" -add-label "Pending analysis of PR (maintenance team)" + + - name: Set a label + uses: vkirilichev/changed-lines-count-labeler@v0.2 + with: + repo-token: ${{ secrets.GITHUB_TOKEN }} + configuration-path: .github/changed-lines-count-labeler.yml + continue-on-error: true From e1b919366e1c30e5b4a8fb4cd3e64a7fa493eff8 Mon Sep 17 00:00:00 2001 From: "Thomas C." <56068416+Thomas905@users.noreply.github.com> Date: Wed, 1 Oct 2025 19:18:31 +0200 Subject: [PATCH 2/5] FIX : To have only the sender's entity when sending mail (#31053) * fix * Update html.formmail.class.php * Update html.formmail.class.php --------- Co-authored-by: Laurent Destailleur Co-authored-by: lvessiller-opendsi --- htdocs/core/class/html.formmail.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php index 49669a4c02c..c54bdab2949 100644 --- a/htdocs/core/class/html.formmail.class.php +++ b/htdocs/core/class/html.formmail.class.php @@ -627,7 +627,7 @@ class FormMail extends Form // Add also email aliases from the c_email_senderprofile table $sql = "SELECT rowid, label, email FROM ".$this->db->prefix()."c_email_senderprofile"; - $sql .= " WHERE active = 1 AND (private = 0 OR private = ".((int) $user->id).")"; + $sql .= " WHERE active = 1 AND (private = 0 OR private = ".((int) $user->id).") AND entity in getEntity('c_email_senderprofile')"; $sql .= " ORDER BY position"; $resql = $this->db->query($sql); if ($resql) { From 43c233668360669b08282b5e52f0ed94c7d33351 Mon Sep 17 00:00:00 2001 From: ldestailleur Date: Wed, 1 Oct 2025 19:28:36 +0200 Subject: [PATCH 3/5] Log --- .github/workflows/pr-18.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr-18.yaml b/.github/workflows/pr-18.yaml index 23f53665925..e47df02caa2 100644 --- a/.github/workflows/pr-18.yaml +++ b/.github/workflows/pr-18.yaml @@ -6,7 +6,7 @@ # Go on Organisation - Secret and variables and create a variable PR18_APP_ID and copy the ID of the previously create ID. Choose the repository access to "Repository Dolibarr". # -name: Set reviewer for v18 +name: Set reviewer and label for v18 on: pull_request_target: types: [opened, synchronize, reopened] From f85b53a4ca6ecbe22c0d211e91bbdae2b9ba0069 Mon Sep 17 00:00:00 2001 From: ldestailleur Date: Wed, 1 Oct 2025 19:29:30 +0200 Subject: [PATCH 4/5] Test CI --- .github/workflows/pr-18.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/pr-18.yaml b/.github/workflows/pr-18.yaml index e47df02caa2..8c46435869f 100644 --- a/.github/workflows/pr-18.yaml +++ b/.github/workflows/pr-18.yaml @@ -48,11 +48,11 @@ jobs: gh pr edit "${{env.url}}" --add-reviewer rycks gh pr edit "${{env.url}}" --add-reviewer lvessiller-opendsi #gh pr edit "${{env.url}}" --add-reviewer eldy - gh pr edit "${{env.url}}" -add-label "Pending analysis of PR (maintenance team)" + gh pr edit "${{env.url}}" --add-label "Pending analysis of PR (maintenance team)" - - name: Set a label - uses: vkirilichev/changed-lines-count-labeler@v0.2 - with: - repo-token: ${{ secrets.GITHUB_TOKEN }} - configuration-path: .github/changed-lines-count-labeler.yml - continue-on-error: true + #- name: Set a label + # uses: vkirilichev/changed-lines-count-labeler@v0.2 + # with: + # repo-token: ${{ secrets.GITHUB_TOKEN }} + # configuration-path: .github/changed-lines-count-labeler.yml + # continue-on-error: true From 477d755bbc96823d093dfbb7770c8ded8b131a82 Mon Sep 17 00:00:00 2001 From: ldestailleur Date: Wed, 1 Oct 2025 19:32:40 +0200 Subject: [PATCH 5/5] Clean CI files --- .github/changed-lines-count-labeler.yml | 3 --- .../workflows/pr-18-autolabel.yaml.disabled | 21 ------------------- .github/workflows/pr-18.yaml | 9 +------- 3 files changed, 1 insertion(+), 32 deletions(-) delete mode 100644 .github/changed-lines-count-labeler.yml delete mode 100644 .github/workflows/pr-18-autolabel.yaml.disabled diff --git a/.github/changed-lines-count-labeler.yml b/.github/changed-lines-count-labeler.yml deleted file mode 100644 index 39e663821fb..00000000000 --- a/.github/changed-lines-count-labeler.yml +++ /dev/null @@ -1,3 +0,0 @@ -# Add this tag for any changes for more than 1 line -"Pending analysis of PR (maintenance team)": - min: 1 diff --git a/.github/workflows/pr-18-autolabel.yaml.disabled b/.github/workflows/pr-18-autolabel.yaml.disabled deleted file mode 100644 index feb9ee17c97..00000000000 --- a/.github/workflows/pr-18-autolabel.yaml.disabled +++ /dev/null @@ -1,21 +0,0 @@ -name: "Set label for v18" -on: - pull_request: - types: [opened, synchronize, reopened] - branches: - - "18.0" - push: - branches: - - "18.0" - -jobs: - changed-lines-count-labeler: - runs-on: ubuntu-latest - name: An action for automatically labelling pull requests based on the changed lines count - steps: - - name: Set a label - uses: vkirilichev/changed-lines-count-labeler@v0.2 - with: - repo-token: ${{ secrets.GITHUB_TOKEN }} - configuration-path: .github/changed-lines-count-labeler.yml - continue-on-error: true diff --git a/.github/workflows/pr-18.yaml b/.github/workflows/pr-18.yaml index 8c46435869f..5898b157a2c 100644 --- a/.github/workflows/pr-18.yaml +++ b/.github/workflows/pr-18.yaml @@ -48,11 +48,4 @@ jobs: gh pr edit "${{env.url}}" --add-reviewer rycks gh pr edit "${{env.url}}" --add-reviewer lvessiller-opendsi #gh pr edit "${{env.url}}" --add-reviewer eldy - gh pr edit "${{env.url}}" --add-label "Pending analysis of PR (maintenance team)" - - #- name: Set a label - # uses: vkirilichev/changed-lines-count-labeler@v0.2 - # with: - # repo-token: ${{ secrets.GITHUB_TOKEN }} - # configuration-path: .github/changed-lines-count-labeler.yml - # continue-on-error: true + gh pr edit "${{env.url}}" --add-label "Assigned to v18 maintenance Team"