Merge branch 'dev_odex25_accounting' into ahmadaking-patch-4

2024-07-03 12:02:15 +03:00 · 2024-07-03 12:02:15 +03:00 · fc23d64599
parent 95ca8bc762 79a9e1a5e1
commit fc23d64599
12 changed files with 232 additions and 152 deletions
--- a/.github/workflows/cyber-project.yml
+++ b/.github/workflows/cyber-project.yml
@ -0,0 +1,41 @@
+name: Cyber Security Project - Pull Code
+
+on:
+
+  workflow_dispatch: 
+
+jobs:
+  deploy_master_server:
+    name: Deploy to Master
+    runs-on: cyber-client-project-runner
+    if: github.event_name == 'workflow_dispatch' && (github.ref == 'refs/heads/master_odex-event' || github.ref == 'refs/heads/master_odex25_accounting' || github.ref == 'refs/heads/master_odex25_base' || github.ref == 'refs/heads/master_odex25_dms' || github.ref == 'refs/heads/master_odex25_fleet' || github.ref == 'refs/heads/master_odex25_ENSAN' || github.ref == 'refs/heads/master_odex25_hr' || github.ref == 'refs/heads/master_odex25_inventory' || github.ref == 'refs/heads/master_odex25_maintenance' || github.ref == 'refs/heads/master_odex25_mobile' || github.ref == 'refs/heads/master_odex25_pos' || github.ref == 'refs/heads/master_odex25_project' || github.ref == 'refs/heads/master_odex25_purchase' || github.ref == 'refs/heads/master_odex25_realstate' || github.ref == 'refs/heads/master_odex25_sales' || github.ref == 'refs/heads/master_odex25_survey' || github.ref == 'refs/heads/master_odex25_transactions' || github.ref == 'refs/heads/master_odex25_website' || github.ref == 'refs/heads/master_openeducat_erp-14.0.1.0')
+    steps:
+      - name: Checkout And Restart Project
+        run: |
+          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/}
+          
+  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')
+    steps:
+      - 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_PREPROD_SERVICE }} preprod ${GITHUB_REF#refs/heads/preprod_} ${GITHUB_REF#refs/heads/}
+          
+  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')
+    steps:
+      - 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/}
--- a/.github/workflows/ensan-project.yml
+++ b/.github/workflows/ensan-project.yml
@ -1,65 +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
-      - master_odex-event
-      - master_odex25_accounting
-      - master_odex25_base
-      - master_odex25_dms
-      - master_odex25_fleet
-      - master_odex25_ENSAN
-      - master_odex25_hr
-      - master_odex25_inventory
-      - master_odex25_maintenance
-      - master_odex25_mobile
-      - master_odex25_pos
-      - master_odex25_project
-      - master_odex25_purchase
-      - master_odex25_realstate
-      - master_odex25_sales
-      - master_odex25_survey
-      - master_odex25_transactions
-      - master_odex25_website
-      - master_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: 

@ -67,35 +48,34 @@ jobs:
  deploy_master_server:
    name: Deploy to Master
    runs-on: ensan-client-project-runner
