Merge branch '18.0' into patch-14

Dolibarr · Nov 21, 2024 · f3c391c · f3c391c
2 parents 6f4a237 + 53ffe42
commit f3c391c
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 9 deletions.
diff --git a/.github/workflows/pr-18.yaml b/.github/workflows/pr-18.yaml
@@ -1,7 +1,6 @@
 on:
   pull_request:
-    types:
-      - opened
+    types: [opened, reopened]
     branches:
       - "18.0"
   push:
@@ -10,17 +9,15 @@ on:
 
 jobs:
   run:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
-
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: Install GitHub CLI
-      run: sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-key C99B11DEB97541F0 && \
-           sudo apt-add-repository https://cli.github.com/packages && \
-           sudo apt update && \
-           sudo apt install gh -y
+      run: |
+        sudo apt update
+        sudo apt install gh -y
 
     - name: Authenticate GitHub CLI
       env:
@@ -29,6 +26,7 @@ jobs:
 
     - name: Assign reviewer
       env:
+        #REVIEWER: "eldy,lvessiller-opendsi,rycks" # Remplacez par le nom d'utilisateur GitHub du reviewer
         REVIEWER: "rycks" # Remplacez par le nom d'utilisateur GitHub du reviewer
       run: |
         pr_number=$(jq --raw-output .number < $GITHUB_EVENT_PATH)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -0,0 +1,21 @@
+on:
+  workflow_dispatch:
+jobs:
+  demo_app_authentication:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Log
+        run: echo "CIAPPID ${{ vars.CIAPPID }}"
+
+      - name: Generate a token
+        id: generate-token
+        uses: actions/create-github-app-token@v1
+        with:
+          app-id: ${{ vars.CIAPPID }}
+          private-key: ${{ secrets.CIAPPPRIKEY }}
+
+      - name: Use the token
+        env:
+          GH_TOKEN: ${{ steps.generate-token.outputs.token }}
+        run: |
+          gh api dolibarr
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
@@ -391,6 +391,7 @@
 					$societe = new Societe($db);
 					$societe->fetch($cmd->socid);
 					$objecttmp->vat_reverse_charge = $societe->vat_reverse_charge;
+					$objecttmp->thirdparty = $societe;
 				}
 				$objecttmp->socid = $cmd->socid;
 				$objecttmp->type = $objecttmp::TYPE_STANDARD;