From ac1c6628104d5c4f85fad7bc7aa0ba4c9cdaa035 Mon Sep 17 00:00:00 2001
From: Samir Ladoui <whitexhunter23@gmail.com>
Date: Wed, 12 Feb 2025 08:29:28 +0100
Subject: [PATCH 1/2] [FIX] exp_transation_letters: fix letter reports

---
 .../exp_transation_letters/i18n/ar_001.po     |  95 +++---
 .../reports/formal_letter.xml                 | 285 ++++------------
 .../reports/letter_template.xml               | 304 +++---------------
 3 files changed, 152 insertions(+), 532 deletions(-)

diff --git a/odex25_transactions/exp_transation_letters/i18n/ar_001.po b/odex25_transactions/exp_transation_letters/i18n/ar_001.po
index 019de58f0..60d80ceaa 100644
--- a/odex25_transactions/exp_transation_letters/i18n/ar_001.po
+++ b/odex25_transactions/exp_transation_letters/i18n/ar_001.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 14.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-04-30 00:36+0000\n"
-"PO-Revision-Date: 2024-04-30 00:36+0000\n"
+"POT-Creation-Date: 2025-02-11 15:31+0000\n"
+"PO-Revision-Date: 2025-02-11 15:31+0000\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -17,32 +17,61 @@ msgstr ""
 
 #. module: exp_transation_letters
 #: model:ir.actions.report,print_report_name:exp_transation_letters.report_letter_action_report
+#: model:ir.actions.report,print_report_name:exp_transation_letters.report_letter_formal_action_report
 msgid "'Letter %s' % (object.name)"
 msgstr "'الخطاب %s' % (object.name)"
 
 #. module: exp_transation_letters
+#: model_terms:ir.ui.view,arch_db:exp_transation_letters.custom_external_formal_layout_standard
 #: model_terms:ir.ui.view,arch_db:exp_transation_letters.custom_external_layout_standard
-msgid "<span style=\"font-weight:bold\">Attachment:</span>"
-msgstr "<span style=\"font-weight:bold\">المرفق:</span>"
+msgid "<span>Attachment:</span>"
+msgstr "<span>المرفق:</span>"
 
 #. module: exp_transation_letters
+#: model_terms:ir.ui.view,arch_db:exp_transation_letters.custom_external_formal_layout_standard
 #: model_terms:ir.ui.view,arch_db:exp_transation_letters.custom_external_layout_standard
-msgid "<span style=\"font-weight:bold;\">Reference:</span>"
-msgstr "<span style=\"font-weight:bold;\">المرجع:</span>"
+msgid "<span>Reference:</span>"
+msgstr "<span>المرجع:</span>"
 
 #. module: exp_transation_letters
+#: model_terms:ir.ui.view,arch_db:exp_transation_letters.custom_external_formal_layout_standard
 #: model_terms:ir.ui.view,arch_db:exp_transation_letters.custom_external_layout_standard
-msgid ""
-"<span style=\"font-weight:bold;font-stretch: expanded;\">Date:</span>"
-msgstr ""
-"<span style=\"font-weight:bold;font-stretch: expanded;\">التاريخ:</span>"
+msgid "<span>Subject:</span>"
+msgstr "<span>الموضوع:</span>"
 
+#. module: exp_transation_letters
+#: model_terms:ir.ui.view,arch_db:exp_transation_letters.custom_external_formal_layout_standard
+#: model_terms:ir.ui.view,arch_db:exp_transation_letters.custom_external_layout_standard
+msgid "<span>Transaction Date:</span>"
+msgstr "<span>تاريخ المعاملة:</span>"
+
+#. module: exp_transation_letters
+#: model_terms:ir.ui.view,arch_db:exp_transation_letters.custom_external_formal_layout_standard
+#: model_terms:ir.ui.view,arch_db:exp_transation_letters.custom_external_layout_standard
+msgid "<span>Transaction Number:</span>"
+msgstr "<span>رقم المعاملة:</span>"
 
 #. module: exp_transation_letters
 #: model_terms:ir.ui.view,arch_db:exp_transation_letters.view_transaction_letters_form
 msgid "Add As Attachment to Transaction"
 msgstr "إضافة كمرفق إلى المعاملة"
 