-    if: github.ref == 'refs/heads/master_odex-event' || github.ref == 'refs/heads/master_odex25_accounting' || github.ref == 'refs/heads/master_odex25_base' || github.ref == 'refs/heads/master_odex25_dms' || github.ref == 'refs/heads/master_odex25_fleet' || github.ref == 'refs/heads/master_odex25_ENSAN' || github.ref == 'refs/heads/master_odex25_hr' || github.ref == 'refs/heads/master_odex25_inventory' || github.ref == 'refs/heads/master_odex25_maintenance' || github.ref == 'refs/heads/master_odex25_mobile' || github.ref == 'refs/heads/master_odex25_pos' || github.ref == 'refs/heads/master_odex25_project' || github.ref == 'refs/heads/master_odex25_purchase' || github.ref == 'refs/heads/master_odex25_realstate' || github.ref == 'refs/heads/master_odex25_sales' || github.ref == 'refs/heads/master_odex25_survey' || github.ref == 'refs/heads/master_odex25_transactions' || github.ref == 'refs/heads/master_odex25_website' || github.ref == 'refs/heads/master_openeducat_erp-14.0.1.0'
+    if: github.event_name == 'workflow_dispatch' && (github.ref == 'refs/heads/master_odex-event' || github.ref == 'refs/heads/master_odex25_accounting' || github.ref == 'refs/heads/master_odex25_base' || github.ref == 'refs/heads/master_odex25_dms' || github.ref == 'refs/heads/master_odex25_fleet' || github.ref == 'refs/heads/master_odex25_ENSAN' || github.ref == 'refs/heads/master_odex25_hr' || github.ref == 'refs/heads/master_odex25_inventory' || github.ref == 'refs/heads/master_odex25_maintenance' || github.ref == 'refs/heads/master_odex25_mobile' || github.ref == 'refs/heads/master_odex25_pos' || github.ref == 'refs/heads/master_odex25_project' || github.ref == 'refs/heads/master_odex25_purchase' || github.ref == 'refs/heads/master_odex25_realstate' || github.ref == 'refs/heads/master_odex25_sales' || github.ref == 'refs/heads/master_odex25_survey' || github.ref == 'refs/heads/master_odex25_transactions' || github.ref == 'refs/heads/master_odex25_website' || github.ref == 'refs/heads/master_openeducat_erp-14.0.1.0')
    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/}
          
  deploy_preprod_server:
    name: Deploy to Preprod
-    runs-on: ensan-app-project-runner
-    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'
+    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')
    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/}
          
  deploy_test_server:
    name: Deploy to Test
-    runs-on: ensan-app-project-runner
-    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/preprod_openeducat_erp-14.0.1.0'
+    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')
    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/}
-          
--- a/.github/workflows/helpdesk-project.yml
+++ b/.github/workflows/helpdesk-project.yml
@ -1,64 +1,6 @@
 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_helpdesk
-      - 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_helpdesk
-      - 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
-      - master_odex25_accounting
-      - master_odex25_base
-      - master_odex25_dms
-      - master_odex25_fleet
-      - master_odex25_ENSAN
-      - master_odex25_hr
-      - master_odex25_inventory
-      - master_odex25_maintenance
-      - master_odex25_mobile
-      - master_odex25_pos
-      - master_odex25_project
-      - master_odex25_purchase
-      - master_odex25_realstate
-      - master_odex25_sales
-      - master_odex25_survey
-      - master_odex25_transactions
-      - master_odex25_website
-      - master_openeducat_erp-14.0.1.0

  workflow_dispatch: 

@ -66,11 +8,11 @@ jobs:
  deploy_master_server:
    name: Deploy to Master
    runs-on: helpdesk-client-project-runner
-    if: github.ref == 'refs/heads/master_odex-event' || github.ref == 'refs/heads/master_odex25_accounting' || github.ref == 'refs/heads/master_odex25_base' || github.ref == 'refs/heads/master_odex25_dms' || github.ref == 'refs/heads/master_odex25_fleet' || github.ref == 'refs/heads/master_odex25_helpdesk' || github.ref == 'refs/heads/master_odex25_hr' || github.ref == 'refs/heads/master_odex25_inventory' || github.ref == 'refs/heads/master_odex25_maintenance' || github.ref == 'refs/heads/master_odex25_mobile' || github.ref == 'refs/heads/master_odex25_pos' || github.ref == 'refs/heads/master_odex25_project' || github.ref == 'refs/heads/master_odex25_purchase' || github.ref == 'refs/heads/master_odex25_realstate' || github.ref == 'refs/heads/master_odex25_sales' || github.ref == 'refs/heads/master_odex25_survey' || github.ref == 'refs/heads/master_odex25_transactions' || github.ref == 'refs/heads/master_odex25_website' || github.ref == 'refs/heads/master_openeducat_erp-14.0.1.0'
+    if: github.event_name == 'workflow_dispatch' && (github.ref == 'refs/heads/master_odex-event' || github.ref == 'refs/heads/master_odex25_accounting' || github.ref == 'refs/heads/master_odex25_base' || github.ref == 'refs/heads/master_odex25_dms' || github.ref == 'refs/heads/master_odex25_fleet' || github.ref == 'refs/heads/master_odex25_ENSAN' || github.ref == 'refs/heads/master_odex25_hr' || github.ref == 'refs/heads/master_odex25_inventory' || github.ref == 'refs/heads/master_odex25_maintenance' || github.ref == 'refs/heads/master_odex25_mobile' || github.ref == 'refs/heads/master_odex25_pos' || github.ref == 'refs/heads/master_odex25_project' || github.ref == 'refs/heads/master_odex25_purchase' || github.ref == 'refs/heads/master_odex25_realstate' || github.ref == 'refs/heads/master_odex25_sales' || github.ref == 'refs/heads/master_odex25_survey' || github.ref == 'refs/heads/master_odex25_transactions' || github.ref == 'refs/heads/master_odex25_website' || github.ref == 'refs/heads/master_openeducat_erp-14.0.1.0')
    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/}
