From 5789229060ca35265b72c214e7a2c26a614ccfb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D8=B4=D8=B1=D9=83=D8=A9=20=D8=AE=D8=A8=D9=8A=D8=B1=20?=
 =?UTF-8?q?=D8=A7=D9=84=D9=85=D8=AD=D8=AF=D9=88=D8=AF=D8=A9?=
 <it@exp-sa.com>
Date: Tue, 2 Jul 2024 12:16:41 +0300
Subject: [PATCH 01/21] Update github action file

---
 .github/workflows/helpdesk-project.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/helpdesk-project.yml b/.github/workflows/helpdesk-project.yml
index 1b4831ca8..cd6474fdb 100644
--- a/.github/workflows/helpdesk-project.yml
+++ b/.github/workflows/helpdesk-project.yml
@@ -12,7 +12,7 @@ jobs:
     steps:
       - name: Checkout And Restart Project
         run: |
-          echo "** [INFO] Running on branch --> ${{ github.ref }}"
+          echo "** [INFO] Running on branch --> ${GITHUB_REF#refs/heads/}"
           
           sudo chmod +x ${{ secrets.HELPDESK_PROJECT_PATH }}/scripts/pull_code.sh
           sudo ${{ secrets.HELPDESK_PROJECT_PATH }}/scripts/pull_code.sh ${{ secrets.HELPDESK_PROJECT_USER }} ${{ secrets.HELPDESK_PROJECT_PATH }} ${{ secrets.HELPDESK_MASTER_SERVICE }} master ${GITHUB_REF#refs/heads/master_} ${GITHUB_REF#refs/heads/}

From d9591378c16141b9ed303a0ac2c3acf8537b3de1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D8=B4=D8=B1=D9=83=D8=A9=20=D8=AE=D8=A8=D9=8A=D8=B1=20?=
 =?UTF-8?q?=D8=A7=D9=84=D9=85=D8=AD=D8=AF=D9=88=D8=AF=D8=A9?=
 <it@exp-sa.com>
Date: Tue, 2 Jul 2024 12:19:06 +0300
Subject: [PATCH 02/21] Update github action file

---
 .github/workflows/cyber-project.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/cyber-project.yml b/.github/workflows/cyber-project.yml
index 48992cffa..69dd840c1 100644
--- a/.github/workflows/cyber-project.yml
+++ b/.github/workflows/cyber-project.yml
@@ -12,7 +12,7 @@ jobs:
     steps:
       - name: Checkout And Restart Project
         run: |
-          echo "** [INFO] Running on branch --> ${{ github.ref }}"
+          echo "** [INFO] Running on branch --> ${GITHUB_REF#refs/heads/}"
           
           sudo chmod +x ${{ secrets.CYBER_PROJECT_PATH }}/scripts/pull_code.sh
           sudo ${{ secrets.CYBER_PROJECT_PATH }}/scripts/pull_code.sh ${{ secrets.CYBER_PROJECT_USER }} ${{ secrets.CYBER_PROJECT_PATH }} ${{ secrets.CYBER_MASTER_SERVICE }} master ${GITHUB_REF#refs/heads/master_} ${GITHUB_REF#refs/heads/}
@@ -24,7 +24,7 @@ jobs:
     steps:
       - name: Checkout And Restart Project
         run: |
-          echo "** [INFO] Running on branch -->  ${{ github.ref }}"
+          echo "** [INFO] Running on branch -->  ${GITHUB_REF#refs/heads/}"
 
           sudo chmod +x ${{ secrets.CYBER_APP_PROJECT_PATH }}/scripts/pull_code.sh
           sudo ${{ secrets.CYBER_APP_PROJECT_PATH }}/scripts/pull_code.sh ${{ secrets.CYBER_APP_PROJECT_USER }} ${{ secrets.CYBER_APP_PROJECT_PATH }} ${{ secrets.CYBER_APP_PREPROD_SERVICE }} preprod ${GITHUB_REF#refs/heads/preprod_} ${GITHUB_REF#refs/heads/}
@@ -36,6 +36,6 @@ jobs:
     steps:
       - name: Checkout And Restart Project
         run: |
-          echo "** [INFO] Running on branch -->  ${{ github.ref }}"
+          echo "** [INFO] Running on branch -->  ${GITHUB_REF#refs/heads/}"
           sudo chmod +x ${{ secrets.CYBER_APP_PROJECT_PATH }}/scripts/pull_code.sh
           sudo ${{ secrets.CYBER_APP_PROJECT_PATH }}/scripts/pull_code.sh ${{ secrets.CYBER_APP_PROJECT_USER }} ${{ secrets.CYBER_APP_PROJECT_PATH }} ${{ secrets.CYBER_APP_TEST_SERVICE }} test ${GITHUB_REF#refs/heads/dev_} ${GITHUB_REF#refs/heads/}

From 41a6cc682570875660695d9186a101055e81f98e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D8=B4=D8=B1=D9=83=D8=A9=20=D8=AE=D8=A8=D9=8A=D8=B1=20?=
 =?UTF-8?q?=D8=A7=D9=84=D9=85=D8=AD=D8=AF=D9=88=D8=AF=D8=A9?=
 <it@exp-sa.com>
Date: Tue, 2 Jul 2024 12:20:52 +0300
Subject: [PATCH 03/21] Update github action file

---
 .github/workflows/twahod-project.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/twahod-project.yml b/.github/workflows/twahod-project.yml
index 2e507c0de..a52fa824b 100644
--- a/.github/workflows/twahod-project.yml
+++ b/.github/workflows/twahod-project.yml
@@ -12,7 +12,7 @@ jobs:
   #   steps:
   #     - name: Checkout And Restart Project
   #       run: |
-  #         echo "** [INFO] Running on branch --> ${{ github.ref }}"
+  #         echo "** [INFO] Running on branch --> ${GITHUB_REF#refs/heads/}"
           
   #         sudo chmod +x ${{ secrets.TWAHOD_PROJECT_PATH }}/scripts/pull_code.sh
   #         sudo ${{ secrets.TWAHOD_PROJECT_PATH }}/scripts/pull_code.sh ${{ secrets.TWAHOD_PROJECT_USER }} ${{ secrets.TWAHOD_PROJECT_PATH }} ${{ secrets.TWAHOD_MASTER_SERVICE }} master ${GITHUB_REF#refs/heads/master_} ${GITHUB_REF#refs/heads/}
@@ -24,7 +24,7 @@ jobs:
     steps:
       - name: Checkout And Restart Project
         run: |
-          echo "** [INFO] Running on branch -->  ${{ github.ref }}"
+          echo "** [INFO] Running on branch -->  ${GITHUB_REF#refs/heads/}"
 
           sudo chmod +x ${{ secrets.TWAHOD_APP_PROJECT_PATH }}/scripts/pull_code.sh
           sudo ${{ secrets.TWAHOD_APP_PROJECT_PATH }}/scripts/pull_code.sh ${{ secrets.TWAHOD_APP_PROJECT_USER }} ${{ secrets.TWAHOD_APP_PROJECT_PATH }} ${{ secrets.TWAHOD_APP_PREPROD_SERVICE }} preprod ${GITHUB_REF#refs/heads/preprod_} ${GITHUB_REF#refs/heads/}
@@ -36,6 +36,6 @@ jobs:
     steps:
       - name: Checkout And Restart Project
         run: |
-          echo "** [INFO] Running on branch -->  ${{ github.ref }}"
+          echo "** [INFO] Running on branch -->  ${GITHUB_REF#refs/heads/}"
           sudo chmod +x ${{ secrets.TWAHOD_APP_PROJECT_PATH }}/scripts/pull_code.sh
           sudo ${{ secrets.TWAHOD_APP_PROJECT_PATH }}/scripts/pull_code.sh ${{ secrets.TWAHOD_APP_PROJECT_USER }} ${{ secrets.TWAHOD_APP_PROJECT_PATH }} ${{ secrets.TWAHOD_APP_TEST_SERVICE }} test ${GITHUB_REF#refs/heads/dev_} ${GITHUB_REF#refs/heads/}

From ef38be5d8f3f35d9dd3378dc8ad590293c0bc757 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D8=B4=D8=B1=D9=83=D8=A9=20=D8=AE=D8=A8=D9=8A=D8=B1=20?=
 =?UTF-8?q?=D8=A7=D9=84=D9=85=D8=AD=D8=AF=D9=88=D8=AF=D8=A9?=
 <it@exp-sa.com>
Date: Tue, 2 Jul 2024 12:21:53 +0300
Subject: [PATCH 04/21] Update github action file

---
 .github/workflows/ensan-project.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ensan-project.yml b/.github/workflows/ensan-project.yml
index 24ada28ad..24e691469 100644
--- a/.github/workflows/ensan-project.yml
+++ b/.github/workflows/ensan-project.yml
@@ -52,8 +52,8 @@ jobs:
     steps:
       - name: Checkout And Restart Project
         run: |
-          echo "** [INFO] Running on branch --> ${{ github.ref }}"
-          
+          echo "** [INFO] Running on branch --> ${GITHUB_REF#refs/heads/}"
+                    
           sudo chmod +x ${{ secrets.ENSAN_PROJECT_PATH }}/scripts/pull_code.sh
           sudo ${{ secrets.ENSAN_PROJECT_PATH }}/scripts/pull_code.sh ${{ secrets.ENSAN_PROJECT_USER }} ${{ secrets.ENSAN_PROJECT_PATH }} ${{ secrets.ENSAN_MASTER_SERVICE }} master ${GITHUB_REF#refs/heads/master_} ${GITHUB_REF#refs/heads/}
           
@@ -64,7 +64,7 @@ jobs:
     steps:
       - name: Checkout And Restart Project
         run: |
-          echo "** [INFO] Running on branch -->  ${{ github.ref }}"
+          echo "** [INFO] Running on branch -->  ${GITHUB_REF#refs/heads/}"
 
           sudo chmod +x ${{ secrets.ENSAN_APP_PROJECT_PATH }}/scripts/pull_code.sh
           sudo ${{ secrets.ENSAN_APP_PROJECT_PATH }}/scripts/pull_code.sh ${{ secrets.ENSAN_APP_PROJECT_USER }} ${{ secrets.ENSAN_APP_PROJECT_PATH }} ${{ secrets.ENSAN_APP_PREPROD_SERVICE }} preprod ${GITHUB_REF#refs/heads/preprod_} ${GITHUB_REF#refs/heads/}
@@ -76,6 +76,6 @@ jobs:
     steps:
       - name: Checkout And Restart Project
         run: |
-          echo "** [INFO] Running on branch -->  ${{ github.ref }}"
+          echo "** [INFO] Running on branch -->  ${GITHUB_REF#refs/heads/}"
           sudo chmod +x ${{ secrets.ENSAN_APP_PROJECT_PATH }}/scripts/pull_code.sh
           sudo ${{ secrets.ENSAN_APP_PROJECT_PATH }}/scripts/pull_code.sh ${{ secrets.ENSAN_APP_PROJECT_USER }} ${{ secrets.ENSAN_APP_PROJECT_PATH }} ${{ secrets.ENSAN_APP_TEST_SERVICE }} test ${GITHUB_REF#refs/heads/dev_} ${GITHUB_REF#refs/heads/}

From 358a69b6f231985582eebe0038cf4ead0a42f82b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D8=B4=D8=B1=D9=83=D8=A9=20=D8=AE=D8=A8=D9=8A=D8=B1=20?=
 =?UTF-8?q?=D8=A7=D9=84=D9=85=D8=AD=D8=AF=D9=88=D8=AF=D8=A9?=
 <it@exp-sa.com>
Date: Tue, 2 Jul 2024 12:22:45 +0300
Subject: [PATCH 05/21] Update github action file

---
 .github/workflows/odex25-standard.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/odex25-standard.yml b/.github/workflows/odex25-standard.yml
index 2c2ef9169..71e66ed5d 100644
--- a/.github/workflows/odex25-standard.yml
+++ b/.github/workflows/odex25-standard.yml
@@ -12,7 +12,7 @@ jobs:
     steps:
       - name: Checkout And Restart Project
         run: |
-          echo "** [INFO] Running on branch --> ${{ github.ref }}"
+          echo "** [INFO] Running on branch --> ${GITHUB_REF#refs/heads/}"
           
           sudo chmod +x ${{ secrets.APP_SERVER_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh
           sudo ${{ secrets.APP_SERVER_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh ${{ secrets.APP_SERVER_USER14 }} ${{ secrets.APP_SERVER_STANDARD_FOLDER_PATH }} ${{ secrets.ODEX25_STANDARD_MASTER_SERVICE }} master ${GITHUB_REF#refs/heads/master_} ${GITHUB_REF#refs/heads/}
@@ -24,7 +24,7 @@ jobs:
     steps:
       - name: Checkout And Restart Project
         run: |
-          echo "** [INFO] Running on branch -->  ${{ github.ref }}"
+          echo "** [INFO] Running on branch -->  ${GITHUB_REF#refs/heads/}"
 
           sudo chmod +x ${{ secrets.APP_SERVER_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh
           sudo ${{ secrets.APP_SERVER_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh ${{ secrets.APP_SERVER_USER14 }} ${{ secrets.APP_SERVER_STANDARD_FOLDER_PATH }} ${{ secrets.ODEX25_STANDARD_PREPROD_SERVICE }} preprod ${GITHUB_REF#refs/heads/preprod_} ${GITHUB_REF#refs/heads/}
@@ -36,6 +36,6 @@ jobs:
     steps:
       - name: Checkout And Restart Project
         run: |
-          echo "** [INFO] Running on branch -->  ${{ github.ref }}"
+          echo "** [INFO] Running on branch -->  ${GITHUB_REF#refs/heads/}"
           sudo chmod +x ${{ secrets.APP_SERVER_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh
           sudo ${{ secrets.APP_SERVER_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh ${{ secrets.APP_SERVER_USER14 }} ${{ secrets.APP_SERVER_STANDARD_FOLDER_PATH }} ${{ secrets.ODEX25_STANDARD_TEST_SERVICE }} test ${GITHUB_REF#refs/heads/dev_} ${GITHUB_REF#refs/heads/}

From 1ce70f3ab729e9afd7ac1587372fd874fb2299f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D8=B4=D8=B1=D9=83=D8=A9=20=D8=AE=D8=A8=D9=8A=D8=B1=20?=
 =?UTF-8?q?=D8=A7=D9=84=D9=85=D8=AD=D8=AF=D9=88=D8=AF=D8=A9?=
 <it@exp-sa.com>
Date: Tue, 2 Jul 2024 12:23:59 +0300
Subject: [PATCH 06/21] Update github action file

---
 .github/workflows/odex25-general.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/odex25-general.yml b/.github/workflows/odex25-general.yml
index 7b62f8519..8aff2e966 100644
--- a/.github/workflows/odex25-general.yml
+++ b/.github/workflows/odex25-general.yml
@@ -12,7 +12,7 @@ jobs:
   #   steps:
   #     - name: Checkout And Restart Project
   #       run: |
-  #         echo "** [INFO] Running on branch --> ${{ github.ref }}"
+  #         echo "** [INFO] Running on branch --> ${GITHUB_REF#refs/heads/}"
           
   #         sudo chmod +x ${{ secrets.APP_SERVER_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh
   #         sudo ${{ secrets.APP_SERVER_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh ${{ secrets.APP_SERVER_USER14 }} ${{ secrets.APP_SERVER_STANDARD_FOLDER_PATH }} ${{ secrets.ODEX25_GENERAL_MASTER_SERVICE }} master ${GITHUB_REF#refs/heads/master_} ${GITHUB_REF#refs/heads/}
@@ -24,7 +24,7 @@ jobs:
     steps:
       - name: Checkout And Restart Project
         run: |
-          echo "** [INFO] Running on branch -->  ${{ github.ref }}"
+          echo "** [INFO] Running on branch -->  ${GITHUB_REF#refs/heads/}"
 
           sudo chmod +x ${{ secrets.APP_SERVER_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh
           sudo ${{ secrets.APP_SERVER_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh ${{ secrets.APP_SERVER_USER14 }} ${{ secrets.APP_SERVER_STANDARD_FOLDER_PATH }} ${{ secrets.ODEX25_GENERAL_PREPROD_SERVICE }} preprod ${GITHUB_REF#refs/heads/preprod_} ${GITHUB_REF#refs/heads/}
@@ -36,6 +36,6 @@ jobs:
     steps:
       - name: Checkout And Restart Project
         run: |
-          echo "** [INFO] Running on branch -->  ${{ github.ref }}"
+          echo "** [INFO] Running on branch -->  ${GITHUB_REF#refs/heads/}"
           sudo chmod +x ${{ secrets.APP_SERVER_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh
           sudo ${{ secrets.APP_SERVER_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh ${{ secrets.APP_SERVER_USER14 }} ${{ secrets.APP_SERVER_STANDARD_FOLDER_PATH }} ${{ secrets.ODEX25_GENERAL_TEST_SERVICE }} test ${GITHUB_REF#refs/heads/dev_} ${GITHUB_REF#refs/heads/}

From 19544e7558d970ff1e20892d56e536b06b84c454 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D8=B4=D8=B1=D9=83=D8=A9=20=D8=AE=D8=A8=D9=8A=D8=B1=20?=
 =?UTF-8?q?=D8=A7=D9=84=D9=85=D8=AD=D8=AF=D9=88=D8=AF=D8=A9?=
 <it@exp-sa.com>
Date: Sun, 7 Jul 2024 21:04:49 +0300
Subject: [PATCH 07/21] Update github action file

---
 .github/workflows/odex25-general.yml | 40 ++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/.github/workflows/odex25-general.yml b/.github/workflows/odex25-general.yml
index 8aff2e966..a2d17fd34 100644
--- a/.github/workflows/odex25-general.yml
+++ b/.github/workflows/odex25-general.yml
@@ -1,6 +1,46 @@
 name: Odex25-General Project - Pull Code
 
 on:
+  push:
+    branches:
+      - dev_odex-event
+      - dev_odex25_accounting
+      - dev_odex25_base
+      - dev_odex25_dms
+      - dev_odex25_fleet
+      - dev_odex25_ENSAN
+      - dev_odex25_hr
+      - dev_odex25_inventory
+      - dev_odex25_maintenance
+      - dev_odex25_mobile
+      - dev_odex25_pos
+      - dev_odex25_project
+      - dev_odex25_purchase
+      - dev_odex25_realstate
+      - dev_odex25_sales
+      - dev_odex25_survey
+      - dev_odex25_transactions
+      - dev_odex25_website
+      - dev_openeducat_erp-14.0.1.0
+      - preprod_odex-event
+      - preprod_odex25_accounting
+      - preprod_odex25_base
+      - preprod_odex25_dms
+      - preprod_odex25_fleet
+      - preprod_odex25_ENSAN
+      - preprod_odex25_hr
+      - preprod_odex25_inventory
+      - preprod_odex25_maintenance
+      - preprod_odex25_mobile
+      - preprod_odex25_pos
+      - preprod_odex25_project
+      - preprod_odex25_purchase
+      - preprod_odex25_realstate
+      - preprod_odex25_sales
+      - preprod_odex25_survey
+      - preprod_odex25_transactions
+      - preprod_odex25_website
+      - preprod_openeducat_erp-14.0.1.0
 
   workflow_dispatch: 
 

From c33c3016392791772c8e6c73e6dba779f8fe36b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D8=B4=D8=B1=D9=83=D8=A9=20=D8=AE=D8=A8=D9=8A=D8=B1=20?=
 =?UTF-8?q?=D8=A7=D9=84=D9=85=D8=AD=D8=AF=D9=88=D8=AF=D8=A9?=
 <it@exp-sa.com>
Date: Sun, 7 Jul 2024 21:05:20 +0300
Subject: [PATCH 08/21] Update github action file

---
 .github/workflows/ensan-project.yml | 80 ++++++++++++++---------------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/.github/workflows/ensan-project.yml b/.github/workflows/ensan-project.yml
index 24e691469..e80316b6c 100644
--- a/.github/workflows/ensan-project.yml
+++ b/.github/workflows/ensan-project.yml
@@ -1,46 +1,46 @@
 name: Ensan Project - Pull Code
 
 on:
-  # push:
-  #   branches:
-      # - dev_odex-event
-      # - dev_odex25_accounting
-      # - dev_odex25_base
-      # - dev_odex25_dms
-      # - dev_odex25_fleet
-      # - dev_odex25_ENSAN
-      # - dev_odex25_hr
-      # - dev_odex25_inventory
-      # - dev_odex25_maintenance
-      # - dev_odex25_mobile
-      # - dev_odex25_pos
-      # - dev_odex25_project
-      # - dev_odex25_purchase
-      # - dev_odex25_realstate
-      # - dev_odex25_sales
-      # - dev_odex25_survey
-      # - dev_odex25_transactions
-      # - dev_odex25_website
-      # - dev_openeducat_erp-14.0.1.0
-      # - preprod_odex-event
-      # - preprod_odex25_accounting
-      # - preprod_odex25_base
-      # - preprod_odex25_dms
-      # - preprod_odex25_fleet
-      # - preprod_odex25_ENSAN
-      # - preprod_odex25_hr
-      # - preprod_odex25_inventory
-      # - preprod_odex25_maintenance
-      # - preprod_odex25_mobile
-      # - preprod_odex25_pos
-      # - preprod_odex25_project
-      # - preprod_odex25_purchase
-      # - preprod_odex25_realstate
-      # - preprod_odex25_sales
-      # - preprod_odex25_survey
-      # - preprod_odex25_transactions
-      # - preprod_odex25_website
-      # - preprod_openeducat_erp-14.0.1.0
+  push:
+    branches:
+      - dev_odex-event
+      - dev_odex25_accounting
+      - dev_odex25_base
+      - dev_odex25_dms
+      - dev_odex25_fleet
+      - dev_odex25_ENSAN
+      - dev_odex25_hr
+      - dev_odex25_inventory
+      - dev_odex25_maintenance
+      - dev_odex25_mobile
+      - dev_odex25_pos
+      - dev_odex25_project
+      - dev_odex25_purchase
+      - dev_odex25_realstate
+      - dev_odex25_sales
+      - dev_odex25_survey
+      - dev_odex25_transactions
+      - dev_odex25_website
+      - dev_openeducat_erp-14.0.1.0
+      - preprod_odex-event
+      - preprod_odex25_accounting
+      - preprod_odex25_base
+      - preprod_odex25_dms
+      - preprod_odex25_fleet
+      - preprod_odex25_ENSAN
+      - preprod_odex25_hr
+      - preprod_odex25_inventory
+      - preprod_odex25_maintenance
+      - preprod_odex25_mobile
+      - preprod_odex25_pos
+      - preprod_odex25_project
+      - preprod_odex25_purchase
+      - preprod_odex25_realstate
+      - preprod_odex25_sales
+      - preprod_odex25_survey
+      - preprod_odex25_transactions
+      - preprod_odex25_website
+      - preprod_openeducat_erp-14.0.1.0
 
   workflow_dispatch: 
 

From fd0bf462daaea8b492bf12c7b82bb3d990d3005c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D8=B4=D8=B1=D9=83=D8=A9=20=D8=AE=D8=A8=D9=8A=D8=B1=20?=
 =?UTF-8?q?=D8=A7=D9=84=D9=85=D8=AD=D8=AF=D9=88=D8=AF=D8=A9?=
 <it@exp-sa.com>
Date: Sun, 7 Jul 2024 21:06:21 +0300
Subject: [PATCH 09/21] Update github action file

---
 .github/workflows/odex25-standard.yml | 40 +++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/.github/workflows/odex25-standard.yml b/.github/workflows/odex25-standard.yml
index 71e66ed5d..264450479 100644
--- a/.github/workflows/odex25-standard.yml
+++ b/.github/workflows/odex25-standard.yml
@@ -1,6 +1,46 @@
 name: ODEX25_STANDARD Project - Pull Code
 
 on:
+  push:
+    branches:
+      - dev_odex-event
+      - dev_odex25_accounting
+      - dev_odex25_base
+      - dev_odex25_dms
+      - dev_odex25_fleet
+      - dev_odex25_ENSAN
+      - dev_odex25_hr
+      - dev_odex25_inventory
+      - dev_odex25_maintenance
+      - dev_odex25_mobile
+      - dev_odex25_pos
+      - dev_odex25_project
+      - dev_odex25_purchase
+      - dev_odex25_realstate
+      - dev_odex25_sales
+      - dev_odex25_survey
+      - dev_odex25_transactions
+      - dev_odex25_website
+      - dev_openeducat_erp-14.0.1.0
+      - preprod_odex-event
+      - preprod_odex25_accounting
+      - preprod_odex25_base
+      - preprod_odex25_dms
+      - preprod_odex25_fleet
+      - preprod_odex25_ENSAN
+      - preprod_odex25_hr
+      - preprod_odex25_inventory
+      - preprod_odex25_maintenance
+      - preprod_odex25_mobile
+      - preprod_odex25_pos
+      - preprod_odex25_project
+      - preprod_odex25_purchase
+      - preprod_odex25_realstate
+      - preprod_odex25_sales
+      - preprod_odex25_survey
+      - preprod_odex25_transactions
+      - preprod_odex25_website
+      - preprod_openeducat_erp-14.0.1.0
 
   workflow_dispatch: 
 

From 9cc4d2f8ffa0259e01888f7f736e6099111895ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D8=B4=D8=B1=D9=83=D8=A9=20=D8=AE=D8=A8=D9=8A=D8=B1=20?=
 =?UTF-8?q?=D8=A7=D9=84=D9=85=D8=AD=D8=AF=D9=88=D8=AF=D8=A9?=
 <it@exp-sa.com>
Date: Sun, 7 Jul 2024 21:06:54 +0300
Subject: [PATCH 10/21] Update github action file

---
 .github/workflows/cyber-project.yml | 40 +++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/.github/workflows/cyber-project.yml b/.github/workflows/cyber-project.yml
index 69dd840c1..f20839277 100644
--- a/.github/workflows/cyber-project.yml
+++ b/.github/workflows/cyber-project.yml
@@ -1,6 +1,46 @@
 name: Cyber Security Project - Pull Code
 
 on:
+  push:
+    branches:
+      - dev_odex-event
+      - dev_odex25_accounting
+      - dev_odex25_base
+      - dev_odex25_dms
+      - dev_odex25_fleet
+      - dev_odex25_ENSAN
+      - dev_odex25_hr
+      - dev_odex25_inventory
+      - dev_odex25_maintenance
+      - dev_odex25_mobile
+      - dev_odex25_pos
+      - dev_odex25_project
+      - dev_odex25_purchase
+      - dev_odex25_realstate
+      - dev_odex25_sales
+      - dev_odex25_survey
+      - dev_odex25_transactions
+      - dev_odex25_website
+      - dev_openeducat_erp-14.0.1.0
+      - preprod_odex-event
+      - preprod_odex25_accounting
+      - preprod_odex25_base
+      - preprod_odex25_dms
+      - preprod_odex25_fleet
+      - preprod_odex25_ENSAN
+      - preprod_odex25_hr
+      - preprod_odex25_inventory
+      - preprod_odex25_maintenance
+      - preprod_odex25_mobile
+      - preprod_odex25_pos
+      - preprod_odex25_project
+      - preprod_odex25_purchase
+      - preprod_odex25_realstate
+      - preprod_odex25_sales
+      - preprod_odex25_survey
+      - preprod_odex25_transactions
+      - preprod_odex25_website
+      - preprod_openeducat_erp-14.0.1.0
 
   workflow_dispatch: 
 

From 90cc04be3b4f15b75fdd02d8e6f61e82e444bad1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D8=B4=D8=B1=D9=83=D8=A9=20=D8=AE=D8=A8=D9=8A=D8=B1=20?=
 =?UTF-8?q?=D8=A7=D9=84=D9=85=D8=AD=D8=AF=D9=88=D8=AF=D8=A9?=
 <it@exp-sa.com>
Date: Sun, 7 Jul 2024 21:08:26 +0300
Subject: [PATCH 11/21] Update github action file

---
 .github/workflows/helpdesk-project.yml | 40 ++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/.github/workflows/helpdesk-project.yml b/.github/workflows/helpdesk-project.yml
index cd6474fdb..b64eda54a 100644
--- a/.github/workflows/helpdesk-project.yml
+++ b/.github/workflows/helpdesk-project.yml
@@ -1,6 +1,46 @@
 name: Helpdesk Project - Pull Code
 
 on:
+  push:
+    branches:
+      - dev_odex-event
+      - dev_odex25_accounting
+      - dev_odex25_base
+      - dev_odex25_dms
+      - dev_odex25_fleet
+      - dev_odex25_ENSAN
+      - dev_odex25_hr
+      - dev_odex25_inventory
+      - dev_odex25_maintenance
+      - dev_odex25_mobile
+      - dev_odex25_pos
+      - dev_odex25_project
+      - dev_odex25_purchase
+      - dev_odex25_realstate
+      - dev_odex25_sales
+      - dev_odex25_survey
+      - dev_odex25_transactions
+      - dev_odex25_website
+      - dev_openeducat_erp-14.0.1.0
+      - preprod_odex-event
+      - preprod_odex25_accounting
+      - preprod_odex25_base
+      - preprod_odex25_dms
+      - preprod_odex25_fleet
+      - preprod_odex25_ENSAN
+      - preprod_odex25_hr
+      - preprod_odex25_inventory
+      - preprod_odex25_maintenance
+      - preprod_odex25_mobile
+      - preprod_odex25_pos
+      - preprod_odex25_project
+      - preprod_odex25_purchase
+      - preprod_odex25_realstate
+      - preprod_odex25_sales
+      - preprod_odex25_survey
+      - preprod_odex25_transactions
+      - preprod_odex25_website
+      - preprod_openeducat_erp-14.0.1.0
 
   workflow_dispatch: 
 

From 1c785d949caf532f2468ac6768582153f02c8b47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D8=B4=D8=B1=D9=83=D8=A9=20=D8=AE=D8=A8=D9=8A=D8=B1=20?=
 =?UTF-8?q?=D8=A7=D9=84=D9=85=D8=AD=D8=AF=D9=88=D8=AF=D8=A9?=
 <it@exp-sa.com>
Date: Sun, 7 Jul 2024 21:11:18 +0300
Subject: [PATCH 12/21] Update github action file

---
 .github/workflows/twahod-project.yml | 40 ++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/.github/workflows/twahod-project.yml b/.github/workflows/twahod-project.yml
index a52fa824b..7c306aaa6 100644
--- a/.github/workflows/twahod-project.yml
+++ b/.github/workflows/twahod-project.yml
@@ -1,6 +1,46 @@
 name: Twahod Project - Pull Code
 
 on:
+  push:
+    branches:
+      - dev_odex-event
+      - dev_odex25_accounting
+      - dev_odex25_base
+      - dev_odex25_dms
+      - dev_odex25_fleet
+      - dev_odex25_ENSAN
+      - dev_odex25_hr
+      - dev_odex25_inventory
+      - dev_odex25_maintenance
+      - dev_odex25_mobile
+      - dev_odex25_pos
+      - dev_odex25_project
+      - dev_odex25_purchase
+      - dev_odex25_realstate
+      - dev_odex25_sales
+      - dev_odex25_survey
+      - dev_odex25_transactions
+      - dev_odex25_website
+      - dev_openeducat_erp-14.0.1.0
+      - preprod_odex-event
+      - preprod_odex25_accounting
+      - preprod_odex25_base
+      - preprod_odex25_dms
+      - preprod_odex25_fleet
+      - preprod_odex25_ENSAN
+      - preprod_odex25_hr
+      - preprod_odex25_inventory
+      - preprod_odex25_maintenance
+      - preprod_odex25_mobile
+      - preprod_odex25_pos
+      - preprod_odex25_project
+      - preprod_odex25_purchase
+      - preprod_odex25_realstate
+      - preprod_odex25_sales
+      - preprod_odex25_survey
+      - preprod_odex25_transactions
+      - preprod_odex25_website
+      - preprod_openeducat_erp-14.0.1.0
 
   workflow_dispatch: 
 

From d817a5f2d923ddc5acf8455f446403ed715086bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D8=B4=D8=B1=D9=83=D8=A9=20=D8=AE=D8=A8=D9=8A=D8=B1=20?=
 =?UTF-8?q?=D8=A7=D9=84=D9=85=D8=AD=D8=AF=D9=88=D8=AF=D8=A9?=
 <it@exp-sa.com>
Date: Sun, 7 Jul 2024 22:30:40 +0300
Subject: [PATCH 13/21] Update github action file

---
 .github/workflows/odex25-standard.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/odex25-standard.yml b/.github/workflows/odex25-standard.yml
index 264450479..267342024 100644
--- a/.github/workflows/odex25-standard.yml
+++ b/.github/workflows/odex25-standard.yml
@@ -60,7 +60,7 @@ jobs:
   deploy_preprod_server:
     name: Deploy to Preprod
     runs-on: app-sever-project-runner
-    if: github.event_name == 'workflow_dispatch' && (github.ref == 'refs/heads/preprod_odex-event' || github.ref == 'refs/heads/preprod_odex25_accounting' || github.ref == 'refs/heads/preprod_odex25_base' || github.ref == 'refs/heads/preprod_odex25_dms' || github.ref == 'refs/heads/preprod_odex25_fleet' || github.ref == 'refs/heads/preprod_odex25_ENSAN' || github.ref == 'refs/heads/preprod_odex25_hr' || github.ref == 'refs/heads/preprod_odex25_inventory' || github.ref == 'refs/heads/preprod_odex25_maintenance' || github.ref == 'refs/heads/preprod_odex25_mobile' || github.ref == 'refs/heads/preprod_odex25_pos' || github.ref == 'refs/heads/preprod_odex25_project' || github.ref == 'refs/heads/preprod_odex25_purchase' || github.ref == 'refs/heads/preprod_odex25_realstate' || github.ref == 'refs/heads/preprod_odex25_sales' || github.ref == 'refs/heads/preprod_odex25_survey' || github.ref == 'refs/heads/preprod_odex25_transactions' || github.ref == 'refs/heads/preprod_odex25_website' || github.ref == 'refs/heads/preprod_openeducat_erp-14.0.1.0')
+    if: github.ref == 'refs/heads/preprod_odex-event' || github.ref == 'refs/heads/preprod_odex25_accounting' || github.ref == 'refs/heads/preprod_odex25_base' || github.ref == 'refs/heads/preprod_odex25_dms' || github.ref == 'refs/heads/preprod_odex25_fleet' || github.ref == 'refs/heads/preprod_odex25_ENSAN' || github.ref == 'refs/heads/preprod_odex25_hr' || github.ref == 'refs/heads/preprod_odex25_inventory' || github.ref == 'refs/heads/preprod_odex25_maintenance' || github.ref == 'refs/heads/preprod_odex25_mobile' || github.ref == 'refs/heads/preprod_odex25_pos' || github.ref == 'refs/heads/preprod_odex25_project' || github.ref == 'refs/heads/preprod_odex25_purchase' || github.ref == 'refs/heads/preprod_odex25_realstate' || github.ref == 'refs/heads/preprod_odex25_sales' || github.ref == 'refs/heads/preprod_odex25_survey' || github.ref == 'refs/heads/preprod_odex25_transactions' || github.ref == 'refs/heads/preprod_odex25_website' || github.ref == 'refs/heads/preprod_openeducat_erp-14.0.1.0'
     steps:
       - name: Checkout And Restart Project
         run: |
@@ -72,7 +72,7 @@ jobs:
   deploy_test_server:
     name: Deploy to Test
     runs-on: app-sever-project-runner
-    if: github.event_name == 'workflow_dispatch' && (github.ref == 'refs/heads/dev_odex-event' || github.ref == 'refs/heads/dev_odex25_accounting' || github.ref == 'refs/heads/dev_odex25_base' || github.ref == 'refs/heads/dev_odex25_dms' || github.ref == 'refs/heads/dev_odex25_fleet' || github.ref == 'refs/heads/dev_odex25_ENSAN' || github.ref == 'refs/heads/dev_odex25_hr' || github.ref == 'refs/heads/dev_odex25_inventory' || github.ref == 'refs/heads/dev_odex25_maintenance' || github.ref == 'refs/heads/dev_odex25_mobile' || github.ref == 'refs/heads/dev_odex25_pos' || github.ref == 'refs/heads/dev_odex25_project' || github.ref == 'refs/heads/dev_odex25_purchase' || github.ref == 'refs/heads/dev_odex25_realstate' || github.ref == 'refs/heads/dev_odex25_sales' || github.ref == 'refs/heads/dev_odex25_survey' || github.ref == 'refs/heads/dev_odex25_transactions' || github.ref == 'refs/heads/dev_odex25_website' || github.ref == 'refs/heads/dev_openeducat_erp-14.0.1.0')
+    if: github.ref == 'refs/heads/dev_odex-event' || github.ref == 'refs/heads/dev_odex25_accounting' || github.ref == 'refs/heads/dev_odex25_base' || github.ref == 'refs/heads/dev_odex25_dms' || github.ref == 'refs/heads/dev_odex25_fleet' || github.ref == 'refs/heads/dev_odex25_ENSAN' || github.ref == 'refs/heads/dev_odex25_hr' || github.ref == 'refs/heads/dev_odex25_inventory' || github.ref == 'refs/heads/dev_odex25_maintenance' || github.ref == 'refs/heads/dev_odex25_mobile' || github.ref == 'refs/heads/dev_odex25_pos' || github.ref == 'refs/heads/dev_odex25_project' || github.ref == 'refs/heads/dev_odex25_purchase' || github.ref == 'refs/heads/dev_odex25_realstate' || github.ref == 'refs/heads/dev_odex25_sales' || github.ref == 'refs/heads/dev_odex25_survey' || github.ref == 'refs/heads/dev_odex25_transactions' || github.ref == 'refs/heads/dev_odex25_website' || github.ref == 'refs/heads/dev_openeducat_erp-14.0.1.0'
     steps:
       - name: Checkout And Restart Project
         run: |

From 81f4a679070945753fb69f9c11b0730255c2a2da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D8=B4=D8=B1=D9=83=D8=A9=20=D8=AE=D8=A8=D9=8A=D8=B1=20?=
 =?UTF-8?q?=D8=A7=D9=84=D9=85=D8=AD=D8=AF=D9=88=D8=AF=D8=A9?=
 <it@exp-sa.com>
Date: Sun, 7 Jul 2024 22:31:49 +0300
Subject: [PATCH 14/21] Update github action file

---
 .github/workflows/ensan-project.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ensan-project.yml b/.github/workflows/ensan-project.yml
index e80316b6c..9863cac9a 100644
--- a/.github/workflows/ensan-project.yml
+++ b/.github/workflows/ensan-project.yml
@@ -60,7 +60,7 @@ jobs:
   deploy_preprod_server:
     name: Deploy to Preprod
     runs-on: app-sever-project-runner
-    if: github.event_name == 'workflow_dispatch' && (github.ref == 'refs/heads/preprod_odex-event' || github.ref == 'refs/heads/preprod_odex25_accounting' || github.ref == 'refs/heads/preprod_odex25_base' || github.ref == 'refs/heads/preprod_odex25_dms' || github.ref == 'refs/heads/preprod_odex25_fleet' || github.ref == 'refs/heads/preprod_odex25_ENSAN' || github.ref == 'refs/heads/preprod_odex25_hr' || github.ref == 'refs/heads/preprod_odex25_inventory' || github.ref == 'refs/heads/preprod_odex25_maintenance' || github.ref == 'refs/heads/preprod_odex25_mobile' || github.ref == 'refs/heads/preprod_odex25_pos' || github.ref == 'refs/heads/preprod_odex25_project' || github.ref == 'refs/heads/preprod_odex25_purchase' || github.ref == 'refs/heads/preprod_odex25_realstate' || github.ref == 'refs/heads/preprod_odex25_sales' || github.ref == 'refs/heads/preprod_odex25_survey' || github.ref == 'refs/heads/preprod_odex25_transactions' || github.ref == 'refs/heads/preprod_odex25_website' || github.ref == 'refs/heads/preprod_openeducat_erp-14.0.1.0')
+    if: github.event_name == 'workflow_dispatch' && (github.ref == 'refs/heads/preprod_odex-event' || github.ref == 'refs/heads/preprod_odex25_accounting' || github.ref == 'refs/heads/preprod_odex25_base' || github.ref == 'refs/heads/preprod_odex25_dms' || github.ref == 'refs/heads/preprod_odex25_fleet' || github.ref == 'refs/heads/preprod_odex25_ENSAN' || github.ref == 'refs/heads/preprod_odex25_hr' || github.ref == 'refs/heads/preprod_odex25_inventory' || github.ref == 'refs/heads/preprod_odex25_maintenance' || github.ref == 'refs/heads/preprod_odex25_mobile' || github.ref == 'refs/heads/preprod_odex25_pos' || github.ref == 'refs/heads/preprod_odex25_project' || github.ref == 'refs/heads/preprod_odex25_purchase' || github.ref == 'refs/heads/preprod_odex25_realstate' || github.ref == 'refs/heads/preprod_odex25_sales' || github.ref == 'refs/heads/preprod_odex25_survey' || github.ref == 'refs/heads/preprod_odex25_transactions' || github.ref == 'refs/heads/preprod_odex25_website' || github.ref == 'refs/heads/preprod_openeducat_erp-14.0.1.0'
     steps:
       - name: Checkout And Restart Project
         run: |
@@ -72,7 +72,7 @@ jobs:
   deploy_test_server:
     name: Deploy to Test
     runs-on: app-sever-project-runner
-    if: github.event_name == 'workflow_dispatch' && (github.ref == 'refs/heads/dev_odex-event' || github.ref == 'refs/heads/dev_odex25_accounting' || github.ref == 'refs/heads/dev_odex25_base' || github.ref == 'refs/heads/dev_odex25_dms' || github.ref == 'refs/heads/dev_odex25_fleet' || github.ref == 'refs/heads/dev_odex25_ENSAN' || github.ref == 'refs/heads/dev_odex25_hr' || github.ref == 'refs/heads/dev_odex25_inventory' || github.ref == 'refs/heads/dev_odex25_maintenance' || github.ref == 'refs/heads/dev_odex25_mobile' || github.ref == 'refs/heads/dev_odex25_pos' || github.ref == 'refs/heads/dev_odex25_project' || github.ref == 'refs/heads/dev_odex25_purchase' || github.ref == 'refs/heads/dev_odex25_realstate' || github.ref == 'refs/heads/dev_odex25_sales' || github.ref == 'refs/heads/dev_odex25_survey' || github.ref == 'refs/heads/dev_odex25_transactions' || github.ref == 'refs/heads/dev_odex25_website' || github.ref == 'refs/heads/dev_openeducat_erp-14.0.1.0')
+    if: github.ref == 'refs/heads/dev_odex-event' || github.ref == 'refs/heads/dev_odex25_accounting' || github.ref == 'refs/heads/dev_odex25_base' || github.ref == 'refs/heads/dev_odex25_dms' || github.ref == 'refs/heads/dev_odex25_fleet' || github.ref == 'refs/heads/dev_odex25_ENSAN' || github.ref == 'refs/heads/dev_odex25_hr' || github.ref == 'refs/heads/dev_odex25_inventory' || github.ref == 'refs/heads/dev_odex25_maintenance' || github.ref == 'refs/heads/dev_odex25_mobile' || github.ref == 'refs/heads/dev_odex25_pos' || github.ref == 'refs/heads/dev_odex25_project' || github.ref == 'refs/heads/dev_odex25_purchase' || github.ref == 'refs/heads/dev_odex25_realstate' || github.ref == 'refs/heads/dev_odex25_sales' || github.ref == 'refs/heads/dev_odex25_survey' || github.ref == 'refs/heads/dev_odex25_transactions' || github.ref == 'refs/heads/dev_odex25_website' || github.ref == 'refs/heads/dev_openeducat_erp-14.0.1.0'
     steps:
       - name: Checkout And Restart Project
         run: |

From 808ea34164548a5ac6908a73efd4ec5575a0379a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D8=B4=D8=B1=D9=83=D8=A9=20=D8=AE=D8=A8=D9=8A=D8=B1=20?=
 =?UTF-8?q?=D8=A7=D9=84=D9=85=D8=AD=D8=AF=D9=88=D8=AF=D8=A9?=
 <it@exp-sa.com>
Date: Sun, 7 Jul 2024 22:32:03 +0300
Subject: [PATCH 15/21] Update github action file

---
 .github/workflows/helpdesk-project.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/helpdesk-project.yml b/.github/workflows/helpdesk-project.yml
index b64eda54a..3967510f5 100644
--- a/.github/workflows/helpdesk-project.yml
+++ b/.github/workflows/helpdesk-project.yml
@@ -60,7 +60,7 @@ jobs:
   deploy_preprod_server:
     name: Deploy to Preprod
     runs-on: helpdesk-client-project-runner
-    if: github.event_name == 'workflow_dispatch' && (github.ref == 'refs/heads/preprod_odex-event' || github.ref == 'refs/heads/preprod_odex25_accounting' || github.ref == 'refs/heads/preprod_odex25_base' || github.ref == 'refs/heads/preprod_odex25_dms' || github.ref == 'refs/heads/preprod_odex25_fleet' || github.ref == 'refs/heads/preprod_odex25_helpdesk' || github.ref == 'refs/heads/preprod_odex25_hr' || github.ref == 'refs/heads/preprod_odex25_inventory' || github.ref == 'refs/heads/preprod_odex25_maintenance' || github.ref == 'refs/heads/preprod_odex25_mobile' || github.ref == 'refs/heads/preprod_odex25_pos' || github.ref == 'refs/heads/preprod_odex25_project' || github.ref == 'refs/heads/preprod_odex25_purchase' || github.ref == 'refs/heads/preprod_odex25_realstate' || github.ref == 'refs/heads/preprod_odex25_sales' || github.ref == 'refs/heads/preprod_odex25_survey' || github.ref == 'refs/heads/preprod_odex25_transactions' || github.ref == 'refs/heads/preprod_odex25_website' || github.ref == 'refs/heads/preprod_openeducat_erp-14.0.1.0')
+    if: github.ref == 'refs/heads/preprod_odex-event' || github.ref == 'refs/heads/preprod_odex25_accounting' || github.ref == 'refs/heads/preprod_odex25_base' || github.ref == 'refs/heads/preprod_odex25_dms' || github.ref == 'refs/heads/preprod_odex25_fleet' || github.ref == 'refs/heads/preprod_odex25_helpdesk' || github.ref == 'refs/heads/preprod_odex25_hr' || github.ref == 'refs/heads/preprod_odex25_inventory' || github.ref == 'refs/heads/preprod_odex25_maintenance' || github.ref == 'refs/heads/preprod_odex25_mobile' || github.ref == 'refs/heads/preprod_odex25_pos' || github.ref == 'refs/heads/preprod_odex25_project' || github.ref == 'refs/heads/preprod_odex25_purchase' || github.ref == 'refs/heads/preprod_odex25_realstate' || github.ref == 'refs/heads/preprod_odex25_sales' || github.ref == 'refs/heads/preprod_odex25_survey' || github.ref == 'refs/heads/preprod_odex25_transactions' || github.ref == 'refs/heads/preprod_odex25_website' || github.ref == 'refs/heads/preprod_openeducat_erp-14.0.1.0'
     steps:
       - name: Checkout And Restart Project
         run: |
@@ -72,7 +72,7 @@ jobs:
   deploy_test_server:
     name: Deploy to Test
     runs-on: helpdesk-client-project-runner
-    if: github.event_name == 'workflow_dispatch' && (github.ref == 'refs/heads/dev_odex-event' || github.ref == 'refs/heads/dev_odex25_accounting' || github.ref == 'refs/heads/dev_odex25_base' || github.ref == 'refs/heads/dev_odex25_dms' || github.ref == 'refs/heads/dev_odex25_fleet' || github.ref == 'refs/heads/dev_odex25_helpdesk' || github.ref == 'refs/heads/dev_odex25_hr' || github.ref == 'refs/heads/dev_odex25_inventory' || github.ref == 'refs/heads/dev_odex25_maintenance' || github.ref == 'refs/heads/dev_odex25_mobile' || github.ref == 'refs/heads/dev_odex25_pos' || github.ref == 'refs/heads/dev_odex25_project' || github.ref == 'refs/heads/dev_odex25_purchase' || github.ref == 'refs/heads/dev_odex25_realstate' || github.ref == 'refs/heads/dev_odex25_sales' || github.ref == 'refs/heads/dev_odex25_survey' || github.ref == 'refs/heads/dev_odex25_transactions' || github.ref == 'refs/heads/dev_odex25_website' || github.ref == 'refs/heads/dev_openeducat_erp-14.0.1.0')
+    if: github.ref == 'refs/heads/dev_odex-event' || github.ref == 'refs/heads/dev_odex25_accounting' || github.ref == 'refs/heads/dev_odex25_base' || github.ref == 'refs/heads/dev_odex25_dms' || github.ref == 'refs/heads/dev_odex25_fleet' || github.ref == 'refs/heads/dev_odex25_helpdesk' || github.ref == 'refs/heads/dev_odex25_hr' || github.ref == 'refs/heads/dev_odex25_inventory' || github.ref == 'refs/heads/dev_odex25_maintenance' || github.ref == 'refs/heads/dev_odex25_mobile' || github.ref == 'refs/heads/dev_odex25_pos' || github.ref == 'refs/heads/dev_odex25_project' || github.ref == 'refs/heads/dev_odex25_purchase' || github.ref == 'refs/heads/dev_odex25_realstate' || github.ref == 'refs/heads/dev_odex25_sales' || github.ref == 'refs/heads/dev_odex25_survey' || github.ref == 'refs/heads/dev_odex25_transactions' || github.ref == 'refs/heads/dev_odex25_website' || github.ref == 'refs/heads/dev_openeducat_erp-14.0.1.0'
     steps:
       - name: Checkout And Restart Project
         run: |

From 0c2735178760326373d140de5aed5db2c793f9b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D8=B4=D8=B1=D9=83=D8=A9=20=D8=AE=D8=A8=D9=8A=D8=B1=20?=
 =?UTF-8?q?=D8=A7=D9=84=D9=85=D8=AD=D8=AF=D9=88=D8=AF=D8=A9?=
 <it@exp-sa.com>
Date: Sun, 7 Jul 2024 22:34:00 +0300
Subject: [PATCH 16/21] Update github action file

---
 .github/workflows/twahod-project.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/twahod-project.yml b/.github/workflows/twahod-project.yml
index 7c306aaa6..e76aa4dc8 100644
--- a/.github/workflows/twahod-project.yml
+++ b/.github/workflows/twahod-project.yml
@@ -60,7 +60,7 @@ jobs:
   deploy_preprod_server:
     name: Deploy to Preprod
     runs-on: app-sever-project-runner
-    if: github.event_name == 'workflow_dispatch' && (github.ref == 'refs/heads/preprod_odex-event' || github.ref == 'refs/heads/preprod_odex25_accounting' || github.ref == 'refs/heads/preprod_odex25_base' || github.ref == 'refs/heads/preprod_odex25_dms' || github.ref == 'refs/heads/preprod_odex25_fleet' || github.ref == 'refs/heads/preprod_odex25_ENSAN' || github.ref == 'refs/heads/preprod_odex25_hr' || github.ref == 'refs/heads/preprod_odex25_inventory' || github.ref == 'refs/heads/preprod_odex25_maintenance' || github.ref == 'refs/heads/preprod_odex25_mobile' || github.ref == 'refs/heads/preprod_odex25_pos' || github.ref == 'refs/heads/preprod_odex25_project' || github.ref == 'refs/heads/preprod_odex25_purchase' || github.ref == 'refs/heads/preprod_odex25_realstate' || github.ref == 'refs/heads/preprod_odex25_sales' || github.ref == 'refs/heads/preprod_odex25_survey' || github.ref == 'refs/heads/preprod_odex25_transactions' || github.ref == 'refs/heads/preprod_odex25_website' || github.ref == 'refs/heads/preprod_openeducat_erp-14.0.1.0')
+    if: github.ref == 'refs/heads/preprod_odex-event' || github.ref == 'refs/heads/preprod_odex25_accounting' || github.ref == 'refs/heads/preprod_odex25_base' || github.ref == 'refs/heads/preprod_odex25_dms' || github.ref == 'refs/heads/preprod_odex25_fleet' || github.ref == 'refs/heads/preprod_odex25_ENSAN' || github.ref == 'refs/heads/preprod_odex25_hr' || github.ref == 'refs/heads/preprod_odex25_inventory' || github.ref == 'refs/heads/preprod_odex25_maintenance' || github.ref == 'refs/heads/preprod_odex25_mobile' || github.ref == 'refs/heads/preprod_odex25_pos' || github.ref == 'refs/heads/preprod_odex25_project' || github.ref == 'refs/heads/preprod_odex25_purchase' || github.ref == 'refs/heads/preprod_odex25_realstate' || github.ref == 'refs/heads/preprod_odex25_sales' || github.ref == 'refs/heads/preprod_odex25_survey' || github.ref == 'refs/heads/preprod_odex25_transactions' || github.ref == 'refs/heads/preprod_odex25_website' || github.ref == 'refs/heads/preprod_openeducat_erp-14.0.1.0'
     steps:
       - name: Checkout And Restart Project
         run: |
@@ -72,7 +72,7 @@ jobs:
   deploy_test_server:
     name: Deploy to Test
     runs-on: app-sever-project-runner
-    if: github.event_name == 'workflow_dispatch' && (github.ref == 'refs/heads/dev_odex-event' || github.ref == 'refs/heads/dev_odex25_accounting' || github.ref == 'refs/heads/dev_odex25_base' || github.ref == 'refs/heads/dev_odex25_dms' || github.ref == 'refs/heads/dev_odex25_fleet' || github.ref == 'refs/heads/dev_odex25_ENSAN' || github.ref == 'refs/heads/dev_odex25_hr' || github.ref == 'refs/heads/dev_odex25_inventory' || github.ref == 'refs/heads/dev_odex25_maintenance' || github.ref == 'refs/heads/dev_odex25_mobile' || github.ref == 'refs/heads/dev_odex25_pos' || github.ref == 'refs/heads/dev_odex25_project' || github.ref == 'refs/heads/dev_odex25_purchase' || github.ref == 'refs/heads/dev_odex25_realstate' || github.ref == 'refs/heads/dev_odex25_sales' || github.ref == 'refs/heads/dev_odex25_survey' || github.ref == 'refs/heads/dev_odex25_transactions' || github.ref == 'refs/heads/dev_odex25_website' || github.ref == 'refs/heads/dev_openeducat_erp-14.0.1.0')
+    if: github.ref == 'refs/heads/dev_odex-event' || github.ref == 'refs/heads/dev_odex25_accounting' || github.ref == 'refs/heads/dev_odex25_base' || github.ref == 'refs/heads/dev_odex25_dms' || github.ref == 'refs/heads/dev_odex25_fleet' || github.ref == 'refs/heads/dev_odex25_ENSAN' || github.ref == 'refs/heads/dev_odex25_hr' || github.ref == 'refs/heads/dev_odex25_inventory' || github.ref == 'refs/heads/dev_odex25_maintenance' || github.ref == 'refs/heads/dev_odex25_mobile' || github.ref == 'refs/heads/dev_odex25_pos' || github.ref == 'refs/heads/dev_odex25_project' || github.ref == 'refs/heads/dev_odex25_purchase' || github.ref == 'refs/heads/dev_odex25_realstate' || github.ref == 'refs/heads/dev_odex25_sales' || github.ref == 'refs/heads/dev_odex25_survey' || github.ref == 'refs/heads/dev_odex25_transactions' || github.ref == 'refs/heads/dev_odex25_website' || github.ref == 'refs/heads/dev_openeducat_erp-14.0.1.0'
     steps:
       - name: Checkout And Restart Project
         run: |

From 2a303dbfa2c367401103c780bdf6791564fe92e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D8=B4=D8=B1=D9=83=D8=A9=20=D8=AE=D8=A8=D9=8A=D8=B1=20?=
 =?UTF-8?q?=D8=A7=D9=84=D9=85=D8=AD=D8=AF=D9=88=D8=AF=D8=A9?=
 <it@exp-sa.com>
Date: Sun, 7 Jul 2024 22:34:38 +0300
Subject: [PATCH 17/21] Update github action file

---
 .github/workflows/odex25-general.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/odex25-general.yml b/.github/workflows/odex25-general.yml
index a2d17fd34..d49a9e215 100644
--- a/.github/workflows/odex25-general.yml
+++ b/.github/workflows/odex25-general.yml
@@ -60,7 +60,7 @@ jobs:
   deploy_preprod_server:
     name: Deploy to Preprod
     runs-on: app-sever-project-runner
-    if: github.event_name == 'workflow_dispatch' && (github.ref == 'refs/heads/preprod_odex-event' || github.ref == 'refs/heads/preprod_odex25_accounting' || github.ref == 'refs/heads/preprod_odex25_base' || github.ref == 'refs/heads/preprod_odex25_dms' || github.ref == 'refs/heads/preprod_odex25_fleet' || github.ref == 'refs/heads/preprod_odex25_ENSAN' || github.ref == 'refs/heads/preprod_odex25_hr' || github.ref == 'refs/heads/preprod_odex25_inventory' || github.ref == 'refs/heads/preprod_odex25_maintenance' || github.ref == 'refs/heads/preprod_odex25_mobile' || github.ref == 'refs/heads/preprod_odex25_pos' || github.ref == 'refs/heads/preprod_odex25_project' || github.ref == 'refs/heads/preprod_odex25_purchase' || github.ref == 'refs/heads/preprod_odex25_realstate' || github.ref == 'refs/heads/preprod_odex25_sales' || github.ref == 'refs/heads/preprod_odex25_survey' || github.ref == 'refs/heads/preprod_odex25_transactions' || github.ref == 'refs/heads/preprod_odex25_website' || github.ref == 'refs/heads/preprod_openeducat_erp-14.0.1.0')
+    if: github.ref == 'refs/heads/preprod_odex-event' || github.ref == 'refs/heads/preprod_odex25_accounting' || github.ref == 'refs/heads/preprod_odex25_base' || github.ref == 'refs/heads/preprod_odex25_dms' || github.ref == 'refs/heads/preprod_odex25_fleet' || github.ref == 'refs/heads/preprod_odex25_ENSAN' || github.ref == 'refs/heads/preprod_odex25_hr' || github.ref == 'refs/heads/preprod_odex25_inventory' || github.ref == 'refs/heads/preprod_odex25_maintenance' || github.ref == 'refs/heads/preprod_odex25_mobile' || github.ref == 'refs/heads/preprod_odex25_pos' || github.ref == 'refs/heads/preprod_odex25_project' || github.ref == 'refs/heads/preprod_odex25_purchase' || github.ref == 'refs/heads/preprod_odex25_realstate' || github.ref == 'refs/heads/preprod_odex25_sales' || github.ref == 'refs/heads/preprod_odex25_survey' || github.ref == 'refs/heads/preprod_odex25_transactions' || github.ref == 'refs/heads/preprod_odex25_website' || github.ref == 'refs/heads/preprod_openeducat_erp-14.0.1.0'
     steps:
       - name: Checkout And Restart Project
         run: |
@@ -72,7 +72,7 @@ jobs:
   deploy_test_server:
     name: Deploy to Test
     runs-on: app-sever-project-runner
-    if: github.event_name == 'workflow_dispatch' && (github.ref == 'refs/heads/dev_odex-event' || github.ref == 'refs/heads/dev_odex25_accounting' || github.ref == 'refs/heads/dev_odex25_base' || github.ref == 'refs/heads/dev_odex25_dms' || github.ref == 'refs/heads/dev_odex25_fleet' || github.ref == 'refs/heads/dev_odex25_ENSAN' || github.ref == 'refs/heads/dev_odex25_hr' || github.ref == 'refs/heads/dev_odex25_inventory' || github.ref == 'refs/heads/dev_odex25_maintenance' || github.ref == 'refs/heads/dev_odex25_mobile' || github.ref == 'refs/heads/dev_odex25_pos' || github.ref == 'refs/heads/dev_odex25_project' || github.ref == 'refs/heads/dev_odex25_purchase' || github.ref == 'refs/heads/dev_odex25_realstate' || github.ref == 'refs/heads/dev_odex25_sales' || github.ref == 'refs/heads/dev_odex25_survey' || github.ref == 'refs/heads/dev_odex25_transactions' || github.ref == 'refs/heads/dev_odex25_website' || github.ref == 'refs/heads/dev_openeducat_erp-14.0.1.0')
+    if: github.ref == 'refs/heads/dev_odex-event' || github.ref == 'refs/heads/dev_odex25_accounting' || github.ref == 'refs/heads/dev_odex25_base' || github.ref == 'refs/heads/dev_odex25_dms' || github.ref == 'refs/heads/dev_odex25_fleet' || github.ref == 'refs/heads/dev_odex25_ENSAN' || github.ref == 'refs/heads/dev_odex25_hr' || github.ref == 'refs/heads/dev_odex25_inventory' || github.ref == 'refs/heads/dev_odex25_maintenance' || github.ref == 'refs/heads/dev_odex25_mobile' || github.ref == 'refs/heads/dev_odex25_pos' || github.ref == 'refs/heads/dev_odex25_project' || github.ref == 'refs/heads/dev_odex25_purchase' || github.ref == 'refs/heads/dev_odex25_realstate' || github.ref == 'refs/heads/dev_odex25_sales' || github.ref == 'refs/heads/dev_odex25_survey' || github.ref == 'refs/heads/dev_odex25_transactions' || github.ref == 'refs/heads/dev_odex25_website' || github.ref == 'refs/heads/dev_openeducat_erp-14.0.1.0'
     steps:
       - name: Checkout And Restart Project
         run: |

From fcbcf1164640e200bd2bed806bd040fc9276ea69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D8=B4=D8=B1=D9=83=D8=A9=20=D8=AE=D8=A8=D9=8A=D8=B1=20?=
 =?UTF-8?q?=D8=A7=D9=84=D9=85=D8=AD=D8=AF=D9=88=D8=AF=D8=A9?=
 <it@exp-sa.com>
Date: Sun, 7 Jul 2024 22:35:12 +0300
Subject: [PATCH 18/21] Update github action file

---
 .github/workflows/cyber-project.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/cyber-project.yml b/.github/workflows/cyber-project.yml
index f20839277..c2c3ae154 100644
--- a/.github/workflows/cyber-project.yml
+++ b/.github/workflows/cyber-project.yml
@@ -60,7 +60,7 @@ jobs:
   deploy_preprod_server:
     name: Deploy to Preprod
     runs-on: app-sever-project-runner
-    if: github.event_name == 'workflow_dispatch' && (github.ref == 'refs/heads/preprod_odex-event' || github.ref == 'refs/heads/preprod_odex25_accounting' || github.ref == 'refs/heads/preprod_odex25_base' || github.ref == 'refs/heads/preprod_odex25_dms' || github.ref == 'refs/heads/preprod_odex25_fleet' || github.ref == 'refs/heads/preprod_odex25_ENSAN' || github.ref == 'refs/heads/preprod_odex25_hr' || github.ref == 'refs/heads/preprod_odex25_inventory' || github.ref == 'refs/heads/preprod_odex25_maintenance' || github.ref == 'refs/heads/preprod_odex25_mobile' || github.ref == 'refs/heads/preprod_odex25_pos' || github.ref == 'refs/heads/preprod_odex25_project' || github.ref == 'refs/heads/preprod_odex25_purchase' || github.ref == 'refs/heads/preprod_odex25_realstate' || github.ref == 'refs/heads/preprod_odex25_sales' || github.ref == 'refs/heads/preprod_odex25_survey' || github.ref == 'refs/heads/preprod_odex25_transactions' || github.ref == 'refs/heads/preprod_odex25_website' || github.ref == 'refs/heads/preprod_openeducat_erp-14.0.1.0')
+    if: github.ref == 'refs/heads/preprod_odex-event' || github.ref == 'refs/heads/preprod_odex25_accounting' || github.ref == 'refs/heads/preprod_odex25_base' || github.ref == 'refs/heads/preprod_odex25_dms' || github.ref == 'refs/heads/preprod_odex25_fleet' || github.ref == 'refs/heads/preprod_odex25_ENSAN' || github.ref == 'refs/heads/preprod_odex25_hr' || github.ref == 'refs/heads/preprod_odex25_inventory' || github.ref == 'refs/heads/preprod_odex25_maintenance' || github.ref == 'refs/heads/preprod_odex25_mobile' || github.ref == 'refs/heads/preprod_odex25_pos' || github.ref == 'refs/heads/preprod_odex25_project' || github.ref == 'refs/heads/preprod_odex25_purchase' || github.ref == 'refs/heads/preprod_odex25_realstate' || github.ref == 'refs/heads/preprod_odex25_sales' || github.ref == 'refs/heads/preprod_odex25_survey' || github.ref == 'refs/heads/preprod_odex25_transactions' || github.ref == 'refs/heads/preprod_odex25_website' || github.ref == 'refs/heads/preprod_openeducat_erp-14.0.1.0'
     steps:
       - name: Checkout And Restart Project
         run: |
@@ -72,7 +72,7 @@ jobs:
   deploy_test_server:
     name: Deploy to Test
     runs-on: app-sever-project-runner
-    if: github.event_name == 'workflow_dispatch' && (github.ref == 'refs/heads/dev_odex-event' || github.ref == 'refs/heads/dev_odex25_accounting' || github.ref == 'refs/heads/dev_odex25_base' || github.ref == 'refs/heads/dev_odex25_dms' || github.ref == 'refs/heads/dev_odex25_fleet' || github.ref == 'refs/heads/dev_odex25_ENSAN' || github.ref == 'refs/heads/dev_odex25_hr' || github.ref == 'refs/heads/dev_odex25_inventory' || github.ref == 'refs/heads/dev_odex25_maintenance' || github.ref == 'refs/heads/dev_odex25_mobile' || github.ref == 'refs/heads/dev_odex25_pos' || github.ref == 'refs/heads/dev_odex25_project' || github.ref == 'refs/heads/dev_odex25_purchase' || github.ref == 'refs/heads/dev_odex25_realstate' || github.ref == 'refs/heads/dev_odex25_sales' || github.ref == 'refs/heads/dev_odex25_survey' || github.ref == 'refs/heads/dev_odex25_transactions' || github.ref == 'refs/heads/dev_odex25_website' || github.ref == 'refs/heads/dev_openeducat_erp-14.0.1.0')
+    if: github.ref == 'refs/heads/dev_odex-event' || github.ref == 'refs/heads/dev_odex25_accounting' || github.ref == 'refs/heads/dev_odex25_base' || github.ref == 'refs/heads/dev_odex25_dms' || github.ref == 'refs/heads/dev_odex25_fleet' || github.ref == 'refs/heads/dev_odex25_ENSAN' || github.ref == 'refs/heads/dev_odex25_hr' || github.ref == 'refs/heads/dev_odex25_inventory' || github.ref == 'refs/heads/dev_odex25_maintenance' || github.ref == 'refs/heads/dev_odex25_mobile' || github.ref == 'refs/heads/dev_odex25_pos' || github.ref == 'refs/heads/dev_odex25_project' || github.ref == 'refs/heads/dev_odex25_purchase' || github.ref == 'refs/heads/dev_odex25_realstate' || github.ref == 'refs/heads/dev_odex25_sales' || github.ref == 'refs/heads/dev_odex25_survey' || github.ref == 'refs/heads/dev_odex25_transactions' || github.ref == 'refs/heads/dev_odex25_website' || github.ref == 'refs/heads/dev_openeducat_erp-14.0.1.0'
     steps:
       - name: Checkout And Restart Project
         run: |

From 99d49464a0fd439e3ec5cb9dbc71e6d708b82000 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D8=B4=D8=B1=D9=83=D8=A9=20=D8=AE=D8=A8=D9=8A=D8=B1=20?=
 =?UTF-8?q?=D8=A7=D9=84=D9=85=D8=AD=D8=AF=D9=88=D8=AF=D8=A9?=
 <it@exp-sa.com>
Date: Sun, 7 Jul 2024 23:24:18 +0300
Subject: [PATCH 19/21] Update github action file

---
 .github/workflows/ensan-project.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ensan-project.yml b/.github/workflows/ensan-project.yml
index 9863cac9a..a9a862d1d 100644
--- a/.github/workflows/ensan-project.yml
+++ b/.github/workflows/ensan-project.yml
@@ -60,7 +60,7 @@ jobs:
   deploy_preprod_server:
     name: Deploy to Preprod
     runs-on: app-sever-project-runner
-    if: github.event_name == 'workflow_dispatch' && (github.ref == 'refs/heads/preprod_odex-event' || github.ref == 'refs/heads/preprod_odex25_accounting' || github.ref == 'refs/heads/preprod_odex25_base' || github.ref == 'refs/heads/preprod_odex25_dms' || github.ref == 'refs/heads/preprod_odex25_fleet' || github.ref == 'refs/heads/preprod_odex25_ENSAN' || github.ref == 'refs/heads/preprod_odex25_hr' || github.ref == 'refs/heads/preprod_odex25_inventory' || github.ref == 'refs/heads/preprod_odex25_maintenance' || github.ref == 'refs/heads/preprod_odex25_mobile' || github.ref == 'refs/heads/preprod_odex25_pos' || github.ref == 'refs/heads/preprod_odex25_project' || github.ref == 'refs/heads/preprod_odex25_purchase' || github.ref == 'refs/heads/preprod_odex25_realstate' || github.ref == 'refs/heads/preprod_odex25_sales' || github.ref == 'refs/heads/preprod_odex25_survey' || github.ref == 'refs/heads/preprod_odex25_transactions' || github.ref == 'refs/heads/preprod_odex25_website' || github.ref == 'refs/heads/preprod_openeducat_erp-14.0.1.0'
+    if: github.ref == 'refs/heads/preprod_odex-event' || github.ref == 'refs/heads/preprod_odex25_accounting' || github.ref == 'refs/heads/preprod_odex25_base' || github.ref == 'refs/heads/preprod_odex25_dms' || github.ref == 'refs/heads/preprod_odex25_fleet' || github.ref == 'refs/heads/preprod_odex25_ENSAN' || github.ref == 'refs/heads/preprod_odex25_hr' || github.ref == 'refs/heads/preprod_odex25_inventory' || github.ref == 'refs/heads/preprod_odex25_maintenance' || github.ref == 'refs/heads/preprod_odex25_mobile' || github.ref == 'refs/heads/preprod_odex25_pos' || github.ref == 'refs/heads/preprod_odex25_project' || github.ref == 'refs/heads/preprod_odex25_purchase' || github.ref == 'refs/heads/preprod_odex25_realstate' || github.ref == 'refs/heads/preprod_odex25_sales' || github.ref == 'refs/heads/preprod_odex25_survey' || github.ref == 'refs/heads/preprod_odex25_transactions' || github.ref == 'refs/heads/preprod_odex25_website' || github.ref == 'refs/heads/preprod_openeducat_erp-14.0.1.0'
     steps:
       - name: Checkout And Restart Project
         run: |

From 1f8fc5e16c40b9e21e194ccf5206745ea52f39d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D8=B4=D8=B1=D9=83=D8=A9=20=D8=AE=D8=A8=D9=8A=D8=B1=20?=
 =?UTF-8?q?=D8=A7=D9=84=D9=85=D8=AD=D8=AF=D9=88=D8=AF=D8=A9?=
 <it@exp-sa.com>
Date: Fri, 12 Jul 2024 19:59:44 +0300
Subject: [PATCH 20/21] Update github action file

---
 .github/workflows/cyber-project.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/cyber-project.yml b/.github/workflows/cyber-project.yml
index c2c3ae154..6e7b79a04 100644
--- a/.github/workflows/cyber-project.yml
+++ b/.github/workflows/cyber-project.yml
@@ -56,7 +56,7 @@ jobs:
           
           sudo chmod +x ${{ secrets.CYBER_PROJECT_PATH }}/scripts/pull_code.sh
           sudo ${{ secrets.CYBER_PROJECT_PATH }}/scripts/pull_code.sh ${{ secrets.CYBER_PROJECT_USER }} ${{ secrets.CYBER_PROJECT_PATH }} ${{ secrets.CYBER_MASTER_SERVICE }} master ${GITHUB_REF#refs/heads/master_} ${GITHUB_REF#refs/heads/}
-          
+
   deploy_preprod_server:
     name: Deploy to Preprod
     runs-on: app-sever-project-runner
@@ -66,8 +66,8 @@ jobs:
         run: |
           echo "** [INFO] Running on branch -->  ${GITHUB_REF#refs/heads/}"
 
-          sudo chmod +x ${{ secrets.CYBER_APP_PROJECT_PATH }}/scripts/pull_code.sh
-          sudo ${{ secrets.CYBER_APP_PROJECT_PATH }}/scripts/pull_code.sh ${{ secrets.CYBER_APP_PROJECT_USER }} ${{ secrets.CYBER_APP_PROJECT_PATH }} ${{ secrets.CYBER_APP_PREPROD_SERVICE }} preprod ${GITHUB_REF#refs/heads/preprod_} ${GITHUB_REF#refs/heads/}
+          sudo chmod +x ${{ secrets.APP_SERVER_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh
+          sudo ${{ secrets.APP_SERVER_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh ${{ secrets.APP_SERVER_USER14 }} ${{ secrets.APP_SERVER_STANDARD_FOLDER_PATH }} ${{ secrets.CYBER_APP_PREPROD_SERVICE }} preprod ${GITHUB_REF#refs/heads/preprod_} ${GITHUB_REF#refs/heads/}
           
   deploy_test_server:
     name: Deploy to Test
@@ -77,5 +77,5 @@ jobs:
       - name: Checkout And Restart Project
         run: |
           echo "** [INFO] Running on branch -->  ${GITHUB_REF#refs/heads/}"
-          sudo chmod +x ${{ secrets.CYBER_APP_PROJECT_PATH }}/scripts/pull_code.sh
-          sudo ${{ secrets.CYBER_APP_PROJECT_PATH }}/scripts/pull_code.sh ${{ secrets.CYBER_APP_PROJECT_USER }} ${{ secrets.CYBER_APP_PROJECT_PATH }} ${{ secrets.CYBER_APP_TEST_SERVICE }} test ${GITHUB_REF#refs/heads/dev_} ${GITHUB_REF#refs/heads/}
+          sudo chmod +x ${{ secrets.APP_SERVER_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh
+          sudo ${{ secrets.APP_SERVER_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh ${{ secrets.APP_SERVER_USER14 }} ${{ secrets.APP_SERVER_STANDARD_FOLDER_PATH }} ${{ secrets.CYBER_APP_TEST_SERVICE }} test ${GITHUB_REF#refs/heads/dev_} ${GITHUB_REF#refs/heads/}

From b4000f5707e717de4f1355b9d11332115dca7316 Mon Sep 17 00:00:00 2001
From: zainab8585 <zeinabeng900@gmail.com>
Date: Wed, 17 Jul 2024 05:37:45 +0200
Subject: [PATCH 21/21] [FIX]FIX issue in project

---
 odex25_project/project_base/models/project.py             | 8 ++++----
 odex25_project/project_base/models/project_invoice.py     | 6 +++---
 .../project_base/views/project_invoice_views.xml          | 6 +++---
 odex25_project/project_base/views/project_views.xml       | 6 +++---
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/odex25_project/project_base/models/project.py b/odex25_project/project_base/models/project.py
index 00f664292..5cf3e4449 100644
--- a/odex25_project/project_base/models/project.py
+++ b/odex25_project/project_base/models/project.py
@@ -67,12 +67,12 @@ class Project(models.Model):
     close_reason = fields.Text(string="Close Reason")
     project_team_ids = fields.One2many('project.team', 'project_id', string="Project Team")
     invoice_ids = fields.One2many('project.invoice', 'project_id', "Invoice", copy=False, help="The Details of invoice")
-    total_invoiced_amount = fields.Float('Total Invoiced Amount', compute='compute_total_invoiced_amount')
+    total_invoiced_amount = fields.Float('Total Invoiced Amount',store=True, compute='compute_total_invoiced_amount')
     no_of_invoices = fields.Integer(compute='compute_total_invoiced_payment')
     no_of_paid_invoices = fields.Integer(compute='compute_total_invoiced_payment')
-    total_invoiced_payment = fields.Float('Paid Amount', compute='compute_total_invoiced_payment')
-    residual_amount = fields.Float('Remaining Amount', compute='compute_residual_amount')
-    back_log_amount = fields.Float('Back Log Amount', compute='compute_back_log_amount')
+    total_invoiced_payment = fields.Float('Paid Amount',store=True, compute='compute_total_invoiced_payment')
+    residual_amount = fields.Float('Remaining Amount',store=True, compute='compute_residual_amount')
+    back_log_amount = fields.Float('Back Log Amount',store=True, compute='compute_back_log_amount')
     # TODO check if this fields needed
     is_down_payment = fields.Boolean('Down Payment')
     to_invoice = fields.Boolean(compute="compute_to_invoice", store=True)
diff --git a/odex25_project/project_base/models/project_invoice.py b/odex25_project/project_base/models/project_invoice.py
index 78fb08262..59d0808af 100644
--- a/odex25_project/project_base/models/project_invoice.py
+++ b/odex25_project/project_base/models/project_invoice.py
@@ -34,8 +34,8 @@ class ProjectInvoice(models.Model):
     project_downinv_ids = fields.One2many('project.invoice.line', 'project_invoice_id', string='Lines',
         domain=[('is_downpayment', '=', True)])
     currency_id = fields.Many2one(related="project_id.currency_id", store=True)
-    payment_amount = fields.Monetary(string='Paid Amount', compute="_compute_payment_amount")
-    residual_amount = fields.Monetary('Remaining Amount', compute_sudo=True , compute='_compute_indo_invoice_id')
+    payment_amount = fields.Monetary(string='Paid Amount',store=True, compute="_compute_payment_amount")
+    residual_amount = fields.Monetary('Remaining Amount',store=True, compute_sudo=True , compute='_compute_indo_invoice_id')
     invoice_type = fields.Selection([('project', 'Project'), ('consultant','Consultant'),
         ('variation_order', 'Variation Order')], string='Invoice Type', default='project')
     has_downpayment = fields.Boolean(compute="_check_downpayment")
@@ -269,7 +269,7 @@ class ProjectInvoiceLine(models.Model):
     product_uom_qty = fields.Float(string='Percentage', digits='Product Unit of Measure', required=True, default=0.0)
     amount = fields.Monetary("Amount")
     product_uom = fields.Many2one('uom.uom', string='Unit of Measure', )
-    price_unit = fields.Float('Unit Price', digits='Project  Amount', compute="get_price_unit_value")
+    price_unit = fields.Float('Unit Price', digits='Project  Amount',store=True, compute="get_price_unit_value")
     discount = fields.Float(string='Discount (%)', digits='Discount')
     price_subtotal = fields.Monetary(string='Subtotal', store=True)
     price_tax = fields.Float(string='Total Tax', compute="_compute_amount", store=True)
diff --git a/odex25_project/project_base/views/project_invoice_views.xml b/odex25_project/project_base/views/project_invoice_views.xml
index 7386cf1b1..5ac1b1a82 100644
--- a/odex25_project/project_base/views/project_invoice_views.xml
+++ b/odex25_project/project_base/views/project_invoice_views.xml
@@ -57,11 +57,11 @@
                                     <field name="qty_invoiced" decoration-info="(qty_invoiced)" decoration-bf="(qty_invoiced)" force_save="1" optional="hide"/>
                                     <field name="product_uom" attrs="{'readonly': ['|', ('parent.state', '!=', 'draft'), ('parent.invoice_type', '=', 'project')]}" optional="hide" force_save="1"/>
                                     <field name="price_unit" attrs="{'readonly': ['|', ('parent.state', '!=', 'draft'), ('parent.invoice_type', '=', 'project')]}" force_save="1"/>
-                                    <field name="price_subtotal"/>
+                                    <field name="price_subtotal" force_save="1"/>
                                     <field name="tax_id" widget="many2many_tags" options="{'no_create': True}" attrs="{'readonly': [ ('parent.state', '!=', 'draft')]}" force_save="1"/>
-                                    <field name="price_tax"/>
+                                    <field name="price_tax" force_save="1"/>
 
-                                    <field name="price_total"/>
+                                    <field name="price_total" force_save="1"/>
                                 </tree>
                             </field>
                             <separator string="DowmPayment" attrs="{'invisible':[('has_downpayment', '!=', True)]}"/>
diff --git a/odex25_project/project_base/views/project_views.xml b/odex25_project/project_base/views/project_views.xml
index 8ef2959e5..a1f2ea773 100644
--- a/odex25_project/project_base/views/project_views.xml
+++ b/odex25_project/project_base/views/project_views.xml
@@ -172,7 +172,7 @@
             </xpath>
             <xpath expr="//page[@name='description_page']" position="after">
 
-                <page name="team" attrs="{'invisible':[('state','in',['draft'])]}" string="Project Team">
+                <page name="team" string="Project Team">
                     <field name="project_team_ids" nolabel="1">
                         <tree editable="top">
                             <field name="employee_id" required="1" />
@@ -224,12 +224,12 @@
                             <div class="oe_subtotal_footer_separator oe_inline o_td_label">
                                 <label for="total_invoiced_payment" />
                             </div>
-                            <field name="total_invoiced_payment" nolabel="1" class="oe_subtotal_footer_separator" widget="monetary" options="{'currency_field': 'currency_id'}" />
+                            <field name="total_invoiced_payment" force_save="1"  nolabel="1" class="oe_subtotal_footer_separator" widget="monetary" options="{'currency_field': 'currency_id'}" />
 
                             <div class="oe_subtotal_footer_separator oe_inline o_td_label">
                                 <label for="residual_amount" />
                             </div>
-                            <field name="residual_amount" nolabel="1" class="oe_subtotal_footer_separator" widget="monetary" options="{'currency_field': 'currency_id'}" />
+                            <field name="residual_amount" force_save="1"  nolabel="1" class="oe_subtotal_footer_separator" widget="monetary" options="{'currency_field': 'currency_id'}" />
                         </group>
                         <div class="oe_clear" />
                     </group>