+#. module: exp_transation_letters
+#: model:ir.model.fields,field_description:exp_transation_letters.field_res_users__attachment_id
+msgid "Attachment"
+msgstr ""
+
+#. module: exp_transation_letters
+#: model:ir.model.fields,field_description:exp_transation_letters.field_letters_letters__attachment_generated
+msgid "Attachment Generated"
+msgstr ""
+
+#. module: exp_transation_letters
+#: model:ir.model.fields,field_description:exp_transation_letters.field_letters_letters__attachment_ids
+#: model:ir.model.fields,field_description:exp_transation_letters.field_letters_template__attachment_ids
+msgid "Attachments"
+msgstr ""
+
 #. module: exp_transation_letters
 #: model:ir.model.fields,field_description:exp_transation_letters.field_letters_template__conclusion
 msgid "Conclusion"
@@ -119,6 +148,11 @@ msgstr "المعاملة الداخلية"
 msgid "Introduction"
 msgstr "المقدمة"
 
+#. module: exp_transation_letters
+#: model:ir.model.fields,field_description:exp_transation_letters.field_letters_letters__is_sign
+msgid "Is Sign"
+msgstr ""
+
 #. module: exp_transation_letters
 #: model:ir.model.fields,field_description:exp_transation_letters.field_letters_letters____last_update
 #: model:ir.model.fields,field_description:exp_transation_letters.field_letters_template____last_update
@@ -138,6 +172,7 @@ msgid "Last Updated on"
 msgstr "آخر تحديث في"
 
 #. module: exp_transation_letters
+#: model:ir.model.fields,field_description:exp_transation_letters.field_res_users__letter_id
 #: model:res.groups,name:exp_transation_letters.group_cm_letter
 msgid "Letter"
 msgstr "الخطابات"
@@ -178,24 +213,6 @@ msgstr "قالب الخطاب"
 msgid "Name"
 msgstr "الاسم"
 
-#. module: exp_transation_letters
-#: model_terms:ir.ui.view,arch_db:exp_transation_letters.custom_external_formal_layout_standard
-#: model_terms:ir.ui.view,arch_db:exp_transation_letters.custom_external_layout_standard
-msgid "Transaction Number:"
-msgstr "رقم المعاملة:"
-
-#. module: exp_transation_letters
-#: model_terms:ir.ui.view,arch_db:exp_transation_letters.custom_external_formal_layout_standard
-#: model_terms:ir.ui.view,arch_db:exp_transation_letters.custom_external_layout_standard
-msgid "Subject:"
-msgstr "الموضوع:"
-
-#. module: exp_transation_letters
-#: model_terms:ir.ui.view,arch_db:exp_transation_letters.custom_external_formal_layout_standard
-#: model_terms:ir.ui.view,arch_db:exp_transation_letters.custom_external_layout_standard
-msgid "Transaction Date:"
-msgstr "تاريخ المعاملة:"
-
 #. module: exp_transation_letters
 #: model:ir.model.fields.selection,name:exp_transation_letters.selection__letters_letters__transaction_type__outgoing
 msgid "Outgoing"
@@ -207,9 +224,9 @@ msgid "Outgoing Transaction"
 msgstr "معاملة خارجية"
 
 #. module: exp_transation_letters
-#: model_terms:ir.ui.view,arch_db:exp_transation_letters.custom_external_layout_standard
-msgid "Page: <span class=\"page\"/> / <span class=\"topage\"/>"
-msgstr ""
+#: model:ir.actions.report,name:exp_transation_letters.report_letter_formal_action_report
+msgid "Print Formal letters"
+msgstr "طباعة الخطاب على ورق رسمي"
 
 #. module: exp_transation_letters
 #: model:ir.actions.report,name:exp_transation_letters.report_letter_action_report
@@ -217,15 +234,16 @@ msgid "Print letters"
 msgstr "طباعة الخطاب"
 
 #. module: exp_transation_letters
-#: model:ir.actions.report,name:exp_transation_letters.report_letter_formal_action_report
-msgid "Print Formal letters"
-msgstr "طباعة الخطاب على ورق رسمي"
-
-#. module: exp_transation_letters
+#: model:ir.model.fields,field_description:exp_transation_letters.field_letters_letters__new_signature
 #: model:ir.model.fields,field_description:exp_transation_letters.field_letters_letters__signature
 msgid "Signature image"
 msgstr "صورة التوقيع"
 
+#. module: exp_transation_letters
+#: model:ir.model.fields,field_description:exp_transation_letters.field_letters_letters__signed_user_id
+msgid "Signed User"
+msgstr ""
+
 #. module: exp_transation_letters
 #: model:ir.model.fields,field_description:exp_transation_letters.field_letters_letters__letter_template
 msgid "Template"
@@ -247,6 +265,11 @@ msgstr "نوع المعاملة"
 msgid "Unite"
 msgstr "وحدة"
 
