From 38b4a95940810f0ac86f256db52cf1e3cf720451 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9rome=20Maes?= <jem@openerp.com>
Date: Tue, 18 Jul 2017 11:57:57 +0200
Subject: [PATCH] [IMP] sale_timesheet: remove duplicate field definition

The field `project_time_mode_id` on res.company is
already defined in project module. This came from the
good old days where timesheet was not totally depending
on project.
In sale_timesheet, the field was redefined, and a hack
with xml id was done. It is time to remove this crap.
---
 addons/sale_timesheet/__manifest__.py            |  1 -
 .../sale_timesheet/data/sale_timesheet_data.xml  | 16 ----------------
 addons/sale_timesheet/models/__init__.py         |  1 -
 addons/sale_timesheet/models/res_company.py      | 14 --------------
 4 files changed, 32 deletions(-)
 delete mode 100644 addons/sale_timesheet/data/sale_timesheet_data.xml
 delete mode 100644 addons/sale_timesheet/models/res_company.py

diff --git a/addons/sale_timesheet/__manifest__.py b/addons/sale_timesheet/__manifest__.py
index 8bc94cdffcf..e65f7580af7 100644
--- a/addons/sale_timesheet/__manifest__.py
+++ b/addons/sale_timesheet/__manifest__.py
@@ -16,7 +16,6 @@ have real delivered quantities in sales orders.
     'website': 'https://www.odoo.com/page/warehouse',
     'depends': ['sale_management', 'hr_timesheet'],
     'data': [
-        'data/sale_timesheet_data.xml',
         'views/account_invoice_views.xml',
         'views/sale_order_views.xml',
         'views/product_views.xml',
diff --git a/addons/sale_timesheet/data/sale_timesheet_data.xml b/addons/sale_timesheet/data/sale_timesheet_data.xml
deleted file mode 100644
index f0d5148a754..00000000000
--- a/addons/sale_timesheet/data/sale_timesheet_data.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data noupdate="1">
-
-        <!-- sale_timesheet and project define the same field without depending on each, which causes the field to be deleted when the module that created it
-        is deleted. To avoid this, we create xmlids manually for this field in both modules to prevent accidental deletion. To fix in saas-7 by moving the field definition-->
-        <record id="duplicate_field_xmlid" model="ir.model.data">
-            <field name="res_id" search="[('model','=','res.company'),('name','=','project_time_mode_id')]" model="ir.model.fields"/>
-            <field name="model">ir.model.fields</field>
-            <field name="module">sale_timesheet</field>
-            <field name="name">project_time_mode_id_duplicate_xmlid</field>
-            <field name="noupdate">True</field>
-        </record>
-    </data>
-
-</odoo>
diff --git a/addons/sale_timesheet/models/__init__.py b/addons/sale_timesheet/models/__init__.py
index cd36b996ae6..d22baec4d49 100644
--- a/addons/sale_timesheet/models/__init__.py
+++ b/addons/sale_timesheet/models/__init__.py
@@ -6,5 +6,4 @@ from . import account_invoice
 from . import hr
 from . import product
 from . import project
-from . import res_company
 from . import sale_order
diff --git a/addons/sale_timesheet/models/res_company.py b/addons/sale_timesheet/models/res_company.py
deleted file mode 100644
index 19d5ce45ea0..00000000000
--- a/addons/sale_timesheet/models/res_company.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-from odoo import models, api, fields
-
-
-class ResCompany(models.Model):
-    _inherit = 'res.company'
-
-    @api.model
-    def _get_default_uom_id(self):
-        return self.env.ref("product.product_uom_hour", raise_if_not_found=False)
-
-    project_time_mode_id = fields.Many2one('product.uom', 'Timesheet UoM', default=_get_default_uom_id)