From 9d4fcba3833b27c8475366bf50f00634c34d9e05 Mon Sep 17 00:00:00 2001
From: Bhoomi <bhoomi@hibou.io>
Date: Mon, 7 Oct 2019 18:49:51 -0400
Subject: [PATCH] WIP `timesheet_description` For Odoo 13.0 (Time sheet has new
 view on fronted)

---
 timesheet_description/__manifest__.py         |  4 +-
 timesheet_description/models/timesheet.py     |  1 -
 .../views/project_templates.xml               |  2 +-
 .../views/timesheet_views.xml                 | 84 +++++++++----------
 4 files changed, 45 insertions(+), 46 deletions(-)

diff --git a/timesheet_description/__manifest__.py b/timesheet_description/__manifest__.py
index 090b3f75..edf86384 100644
--- a/timesheet_description/__manifest__.py
+++ b/timesheet_description/__manifest__.py
@@ -1,6 +1,6 @@
 {
     'name': 'Timesheet Description',
-    'version': '12.0.1.0.0',
+    'version': '13.0.1.0.0',
     'author': 'Hibou Corp. <hello@hibou.io>',
     'website': 'https://hibou.io/',
     'license': 'AGPL-3',
@@ -16,7 +16,7 @@ Optionally, allows you to display your timesheet entries in markdown on the fron
         'hr_timesheet',
     ],
     'data': [
-        'views/project_templates.xml',
+        # 'views/project_templates.xml',
         'views/timesheet_views.xml',
     ],
     'installable': True,
diff --git a/timesheet_description/models/timesheet.py b/timesheet_description/models/timesheet.py
index 30cd3401..30b71e43 100644
--- a/timesheet_description/models/timesheet.py
+++ b/timesheet_description/models/timesheet.py
@@ -11,7 +11,6 @@ class AnalyticLine(models.Model):
 
     name_markdown = fields.Html(compute='_compute_name_markdown')
 
-    @api.multi
     def _compute_name_markdown(self):
         if not markdown:
             for line in self:
diff --git a/timesheet_description/views/project_templates.xml b/timesheet_description/views/project_templates.xml
index e2d78d0b..f9f05843 100644
--- a/timesheet_description/views/project_templates.xml
+++ b/timesheet_description/views/project_templates.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
-    <template id="portal_my_task_markdown" inherit_id='project.portal_my_task' customize_show="True" name="Timesheet Use Markdown">
+    <template id="portal_my_task_markdown" inherit_id='hr_timesheet.portal_timesheet_table' name="Timesheet Use Markdown">
         <xpath expr="//t[@t-esc='timesheet.name']" position="replace">
             <div t-if="timesheet.name_markdown" t-field="timesheet.name_markdown" />
             <t t-else="" t-esc="timesheet.name" />
diff --git a/timesheet_description/views/timesheet_views.xml b/timesheet_description/views/timesheet_views.xml
index 640a616a..019b6f68 100644
--- a/timesheet_description/views/timesheet_views.xml
+++ b/timesheet_description/views/timesheet_views.xml
@@ -1,46 +1,46 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
-    <record id="view_task_form2_inherit" model="ir.ui.view">
-        <field name="name">project.task.form.inherit</field>
-        <field name="model">project.task</field>
-        <field name="inherit_id" ref="hr_timesheet.view_task_form2_inherited" />
-        <field name="arch" type="xml">
-            <xpath expr="//field[@name='timesheet_ids']" position="attributes">
-                <attribute name="context">{'default_project_id': project_id, 'default_task_id': active_id}</attribute>
-            </xpath>
-            <xpath expr="//field[@name='timesheet_ids']/tree" position="attributes">
-                <attribute name="editable"/>
-            </xpath>
-            <xpath expr="//field[@name='timesheet_ids']" position="inside">
-                <form>
-                    <sheet>
-                        <group>
-                            <group>
-                                <field name="project_id" invisible="1"/>
-                                <field name="task_id" invisible="1"/>
-                                <field name="user_id" invisible="1" groups="hr_timesheet.group_timesheet_manager"/>
-                                <field name="employee_id" groups="hr_timesheet.group_timesheet_manager"/>
-                            </group>
-                            <group>
-                                <field name="date"/>
-                                <field name="unit_amount" string="Time Spent" widget="float_time"/>
-                            </group>
-                        </group>
-                        <field name="name" nolabel="1" widget="text" placeholder="Describe your activity (you can use markdown)" colspan="4"/>
-                    </sheet>
-                </form>
-            </xpath>
-        </field>
-    </record>
+<!--    <record id="view_task_form2_inherit" model="ir.ui.view">-->
+<!--        <field name="name">project.task.form.inherit</field>-->
+<!--        <field name="model">project.task</field>-->
+<!--        <field name="inherit_id" ref="hr_timesheet.view_task_form2_inherited" />-->
+<!--        <field name="arch" type="xml">-->
+<!--            <xpath expr="//field[@name='timesheet_ids']" position="attributes">-->
+<!--                <attribute name="context">{'default_project_id': project_id, 'default_task_id': active_id}</attribute>-->
+<!--            </xpath>-->
+<!--            <xpath expr="//field[@name='timesheet_ids']/tree" position="attributes">-->
+<!--                <attribute name="editable"/>-->
+<!--            </xpath>-->
+<!--            <xpath expr="//field[@name='timesheet_ids']" position="inside">-->
+<!--                <form>-->
+<!--                    <sheet>-->
+<!--                        <group>-->
+<!--                            <group>-->
+<!--                                <field name="project_id" invisible="1"/>-->
+<!--                                <field name="task_id" invisible="1"/>-->
+<!--                                <field name="user_id" invisible="1" groups="hr_timesheet.group_timesheet_manager"/>-->
+<!--                                <field name="employee_id" groups="hr_timesheet.group_timesheet_manager"/>-->
+<!--                            </group>-->
+<!--                            <group>-->
+<!--                                <field name="date"/>-->
+<!--                                <field name="unit_amount" string="Time Spent" widget="float_time"/>-->
+<!--                            </group>-->
+<!--                        </group>-->
+<!--                        <field name="name" nolabel="1" widget="text" placeholder="Describe your activity (you can use markdown)" colspan="4"/>-->
+<!--                    </sheet>-->
+<!--                </form>-->
+<!--            </xpath>-->
+<!--        </field>-->
+<!--    </record>-->
 
-    <record id="hr_timesheet_line_tree_inherit" model="ir.ui.view">
-        <field name="name">account.analytic.line.tree.hr_timesheet.inherit</field>
-        <field name="model">account.analytic.line</field>
-        <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_tree" />
-        <field name="arch" type="xml">
-            <xpath expr="//tree" position="attributes">
-                <attribute name="editable"/>
-            </xpath>
-        </field>
-    </record>
+<!--    <record id="hr_timesheet_line_tree_inherit" model="ir.ui.view">-->
+<!--        <field name="name">account.analytic.line.tree.hr_timesheet.inherit</field>-->
+<!--        <field name="model">account.analytic.line</field>-->
+<!--        <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_tree" />-->
+<!--        <field name="arch" type="xml">-->
+<!--            <xpath expr="//tree" position="attributes">-->
+<!--                <attribute name="editable"/>-->
+<!--            </xpath>-->
+<!--        </field>-->
+<!--    </record>-->
 </odoo>
\ No newline at end of file