+#. module: exp_transation_letters
+#: model:ir.model,name:exp_transation_letters.model_res_users
+msgid "Users"
+msgstr "المستخدمون"
+
 #. module: exp_transation_letters
 #: model:ir.model,name:exp_transation_letters.model_letters_letters
 msgid "letters.letters"
diff --git a/odex25_transactions/exp_transation_letters/reports/formal_letter.xml b/odex25_transactions/exp_transation_letters/reports/formal_letter.xml
index f748114ee..b5c13f79e 100644
--- a/odex25_transactions/exp_transation_letters/reports/formal_letter.xml
+++ b/odex25_transactions/exp_transation_letters/reports/formal_letter.xml
@@ -4,214 +4,56 @@
         <template id="custom_external_formal_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';
+                    src: url("/exp_transation_letters/static/src/fonts/Al-Mohanad.ttf") format("truetype");
+                    font-weight: normal;
+                    font-style: normal;
+                }
+
+                @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;
+                    font-family: 'Al-Mohanad', sans-serif !important;
                 }
             </style>
-            <t t-if="o.incoming_transaction_id">
-                <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"
-                                   style="border:1px solid white;width:50;margin-left:60px;margin-top:0px;margin-right:5px;margin-bottom:40px;text-align: justify;">
-                                <tr style="border:0px">
-                                    <td style="font-weight: bold;border:0px;padding-right:30px !important;">Number:
-                                        <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>-->
-
-<!--                                        <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-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>
-                                        <span t-field="o.incoming_transaction_id.transaction_date"
-                                              t-field-options="{&quot;format&quot;: &quot;yyyy/MM/dd&quot;}"/>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td colspan="2" style="border:0px;padding-right:30px !important;">
-                                        <span style="font-weight:bold">Attachment:</span>
-                                        <span style="direction: ltr !important;">
-                                            <t t-esc="o.incoming_transaction_id.attachment_num"/>
-                                        </span>
-                                    </td>
-                                </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;margin-left:-40px;"/>
-                                    </td>
-                                </tr>
-                            </table>
-
+            <div class="header">
+                <t t-set="transaction_id" t-value="o.incoming_transaction_id or o.internal_transaction_id or o.outgoing_transaction_id"/>
+                <div class="row" style="direction:ltr;">
+                    <div class="col-6">
+                        <div class="w-100 font-weight-bold" style="padding-right:85px;font-family:'Al-Mohanad' !important">
+                            <div>
+                                <span>Transaction Number:</span> <span t-esc="transaction_id.name" />
+                            </div>
+                            <div t-if="o.incoming_transaction_id">
+                                <span>Reference:</span> <span 
+                                                            t-field="transaction_id.transaction_date" 
+                                                            t-field-options="{&quot;format&quot;: &quot;yyyy/MM/dd&quot;}"/>
+                            </div>
+                            <div t-if="o.incoming_transaction_id">
+                                <span>Attachment:</span> <span t-esc="transaction_id.attachment_num"/>
+                            </div>
+                            <div t-if="o.outgoing_transaction_id or o.internal_transaction_id">
+                                <span>Subject:</span> <span t-esc="transaction_id.subject" />
+                            </div>
+                            <div t-if="o.outgoing_transaction_id or o.internal_transaction_id">
+                                <span>Transaction Date:</span> <span 
+                                                                    t-field="transaction_id.transaction_date" 
+                                                                    t-field-options="{&quot;format&quot;: &quot;yyyy/MM/dd&quot;}"/>
+                            </div>
+                            <div>
+                                <img 
+                                    t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s' % ('Code128', transaction_id.name, 600, 100)"
+                                    style="width:250px;height:40px;margin-top:5px;margin-left:-40px;"/>
+                            </div>
                         </div>
-<!--                        <div class="col-6 text-left">-->
-<!--                            <table align="left">-->
-<!--                                <tr style="border:0px">-->
-<!--                                    <td colspan="2" style="border:0px">-->
-<!--                                        <img t-att-src="'/logo.png?company=%s' % (o.env.user.company_id.id or 0)"-->
-<!--                                             t-att-alt="'%s' % company.name" style="width:80px;height:80px;"/>-->
-<!--                                    </td>-->
-<!--                                </tr>-->
-<!--                            </table>-->
-<!--                        </div>-->
                     </div>
                 </div>
