From 3a0abfffa3540d7606937657b44df7c486e4f1f4 Mon Sep 17 00:00:00 2001
From: Cedric Collins <cedric@hibou.io>
Date: Wed, 31 Mar 2021 13:59:40 -0500
Subject: [PATCH] [MIG] hr_payroll_slip_ytd: migrate to 14.0

H4817
---
 hr_payroll_slip_ytd/__manifest__.py         |  2 +-
 hr_payroll_slip_ytd/views/payslip_views.xml | 18 +++++++++++++-----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/hr_payroll_slip_ytd/__manifest__.py b/hr_payroll_slip_ytd/__manifest__.py
index da94f254..92176dd2 100755
--- a/hr_payroll_slip_ytd/__manifest__.py
+++ b/hr_payroll_slip_ytd/__manifest__.py
@@ -1,7 +1,7 @@
 {
     'name': 'Payroll Report Year to Date',
     'author': 'Hibou Corp. <hello@hibou.io>',
-    'version': '13.0.1.1.0',
+    'version': '14.0.1.1.0',
     'category': 'Human Resources',
     'sequence': 95,
     'summary': 'Show YTD computations on Payslip Report',
diff --git a/hr_payroll_slip_ytd/views/payslip_views.xml b/hr_payroll_slip_ytd/views/payslip_views.xml
index c1a83a5a..34241ecd 100644
--- a/hr_payroll_slip_ytd/views/payslip_views.xml
+++ b/hr_payroll_slip_ytd/views/payslip_views.xml
@@ -2,14 +2,22 @@
 <odoo>
     <template id="report_payslip_inherit" name="Payslip YTD" inherit_id="hr_payroll.report_payslip">
         <!-- Add YTD to basic salary summary -->
-        <xpath expr="//table[3]/tr" position="inside">
+        <xpath expr="//table[2]/tr" position="inside">
             <t t-set="ytd" t-value="o.ytd('BASIC', allow_draft=True)"/>
             <td><strong>YTD</strong></td>
             <td><span t-esc="ytd.get('total', 0.0)" t-options="{&quot;widget&quot;: &quot;monetary&quot;, &quot;display_currency&quot;: o.company_id.currency_id}"/></td>
         </xpath>
 
+        <!-- Revert the way quantity is represented on the payslip -->
+        <xpath expr="//div[@id='total']/table/thead/tr//th[3]" position="replace">
+            <th>Quantity/Number of Days</th>
+        </xpath>
+        <xpath expr="//div[@id='total']/table/tbody/span[2]//td[3]/span" position="attributes">
+            <attribute name="t-if"/>
+        </xpath>
+
         <!-- Add YTD to the table head-->
-        <xpath expr="//table[4]/thead/tr//th[last()]" position="after">
+        <xpath expr="//div[@id='total']/table/thead/tr//th[last()]" position="after">
             <th>Total</th>
             <th>YTD Quantity</th>
             <th>YTD Amount</th>
@@ -18,7 +26,7 @@
 
 
         <!-- Add YTD worked days data -->
-        <xpath expr="//table[4]/tbody/tr[1]/td[last()]" position="after">
+        <xpath expr="//div[@id='total']/table/tbody/span[1]//td[last()]" position="after">
             <t t-set="worked_ytd" t-value="o.worked_ytd(worked_days.code, allow_draft=True)"/>
             <td/>
             <td/>
@@ -27,13 +35,13 @@
         </xpath>
 
         <!-- Re-add column for line amount -->
-        <xpath expr="//table[4]/tbody/tr[2]/td[last()]" position="before">
+        <xpath expr="//div[@id='total']/table/tbody/span[2]//td[last()]" position="before">
             <td><span t-esc="line.amount"
                       t-options='{"widget": "monetary", "display_currency": o.company_id.currency_id}'/></td>
         </xpath>
 
         <!-- Add YTD table data-->
-        <xpath expr="//table[4]/tbody/tr[2]/td[last()]" position="after">
+        <xpath expr="//div[@id='total']/table/tbody/span[2]//td[last()]" position="after">
              <t t-set="ytd" t-value="o.ytd(line.code, allow_draft=True)"/>
              <td><span t-esc="ytd.get('quantity', 0.0)"/></td>
              <td><span t-esc="ytd.get('amount', 0.0)" t-options="{&quot;widget&quot;: &quot;monetary&quot;, &quot;display_currency&quot;: o.company_id.currency_id}"/></td>