diff --git a/addons/project/project_data.xml b/addons/project/project_data.xml
index 8ffc7ad91c1..c1d87077064 100644
--- a/addons/project/project_data.xml
+++ b/addons/project/project_data.xml
@@ -21,6 +21,17 @@
         <!-- alias domain: project.config.settings -->
         <function id="default_alias_domain_project" model="ir.values" name="set_default" eval="('project.config.settings', 'generate_project_alias', 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">project</field>
+            <field name="name">project_time_mode_id_duplicate_xmlid</field>
+            <field name="noupdate">True</field>
+        </record>
+
     </data>
     <data>
 
@@ -319,6 +330,5 @@
             <field name="displayed_image_id" ref="msg_task_data_14_attach"/>
         </record>
 
-
     </data>
 </openerp>
diff --git a/addons/sale_timesheet/__openerp__.py b/addons/sale_timesheet/__openerp__.py
index 50c28f31857..042d3539326 100644
--- a/addons/sale_timesheet/__openerp__.py
+++ b/addons/sale_timesheet/__openerp__.py
@@ -17,7 +17,8 @@ have real delivered quantities in sales orders.
     'author': 'OpenERP SA',
     'website': 'https://www.odoo.com/page/warehouse',
     'depends': ['sale', 'hr_timesheet'],
-    'data': ['views/sale_timesheet_view.xml'],
+    'data': ['views/sale_timesheet_view.xml',
+             'data/sale_timesheet_data.xml'],
     'demo': ['data/sale_timesheet_demo.xml'],
     'installable': True,
     'auto_install': True,
diff --git a/addons/sale_timesheet/data/sale_timesheet_data.xml b/addons/sale_timesheet/data/sale_timesheet_data.xml
new file mode 100644
index 00000000000..f0d5148a754
--- /dev/null
+++ b/addons/sale_timesheet/data/sale_timesheet_data.xml
@@ -0,0 +1,16 @@
+<?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>