-            </t>
-
-            <t t-if="o.internal_transaction_id">
-                <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;">
-                            <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;">
-                                <tr style="border:0px">
-                                    <td style="font-weight: bold;border:0px;padding-right:30px !important;">Transaction Number:
-                                        <t t-esc="o.internal_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>-->
-
-                                <!--        <t t-set="date_hijri" t-value="o.internal_transaction_id.transaction_date_hijri"/>-->
-
-                                <!--        <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>-->
-                                <tr>
-                                    <td colspan="2" style="font-weight:bold;border:0px;padding-right:30px !important;">Subject:
-                                        <span t-field="o.internal_transaction_id.subject"
-                                              t-field-options="{&quot;format&quot;: &quot;yyyy/MM/dd&quot;}"/>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td colspan="2" style="font-weight:bold;border:0px;padding-right:30px !important;">Transaction Date:
-                                        <span t-field="o.internal_transaction_id.transaction_date"
-                                              t-field-options="{&quot;format&quot;: &quot;yyyy/MM/dd&quot;}"/>
-                                    </td>
-                                </tr>
-                                <!--<tr>-->
-                                <!--    <td colspan="2" style="border:0px;padding-right:30px !important;">-->
-                                <!--        <span style="font-weight:bold">Attachment:</span>-->
-                                <!--        <span style="direction: ltr !important;">-->
-                                <!--            <t t-esc="o.internal_transaction_id.attachment_num"/>-->
-                                <!--        </span>-->
-                                <!--    </td>-->
-                                <!--</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.internal_transaction_id.name, 600, 100)"
-                                             style="width:250px;height:40px;margin-top:5px;"/>
-                                    </td>
-                                </tr>
-                            </table>
-                        </div>
-                        <!--<div class="col-6 text-left">-->
-                        <!--    <table align="left">-->
-                        <!--        <tr style="border:0px">-->
-                        <!--            <td>-->
-                        <!--                <img t-att-src="'/logo.png?company=%s' % (o.env.user.company_id.id or 0)" t-att-alt="'%s' % company.name" style="width:80px;height:80px;"/>-->
-                        <!--        Transaction    </td>-->
-                        <!--        </tr>-->
-                        <!--    </table>-->
-                        <!--</div>-->
-                    </div>
-                </div>
-            </t>
-
-            <t t-if="o.outgoing_transaction_id">
-                <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;">
-                            <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;">
-                                <tr style="border:0px">
-                                    <td style="font-weight: bold;border:0px;padding-right:30px !important;">Transaction Number:
-                                        <t t-esc="o.outgoing_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>-->
-
-                                <!--        <t t-set="date_hijri" t-value="o.outgoing_transaction_id.transaction_date_hijri"/>-->
-
-                                <!--        <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>-->
-                                <tr>
-                                    <td colspan="2" style="font-weight: bold;border:0px;padding-right:30px !important;">Subject:
-                                        <span t-field="o.outgoing_transaction_id.subject"
-                                              t-field-options="{&quot;format&quot;: &quot;yyyy/MM/dd&quot;}"/>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td colspan="2" style="font-weight:bold;border:0px;padding-right:30px !important;">Transaction Date:
-                                        <span t-field="o.outgoing_transaction_id.transaction_date"
-                                              t-field-options="{&quot;format&quot;: &quot;yyyy/MM/dd&quot;}"/>
-                                    </td>
-                                </tr>
-                                <!--<tr>-->
-                                <!--    <td colspan="2" style="border:0px;padding-right:30px !important;">-->
-                                <!--        <span style="font-weight:bold">Attachment:</span>-->
-                                <!--        <span style="direction: ltr !important;">-->
-                                <!--            <t t-esc="o.outgoing_transaction_id.attachment_num"/>-->
-                                <!--        </span>-->
-                                <!--    </td>-->
-                                <!--</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.outgoing_transaction_id.name, 600, 100)"
-                                             style="width:250px;height:40px;margin-top:5px;"/>
-                                    </td>
-                                </tr>
-                            </table>
-                        </div>
-                        <!--<div class="col-6 text-left">-->
-                        <!--    <table align="left">-->
-                        <!--        <tr style="border:0px">-->
-                        <!--            <td colspan="2" style="border:0px">-->
-                        <!--                <img t-att-src="'/logo.png?company=%s' % (o.env.user.company_id.id or 0)" t-att-alt="'%s' % company.name" style="width:80px;height:80px;"/>-->
-                        <!--            </td>-->
-                        <!--        </tr>-->
-                        <!--    </table>-->
-                        <!--</div>-->
-                    </div>
-                </div>
-            </t>
+            </div>
 
             <t t-if="o.outgoing_transaction_id =='' and o.internal_transaction_id=='' and o.incoming_transaction_id ==''">
                 <div class="header mohanad-font">
@@ -219,32 +61,12 @@
                         <div class="col-6 text-right">
 
                         </div>
