[UPD] hr_base_reports

odex25_hr/hr_base_reports/i18n/ar_001.po

@@ -382,8 +382,8 @@ msgstr "تاريخ السلفة"
 #: code:addons/hr_base_reports/report/handover_reprt.py:0
 #: model_terms:ir.ui.view,arch_db:hr_base_reports.employee_handover_report
 #, python-format
-msgid "Date of Resignation"
+msgid "Date of Request"
-msgstr "تاريخ الاستقالة"
+msgstr "تاريخ الطلب"
 
 #. module: hr_base_reports
 #: model_terms:ir.ui.view,arch_db:hr_base_reports.form_hr_leave_report_wizard
@@ -698,7 +698,7 @@ msgstr "تقرير عام"
 #: model_terms:ir.ui.view,arch_db:hr_base_reports.employee_handover_report
 #, python-format
 msgid "Employee Handover Report"
-msgstr "تقرير الإستقالات"
+msgstr "تقرير الإستقالات ونهاية الخدمة"
 
 #. module: hr_base_reports
 #: code:addons/hr_base_reports/report/absence_execuse.py:0
@@ -992,7 +992,7 @@ msgstr "التسليم والتسلم"
 #. module: hr_base_reports
 #: model:ir.ui.menu,name:hr_base_reports.employee_handover_report_menu
 msgid "Handover Report"
-msgstr "تقرير الإستقالات"
+msgstr "تقرير الإستقالات ونهاية الخدمة"
 
 #. module: hr_base_reports
 #: code:addons/hr_base_reports/wizard/overtime_report.py:0

odex25_hr/hr_base_reports/report/handover_report_template.xml

@@ -26,9 +26,9 @@
 									<th style="text-align:center;color:#FFFFFF">Employee Name</th>
 									<th style="text-align:center;color:#FFFFFF">Job Title</th>
 									<th style="text-align:center;color:#FFFFFF">Department</th>
-									<th style="text-align:center;color:#FFFFFF">Join Date</th>
 									<th style="text-align:center;color:#FFFFFF">Reason of Resignation</th>
-									<th style="text-align:center;color:#FFFFFF">Date of Resignation</th>
+									<th style="text-align:center;color:#FFFFFF">Date of Request</th>
+									<th style="text-align:center;color:#FFFFFF">Join Date</th>
 									<th style="text-align:center;color:#FFFFFF">Last Date</th>
 									<th style="text-align:center;color:#FFFFFF">Location</th>
 									<th style="text-align:center;color:#FFFFFF">Line Manager</th>
@@ -54,14 +54,14 @@
 										<td>
 											<span t-esc="o.employee_id.department_id.name"/>
 										</td>
-										<td>
-											<t t-esc="o.first_hire_date"/>
-										</td>
 										<td>
 											<span t-esc="o.cause_type.name"/>
 										</td>
 										<td>
-											<span t-esc="o.create_date"/>
+											<span t-esc="o.create_date" t-options="{'widget': 'date', 'date_only': 'true', 'format': 'yyyy-MM-dd'}"/>
+										</td>
+										<td>
+											<t t-esc="o.first_hire_date"/>
 										</td>
 										<td>
 											<span t-esc="o.last_work_date"/>
@@ -81,12 +81,29 @@
 			</t>
 		</template>
 
+		<record id="employee_handover_paperformat" model="report.paperformat">
+            <field name="name">Employee Handover Paperformat</field>
+            <field name="default" eval="True" />
+            <field name="format">A4</field>
+            <field name="page_height">0</field>
+            <field name="page_width">0</field>
+			<field name="orientation">Landscape</field>
+            <field name="margin_top">40</field>
+            <field name="margin_bottom">32</field>
+            <field name="margin_left">7</field>
+            <field name="margin_right">7</field>
+            <field name="header_line" eval="False" />
+            <field name="header_spacing">35</field>
+            <field name="dpi">90</field>
+        </record>
+
         <record id="employee_handover_report_act" model="ir.actions.report">
             <field name="model">hr.termination</field>
             <field name="name">Employee Handover Report</field>
             <field name="report_type">qweb-pdf</field>
             <field name="report_name">hr_base_reports.employee_handover_report</field>
             <field name="report_file">hr_base_reports.employee_handover_report</field>
+			<field name="paperformat_id" ref="employee_handover_paperformat" />
         </record>
         <record id="employee_handover_report_act_xlsx" model="ir.actions.report">
             <field name="model">hr.termination</field>

odex25_hr/hr_base_reports/report/handover_reprt.py

@@ -8,22 +8,25 @@ class EmployeeHandoverReport(models.AbstractModel):
     _description = 'Employee Handover Report'
 
     def get_result(self, data=None):
+        HrEmployee = self.env['hr.employee'].sudo()
+        HrTermination = self.env['hr.termination'].sudo()
         form = data['form']
         employees = False
-        li = []
         domain = []
         if form['employee_ids']:
-            employees = self.env['hr.employee'].sudo().browse(form['employee_ids'])
+            employees = HrEmployee.browse(form['employee_ids'])
         else:
             if form['department_ids'] and not form['employee_ids']:
                 domain = [('department_id', 'in', form['department_ids'])]
-            # domain += [('state','=','open')]
+            domain += [('active', 'in', [True, False])]
-            employees = self.env['hr.employee'].sudo().search(domain)
+            employees = HrEmployee.search(domain)
+            if not employees:
+                return HrTermination
         value = [('last_work_date', '>=', form['date_from']), ('create_date', '<=', form['date_to']),
                  ('state', '!=', 'refused')]
         if employees:
             value += [('employee_id', 'in', employees.ids)]
-        records = self.env['hr.termination'].sudo().search(value)
+        records = HrTermination.search(value)
         records = records.sorted(key=lambda r: r.department_id.id)
         return records
 
@@ -67,9 +70,8 @@ class EmployeeHandoverReportXlsx(models.AbstractModel):
         clm = 0
         for res in [
             (_('#')), (_('Employee ID')), (_('Employee Name')), (_('Job Title')),
-            (_('Department')), (_('Join Date')), (_('Reason of Resignation')), (_('Date of Resignation')),
+            (_('Department')), (_('Reason of Resignation')), (_('Date of Request')), (_('Join Date')), 
-            (_('Last Date')),
+            (_('Last Date')), (_('Location')), (_('Line Manager'))]:
-            (_('Location')), (_('Line Manager'))]:
             sheet.write(row, clm, res, format0)
             clm += 1
         row = 10