Merge remote-tracking branch 'origin/dev_odex25_base' into dev_odex25_base

.github/workflows/app-server.yml

@@ -1,107 +0,0 @@
-name: App Server - Pull Code
-
-# This Server contain many services:
-#   - Cyber project (dev - preprod)
-#   - Ensan project (dev - preprod)
-#   - Odex25-General Project (dev - preprod)
-#   - ODEX25_STANDARD Project (dev - preprod - prod)
-#   - Twahod Project (dev - preprod)
-#   - Helpdesk Project (dev - preprod)
-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
-      - dev_odex25_ensan
-      - 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
-      - preprod_odex25_ensan
-
-  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' || github.ref == 'refs/heads/master_odex25_ensan')
-  #   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.CYBER_APP_MASTER_SERVICE }} master ${GITHUB_REF#refs/heads/master_} ${GITHUB_REF#refs/heads/}
-  #         if [ $? -eq 0 ]; then
-  #             echo "** [INFO] "MASTER" services have been restarted."
-  #         else
-  #             echo "** [ERROR] Failed to restart "MASTER" services."
-  #         fi
-
-  deploy_preprod_server:
-    name: Deploy to Preprod
-    runs-on: app-sever-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' || github.ref == 'refs/heads/preprod_odex25_ensan'
-    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.CYBER_APP_PREPROD_SERVICE }} preprod ${GITHUB_REF#refs/heads/preprod_} ${GITHUB_REF#refs/heads/}
-          sudo systemctl restart ${{ secrets.ENSAN_APP_PREPROD_SERVICE }} ${{ secrets.ODEX25_GENERAL_PREPROD_SERVICE }} ${{ secrets.ODEX25_STANDARD_PREPROD_SERVICE }} ${{ secrets.TWAHOD_APP_PREPROD_SERVICE }} ${{ secrets.ODEX25_DEMO_PREPROD_SERVICE }} ${{ secrets.HELPDESK_PREPROD_SERVICE }} ${{ secrets.TRAHUM_PREPROD_SERVICE }}
-          if [ $? -eq 0 ]; then
-              echo "** [INFO] "PREPROD" services have been restarted."
-          else
-              echo "** [ERROR] Failed to restart "PREPROD" services."
-          fi
-          
-  deploy_test_server:
-    name: Deploy to Test
-    runs-on: app-sever-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/dev_openeducat_erp-14.0.1.0' || github.ref == 'refs/heads/dev_odex25_ensan'
-    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.CYBER_APP_TEST_SERVICE }} test ${GITHUB_REF#refs/heads/dev_} ${GITHUB_REF#refs/heads/}
-          sudo systemctl restart ${{ secrets.ENSAN_APP_TEST_SERVICE }} ${{ secrets.ODEX25_GENERAL_TEST_SERVICE }} ${{ secrets.ODEX25_STANDARD_TEST_SERVICE }} ${{ secrets.TWAHOD_APP_TEST_SERVICE }} ${{ secrets.HELPDESK_TEST_SERVICE }} ${{ secrets.KAZ_LIBRARY_TEST_SERVICE }} ${{ secrets.TRAHUM_TEST_SERVICE }}
-          if [ $? -eq 0 ]; then
-              echo "** [INFO] "DEV" services have been restarted."
-          else
-              echo "** [ERROR] Failed to restart "DEV" services."
-          fi

.github/workflows/cyber-project.yml

@@ -1,18 +0,0 @@
-name: Cyber 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' || github.ref == 'refs/heads/master_odex25_ensan')
-    steps:
-      - name: Checkout And Restart Project
-        run: |
-          echo "** [INFO] Running on branch --> ${GITHUB_REF#refs/heads/}"
-                    
-          sudo chmod +x ${{ secrets.CYBER_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh
-          sudo ${{ secrets.CYBER_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh ${{ secrets.CYBER_PROJECT_USER }} ${{ secrets.CYBER_STANDARD_FOLDER_PATH }} ${{ secrets.CYBER_MASTER_SERVICE }} master ${GITHUB_REF#refs/heads/master_} ${GITHUB_REF#refs/heads/}
-          

.github/workflows/dev-preprod-servers.yml

@@ -0,0 +1,90 @@
+name: Dev/Preprod Servers - 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
+      - dev_odex25_ensan
+      - 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
+      - preprod_odex25_ensan
+
+  workflow_dispatch:
+    inputs:
+      environment:
+        description: 'Select Server'
+        required: true
+        type: choice
+        options:
+          - dev
+          - preprod
+        default: dev
+
+jobs:
+
+  deploy_preprod_server:
+    name: Deploy to Preprod Servers
+    runs-on: app-sever-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' || github.ref == 'refs/heads/preprod_odex25_ensan') || (github.event_name == 'workflow_dispatch' && github.event.inputs.environment == 'preprod')
+    steps:
+      - name: Checkout And Restart Project
+        run: |
+          sudo chmod +x /home/${{ secrets.CLIENT_USER }}/scripts/pull/preprod_pull_standard_code.sh
+          sudo /home/${{ secrets.CLIENT_USER }}/scripts/pull/preprod_pull_standard_code.sh
+          sudo systemctl restart ${{ secrets.ENSAN_APP_PREPROD_SERVICE }} ${{ secrets.ODEX25_GENERAL_PREPROD_SERVICE }} ${{ secrets.ODEX25_STANDARD_PREPROD_SERVICE }} ${{ secrets.TWAHOD_APP_PREPROD_SERVICE }} ${{ secrets.ODEX25_DEMO_PREPROD_SERVICE }} ${{ secrets.HELPDESK_PREPROD_SERVICE }} ${{ secrets.TRAHUM_PREPROD_SERVICE }} ${{ secrets.CYBER_APP_PREPROD_SERVICE }}
+          if [ $? -eq 0 ]; then
+              echo "** [INFO] "PREPROD" services have been restarted."
+          else
+              echo "** [ERROR] Failed to restart "PREPROD" services."
+          fi
+          
+  deploy_test_server:
+    name: Deploy to Dev Servers
+    runs-on: app-sever-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/dev_openeducat_erp-14.0.1.0' || github.ref == 'refs/heads/dev_odex25_ensan') || (github.event_name == 'workflow_dispatch' && github.event.inputs.environment == 'dev')
+    steps:
+      - name: Checkout And Restart Project
+        run: |
+          sudo chmod +x /home/${{ secrets.CLIENT_USER }}/scripts/pull/dev_pull_standard_code.sh
+          sudo /home/${{ secrets.CLIENT_USER }}/scripts/pull/dev_pull_standard_code.sh
+          sudo systemctl restart ${{ secrets.ENSAN_APP_TEST_SERVICE }} ${{ secrets.ODEX25_GENERAL_TEST_SERVICE }} ${{ secrets.ODEX25_STANDARD_TEST_SERVICE }} ${{ secrets.TWAHOD_APP_TEST_SERVICE }} ${{ secrets.HELPDESK_TEST_SERVICE }} ${{ secrets.KAZ_LIBRARY_TEST_SERVICE }} ${{ secrets.TRAHUM_TEST_SERVICE }} ${{ secrets.CYBER_APP_TEST_SERVICE }}
+          if [ $? -eq 0 ]; then
+              echo "** [INFO] "DEV" services have been restarted."
+          else
+              echo "** [ERROR] Failed to restart "DEV" services."
+          fi

.github/workflows/ensan-project.yml

@@ -1,18 +0,0 @@
-name: Ensan Project - Pull Code
-
-on:
-  workflow_dispatch: 
-
-jobs:
-  deploy_master_server:
-    name: Deploy to Master
-    runs-on: ensan-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' || github.ref == 'refs/heads/master_odex25_ensan')
-    steps:
-      - name: Checkout And Restart Project
-        run: |
-          echo "** [INFO] Running on branch --> ${GITHUB_REF#refs/heads/}"
-                    
-          sudo chmod +x ${{ secrets.ENSAN_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh
-          sudo ${{ secrets.ENSAN_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh ${{ secrets.ENSAN_PROJECT_USER }} ${{ secrets.ENSAN_STANDARD_FOLDER_PATH }} ${{ secrets.ENSAN_MASTER_SERVICE }} master ${GITHUB_REF#refs/heads/master_} ${GITHUB_REF#refs/heads/}
-          

.github/workflows/helpdesk-project.yml

@@ -1,18 +0,0 @@
-name: HELPDESK Project - Pull Code
-
-on:
-  workflow_dispatch: 
-
-jobs:
-  deploy_master_server:
-    name: Deploy to Master
-    runs-on: helpdesk_server
-    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' || github.ref == 'refs/heads/master_odex25_ensan')
-    steps:
-      - name: Checkout And Restart Project
-        run: |
-          echo "** [INFO] Running on branch --> ${GITHUB_REF#refs/heads/}"
-                    
-          sudo chmod +x ${{ secrets.HELPDESK_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh
-          sudo ${{ secrets.HELPDESK_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh ${{ secrets.HELPDESK_PROJECT_USER }} ${{ secrets.HELPDESK_STANDARD_FOLDER_PATH }} ${{ secrets.HELPDESK_MASTER_SERVICE }} master ${GITHUB_REF#refs/heads/master_} ${GITHUB_REF#refs/heads/}
-          

.github/workflows/kaz-library-project.yml

@@ -1,18 +0,0 @@
-name: KAZ-Library Project - Pull Code
-
-on:
-  workflow_dispatch: 
-
-jobs:
-  deploy_master_server:
-    name: Deploy to Master
-    runs-on: kaz-library-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' || github.ref == 'refs/heads/master_odex25_ensan')
-    steps:
-      - name: Checkout And Restart Project
-        run: |
-          echo "** [INFO] Running on branch --> ${GITHUB_REF#refs/heads/}"
-                    
-          sudo chmod +x ${{ secrets.KAZ_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh
-          sudo ${{ secrets.KAZ_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh ${{ secrets.KAZ_PROJECT_USER }} ${{ secrets.KAZ_STANDARD_FOLDER_PATH }} ${{ secrets.KAZ_MASTER_SERVICE }} master ${GITHUB_REF#refs/heads/master_} ${GITHUB_REF#refs/heads/}
-          

.github/workflows/production_pull_code.yml

@@ -0,0 +1,86 @@
+name: Production Projects - Pull Code
+
+on:
+  workflow_dispatch:
+    inputs:
+      environment:
+        description: 'Select Project Prod Server'
+        required: true
+        type: choice
+        options:
+          - Cyber-Security-Project
+          - Ensan-Project
+          - Helpdesk-Khabir-Project
+          - King-AbdelAziz-Library-Project
+          - Twahod-Project
+
+jobs:
+# Cyber Project
+  cyber_master_server:
+    name: Deploy to Cyber Master
+    runs-on: cyber-client-project-runner
+    if: github.event_name == 'workflow_dispatch' && github.event.inputs.environment == 'Cyber-Security-Project' && (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' || github.ref == 'refs/heads/master_odex25_ensan')
+    # if: github.event_name == 'workflow_dispatch' && github.event.inputs.environment == 'Cyber-Security-Project'
+    steps:
+      - name: Checkout And Restart Project
+        run: |                    
+          echo "** [INFO] Running on branch --> ${GITHUB_REF#refs/heads/}"
+          
+          sudo chmod +x ${{ secrets.CYBER_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh
+          sudo ${{ secrets.CYBER_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh ${{ secrets.CYBER_PROJECT_USER }} ${{ secrets.CYBER_STANDARD_FOLDER_PATH }} ${{ secrets.CYBER_MASTER_SERVICE }} master ${GITHUB_REF#refs/heads/master_} ${GITHUB_REF#refs/heads/}
+  
+# Ensan Project
+  ensan_master_server:
+    name: Deploy to Ensan Master
+    runs-on: ensan-client-project-runner
+    if: github.event_name == 'workflow_dispatch' && github.event.inputs.environment == 'Ensan-Project' && (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' || github.ref == 'refs/heads/master_odex25_ensan')
+    steps:
+      - name: Checkout And Restart Project
+        run: |
+          echo "** [INFO] Running on branch --> ${GITHUB_REF#refs/heads/}"
+                    
+          sudo chmod +x ${{ secrets.ENSAN_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh
+          sudo ${{ secrets.ENSAN_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh ${{ secrets.ENSAN_PROJECT_USER }} ${{ secrets.ENSAN_STANDARD_FOLDER_PATH }} ${{ secrets.ENSAN_MASTER_SERVICE }} master ${GITHUB_REF#refs/heads/master_} ${GITHUB_REF#refs/heads/}
+  
+# Helpdesk Project
+  helpdesk_maser_server:
+    name: Deploy to Helpdesk Master
+    runs-on: helpdesk_server
+    if: github.event_name == 'workflow_dispatch' && github.event.inputs.environment == 'Helpdesk-Khabir-Project' && (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' || github.ref == 'refs/heads/master_odex25_ensan')
+    steps:
+      - name: Checkout And Restart Project
+        run: |
+          echo "** [INFO] Running on branch --> ${GITHUB_REF#refs/heads/}"
+                    
+          sudo chmod +x ${{ secrets.HELPDESK_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh
+          sudo ${{ secrets.HELPDESK_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh ${{ secrets.HELPDESK_PROJECT_USER }} ${{ secrets.HELPDESK_STANDARD_FOLDER_PATH }} ${{ secrets.HELPDESK_MASTER_SERVICE }} master ${GITHUB_REF#refs/heads/master_} ${GITHUB_REF#refs/heads/}
+
+# King Abdel Aziz Lobrary project
+  kaz_master_server:
+    name: Deploy to KAZ Master
+    runs-on: kaz-library-project-runner
+    if: github.event_name == 'workflow_dispatch' && github.event.inputs.environment == 'King-AbdelAziz-Library-Project' && (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' || github.ref == 'refs/heads/master_odex25_ensan')
+    steps:
+      - name: Checkout And Restart Project
+        run: |
+          echo "** [INFO] Running on branch --> ${GITHUB_REF#refs/heads/}"
+                    
+          sudo chmod +x ${{ secrets.KAZ_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh
+          sudo ${{ secrets.KAZ_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh ${{ secrets.KAZ_PROJECT_USER }} ${{ secrets.KAZ_STANDARD_FOLDER_PATH }} ${{ secrets.KAZ_MASTER_SERVICE }} master ${GITHUB_REF#refs/heads/master_} ${GITHUB_REF#refs/heads/}
+
+# Twahod project
+  twahod_master_server:
+    name: Deploy to Twahod Master
+    runs-on: twahod-client-project-runner
+    if: github.event_name == 'workflow_dispatch' && github.event.inputs.environment == 'Twahod-Project' && (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' || github.ref == 'refs/heads/master_odex25_ensan')
+    steps:
+      - name: Checkout And Restart Project
+        run: |
+          echo "** [INFO] Running on branch --> ${GITHUB_REF#refs/heads/}"
+                    
+          sudo chmod +x ${{ secrets.TWAHOD_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh
+          sudo ${{ secrets.TWAHOD_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh ${{ secrets.TWAHOD_PROJECT_USER }} ${{ secrets.TWAHOD_STANDARD_FOLDER_PATH }} ${{ secrets.TWAHOD_MASTER_SERVICE }} master ${GITHUB_REF#refs/heads/master_} ${GITHUB_REF#refs/heads/}
+
+# 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' || github.ref == 'refs/heads/master_odex25_ensan')
+
+        

.github/workflows/twahod-project.yml

@@ -1,17 +0,0 @@
-name: Twahod Project - Pull Code
-
-on:
-  workflow_dispatch: 
-
-jobs:
-  deploy_master_server:
-    name: Deploy to Master
-    runs-on: twahod-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' || github.ref == 'refs/heads/master_odex25_ensan')
-    steps:
-      - name: Checkout And Restart Project
-        run: |
-          echo "** [INFO] Running on branch --> ${GITHUB_REF#refs/heads/}"
-                    
-          sudo chmod +x ${{ secrets.TWAHOD_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh
-          sudo ${{ secrets.TWAHOD_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh ${{ secrets.TWAHOD_PROJECT_USER }} ${{ secrets.TWAHOD_STANDARD_FOLDER_PATH }} ${{ secrets.TWAHOD_MASTER_SERVICE }} master ${GITHUB_REF#refs/heads/master_} ${GITHUB_REF#refs/heads/}

odex25_base/expert_std_backend_theme/static/src/scss/navbar.scss

@@ -1,6 +1,6 @@
-ul.o_menu_sections{
+// ul.o_menu_sections{
-    margin-right: 30px;
+//     margin-right: 30px;
-}
+// }
 
 .o_user_menu_mobile{
     display: none;

odex25_base/expert_std_backend_theme/static/src/scss/web.scss

@@ -2,18 +2,18 @@
     font-family: "bukra";
     font-style: normal;
     font-weight: 400;
-    src: url(/expert_std_backend_theme/static/src/fonts/29ltbukraregular.otf)
+    src: url(../fonts/29ltbukraregular.otf)
             format("opentype"),
-        url(/expert_std_backend_theme/static/src/fonts/29ltbukralight.ttf)
+        url(../fonts/29ltbukralight.ttf)
             format("truetype");
 }
 @font-face {
     font-family: "bukra";
     font-style: normal;
     font-weight: 700;
-    src: url(/expert_std_backend_theme/static/src/fonts/29ltbukrabold.otf)
+    src: url(../fonts/29ltbukrabold.otf)
             format("opentype"),
-        url(/expert_std_backend_theme/static/src/fonts/alfont_com_خط-بكرا-عريض.ttf)
+        url(../fonts/alfont_com_خط-بكرا-عريض.ttf)
             format("truetype");
 }
 .rtl *:not(.fa),
@@ -69,7 +69,7 @@ body {
 .o_MessageList_emptyTitle.o-neutral-face-icon:before,
 .o_view_nocontent .o_nocontent_help .o_view_nocontent_smiling_face:before {
     background: transparent
-        url(/expert_std_backend_theme/static/src/img/smiling_face.svg) no-repeat
+        url(../img/smiling_face.svg) no-repeat
         center;
 }
 
@@ -97,8 +97,8 @@ body.o_home_menu_background header .o_main_navbar {
     background: transparent !important;
 }
 
-.o_onboarding.o_onboarding_blue .o_onboarding_wrap{
+.o_search_panel .list-group-item .list-group-item-action.active .o_search_panel_label_title{
-    background: $sidebar_bg;
+    color: #FFFFFF !important;
 }
 
 @media screen and (max-width: 319px) {
@@ -361,18 +361,6 @@ body.o_home_menu_background header .o_main_navbar {
         header.active {
         background: $sidebar_bg;
     }
-    .o_web_client
-        .o_action_manager
-        .o_action
-        .o_content
-        .o_search_panel
-        .o_search_panel_section
-        ul.o_search_panel_field
-        li
-        header.active
-        label {
-        color: white;
-    }
     .o_web_client
         .o_action_manager
         .o_action
@@ -706,11 +694,7 @@ body.o_home_menu_background header .o_main_navbar {
         .settings
         .app_settings_block
         h2 {
-        background: linear-gradient(
+        background: $sidebar_bg;
-            -270deg,
-            #134779 0%,
-            #1a6ab7 75%
-        ) !important;
         color: white !important;
         font-weight: 500 !important;
     }
@@ -1321,11 +1305,7 @@ body.o_home_menu_background header .o_main_navbar {
         .settings
         .app_settings_block
         h2 {
-        background: linear-gradient(
+        background: $sidebar_bg;
-            -270deg,
-            #134779 0%,
-            #1a6ab7 75%
-        ) !important;
         color: white !important;
         font-weight: 500 !important;
     }
@@ -1936,11 +1916,7 @@ body.o_home_menu_background header .o_main_navbar {
         .settings
         .app_settings_block
         h2 {
-        background: linear-gradient(
+        background: $sidebar_bg;
-            -270deg,
-            #134779 0%,
-            #1a6ab7 75%
-        ) !important;
         color: white !important;
         font-weight: 500 !important;
     }
@@ -1970,10 +1946,10 @@ body.o_home_menu_background header .o_main_navbar {
     .o_web_client header .o_main_navbar a.o_menu_brand:hover {
         background-color: $primary_accent;
     }
-    .o_web_client header .o_main_navbar ul.o_menu_sections {
+    // .o_web_client header .o_main_navbar ul.o_menu_sections {
-        display: flex;
+    //     display: flex;
-        flex-wrap: nowrap;
+    //     flex-wrap: nowrap;
-    }
+    // }
     .o_web_client header .o_main_navbar ul.o_menu_sections li a {
         color: white;
     }
@@ -2425,11 +2401,7 @@ body.o_home_menu_background header .o_main_navbar {
         .settings
         .app_settings_block
         h2 {
-        background: linear-gradient(
+        background: $sidebar_bg;
-            -270deg,
-            #134779 0%,
-            #1a6ab7 75%
-        ) !important;
         color: white !important;
         font-weight: 500 !important;
     }
@@ -2560,11 +2532,7 @@ body.o_home_menu_background header .o_main_navbar {
         .settings
         .app_settings_block
         h2 {
-        background: linear-gradient(
+        background: $sidebar_bg;
-            -270deg,
-            #134779 0%,
-            #1a6ab7 75%
-        ) !important;
         color: white !important;
         font-weight: 500 !important;
     }
@@ -2594,10 +2562,10 @@ body.o_home_menu_background header .o_main_navbar {
     .o_web_client header .o_main_navbar a.o_menu_brand:hover {
         background-color: $primary_accent;
     }
-    .o_web_client header .o_main_navbar ul.o_menu_sections {
+    // .o_web_client header .o_main_navbar ul.o_menu_sections {
-        display: flex;
+    //     display: flex;
-        flex-wrap: nowrap;
+    //     flex-wrap: nowrap;
-    }
+    // }
     .o_web_client header .o_main_navbar ul.o_menu_sections li a {
         color: white;
     }
@@ -3087,11 +3055,7 @@ body.o_home_menu_background header .o_main_navbar {
         .settings
         .app_settings_block
         h2 {
-        background: linear-gradient(
+        background: $sidebar_bg;
-            -270deg,
-            #134779 0%,
-            #1a6ab7 75%
-        ) !important;
         color: white !important;
         font-weight: 500 !important;
     }
@@ -3121,10 +3085,10 @@ body.o_home_menu_background header .o_main_navbar {
     .o_web_client header .o_main_navbar a.o_menu_brand:hover {
         background-color: $primary_accent;
     }
-    .o_web_client header .o_main_navbar ul.o_menu_sections {
+    // .o_web_client header .o_main_navbar ul.o_menu_sections {
-        display: flex;
+    //     display: flex;
-        flex-wrap: nowrap;
+    //     flex-wrap: nowrap;
-    }
+    // }
     .o_web_client header .o_main_navbar ul.o_menu_sections li a {
         color: white;
     }
@@ -3613,11 +3577,7 @@ body.o_home_menu_background header .o_main_navbar {
         .settings
         .app_settings_block
         h2 {
-        background: linear-gradient(
+        background: $sidebar_bg;
-            -270deg,
-            #134779 0%,
-            #1a6ab7 75%
-        ) !important;
         color: white !important;
         font-weight: 500 !important;
     }
@@ -3647,10 +3607,10 @@ body.o_home_menu_background header .o_main_navbar {
     .o_web_client header .o_main_navbar a.o_menu_brand:hover {
         background-color: $primary_accent;
     }
-    .o_web_client header .o_main_navbar ul.o_menu_sections {
+    // .o_web_client header .o_main_navbar ul.o_menu_sections {
-        display: flex;
+    //     display: flex;
-        flex-wrap: nowrap;
+    //     flex-wrap: nowrap;
-    }
+    // }
     .o_web_client header .o_main_navbar ul.o_menu_sections li a {
         color: white;
     }
@@ -4127,11 +4087,7 @@ body.o_home_menu_background header .o_main_navbar {
         .settings
         .app_settings_block
         h2 {
-        background: linear-gradient(
+        background: $sidebar_bg;
-            -270deg,
-            #134779 0%,
-            #1a6ab7 75%
-        ) !important;
         color: white !important;
         font-weight: 500 !important;
     }
@@ -4161,10 +4117,10 @@ body.o_home_menu_background header .o_main_navbar {
     .o_web_client header .o_main_navbar a.o_menu_brand:hover {
         background-color: $primary_accent;
     }
-    .o_web_client header .o_main_navbar ul.o_menu_sections {
+    // .o_web_client header .o_main_navbar ul.o_menu_sections {
-        display: flex;
+    //     display: flex;
-        flex-wrap: nowrap;
+    //     flex-wrap: nowrap;
-    }
+    // }
     .o_web_client header .o_main_navbar ul.o_menu_sections li a {
         color: white;
     }
@@ -4604,11 +4560,7 @@ body.o_home_menu_background header .o_main_navbar {
         .settings
         .app_settings_block
         h2 {
-        background: linear-gradient(
+        background: $sidebar_bg;
-            -270deg,
-            #134779 0%,
-            #1a6ab7 75%
-        ) !important;
         color: white !important;
         font-weight: 500 !important;
     }
@@ -4637,10 +4589,10 @@ body.o_home_menu_background header .o_main_navbar {
     .o_web_client header .o_main_navbar a.o_menu_brand:hover {
         background-color: $primary_accent;
     }
-    .o_web_client header .o_main_navbar ul.o_menu_sections {
+    // .o_web_client header .o_main_navbar ul.o_menu_sections {
-        display: flex;
+    //     display: flex;
-        flex-wrap: nowrap;
+    //     flex-wrap: nowrap;
-    }
+    // }
     .o_web_client header .o_main_navbar ul.o_menu_sections li a {
         color: white;
     }
@@ -5080,11 +5032,7 @@ body.o_home_menu_background header .o_main_navbar {
         .settings
         .app_settings_block
         h2 {
-        background: linear-gradient(
+        background: $sidebar_bg;
-            -270deg,
-            #134779 0%,
-            #1a6ab7 75%
-        ) !important;
         color: white !important;
         font-weight: 500 !important;
     }
@@ -5113,10 +5061,10 @@ body.o_home_menu_background header .o_main_navbar {
     .o_web_client header .o_main_navbar a.o_menu_brand:hover {
         background-color: $primary_accent;
     }
-    .o_web_client header .o_main_navbar ul.o_menu_sections {
+    // .o_web_client header .o_main_navbar ul.o_menu_sections {
-        display: flex;
+    //     display: flex;
-        flex-wrap: nowrap;
+    //     flex-wrap: nowrap;
-    }
+    // }
     .o_web_client header .o_main_navbar ul.o_menu_sections li a {
         color: white;
     }
@@ -5556,11 +5504,7 @@ body.o_home_menu_background header .o_main_navbar {
         .settings
         .app_settings_block
         h2 {
-        background: linear-gradient(
+        background: $sidebar_bg;
-            -270deg,
-            #134779 0%,
-            #1a6ab7 75%
-        ) !important;
         color: white !important;
         font-weight: 500 !important;
     }