-<!--                        <div class="col-6 text-left">-->
-<!--                            <table align="left">-->
-<!--                                <tr style="border:0px">-->
-<!--                                    <td colspan="2" style="border:0px">-->
-<!--                                        <img t-att-src="'/logo.png?company=%s' % (o.env.user.company_id.id or 0)"-->
-<!--                                             t-att-alt="'%s' % company.name" style="width:80px;height:80px;"/>-->
-<!--                                    </td>-->
-<!--                                </tr>-->
-<!--                            </table>-->
-<!--                        </div>-->
                     </div>
                 </div>
             </t>
             <div class="article o_report_layout_standard mohanad-font">
                 <t t-raw="0"/>
             </div>
-            <!--<div class="footer">-->
-            <!--    <div class="text-center">-->
-            <!--        <div class="text-muted">-->
-            <!--            Page:-->
-            <!--            <span class="page"/>-->
-            <!--            /-->
-            <!--            <span class="topage"/>-->
-            <!--        </div>-->
-            <!--    </div>-->
-            <!--</div>-->
         </template>
 
         <template id="formal_letter_external_layout">
@@ -270,20 +92,24 @@
                     <t t-call="exp_transation_letters.formal_letter_external_layout">
                         <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';
+                                src: url("/exp_transation_letters/static/src/fonts/Al-Mohanad.ttf") format("truetype");
+                                font-weight: normal;
+                                font-style: normal;
+                            }
+
+                            @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;
+                                font-family: 'Al-Mohanad', sans-serif !important;
                             }
                         </style>
                         <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">
@@ -294,7 +120,6 @@
                             <br/>
                              <div style="margin-top: 0px; page-break-inside: avoid;" dir="ltr">
                                 <div style="margin-bottom: 10px; text-align: left;margin-left:25px;font-size:18px;">
-<!--                                    <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;margin-left:25px;font-size:18px;">
@@ -305,8 +130,6 @@
                                     <img t-if="o.new_signature" t-attf-src="data:image/*;base64,{{o.new_signature}}"
                                          style="height:auto;max-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"/>-->
                             </div>
                         </div>
 
diff --git a/odex25_transactions/exp_transation_letters/reports/letter_template.xml b/odex25_transactions/exp_transation_letters/reports/letter_template.xml
index 803f4ee9e..676b7a3b9 100644
--- a/odex25_transactions/exp_transation_letters/reports/letter_template.xml
+++ b/odex25_transactions/exp_transation_letters/reports/letter_template.xml
@@ -2,246 +2,43 @@
 <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" 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;">
-                                <tr style="border:0px">
-                                    <td style="font-weight: bold;border:0px;padding-right:30px !important;">Transaction Number:
-                                        <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>-->
-
-<!--                                        <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-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>
-                                        <span t-field="o.incoming_transaction_id.transaction_date"
-                                              t-field-options="{&quot;format&quot;: &quot;yyyy/MM/dd&quot;}"/>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td colspan="2" style="border:0px;padding-right:30px !important;">
-                                        <span style="font-weight:bold">Attachment:</span>
-                                        <span style="direction: ltr !important;">
-                                            <t t-esc="o.incoming_transaction_id.attachment_num"/>
-                                        </span>
-                                    </td>
-                                </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;margin-left:-40px;"/>
-                                    </td>
-                                </tr>
-                            </table>
-
+            <div class="header">
+                <t t-set="transaction_id" t-value="o.incoming_transaction_id or o.internal_transaction_id or o.outgoing_transaction_id"/>
+                <div class="row" style="direction:ltr;">
+                    <div class="col-6">
+                        <div class="w-100 font-weight-bold" style="padding-right:85px;font-family:'Al-Mohanad' !important">
+                            <div>
+                                <span>Transaction Number:</span> <span t-esc="transaction_id.name" />
+                            </div>
+                            <div t-if="o.incoming_transaction_id">
+                                <span>Reference:</span> <span 
+                                                            t-field="transaction_id.transaction_date" 
+                                                            t-field-options="{&quot;format&quot;: &quot;yyyy/MM/dd&quot;}"/>
+                            </div>
+                            <div t-if="o.incoming_transaction_id">
+                                <span>Attachment:</span> <span t-esc="transaction_id.attachment_num"/>
+                            </div>
+                            <div t-if="o.outgoing_transaction_id or o.internal_transaction_id">
+                                <span>Subject:</span> <span t-esc="transaction_id.subject" />
+                            </div>
+                            <div t-if="o.outgoing_transaction_id or o.internal_transaction_id">
+                                <span>Transaction Date:</span> <span
+                                                                    t-field="transaction_id.transaction_date" 
+                                                                    t-field-options="{&quot;format&quot;: &quot;yyyy/MM/dd&quot;}"/>
+                            </div>
+                            <div>
+                                <img 
+                                    t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s' % ('Code128', transaction_id.name, 600, 100)"
+                                    style="width:250px;height:40px;margin-top:5px;margin-left:-40px;"/>
+                            </div>
                         </div>
