From 82a0422df5415276bd997cae29ab99a9bfb7b916 Mon Sep 17 00:00:00 2001
From: "Xavier BOL (xbo)" <xbo@odoo.com>
Date: Tue, 12 Jan 2021 14:17:46 +0100
Subject: [PATCH] [IMP] sale_timesheet: move View Timesheets button in portal
 invoice

Before this commit, we show the button in the invoice page.

This commit moves this button in the sidebar (left panel).

task-2424382
---
 addons/sale_timesheet/__manifest__.py               |  1 -
 addons/sale_timesheet/views/report_invoice.xml      | 10 ----------
 .../views/sale_timesheet_portal_templates.xml       | 13 +++++++++++++
 3 files changed, 13 insertions(+), 11 deletions(-)
 delete mode 100644 addons/sale_timesheet/views/report_invoice.xml

diff --git a/addons/sale_timesheet/__manifest__.py b/addons/sale_timesheet/__manifest__.py
index e27005cf5f6..6b3c91b6723 100644
--- a/addons/sale_timesheet/__manifest__.py
+++ b/addons/sale_timesheet/__manifest__.py
@@ -25,7 +25,6 @@ have real delivered quantities in sales orders.
         'views/hr_timesheet_views.xml',
         'views/res_config_settings_views.xml',
         'views/hr_timesheet_templates.xml',
-        'views/report_invoice.xml',
         'views/sale_timesheet_portal_templates.xml',
         'report/project_profitability_report_analysis_views.xml',
         'data/sale_timesheet_filters.xml',
diff --git a/addons/sale_timesheet/views/report_invoice.xml b/addons/sale_timesheet/views/report_invoice.xml
deleted file mode 100644
index 67de7e33928..00000000000
--- a/addons/sale_timesheet/views/report_invoice.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data>
-        <template id="report_invoice_document" inherit_id="account.report_invoice_document">
-            <xpath expr="//div[hasclass('page')]/h2" position="after">
-                <a t-if="report_type == 'html' and o.move_type == 'out_invoice' and o.state in ('draft', 'posted') and o.timesheet_count > 0" target="_blank" t-att-href="'/my/timesheets?search_in=invoice&amp;search=%s' % o.name">View Timesheets</a>
-            </xpath>
-        </template>
-    </data>
-</odoo>
diff --git a/addons/sale_timesheet/views/sale_timesheet_portal_templates.xml b/addons/sale_timesheet/views/sale_timesheet_portal_templates.xml
index 28a222917fd..4b69adf8566 100644
--- a/addons/sale_timesheet/views/sale_timesheet_portal_templates.xml
+++ b/addons/sale_timesheet/views/sale_timesheet_portal_templates.xml
@@ -44,4 +44,17 @@
         </xpath>
     </template>
 
+    <template id="portal_invoice_page_inherit" inherit_id="account.portal_invoice_page">
+        <xpath expr="//t[@t-set='entries']/ul/li[.//a[@id='print_invoice_report']]" position="after">
+            <li class="list-group-item flex-grow-1">
+                <div class="btn-toolbar flex-sm-nowrap justify-content-center">
+                    <div class="btn-group mb-1">
+                        <a t-if="invoice.move_type == 'out_invoice' and invoice.state in ('draft', 'posted') and invoice.timesheet_count > 0"
+                        target="_blank" t-att-href="'/my/timesheets?search_in=invoice&amp;search=%s' % invoice.name">View Timesheets</a>
+                    </div>
+                </div>
+            </li>
+        </xpath>
+    </template>
+
 </odoo>