@ -78,7 +20,7 @@ jobs:
  deploy_preprod_server:
    name: Deploy to Preprod
    runs-on: helpdesk-client-project-runner
-    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'
+    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')
    steps:
      - name: Checkout And Restart Project
        run: |
@ -90,7 +32,7 @@ jobs:
  deploy_test_server:
    name: Deploy to Test
    runs-on: helpdesk-client-project-runner
-    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/preprod_openeducat_erp-14.0.1.0'
+    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')
    steps:
      - name: Checkout And Restart Project
        run: |
--- a/.github/workflows/odex25-general.yml
+++ b/.github/workflows/odex25-general.yml
@ -0,0 +1,41 @@
+name: Odex25-General Project - Pull Code
+
+on:
+
+  workflow_dispatch: 
+
+jobs:
+  # deploy_master_server:
+  #   name: Deploy to Master
+  #   runs-on: app-sever-project-runner
+  #   if: github.event_name == 'workflow_dispatch' && (github.ref == 'refs/heads/master_odex-event' || github.ref == 'refs/heads/master_odex25_accounting' || github.ref == 'refs/heads/master_odex25_base' || github.ref == 'refs/heads/master_odex25_dms' || github.ref == 'refs/heads/master_odex25_fleet' || github.ref == 'refs/heads/master_odex25_ENSAN' || github.ref == 'refs/heads/master_odex25_hr' || github.ref == 'refs/heads/master_odex25_inventory' || github.ref == 'refs/heads/master_odex25_maintenance' || github.ref == 'refs/heads/master_odex25_mobile' || github.ref == 'refs/heads/master_odex25_pos' || github.ref == 'refs/heads/master_odex25_project' || github.ref == 'refs/heads/master_odex25_purchase' || github.ref == 'refs/heads/master_odex25_realstate' || github.ref == 'refs/heads/master_odex25_sales' || github.ref == 'refs/heads/master_odex25_survey' || github.ref == 'refs/heads/master_odex25_transactions' || github.ref == 'refs/heads/master_odex25_website' || github.ref == 'refs/heads/master_openeducat_erp-14.0.1.0')
+  #   steps:
+  #     - name: Checkout And Restart Project
+  #       run: |
+  #         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/}
+          
+  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')
+    steps:
+      - name: Checkout And Restart Project
+        run: |
+          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/}
+          
+  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')
+    steps:
+      - name: Checkout And Restart Project
+        run: |
+          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/}
--- a/.github/workflows/odex25-standard.yml
+++ b/.github/workflows/odex25-standard.yml
@ -0,0 +1,41 @@
+name: ODEX25_STANDARD Project - Pull Code
+
+on:
+
+  workflow_dispatch: 
+
+jobs:
+  deploy_master_server:
+    name: Deploy to Master
+    runs-on: app-sever-project-runner
+    if: github.event_name == 'workflow_dispatch' && (github.ref == 'refs/heads/master_odex-event' || github.ref == 'refs/heads/master_odex25_accounting' || github.ref == 'refs/heads/master_odex25_base' || github.ref == 'refs/heads/master_odex25_dms' || github.ref == 'refs/heads/master_odex25_fleet' || github.ref == 'refs/heads/master_odex25_ENSAN' || github.ref == 'refs/heads/master_odex25_hr' || github.ref == 'refs/heads/master_odex25_inventory' || github.ref == 'refs/heads/master_odex25_maintenance' || github.ref == 'refs/heads/master_odex25_mobile' || github.ref == 'refs/heads/master_odex25_pos' || github.ref == 'refs/heads/master_odex25_project' || github.ref == 'refs/heads/master_odex25_purchase' || github.ref == 'refs/heads/master_odex25_realstate' || github.ref == 'refs/heads/master_odex25_sales' || github.ref == 'refs/heads/master_odex25_survey' || github.ref == 'refs/heads/master_odex25_transactions' || github.ref == 'refs/heads/master_odex25_website' || github.ref == 'refs/heads/master_openeducat_erp-14.0.1.0')
+    steps:
+      - name: Checkout And Restart Project
+        run: |
+          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/}
+          
+  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')
+    steps:
+      - name: Checkout And Restart Project
+        run: |
+          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/}
+          
+  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')
+    steps:
+      - name: Checkout And Restart Project
+        run: |
+          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/}
--- a/.github/workflows/twahod-project.yml
+++ b/.github/workflows/twahod-project.yml
@ -0,0 +1,41 @@
+name: Twahod Project - Pull Code
+
+on:
+
+  workflow_dispatch: 
+
+jobs:
+  # deploy_master_server:
+  #   name: Deploy to Master
+  #   runs-on: twahod-project-runner
+  #   if: github.event_name == 'workflow_dispatch' && (github.ref == 'refs/heads/master_odex-event' || github.ref == 'refs/heads/master_odex25_accounting' || github.ref == 'refs/heads/master_odex25_base' || github.ref == 'refs/heads/master_odex25_dms' || github.ref == 'refs/heads/master_odex25_fleet' || github.ref == 'refs/heads/master_odex25_ENSAN' || github.ref == 'refs/heads/master_odex25_hr' || github.ref == 'refs/heads/master_odex25_inventory' || github.ref == 'refs/heads/master_odex25_maintenance' || github.ref == 'refs/heads/master_odex25_mobile' || github.ref == 'refs/heads/master_odex25_pos' || github.ref == 'refs/heads/master_odex25_project' || github.ref == 'refs/heads/master_odex25_purchase' || github.ref == 'refs/heads/master_odex25_realstate' || github.ref == 'refs/heads/master_odex25_sales' || github.ref == 'refs/heads/master_odex25_survey' || github.ref == 'refs/heads/master_odex25_transactions' || github.ref == 'refs/heads/master_odex25_website' || github.ref == 'refs/heads/master_openeducat_erp-14.0.1.0')
+  #   steps:
+  #     - name: Checkout And Restart Project
+  #       run: |
+  #         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/}
+          
+  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')
+    steps:
+      - name: Checkout And Restart Project
+        run: |
+          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/}
+          
+  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')
+    steps:
+      - name: Checkout And Restart Project
+        run: |
+          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/}
--- a/2
+++ b/2
@ -1,2 +0,0 @@
-# This is a CODEOWNERS file managed by Terraform
-* @moutazmuhammad @ahmadaking @ronozoro @hasan-exp @Abubaker-Altaib @AbuzarExp
--- a/odex25_accounting/account_fiscal_year/models/account_budget.py
+++ b/odex25_accounting/account_fiscal_year/models/account_budget.py
@ -2,7 +2,7 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.

 from odoo import api, fields, models, _