-<!--                        <div class="col-6 text-left">-->
-<!--                            <table align="left">-->
-<!--                                <tr style="border:0px">-->
-<!--                                    <td colspan="2" style="border:0px">-->
-<!--                                        <img t-att-src="'/logo.png?company=%s' % (o.env.user.company_id.id or 0)"-->
-<!--                                             t-att-alt="'%s' % company.name" style="width:80px;height:80px;"/>-->
-<!--                                    </td>-->
-<!--                                </tr>-->
-<!--                            </table>-->
-<!--                        </div>-->
                     </div>
                 </div>
-            </t>
-            <t t-if="o.internal_transaction_id">
-                <div class="header">
-                    <div class="row" style="direction: ltr; margin-top: 0px; margin-left: -50px">
-                        <br/>
-                        <div class="col-6 text-right" style="direction: 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;">
-                                <tr style="border:0px">
-                                    <td style="font-weight: bold;border:0px;padding-right:30px !important;">Transaction Number:
-                                        <t t-esc="o.internal_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>-->
-
-                                <!--        <t t-set="date_hijri" t-value="o.internal_transaction_id.transaction_date_hijri"/>-->
-
-                                <!--        <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>-->
-                                <tr>
-                                    <td colspan="2" style="font-weight: bold;border:0px;padding-right:30px !important;">Subject:
-                                        <span t-field="o.internal_transaction_id.subject"
-                                              t-field-options="{&quot;format&quot;: &quot;yyyy/MM/dd&quot;}"/>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td colspan="2" style="font-weight: bold;border:0px;padding-right:30px !important;">Transaction Date:
-                                        <span t-field="o.internal_transaction_id.transaction_date"
-                                              t-field-options="{&quot;format&quot;: &quot;yyyy/MM/dd&quot;}"/>
-                                    </td>
-                                </tr>
-                                <!--<tr>-->
-                                <!--    <td colspan="2" style="border:0px;padding-right:30px !important;">-->
-                                <!--        <span style="font-weight:bold">Attachment:</span>-->
-                                <!--        <span style="direction: ltr !important;">-->
-                                <!--            <t t-esc="o.internal_transaction_id.attachment_num"/>-->
-                                <!--        </span>-->
-                                <!--    </td>-->
-                                <!--</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.internal_transaction_id.name, 600, 100)"
-                                             style="width:250px;height:40px;margin-top:5px;"/>
-                                    </td>
-                                </tr>
-                            </table>
-                        </div>
-                        <!--<div class="col-6 text-left">-->
-                        <!--    <table align="left">-->
-                        <!--        <tr style="border:0px">-->
-                        <!--            <td>-->
-                        <!--                <img t-att-src="'/logo.png?company=%s' % (o.env.user.company_id.id or 0)" t-att-alt="'%s' % company.name" style="width:80px;height:80px;"/>-->
-                        <!--            </td>-->
-                        <!--        </tr>-->
-                        <!--    </table>-->
-                        <!--</div>-->
-                    </div>
-                </div>
-            </t>
-
-
-            <t t-if="o.outgoing_transaction_id">
-                <div class="header">
-                    <div class="row" style="direction: ltr; margin-top: 0px; margin-left: -50px">
-                        <!--<br/>-->
-                        <div class="col-6 text-right" style="direction: 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;">
-                                <tr style="border:0px">
-                                    <td style="font-weight: bold;border:0px;padding-right:30px !important;">Transaction Number:
-                                        <t t-esc="o.outgoing_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>-->
-
-                                <!--        <t t-set="date_hijri" t-value="o.outgoing_transaction_id.transaction_date_hijri"/>-->
-
-                                <!--        <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>-->
-                                <tr>
-                                    <td colspan="2" style="font-weight: bold;border:0px;padding-right:30px !important;">Subject:
-                                        <span t-field="o.outgoing_transaction_id.subject"
-                                              t-field-options="{&quot;format&quot;: &quot;yyyy/MM/dd&quot;}"/>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td colspan="2" style="font-weight:bold;border:0px;padding-right:30px !important;">Transaction Date:
-                                        <span t-field="o.outgoing_transaction_id.transaction_date"
-                                              t-field-options="{&quot;format&quot;: &quot;yyyy/MM/dd&quot;}"/>
-                                    </td>
-                                </tr>
-                                <!--<tr>-->
-                                <!--    <td colspan="2" style="border:0px;padding-right:30px !important;">-->
-                                <!--        <span style="font-weight:bold">Attachment:</span>-->
-                                <!--        <span style="direction: ltr !important;">-->
-                                <!--            <t t-esc="o.outgoing_transaction_id.attachment_num"/>-->
-                                <!--        </span>-->
-                                <!--    </td>-->
-                                <!--</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.outgoing_transaction_id.name, 600, 100)"
-                                             style="width:250px;height:40px;margin-top:5px;"/>
-                                    </td>
-                                </tr>
-                            </table>
-                        </div>
-                        <!--<div class="col-6 text-left">-->
-                        <!--    <table align="left">-->
-                        <!--        <tr style="border:0px">-->
-                        <!--            <td colspan="2" style="border:0px">-->
-                        <!--                <img t-att-src="'/logo.png?company=%s' % (o.env.user.company_id.id or 0)" t-att-alt="'%s' % company.name" style="width:80px;height:80px;"/>-->
-                        <!--            </td>-->
-                        <!--        </tr>-->
-                        <!--    </table>-->
-                        <!--</div>-->
-                    </div>
-                </div>
-            </t>
-            <t t-if="o.outgoing_transaction_id =='' and o.internal_transaction_id=='' and o.incoming_transaction_id ==''">
-                <div class="header">
-                    <div class="row">
-                        <div class="col-6 text-right">
-
-                        </div>
-<!--                        <div class="col-6 text-left">-->
-<!--                            <table align="left">-->
-<!--                                <tr style="border:0px">-->
-<!--                                    <td colspan="2" style="border:0px">-->
-<!--                                        <img t-att-src="'/logo.png?company=%s' % (o.env.user.company_id.id or 0)"-->
-<!--                                             t-att-alt="'%s' % company.name" style="width:80px;height:80px;"/>-->
-<!--                                    </td>-->
-<!--                                </tr>-->
-<!--                            </table>-->
-<!--                        </div>-->
-                    </div>
-                </div>
-            </t>
+            </div>
 
             <div class="article o_report_layout_standard">
                 <t t-raw="0"/>
             </div>
