From 3531cee144d12512e0fed66bdadd7ab519a1eaa2 Mon Sep 17 00:00:00 2001
From: manar <m.mohie@exp-sa.com>
Date: Tue, 31 Dec 2024 12:22:02 +0200
Subject: [PATCH 1/9] UPDATE exp_transation_letters & exp_transaction_documents

---
 .../models/configuration.py                   |  8 ++-
 .../exp_transation_letters/i18n/ar_001.po     |  7 +--
 .../reports/formal_letter.xml                 | 60 +++++++++----------
 .../reports/letter_template.xml               | 60 ++++++++++++-------
 4 files changed, 78 insertions(+), 57 deletions(-)

diff --git a/odex25_transactions/exp_transaction_documents/models/configuration.py b/odex25_transactions/exp_transaction_documents/models/configuration.py
index 8ebd8ca37..4be9ab6b8 100644
--- a/odex25_transactions/exp_transaction_documents/models/configuration.py
+++ b/odex25_transactions/exp_transaction_documents/models/configuration.py
@@ -94,7 +94,13 @@ class AttachmentRule(models.Model):
 
     def action_signature(self):
         for rec in self:
-            x = self.env['letters.letters'].search([('internal_transaction_id','=',rec.internal_transaction_id.id)],limit=1)
+            if rec.internal_transaction_id:
+                x = self.env['letters.letters'].search([('internal_transaction_id','=',rec.internal_transaction_id.id)],limit=1)
+            elif rec.incoming_transaction_id:
+                x = self.env['letters.letters'].search([('incoming_transaction_id','=',rec.incoming_transaction_id.id)],limit=1)
+            elif rec.outgoing_transaction_id:
+                x = self.env['letters.letters'].search([('outgoing_transaction_id','=',rec.outgoing_transaction_id.id)],limit=1)
+
             rec.signed_user_id = self.env.user.id
             x.signed_user_id = self.env.user.id
             return {
diff --git a/odex25_transactions/exp_transation_letters/i18n/ar_001.po b/odex25_transactions/exp_transation_letters/i18n/ar_001.po
index 53b7da6c6..3b7c37b24 100644
--- a/odex25_transactions/exp_transation_letters/i18n/ar_001.po
+++ b/odex25_transactions/exp_transation_letters/i18n/ar_001.po
@@ -33,11 +33,10 @@ msgstr "<span style=\"font-weight:bold;\">المرجع:</span>"
 #. module: exp_transation_letters
 #: model_terms:ir.ui.view,arch_db:exp_transation_letters.custom_external_layout_standard
 msgid ""
-"<span style=\"font-weight:bold;font-stretch: expanded;\">\n"
-"                                    Date:</span>"
+"<span style=\"font-weight:bold;font-stretch: expanded;\">Date:</span>"
 msgstr ""
-"<span style=\"font-weight:bold;font-stretch: expanded;\">\n"
-"                                    التاريخ:</span>"
+"<span style=\"font-weight:bold;font-stretch: expanded;\">التاريخ:</span>"
+
 
 #. module: exp_transation_letters
 #: model_terms:ir.ui.view,arch_db:exp_transation_letters.view_transaction_letters_form
diff --git a/odex25_transactions/exp_transation_letters/reports/formal_letter.xml b/odex25_transactions/exp_transation_letters/reports/formal_letter.xml
index 97e147a54..b38883a6c 100644
--- a/odex25_transactions/exp_transation_letters/reports/formal_letter.xml
+++ b/odex25_transactions/exp_transation_letters/reports/formal_letter.xml
@@ -10,13 +10,13 @@
                 font-style: normal;
                 }
 