-from odoo.exceptions import UserError, ValidationError, Warning
+from odoo.exceptions import  ValidationError, Warning


 class CrossoveredBudget(models.Model):
--- a/odex25_accounting/account_fiscal_year/models/account_fiscal_year.py
+++ b/odex25_accounting/account_fiscal_year/models/account_fiscal_year.py
@ -2,7 +2,7 @@
 #  License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).

 from odoo import _, api, fields, models
-from odoo.exceptions import ValidationError
+from odoo.exceptions import ValidationError 
 from odoo.osv import expression
 from dateutil.relativedelta import relativedelta

@ -304,7 +304,7 @@ class AccountFiscalYear(models.Model):
        """
        for rec in self:
            if rec.state != 'draft':
-                raise UserError(
+                raise ValidationError(
                    _('You cannot delete a fiscal year not in draft state.'))
            rec.periods_ids.unlink()
        return super().unlink()
--- a/odex25_accounting/account_fiscal_year/models/account_fiscalyears_periods.py
+++ b/odex25_accounting/account_fiscal_year/models/account_fiscalyears_periods.py
@ -2,7 +2,7 @@
 #  License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).

 from odoo import _, api, fields, models
-from odoo.exceptions import ValidationError
+from odoo.exceptions import ValidationError 
 from odoo.osv import expression


@ -114,7 +114,7 @@ class fiscalyears_periods(models.Model):
        """
        for rec in self:
            if rec.state != 'draft':