-            <!--<div class="footer">-->
-            <!--    <div class="text-center">-->
-            <!--        <div class="text-muted">-->
-            <!--            Page:-->
-            <!--            <span class="page"/>-->
-            <!--            /-->
-            <!--            <span class="topage"/>-->
-            <!--        </div>-->
-            <!--    </div>-->
-            <!--</div>-->
         </template>
 
         <template id="letter_external_layout">
@@ -259,18 +56,6 @@
             <t t-call="exp_transation_letters.custom_external_layout_standard">
                 <t t-raw="0"/>
             </t>
-            <!-- <t t-if="company.external_report_layout_id == 'background'">
-                <t t-call="exp_transation_letters.custom_external_layout_standard"><t t-raw="0"/></t>
-            </t>
-            <t t-if="company.external_report_layout_id == 'boxed'">
-                <t t-call="exp_transation_letters.custom_external_layout_standard"><t t-raw="0"/></t>
-            </t>
-            <t t-if="company.external_report_layout_id == 'clean'">
-                <t t-call="exp_transation_letters.custom_external_layout_standard"><t t-raw="0"/></t>
-            </t>
-            <t t-if="company.external_report_layout_id in (False, 'standard')">
-                <t t-call="exp_transation_letters.custom_external_layout_standard"><t t-raw="0"/></t>
-            </t> -->
         </template>
         <template id="transaction_letter_report_temp">
             <t t-call="web.html_container">
@@ -278,29 +63,24 @@
                     <t t-call="exp_transation_letters.letter_external_layout">
                         <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';
+                                src: url("/exp_transation_letters/static/src/fonts/Al-Mohanad.ttf") format("truetype");
+                                font-weight: normal;
+                                font-style: normal;
                             }
 
                             @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';
+                                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;
+                                font-family: 'Al-Mohanad', sans-serif !important;
                             }
                         </style>
                         <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 style="line-height: 16 !important" t-raw="o.content">
                                 </p>
@@ -309,7 +89,6 @@
                             <br/>
                             <div style="margin-top: 0px; page-break-inside: avoid;" dir="ltr">
                                 <div style="margin-bottom: 10px; text-align: left;margin-left:25px;font-size:18px;">
