From 719ddd6b198be3024e9633f37038ce41f30c6611 Mon Sep 17 00:00:00 2001
From: manar <m.mohie@exp-sa.com>
Date: Thu, 23 Jan 2025 15:48:33 +0200
Subject: [PATCH] UPDATE exp_payroll_custom & exp_hr_payroll

---
 odex25_hr/exp_hr_payroll/i18n/ar_001.po       |  2 +-
 .../views/report_payslip_templates.xml        | 46 ++++++++++++-------
 .../templates/report_payslip.xml              |  8 ++--
 3 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/odex25_hr/exp_hr_payroll/i18n/ar_001.po b/odex25_hr/exp_hr_payroll/i18n/ar_001.po
index 409a4380c..ff3a3c27a 100644
--- a/odex25_hr/exp_hr_payroll/i18n/ar_001.po
+++ b/odex25_hr/exp_hr_payroll/i18n/ar_001.po
@@ -102,7 +102,7 @@ msgstr "<strong>التاريخ إلى:</strong>"
 #: model_terms:ir.ui.view,arch_db:exp_hr_payroll.report_payslip
 #: model_terms:ir.ui.view,arch_db:exp_hr_payroll.report_payslip_details
 msgid "<strong>Designation</strong>"
-msgstr "<strong>التعيين</strong>"
+msgstr "<strong>الوظيفة</strong>"
 
 #. module: exp_hr_payroll
 #: model_terms:ir.ui.view,arch_db:exp_hr_payroll.report_payslip
diff --git a/odex25_hr/exp_hr_payroll/views/report_payslip_templates.xml b/odex25_hr/exp_hr_payroll/views/report_payslip_templates.xml
index 35fc0608b..5dc65373e 100644
--- a/odex25_hr/exp_hr_payroll/views/report_payslip_templates.xml
+++ b/odex25_hr/exp_hr_payroll/views/report_payslip_templates.xml
@@ -4,10 +4,22 @@
     <template id="report_payslip">
         <t t-call="web.html_container">
             <t t-foreach="docs" t-as="o">
-                <t t-call="web.external_layout">
-                    <div class="page">
+                <t t-call="web.basic_layout">
+                    <style>
+                        @font-face {font-family: "Sakkal Majalla"; src:
+                        url("/employee_requests/static/fonts/ce7b5754581057e6f7444e2192850cc8.eot"); src:
+                        url("/employee_requests/static/fonts/ce7b5754581057e6f7444e2192850cc8.eot?#iefix")
+                        format("embedded-opentype"),
+                        url("/employee_requests/static/fonts/ce7b5754581057e6f7444e2192850cc8.woff2") format("woff2"),
+                        url("/employee_requests/static/fonts/ce7b5754581057e6f7444e2192850cc8.woff") format("woff"),
+                        url("/employee_requests/static/fonts/ce7b5754581057e6f7444e2192850cc8.ttf") format("truetype");
+                        }
+
+                    </style>
+                    <div class="page" style="font-family:'Sakkal Majalla'!important;font-size:13pt">
                         <h2>Pay Slip</h2>
-                        <p t-field="o.name"/>
+                        <p t-esc="o.date_from.strftime('%Y-%B')"/>
+<!--                        <p t-field="o.name"/>-->
 
                         <table class="table table-sm table-bordered">
                             <tr>
@@ -24,15 +36,15 @@
                                     <span t-field="o.employee_id.job_id"/>
                                 </td>
                             </tr>
-                            <tr>
-                                <td>
-                                    <strong>Address</strong>
-                                </td>
-                                <td colspan="3">
-                                    <div t-field="o.employee_id.address_home_id"
-                                         t-options='{"widget": "contact", "fields": ["address", "name", "phone"], "no_marker": True, "phone_icons": True}'/>
-                                </td>
-                            </tr>
+<!--                            <tr>-->
+<!--                                <td>-->
+<!--                                    <strong>Address</strong>-->
+<!--                                </td>-->
+<!--                                <td colspan="3">-->
+<!--                                    <div t-field="o.employee_id.address_home_id"-->
+<!--                                         t-options='{"widget": "contact", "fields": ["address", "name", "phone"], "no_marker": True, "phone_icons": True}'/>-->
+<!--                                </td>-->
+<!--                            </tr>-->
                             <tr>
                                 <td>
                                     <strong>Email</strong>
@@ -44,7 +56,7 @@
                                     <strong>Identification No</strong>
                                 </td>
                                 <td>
-                                    <span t-field="o.employee_id.identification_id"/>
+                                    <span t-field="o.employee_id.iqama_number"/>
                                 </td>
                             </tr>
                             <tr>
@@ -82,7 +94,7 @@
                                 <tr>
                                     <th>Code</th>
                                     <th>Name</th>
-                                    <th>Quantity/rate</th>
+<!--                                    <th>Quantity/rate</th>-->
                                     <th>Amount</th>
                                     <th>Total</th>
                                 </tr>
@@ -95,9 +107,9 @@
                                     <td>
                                         <span t-field="line.name"/>
                                     </td>
-                                    <td>
-                                        <span t-field="line.quantity"/>
-                                    </td>
+<!--                                    <td>-->
+<!--                                        <span t-field="line.quantity"/>-->
+<!--                                    </td>-->
                                     <td>
                                         <span t-esc="line.amount"
                                               t-options='{"widget": "monetary", "display_currency": o.company_id.currency_id}'/>
diff --git a/odex25_hr/exp_payroll_custom/templates/report_payslip.xml b/odex25_hr/exp_payroll_custom/templates/report_payslip.xml
index 2608c7431..7b1dd4b33 100644
--- a/odex25_hr/exp_payroll_custom/templates/report_payslip.xml
+++ b/odex25_hr/exp_payroll_custom/templates/report_payslip.xml
@@ -49,10 +49,10 @@
                     </strong>
                 </td>
                 <td>
-                    <strong>
-                        <span t-esc="sum([s.total for s in o.loan_ids])"
-                              t-esc-options='{"widget": "monetary", "display_currency": o.company_id.currency_id}'/>
-                    </strong>
+<!--                    <strong>-->
+<!--                        <span t-esc="sum([s.total for s in o.loan_ids])"-->
+<!--                              t-esc-options='{"widget": "monetary", "display_currency": o.company_id.currency_id}'/>-->
+<!--                    </strong>-->
                 </td>
             </tr>
             <tfoot>