-                raise UserError(
+                raise ValidationError(
                    _('You cannot delete a period not in draft state.'))

        self.env['ir.translation'].search([('name', '=', "fiscalyears.periods,name"),
@ -127,7 +127,7 @@ class fiscalyears_periods(models.Model):
        """
        for rec in self:
            if rec.fiscalyear_id.state not in ['open']:
-                raise UserError(
+                raise ValidationError(
                    _('''You cannot open a period where the fiscalyear not in open state.'''))
            rec.state = 'open'

--- a/odex25_accounting/hr_expense_petty_cash/views/petty_cash_views.xml
+++ b/odex25_accounting/hr_expense_petty_cash/views/petty_cash_views.xml
@ -210,17 +210,12 @@

    <menuitem name="Petty Cash"
              id="menu_petty_cash_root"
+              action="action_petty_cash"
              groups="hr_expense_petty_cash.group_petty_cash_manager,hr_expense_petty_cash.group_petty_cash_user"
              web_icon="hr_expense_petty_cash,static/description/odoo_icon.png"
-              sequence="40"/>
+              sequence="1"/>
+

-    <menuitem
-            id="menu_petty_cash"
-            name="Petty Cash"
-            action="action_petty_cash"
-            parent="menu_petty_cash_root"
-            sequence="1"
-    />
    <record id="hr_employee_form_inherit" model="ir.ui.view">
        <field name="name">hr_employee.extend.form</field>
        <field name="model">hr.employee</field>
--- a/odex25_accounting/report_e_invoice/models/account_move.py
+++ b/odex25_accounting/report_e_invoice/models/account_move.py
@ -54,6 +54,7 @@ class AccountMove(models.Model):
                str_to_encode = seller_name_enc + company_vat_enc + timestamp_enc + invoice_total_enc + total_vat_enc
                qr_code_str = base64.b64encode(str_to_encode).decode('UTF-8')
            record.qr_string = qr_code_str
+            record.l10n_sa_qr_code_str = qr_code_str

    @api.depends('line_ids.sale_line_ids')
    def _get_sale_orders(self):
@ -110,7 +111,7 @@ class AccountMove(models.Model):
                partner_name = rec.partner_id.name
            else:
                partner_name = rec.partner_id.name
-            partner_name = str(_('اسم المورد: \t \t ' + partner_name))
+            partner_name = str(_('اسم المورد: \t \t ' + str(partner_name) ))
            partner_vat = "##########"
            if rec.move_type in ['out_invoice', 'in_refund']:
                if rec.company_id.partner_id.vat:
@ -120,14 +121,14 @@ class AccountMove(models.Model):
                if rec.partner_id.vat:
                    partner_vat = rec.partner_id.vat

-            partner_vat = str(_('رقم تسجيل ضريبة: \t \t ' + partner_vat))
+            partner_vat = str(_('رقم تسجيل ضريبة: \t \t ' + str(partner_vat)))

            currency_total = ''.join([rec.currency_id.name, str(rec.amount_total)])
-            total = str(_('إجمالي الفاتورة:  \t \t ' + currency_total))
+            total = str(_('إجمالي الفاتورة:  \t \t ' + str(currency_total)))
            currency_tax = ''.join([rec.currency_id.name, str(rec.amount_tax)])
-            tax = str(_('إجمالي ضريبة القيمة المضافة:  \t \t ' + currency_tax))
+            tax = str(_('إجمالي ضريبة القيمة المضافة:  \t \t ' + str(currency_tax)))
            date_invoice = str(rec.invoice_date)
-            date = str(_('الطابع الزمني للفاتورة:  \t \t ' + date_invoice))
+            date = str(_('الطابع الزمني للفاتورة:  \t \t ' + str(date_invoice)))
            lf = '\n\n'
            ibanqr = lf.join([partner_name, partner_vat, date, total, tax])
            rec.qr_image = generate_qr_code(ibanqr)