-<!--                                    <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;margin-left:25px;font-size:18px;">
@@ -320,11 +99,6 @@
                                     <img t-if="o.new_signature" t-attf-src="data:image/*;base64,{{o.new_signature}}"
                                          style="height:auto;max-width:200px; border: 0px;margin-left:0px"/>
                                 </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="margin-top:50px;height:100px;width:100px; border: 0px;margin-left:25px"/>-->
-<!--                                </div>-->
                             </div>
                         </div>
 

From 1e6cde5ed788c94188d8675f4245ad8c690d7d02 Mon Sep 17 00:00:00 2001
From: Samir Ladoui <whitexhunter23@gmail.com>
Date: Wed, 12 Feb 2025 08:29:33 +0100
Subject: [PATCH 2/2] [FIX] cm_odex_barcode: barcode arabic words

---
 .../cm_odex_barcode/models/barcode.py         | 41 ++++++++++++-------
 1 file changed, 27 insertions(+), 14 deletions(-)

diff --git a/odex25_transactions/cm_odex_barcode/models/barcode.py b/odex25_transactions/cm_odex_barcode/models/barcode.py
index 6e32b40ec..94e57c704 100644
--- a/odex25_transactions/cm_odex_barcode/models/barcode.py
+++ b/odex25_transactions/cm_odex_barcode/models/barcode.py
@@ -35,36 +35,49 @@ class Transaction(models.Model):
 
     binary_barcode = fields.Binary(string='Barcode', attachment=True)
 
-    @api.constrains('ean13', 'name', 'transaction_date', 'type','subject')
+
+    @api.constrains('ean13', 'name', 'transaction_date', 'type', 'subject')
     def binary_compute_constraint(self):
         font_path = os.path.join(os.path.dirname(__file__), 'img', 'amiri-regular.ttf')
         font_size = 22
+        image_width, image_height = 500, 420  # Set image dimensions
 
-        img = Image.new("RGBA", (500, 420), "white")
+        img = Image.new("RGBA", (image_width, image_height), "white")
         draw = ImageDraw.Draw(img)
         font = ImageFont.truetype(font_path, font_size)
 
-        def draw_text(draw, text, position, font, alignment="left"):
-            text_size = draw.textsize(text, font=font)
+        def draw_text(draw, text, y_position, font):
+            """ Draw centered Arabic text """
+            reshaped_text = arabic_reshaper.reshape(text)  # Fix Arabic character joining
 
-            if alignment == "right":
-                position = (position[0] - text_size[0], position[1])
-            elif alignment == "center":
-                position = (position[0] - text_size[0] / 2, position[1])
+            # Get text size
+            text_bbox = draw.textbbox((0, 0), reshaped_text, font=font)
+            text_width = text_bbox[2] - text_bbox[0]
 
-            draw.text(position, text, "black", font=font)
+            # Calculate x position for centering
+            x_position = (image_width - text_width) // 2  
 
-        draw_text(draw, " رقم المعاملة : " + (self.name or ''), (10, 20), font)
-        draw_text(draw, " تاريخ المعاملة الهجري : " + (self.transaction_date_hijri or '').replace('-', '/'), (10, 60), font)
-        draw_text(draw, " تاريخ المعاملة الميلادي : " + (str(self.transaction_date) if self.transaction_date else '').replace('-', '/'), (10, 100), font)
-        draw_text(draw, "  الموضوع : " + (str(self.subject) if self.subject else ''), (120, 140), font)        
+            # Draw text
+            draw.text((x_position, y_position), reshaped_text, "black", font=font)
 
+        # Draw centered Arabic text
+        draw_text(draw, "رقم المعاملة : " + (self.name or ''), 20, font)
+        draw_text(draw, "تاريخ المعاملة الهجري : " + (self.transaction_date_hijri or '').replace('-', '/'), 60, font)
+        draw_text(draw, "تاريخ المعاملة الميلادي : " + (str(self.transaction_date) if self.transaction_date else '').replace('-', '/'), 100, font)
+        draw_text(draw, "الموضوع : " + (str(self.subject) if self.subject else ''), 140, font)
 
         # Generate barcode
         barcode = self.env['ir.actions.report'].barcode('Code11', self.name, width=250, height=100, humanreadable=0)
         barcode_buffer = BytesIO(barcode)
         barcode_image_file = Image.open(barcode_buffer)
-        img.paste(barcode_image_file, (20, 180))
+
+        # Calculate barcode position to center it
+        barcode_width, barcode_height = barcode_image_file.size
+        barcode_x = (image_width - barcode_width) // 2  
+        barcode_y = 180  
+
+        # Paste barcode at the centered position
+        img.paste(barcode_image_file, (barcode_x, barcode_y))
 
         # Save image to binary field
         buffered = BytesIO()