-                .droidkufi-font {
-                font-family: 'Al-Mohanad', sans-serif;
+                * {
+                font-family: 'Al-Mohanad', sans-serif !important;
                 }
             </style>
             <t t-if="o.incoming_transaction_id">
-                <div class="header droidkufi-font">
-                    <div class="row">
+                <div class="header mohanad-font">
+                    <div class="row" style="direction: ltr; margin-top: 0px; margin-left: -50px">
                         <br/>
                         <div class="col-6 text-right">
                             <table align="left"
@@ -26,21 +26,21 @@
                                         <t t-esc="o.incoming_transaction_id.name"/>
                                     </td>
                                 </tr>
-                                <tr style="border:0px">
-                                    <td colspan="2" style="border:0px;padding-right:30px !important;">
-                                        <span style="font-weight:bold;font-stretch: expanded;">
-                                            Date:
-                                        </span>
+<!--                                <tr style="border:0px">-->
+<!--                                    <td colspan="2" style="border:0px;padding-right:30px !important;">-->
+<!--                                        <span style="font-weight:bold;font-stretch: expanded;">-->
+<!--                                            Date:-->
+<!--                                        </span>-->
 
-                                        <t t-set="date_hijri"
-                                           t-value="o.incoming_transaction_id.transaction_date_hijri"/>
+<!--                                        <t t-set="date_hijri"-->
+<!--                                           t-value="o.incoming_transaction_id.transaction_date_hijri"/>-->
 
-                                        <t t-set="date_hijri2" t-value="date_hijri.split('-')"/>
+<!--                                        <t t-set="date_hijri2" t-value="date_hijri.split('-')"/>-->
 
-                                        <t t-esc="date_hijri2[0]"/>/<t t-esc="date_hijri2[1]"/>/
-                                        <t t-esc="date_hijri2[2]"/>
-                                    </td>
-                                </tr>
+<!--                                        <t t-esc="date_hijri2[0]"/>/<t t-esc="date_hijri2[1]"/>/-->
+<!--                                        <t t-esc="date_hijri2[2]"/>-->
+<!--                                    </td>-->
+<!--                                </tr>-->
                                 <tr>
                                     <td colspan="2" style="border:0px;padding-right:30px !important;">
                                         <span style="font-weight:bold;">Reference:</span>
@@ -58,8 +58,8 @@
                                 </tr>
                                 <tr style="border:0px">
                                     <td colspan="2" style="border:0px">
-                                        <img t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%`s&amp;height=%s' % ('Code128', o.incoming_transaction_id.name, 600, 100)"
-                                             style="width:250px;height:40px;margin-top:5px;"/>
+                                        <img t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s' % ('Code128', o.incoming_transaction_id.name, 600, 100)"
+                                             style="width:250px;height:40px;margin-top:5px;margin-left:-40px;"/>
                                     </td>
                                 </tr>
                             </table>
@@ -80,7 +80,7 @@
             </t>
 
             <t t-if="o.internal_transaction_id">
-                <div class="header droidkufi-font">
+                <div class="header mohanad-font">
                     <div class="row" style="direction: ltr; margin-top: 0px; margin-left: -50px">
                         <br/>
                         <div class="col-6 text-right" style="direction: rtl;">
@@ -149,7 +149,7 @@
             </t>
 
             <t t-if="o.outgoing_transaction_id">
-                <div class="header droidkufi-font">
+                <div class="header mohanad-font">
                     <div class="row" style="direction: ltr; margin-top: 0px; margin-left: -50px">
                         <!--<br/>-->
                         <div class="col-6 text-right" style="direction: rtl;">
@@ -218,7 +218,7 @@
             </t>
 
             <t t-if="o.outgoing_transaction_id =='' and o.internal_transaction_id=='' and o.incoming_transaction_id ==''">
-                <div class="header droidkufi-font">
+                <div class="header mohanad-font">
                     <div class="row">
                         <div class="col-6 text-right">
 
@@ -236,7 +236,7 @@
                     </div>
                 </div>
             </t>
-            <div class="article o_report_layout_standard droidkufi-font">
+            <div class="article o_report_layout_standard mohanad-font">
                 <t t-raw="0"/>
             </div>
             <!--<div class="footer">-->
@@ -280,34 +280,34 @@
                             font-style: normal;
                             }
 
-                            .droidkufi-font {
-                            font-family: 'Al-Mohanad', sans-serif;
+                            * {
+                            font-family: 'Al-Mohanad', sans-serif !important;
                             }
                         </style>
-                        <div class="page droidkufi-font">
+                        <div class="page mohanad-font">
                             <!--                            <h4 style="text-align:center;margin-top:20px;font-weight:bold;font-size:20pt">Letter <t t-esc="o.name"/>-->
                             <!--                            </h4>-->
                             <!--                            <strong style="margin: 10px;margin-left:30px"> Date </strong>: <span t-esc="o.date" />-->
                             <br/>
                             <br/>
                             <div style="margin-bottom: 0px">
-                                <p class="droidkufi-font" style="line-height: 16 !important" t-raw="o.content">
+                                <p class="mohanad-font" style="line-height: 16 !important" t-raw="o.content">
                                 </p>
                             </div>
                             <br/>
                             <br/>
                              <div style="margin-top: 0px; page-break-inside: avoid;" dir="ltr">
-                                <div style="margin-bottom: 10px; text-align: left;">
-                                    <strong>اﻹسم:</strong>
+                                <div style="margin-bottom: 10px; text-align: left;margin-left:25px">
+                                    <strong t-if="o.signed_user_id">اﻹسم:</strong>
                                     <span t-esc="o.signed_user_id.name"/>
                                 </div>
-                                <div style="margin-bottom: 10px; text-align: left;">
+                                <div style="margin-bottom: 10px; text-align: left;margin-left:25px">
                                     <span t-esc="o.signed_user_id.employee_id.job_id.name"/>
                                 </div>
 
                                 <div style="margin-top: 10px; text-align: left;">
                                     <img t-if="o.new_signature" t-attf-src="data:image/*;base64,{{o.new_signature}}"
-                                         style="height:200px;width:250px; border: 0px;margin-left:25px"/>
+                                         style="height:200px;width:200px; border: 0px;margin-left:0px"/>
                                 </div>
 <!--                                <img t-if="o.signature" t-attf-src="data:image/*;base64,{{o.signature}}"-->
 <!--                                     style="margin-top:50px;height:100px;width:100px; border: 0px;margin-left:25px"/>-->
diff --git a/odex25_transactions/exp_transation_letters/reports/letter_template.xml b/odex25_transactions/exp_transation_letters/reports/letter_template.xml
index 9067a0212..7e3c99641 100644
--- a/odex25_transactions/exp_transation_letters/reports/letter_template.xml
+++ b/odex25_transactions/exp_transation_letters/reports/letter_template.xml
@@ -2,10 +2,21 @@
 <odoo>
     <data>
         <template id="custom_external_layout_standard">
+            <style type="text/css">
+                @font-face {
+                font-family: 'Al-Mohanad';
+                src: url("/exp_transation_letters/static/src/fonts/Al-Mohanad.ttf") format("truetype");
+                font-weight: normal;
+                font-style: normal;
+                }
+
+                * {
+                font-family: 'Al-Mohanad', sans-serif !important;
+                }
+            </style>
             <t t-if="o.incoming_transaction_id">
                 <div class="header">
-                    <div class="row">
-                        <br/>
+                    <div class="row" style="direction: ltr; margin-top: 0px; margin-left: -50px">
                         <div class="col-6 text-right" style="rtl">
                             <table align="left"
                                    style="border:1px solid white;width:50;margin-left:60px;margin-top:0px;margin-right:5px;margin-bottom:40px;text-align: justify;">
@@ -14,21 +25,19 @@
                                         <t t-esc="o.incoming_transaction_id.name"/>
                                     </td>
                                 </tr>
-                                <tr style="border:0px">
-                                    <td colspan="2" style="border:0px;padding-right:30px !important;">
-                                        <span style="font-weight:bold;font-stretch: expanded;">
-                                            Date:
-                                        </span>
+<!--                                <tr style="border:0px">-->
+<!--                                    <td colspan="2" style="border:0px;padding-right:30px !important;">-->
+<!--                                        <span style="font-weight:bold;font-stretch: expanded;">Date:</span>-->
 
-                                        <t t-set="date_hijri"
-                                           t-value="o.incoming_transaction_id.transaction_date_hijri"/>
+<!--                                        <t t-set="date_hijri"-->
+<!--                                           t-value="o.incoming_transaction_id.transaction_date_hijri"/>-->
 
-                                        <t t-set="date_hijri2" t-value="date_hijri.split('-')"/>
+<!--                                        <t t-set="date_hijri2" t-value="date_hijri.split('-')"/>-->
 
-                                        <t t-esc="date_hijri2[0]"/>/<t t-esc="date_hijri2[1]"/>/
-                                        <t t-esc="date_hijri2[2]"/>
-                                    </td>
-                                </tr>
+<!--                                        <t t-esc="date_hijri2[0]"/>/<t t-esc="date_hijri2[1]"/>/-->
+<!--                                        <t t-esc="date_hijri2[2]"/>-->
+<!--                                    </td>-->
+<!--                                </tr>-->
                                 <tr>
                                     <td colspan="2" style="border:0px;padding-right:30px !important;">
                                         <span style="font-weight:bold;">Reference:</span>
@@ -47,7 +56,7 @@
                                 <tr style="border:0px">
                                     <td colspan="2" style="border:0px">
                                         <img t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s' % ('Code128', o.incoming_transaction_id.name, 600, 100)"
-                                             style="width:250px;height:40px;margin-top:5px;"/>
+                                             style="width:250px;height:40px;margin-top:5px;margin-left:-40px;"/>
                                     </td>
                                 </tr>
                             </table>
@@ -279,11 +288,18 @@
                             font-style: normal;
                             }
 
-                            .droidkufi-font {
-                            font-family: 'Al-Mohanad', sans-serif;
+                            @font-face {
+                            font-family: 'Al-Mohanad';
+                            src: url("/exp_transation_letters/static/src/fonts/Al-Mohanad.ttf") format("truetype");
+                            font-weight: bold;
+                            font-style: normal;
+                            }
+
+                            * {
+                            font-family: 'Al-Mohanad', sans-serif !important;
                             }
                         </style>
-                        <div class="page droidkufi-font">
+                        <div class="page mohanad-font">
                             <!--                            <h4 style="text-align:center;margin-top:20px;font-weight:bold;font-size:20pt">Letter <t t-esc="o.name"/>-->
                             <!--                            </h4>-->
                             <!--                            <strong style="margin: 10px;margin-left:30px"> Date </strong>: <span t-esc="o.date" />-->
@@ -296,17 +312,17 @@
                             <br/>
                             <br/>
                             <div style="margin-top: 0px; page-break-inside: avoid;" dir="ltr">
-                                <div style="margin-bottom: 10px; text-align: left;">
-                                    <strong>اﻹسم:</strong>
+                                <div style="margin-bottom: 10px; text-align: left;margin-left:25px">
+                                    <strong t-if="o.signed_user_id">اﻹسم:</strong>
                                     <span t-esc="o.signed_user_id.name"/>
                                 </div>
-                                <div style="margin-bottom: 10px; text-align: left;">
+                                <div style="margin-bottom: 10px; text-align: left;margin-left:25px">
                                     <span t-esc="o.signed_user_id.employee_id.job_id.name"/>
                                 </div>
 
                                 <div style="margin-top: 10px; text-align: left;">
                                     <img t-if="o.new_signature" t-attf-src="data:image/*;base64,{{o.new_signature}}"
-                                         style="height:200px;width:250px; border: 0px;margin-left:25px"/>
+                                         style="height:200px;width:200px; border: 0px;margin-left:0px"/>
                                 </div>
 
 <!--                                <div style="margin-top: 10px; text-align: left;">-->

From 1f05ff44ee1897f0d099df7d41230d3e8f78c519 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, 16 Mar 2025 14:15:54 +0300
Subject: [PATCH 2/9] Update github action file

---
 .github/workflows/production_pull_code.yml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/.github/workflows/production_pull_code.yml b/.github/workflows/production_pull_code.yml
index 6997f25cc..073755090 100644
--- a/.github/workflows/production_pull_code.yml
+++ b/.github/workflows/production_pull_code.yml
@@ -13,6 +13,7 @@ on:
           - Helpdesk-Khabir-Project
           - King-AbdelAziz-Library-Project
           - Twahod-Project
+          - Ekram-Project
 
 jobs:
 # Cyber Project
@@ -82,6 +83,19 @@ jobs:
           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/}
 
+# Ekram project
+  ekram_master_server:
+    name: Deploy to Ekram Master
+    runs-on: ekram-client-project-runner
+    if: github.event_name == 'workflow_dispatch' && github.event.inputs.environment == 'Ekram-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.EKRAM_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh
+          sudo ${{ secrets.EKRAM_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh ${{ secrets.EKRAM_PROJECT_USER }} ${{ secrets.EKRAM_STANDARD_FOLDER_PATH }} ${{ secrets.EKRAM_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')
 
         

From 8258f9c74bdbaeb9a8144a13b1dea1f604dcf7c5 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, 6 Apr 2025 15:49:43 +0200
Subject: [PATCH 3/9] Update github action file

---
 .github/workflows/production_pull_code.yml | 35 ++++++++++++----------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/production_pull_code.yml b/.github/workflows/production_pull_code.yml
index 073755090..1384dbbf9 100644
--- a/.github/workflows/production_pull_code.yml
+++ b/.github/workflows/production_pull_code.yml
@@ -21,14 +21,14 @@ jobs:
     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/}"
-          
+          mkdir -p ~/master_branch_sha
+          echo "${{ github.sha }}" > ~/master_branch_sha/${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/}
+          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/} ${{ secrets.GH_TOKEN }}
   
 # Ensan Project
   ensan_master_server:
@@ -39,9 +39,10 @@ jobs:
       - name: Checkout And Restart Project
         run: |
           echo "** [INFO] Running on branch --> ${GITHUB_REF#refs/heads/}"
-                    
+          mkdir -p ~/master_branch_sha
+          echo "${{ github.sha }}" > ~/master_branch_sha/${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/}
+          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/} ${{ secrets.GH_TOKEN }}
   
 # Helpdesk Project
   helpdesk_maser_server:
@@ -52,9 +53,10 @@ jobs:
       - name: Checkout And Restart Project
         run: |
           echo "** [INFO] Running on branch --> ${GITHUB_REF#refs/heads/}"
-                    
+          mkdir -p ~/master_branch_sha
+          echo "${{ github.sha }}" > ~/master_branch_sha/${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/}
+          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/} ${{ secrets.GH_TOKEN }}
 
 # King Abdel Aziz Lobrary project
   kaz_master_server:
@@ -65,9 +67,10 @@ jobs:
       - name: Checkout And Restart Project
         run: |
           echo "** [INFO] Running on branch --> ${GITHUB_REF#refs/heads/}"
-                    
+          mkdir -p ~/master_branch_sha
+          echo "${{ github.sha }}" > ~/master_branch_sha/${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/}
+          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/} ${{ secrets.GH_TOKEN }}
           sudo systemctl restart odoo-server-stage.service
 
 # Twahod project
@@ -79,9 +82,10 @@ jobs:
       - name: Checkout And Restart Project
         run: |
           echo "** [INFO] Running on branch --> ${GITHUB_REF#refs/heads/}"
-                    
+          mkdir -p ~/master_branch_sha
+          echo "${{ github.sha }}" > ~/master_branch_sha/${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/}
+          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/} ${{ secrets.GH_TOKEN }}
 
 # Ekram project
   ekram_master_server:
@@ -92,10 +96,9 @@ jobs:
       - name: Checkout And Restart Project
         run: |
           echo "** [INFO] Running on branch --> ${GITHUB_REF#refs/heads/}"
-                    
+          mkdir -p ~/master_branch_sha
+          echo "${{ github.sha }}" > ~/master_branch_sha/${GITHUB_REF#refs/heads/}
           sudo chmod +x ${{ secrets.EKRAM_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh
-          sudo ${{ secrets.EKRAM_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh ${{ secrets.EKRAM_PROJECT_USER }} ${{ secrets.EKRAM_STANDARD_FOLDER_PATH }} ${{ secrets.EKRAM_MASTER_SERVICE }} master ${GITHUB_REF#refs/heads/master_} ${GITHUB_REF#refs/heads/}
+          sudo ${{ secrets.EKRAM_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh ${{ secrets.EKRAM_PROJECT_USER }} ${{ secrets.EKRAM_STANDARD_FOLDER_PATH }} ${{ secrets.EKRAM_MASTER_SERVICE }} master ${GITHUB_REF#refs/heads/master_} ${GITHUB_REF#refs/heads/} ${{ secrets.GH_TOKEN }}
 
-# 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')
-
-        
+          

From b3e4339b5d997029db94dcdf2764d1fdb1bf99b6 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, 8 Apr 2025 12:04:51 +0200
Subject: [PATCH 4/9] Update dev-preprod-servers.yml

---
 .github/workflows/dev-preprod-servers.yml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/dev-preprod-servers.yml b/.github/workflows/dev-preprod-servers.yml
index d86cbb29d..f0362da8a 100644
--- a/.github/workflows/dev-preprod-servers.yml
+++ b/.github/workflows/dev-preprod-servers.yml
@@ -23,6 +23,7 @@ on:
       - dev_odex25_website
       - dev_openeducat_erp-14.0.1.0
       - dev_odex25_ensan
+      - dev_odex25_donation
       - preprod_odex-event
       - preprod_odex25_accounting
       - preprod_odex25_base
@@ -43,6 +44,7 @@ on:
       - preprod_odex25_website
       - preprod_openeducat_erp-14.0.1.0
       - preprod_odex25_ensan
+      - preprod_odex25_donation
 
   workflow_dispatch:
     inputs:
@@ -60,13 +62,13 @@ 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')
+    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.ref 'refs/heads/preprod_odex25_donation') || (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.CYBER_APP_PREPROD_SERVICE }}
+          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
@@ -76,13 +78,13 @@ jobs:
   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')
+    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.ref 'refs/heads/dev_odex25_donation') || (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.CYBER_APP_TEST_SERVICE }}
+          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

From e6c2b65810012466f7174ed8eb7a5d8c42a166e4 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: Wed, 9 Apr 2025 06:07:38 +0200
Subject: [PATCH 5/9] Update github action file

---
 .github/workflows/dev-preprod-servers.yml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/dev-preprod-servers.yml b/.github/workflows/dev-preprod-servers.yml
index f0362da8a..d86cbb29d 100644
--- a/.github/workflows/dev-preprod-servers.yml
+++ b/.github/workflows/dev-preprod-servers.yml
@@ -23,7 +23,6 @@ on:
       - dev_odex25_website
       - dev_openeducat_erp-14.0.1.0
       - dev_odex25_ensan
-      - dev_odex25_donation
       - preprod_odex-event
       - preprod_odex25_accounting
       - preprod_odex25_base
@@ -44,7 +43,6 @@ on:
       - preprod_odex25_website
       - preprod_openeducat_erp-14.0.1.0
       - preprod_odex25_ensan
-      - preprod_odex25_donation
 
   workflow_dispatch:
     inputs:
@@ -62,13 +60,13 @@ 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.ref 'refs/heads/preprod_odex25_donation') || (github.event_name == 'workflow_dispatch' && github.event.inputs.environment == 'preprod')
+    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 }}
+          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.CYBER_APP_PREPROD_SERVICE }}
           if [ $? -eq 0 ]; then
               echo "** [INFO] "PREPROD" services have been restarted."
           else
@@ -78,13 +76,13 @@ jobs:
   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.ref 'refs/heads/dev_odex25_donation') || (github.event_name == 'workflow_dispatch' && github.event.inputs.environment == 'dev')
+    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 }}
+          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.CYBER_APP_TEST_SERVICE }}
           if [ $? -eq 0 ]; then
               echo "** [INFO] "DEV" services have been restarted."
           else

From be48c3228005d2b68658e90a7fc14a01d3baefdb 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: Wed, 28 May 2025 15:31:09 +0300
Subject: [PATCH 6/9] Update github action file

---
 .github/workflows/production_pull_code.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/production_pull_code.yml b/.github/workflows/production_pull_code.yml
index 1384dbbf9..6254be019 100644
--- a/.github/workflows/production_pull_code.yml
+++ b/.github/workflows/production_pull_code.yml
@@ -26,7 +26,7 @@ jobs:
         run: |                    
           echo "** [INFO] Running on branch --> ${GITHUB_REF#refs/heads/}"
           mkdir -p ~/master_branch_sha
-          echo "${{ github.sha }}" > ~/master_branch_sha/${GITHUB_REF#refs/heads/}
+          echo "$(date '+%Y-%m-%d %H:%M:%S') - ${{ github.sha }}" >> ~/master_branch_sha/${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/} ${{ secrets.GH_TOKEN }}
   
@@ -40,7 +40,7 @@ jobs:
         run: |
           echo "** [INFO] Running on branch --> ${GITHUB_REF#refs/heads/}"
           mkdir -p ~/master_branch_sha
-          echo "${{ github.sha }}" > ~/master_branch_sha/${GITHUB_REF#refs/heads/}
+          echo "$(date '+%Y-%m-%d %H:%M:%S') - ${{ github.sha }}" >> ~/master_branch_sha/${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/} ${{ secrets.GH_TOKEN }}
   
@@ -54,7 +54,7 @@ jobs:
         run: |
           echo "** [INFO] Running on branch --> ${GITHUB_REF#refs/heads/}"
           mkdir -p ~/master_branch_sha
-          echo "${{ github.sha }}" > ~/master_branch_sha/${GITHUB_REF#refs/heads/}
+          echo "$(date '+%Y-%m-%d %H:%M:%S') - ${{ github.sha }}" >> ~/master_branch_sha/${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/} ${{ secrets.GH_TOKEN }}
 
@@ -68,7 +68,7 @@ jobs:
         run: |
           echo "** [INFO] Running on branch --> ${GITHUB_REF#refs/heads/}"
           mkdir -p ~/master_branch_sha
-          echo "${{ github.sha }}" > ~/master_branch_sha/${GITHUB_REF#refs/heads/}
+          echo "$(date '+%Y-%m-%d %H:%M:%S') - ${{ github.sha }}" >> ~/master_branch_sha/${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/} ${{ secrets.GH_TOKEN }}
           sudo systemctl restart odoo-server-stage.service
@@ -83,7 +83,7 @@ jobs:
         run: |
           echo "** [INFO] Running on branch --> ${GITHUB_REF#refs/heads/}"
           mkdir -p ~/master_branch_sha
-          echo "${{ github.sha }}" > ~/master_branch_sha/${GITHUB_REF#refs/heads/}
+          echo "$(date '+%Y-%m-%d %H:%M:%S') - ${{ github.sha }}" >> ~/master_branch_sha/${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/} ${{ secrets.GH_TOKEN }}
 
@@ -97,7 +97,7 @@ jobs:
         run: |
           echo "** [INFO] Running on branch --> ${GITHUB_REF#refs/heads/}"
           mkdir -p ~/master_branch_sha
-          echo "${{ github.sha }}" > ~/master_branch_sha/${GITHUB_REF#refs/heads/}
+          echo "$(date '+%Y-%m-%d %H:%M:%S') - ${{ github.sha }}" >> ~/master_branch_sha/${GITHUB_REF#refs/heads/}
           sudo chmod +x ${{ secrets.EKRAM_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh
           sudo ${{ secrets.EKRAM_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh ${{ secrets.EKRAM_PROJECT_USER }} ${{ secrets.EKRAM_STANDARD_FOLDER_PATH }} ${{ secrets.EKRAM_MASTER_SERVICE }} master ${GITHUB_REF#refs/heads/master_} ${GITHUB_REF#refs/heads/} ${{ secrets.GH_TOKEN }}
 

From 272eb8c87cbe9146db4e0408e6deb053567a2329 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: Mon, 16 Jun 2025 10:47:38 +0300
Subject: [PATCH 7/9] Update github action file

---
 .github/workflows/production_pull_code.yml | 41 +++++++++++++++-------
 1 file changed, 28 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/production_pull_code.yml b/.github/workflows/production_pull_code.yml
index 6254be019..3aa0018b1 100644
--- a/.github/workflows/production_pull_code.yml
+++ b/.github/workflows/production_pull_code.yml
@@ -8,27 +8,28 @@ on:
         required: true
         type: choice
         options:
-          - Cyber-Security-Project
+          # - Cyber-Security-Project
           - Ensan-Project
           - Helpdesk-Khabir-Project
           - King-AbdelAziz-Library-Project
           - Twahod-Project
           - Ekram-Project
+          - Sahli-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')
-    steps:
-      - name: Checkout And Restart Project
-        run: |                    
-          echo "** [INFO] Running on branch --> ${GITHUB_REF#refs/heads/}"
-          mkdir -p ~/master_branch_sha
-          echo "$(date '+%Y-%m-%d %H:%M:%S') - ${{ github.sha }}" >> ~/master_branch_sha/${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/} ${{ secrets.GH_TOKEN }}
+  # 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')
+  #   steps:
+  #     - name: Checkout And Restart Project
+  #       run: |                    
+  #         echo "** [INFO] Running on branch --> ${GITHUB_REF#refs/heads/}"
+  #         mkdir -p ~/master_branch_sha
+  #         echo "$(date '+%Y-%m-%d %H:%M:%S') - ${{ github.sha }}" >> ~/master_branch_sha/${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/} ${{ secrets.GH_TOKEN }}
   
 # Ensan Project
   ensan_master_server:
@@ -101,4 +102,18 @@ jobs:
           sudo chmod +x ${{ secrets.EKRAM_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh
           sudo ${{ secrets.EKRAM_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh ${{ secrets.EKRAM_PROJECT_USER }} ${{ secrets.EKRAM_STANDARD_FOLDER_PATH }} ${{ secrets.EKRAM_MASTER_SERVICE }} master ${GITHUB_REF#refs/heads/master_} ${GITHUB_REF#refs/heads/} ${{ secrets.GH_TOKEN }}
 
+# Sahli Prod project
+  sahli_prod_master_server:
+    name: Deploy to Sahli Prod Master
+    runs-on: sahli-client-project-runner
+    if: github.event_name == 'workflow_dispatch' && github.event.inputs.environment == 'Sahli-Project' && (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_hr' || github.ref == 'refs/heads/master_odex25_inventory' || github.ref == 'refs/heads/master_odex25_purchase' || github.ref == 'refs/heads/master_odex25_sales' || github.ref == 'refs/heads/master_odex25_project')
+    steps:
+      - name: Checkout And Restart Project
+        run: |
+          echo "** [INFO] Running on branch --> ${GITHUB_REF#refs/heads/}"
+          mkdir -p ~/master_branch_sha
+          echo "$(date '+%Y-%m-%d %H:%M:%S') - ${{ github.sha }}" >> ~/master_branch_sha/${GITHUB_REF#refs/heads/}
+          sudo chmod +x ${{ secrets.SAHLI_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh
+          sudo ${{ secrets.SAHLI_STANDARD_FOLDER_PATH }}/scripts/pull_code.sh ${{ secrets.SAHLI_PROJECT_USER }} ${{ secrets.SAHLI_STANDARD_FOLDER_PATH }} ${{ secrets.SAHLI_PROD_MASTER_SERVICE }} master ${GITHUB_REF#refs/heads/master_} ${GITHUB_REF#refs/heads/} ${{ secrets.GH_TOKEN }}
+
           

From 0e28ed0aa4ab33c7100654d21d0efc92382e258b 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: Mon, 16 Jun 2025 12:02:01 +0300
Subject: [PATCH 8/9] Update production_pull_code.yml

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

diff --git a/.github/workflows/production_pull_code.yml b/.github/workflows/production_pull_code.yml
index 3aa0018b1..686243128 100644
--- a/.github/workflows/production_pull_code.yml
+++ b/.github/workflows/production_pull_code.yml
@@ -106,7 +106,7 @@ jobs:
   sahli_prod_master_server:
     name: Deploy to Sahli Prod Master
     runs-on: sahli-client-project-runner
-    if: github.event_name == 'workflow_dispatch' && github.event.inputs.environment == 'Sahli-Project' && (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_hr' || github.ref == 'refs/heads/master_odex25_inventory' || github.ref == 'refs/heads/master_odex25_purchase' || github.ref == 'refs/heads/master_odex25_sales' || github.ref == 'refs/heads/master_odex25_project')
+    if: github.event_name == 'workflow_dispatch' && github.event.inputs.environment == 'Sahli-Project' && (github.ref == 'refs/heads/master_odex25_accounting' || github.ref == 'refs/heads/master_odex25_helpdesk' || github.ref == 'refs/heads/master_odex25_base' || github.ref == 'refs/heads/master_odex25_dms' || github.ref == 'refs/heads/master_odex25_hr' || github.ref == 'refs/heads/master_odex25_inventory' || github.ref == 'refs/heads/master_odex25_purchase' || github.ref == 'refs/heads/master_odex25_sales' || github.ref == 'refs/heads/master_odex25_project')
     steps:
       - name: Checkout And Restart Project
         run: |

From 2b311ac60dbb137820e2860e378e48b8ccb390fb 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, 17 Jun 2025 07:14:10 +0300
Subject: [PATCH 9/9] Update github action file

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

diff --git a/.github/workflows/production_pull_code.yml b/.github/workflows/production_pull_code.yml
index 686243128..3aa0018b1 100644
--- a/.github/workflows/production_pull_code.yml
+++ b/.github/workflows/production_pull_code.yml
@@ -106,7 +106,7 @@ jobs:
   sahli_prod_master_server:
     name: Deploy to Sahli Prod Master
     runs-on: sahli-client-project-runner
-    if: github.event_name == 'workflow_dispatch' && github.event.inputs.environment == 'Sahli-Project' && (github.ref == 'refs/heads/master_odex25_accounting' || github.ref == 'refs/heads/master_odex25_helpdesk' || github.ref == 'refs/heads/master_odex25_base' || github.ref == 'refs/heads/master_odex25_dms' || github.ref == 'refs/heads/master_odex25_hr' || github.ref == 'refs/heads/master_odex25_inventory' || github.ref == 'refs/heads/master_odex25_purchase' || github.ref == 'refs/heads/master_odex25_sales' || github.ref == 'refs/heads/master_odex25_project')
+    if: github.event_name == 'workflow_dispatch' && github.event.inputs.environment == 'Sahli-Project' && (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_hr' || github.ref == 'refs/heads/master_odex25_inventory' || github.ref == 'refs/heads/master_odex25_purchase' || github.ref == 'refs/heads/master_odex25_sales' || github.ref == 'refs/heads/master_odex25_project')
     steps:
       - name: Checkout And Restart Project
         run: |