From 145b343e29af79abe8c6e2eb29bc0651308b20fa Mon Sep 17 00:00:00 2001
From: Jared Kipe <jared@hibou.io>
Date: Wed, 23 May 2018 11:49:49 -0700
Subject: [PATCH 1/2] Initial commit of `timesheet_invoice` for 11.0 -- Include
 detailed timesheet entries on invoice PDF.

---
 timesheet_invoice/__init__.py       |  0
 timesheet_invoice/__manifest__.py   | 20 +++++++++++++++++
 timesheet_invoice/invoice_views.xml | 33 +++++++++++++++++++++++++++++
 3 files changed, 53 insertions(+)
 create mode 100644 timesheet_invoice/__init__.py
 create mode 100644 timesheet_invoice/__manifest__.py
 create mode 100644 timesheet_invoice/invoice_views.xml

diff --git a/timesheet_invoice/__init__.py b/timesheet_invoice/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/timesheet_invoice/__manifest__.py b/timesheet_invoice/__manifest__.py
new file mode 100644
index 00000000..78374c94
--- /dev/null
+++ b/timesheet_invoice/__manifest__.py
@@ -0,0 +1,20 @@
+{
+    'name': 'Timesheet Invoice',
+    'version': '11.0.1.0.0',
+    'author': 'Hibou Corp. <hello@hibou.io>',
+    'website': 'https://hibou.io/',
+    'license': 'AGPL-3',
+    'category': 'Tools',
+    'complexity': 'easy',
+    'description': """
+Adds timesheet descriptions onto the invoice report/PDF.
+    """,
+    'depends': [
+        'sale_timesheet',
+    ],
+    'data': [
+        'invoice_views.xml',
+    ],
+    'installable': True,
+    'auto_install': False,
+}
diff --git a/timesheet_invoice/invoice_views.xml b/timesheet_invoice/invoice_views.xml
new file mode 100644
index 00000000..0f74f435
--- /dev/null
+++ b/timesheet_invoice/invoice_views.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <template id="report_invoice_document_inherit" inherit_id="account.report_invoice_document">
+        <xpath expr="//div[@class='page']" position="inside">
+            <div class="container" t-if="o.timesheet_ids">
+                <hr/>
+                <h3>Timesheets</h3>
+                <table class="table table-sm">
+                    <thead>
+                      <tr class="active">
+                        <th>Date</th>
+                        <th class="col-md-6">Description</th>
+                        <th>Responsible</th>
+                        <th>Duration</th>
+                      </tr>
+                    </thead>
+                    <t t-foreach="o.timesheet_ids.mapped('project_id')" t-as="project">
+                        <tr class="bg-primary"><td><h4>Project</h4></td><td colspan="3"><h4 t-esc="project.name"/></td></tr>
+                        <t t-foreach="o.timesheet_ids.filtered(lambda l: l.project_id == project).mapped('task_id')" t-as="task">
+                            <tr class="bg-info"><td><h5>Task</h5></td><td colspan="3"><h5 t-esc="task.name"/></td></tr>
+                            <tr t-foreach="o.timesheet_ids.filtered(lambda l: l.project_id == project and l.task_id == task)" t-as="timesheet">
+                                <td><t t-esc="timesheet.date"/></td>
+                                <td><t t-esc="timesheet.name"/></td>
+                                <td><t t-esc="timesheet.sudo().user_id.name"/></td>
+                                <td><span t-field="timesheet.unit_amount" t-field-options="{&quot;widget&quot;: &quot;duration&quot;, &quot;unit&quot;: &quot;hour&quot;, &quot;round&quot;: &quot;minute&quot;}"/></td>
+                            </tr>
+                        </t>
+                    </t>
+                </table>
+            </div>
+        </xpath>
+    </template>
+</odoo>
\ No newline at end of file

From c886b6db29b6b5b22606fe7ead3786e176a4b7e3 Mon Sep 17 00:00:00 2001
From: Jared Kipe <jared@jaredkipe.com>
Date: Sat, 25 May 2019 17:12:04 -0600
Subject: [PATCH 2/2] MIG `timesheet_invoice` to 12.0

---
 timesheet_invoice/__manifest__.py   | 2 +-
 timesheet_invoice/invoice_views.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/timesheet_invoice/__manifest__.py b/timesheet_invoice/__manifest__.py
index 78374c94..a06e83b4 100644
--- a/timesheet_invoice/__manifest__.py
+++ b/timesheet_invoice/__manifest__.py
@@ -1,6 +1,6 @@
 {
     'name': 'Timesheet Invoice',
-    'version': '11.0.1.0.0',
+    'version': '12.0.1.0.0',
     'author': 'Hibou Corp. <hello@hibou.io>',
     'website': 'https://hibou.io/',
     'license': 'AGPL-3',
diff --git a/timesheet_invoice/invoice_views.xml b/timesheet_invoice/invoice_views.xml
index 0f74f435..ff017598 100644
--- a/timesheet_invoice/invoice_views.xml
+++ b/timesheet_invoice/invoice_views.xml
@@ -22,7 +22,7 @@
                                 <td><t t-esc="timesheet.date"/></td>
                                 <td><t t-esc="timesheet.name"/></td>
                                 <td><t t-esc="timesheet.sudo().user_id.name"/></td>
-                                <td><span t-field="timesheet.unit_amount" t-field-options="{&quot;widget&quot;: &quot;duration&quot;, &quot;unit&quot;: &quot;hour&quot;, &quot;round&quot;: &quot;minute&quot;}"/></td>
+                                <td><span t-field="timesheet.unit_amount" t-options="{&quot;widget&quot;: &quot;duration&quot;, &quot;unit&quot;: &quot;hour&quot;, &quot;round&quot;: &quot;minute&quot;}"/></td>
                             </tr>
                         </t>
                     </t>