From b8f7df1a6a15fc3916c68a37b86213e1fe4d26f2 Mon Sep 17 00:00:00 2001
From: Hetal Dhanak <hdh@odoo.com>
Date: Thu, 17 Jan 2019 10:06:53 +0000
Subject: [PATCH] [IMP] project:  Clean timesheet related fields on task form

 -Moved the share Button to the dropdown Action menu as it was better suitable there.
 -moved sale order item field to extra info as it was better suitable there.
 -changed display of settings for project to give it organized look.

Related Task ID: 1928422

closes odoo/odoo#30310
---
 addons/hr_timesheet/models/hr_timesheet.py    |  4 ++--
 addons/project/views/project_views.xml        | 11 +++++++++-
 .../views/res_config_settings_views.xml       | 22 +++++++++----------
 .../views/project_task_views.xml              |  2 +-
 4 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/addons/hr_timesheet/models/hr_timesheet.py b/addons/hr_timesheet/models/hr_timesheet.py
index da83e0fd0db..943c68cf0d0 100644
--- a/addons/hr_timesheet/models/hr_timesheet.py
+++ b/addons/hr_timesheet/models/hr_timesheet.py
@@ -2,7 +2,7 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from lxml import etree
-import json
+import re
 
 from odoo import api, fields, models, _
 from odoo.exceptions import UserError
@@ -92,7 +92,7 @@ class AccountAnalyticLine(models.Model):
         # custom inheretied view stored in database. Even if normally, no xpath can be done on
         # 'string' attribute.
         for node in doc.xpath("//field[@name='unit_amount'][@widget='timesheet_uom'][not(@string)]"):
-            node.set('string', _('Duration (%s)') % (encoding_uom.name))
+            node.set('string', _('Duration (%s)') % (re.sub(r'[\(\)]', '', encoding_uom.name or '')))
         return etree.tostring(doc, encoding='unicode')
 
     # ----------------------------------------------------
diff --git a/addons/project/views/project_views.xml b/addons/project/views/project_views.xml
index 73d2de26495..0bd4a2308ec 100644
--- a/addons/project/views/project_views.xml
+++ b/addons/project/views/project_views.xml
@@ -415,7 +415,6 @@
                     <header>
                         <button name="action_assign_to_me" string="Assign to Me" type="object" class="oe_highlight"
                             attrs="{'invisible' : [('user_id', '!=', False)]}"/>
-                        <button name="%(portal.portal_share_action)d" string="Share" type="action" class="oe_highlight oe_read_only"/>
                         <field name="stage_id" widget="statusbar" options="{'clickable': '1', 'fold_field': 'fold'}"/>
                     </header>
                     <sheet string="Task">
@@ -500,6 +499,16 @@
             </field>
         </record>
 
+        <act_window
+            id="portal_share_action"
+            name="Share"
+            res_model="portal.share"
+            src_model="project.task"
+            view_type="form"
+            view_mode="form"
+            target="new"
+        />
+
         <record id="quick_create_task_form" model="ir.ui.view">
             <field name="name">project.task.form.quick_create</field>
             <field name="model">project.task</field>
diff --git a/addons/project/views/res_config_settings_views.xml b/addons/project/views/res_config_settings_views.xml
index 48ba37f44c9..97ceecb6b5b 100644
--- a/addons/project/views/res_config_settings_views.xml
+++ b/addons/project/views/res_config_settings_views.xml
@@ -48,17 +48,6 @@
                                     </div>
                                 </div>
                             </div>
-                            <div class="col-12 col-lg-6 o_setting_box">
-                                <div class="o_setting_left_pane">
-                                    <field name="module_hr_timesheet"/>
-                                </div>
-                                <div class="o_setting_right_pane">
-                                    <label for="module_hr_timesheet"/>
-                                    <div class="text-muted">
-                                        Log time on tasks
-                                    </div>
-                                </div>
-                            </div>
                         </div>
                         <h2>Time Management</h2>
                         <div class="row mt16 o_settings_container" name="project_time">
@@ -73,6 +62,17 @@
                                     </div>
                                 </div>
                             </div>
+                            <div class="col-12 col-lg-6 o_setting_box">
+                                <div class="o_setting_left_pane">
+                                    <field name="module_hr_timesheet"/>
+                                </div>
+                                <div class="o_setting_right_pane">
+                                    <label for="module_hr_timesheet"/>
+                                    <div class="text-muted">
+                                        Log time on tasks
+                                    </div>
+                                </div>
+                            </div>
                         </div>
                     </div>
                 </xpath>
diff --git a/addons/sale_timesheet/views/project_task_views.xml b/addons/sale_timesheet/views/project_task_views.xml
index df183f5c32c..d02defc8558 100644
--- a/addons/sale_timesheet/views/project_task_views.xml
+++ b/addons/sale_timesheet/views/project_task_views.xml
@@ -68,7 +68,7 @@
                             string="Sales Order"/>
                     <field name="sale_order_id" invisible="1"/>
                 </xpath>
-                <field name="user_id" position="after">
+                <field name="partner_id" position="after">
                     <field name="sale_line_id" string="Sales Order Item" attrs="{'invisible': ['|', ('partner_id', '=', False)]}" options='{"no_create": True}' context="{'create': False, 'edit': False, 'delete': False}"/>
                     <field name="billable_type" invisible="1"/>
                 </field>