summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2019-03-12 10:29:51 +0000
committerChristophe Simonis <chs@odoo.com>2019-03-12 10:29:51 +0000
commit2602642a78dff6c15d615fadf4c55a6b6ca315df (patch)
treea76202e4f562bd98585006becdc1a75bb1e7f0e4
parent6207391276369143b88c08f5fad6d2d273a7575f (diff)
[IMP] mail,*: remove useless field `is_master_data`
This field is a non-sense. By using the same logic, it should be added to any low level model. Replace the check by a simple verification of presence of an XMLID. A more generic opt-in solution should be integrated into ORM. Partially revert commits 0db0e66e96a8f6b393565da6fbb8dce25ec960b7 and bbd64c22abc19558c1d83a892fc426bf99a094ce. See #29257 odoo/enterprise#3550 closes odoo/odoo#31778 Signed-off-by: Christophe Simonis <chs@odoo.com>
-rw-r--r--addons/fleet/data/mail_data.xml1
-rw-r--r--addons/hr_expense/data/mail_data.xml1
-rw-r--r--addons/hr_holidays/data/mail_data.xml6
-rw-r--r--addons/mail/data/mail_activity_data.xml4
-rw-r--r--addons/mail/models/mail_activity.py6
-rw-r--r--addons/mail/views/mail_activity_views.xml1
-rw-r--r--addons/maintenance/data/mail_data.xml1
-rw-r--r--addons/product_expiry/data/product_expiry_data.xml1
-rw-r--r--addons/sale/data/mail_data.xml1
9 files changed, 3 insertions, 19 deletions
diff --git a/addons/fleet/data/mail_data.xml b/addons/fleet/data/mail_data.xml
index 401f115b87b..0fb2cbc3c96 100644
--- a/addons/fleet/data/mail_data.xml
+++ b/addons/fleet/data/mail_data.xml
@@ -5,7 +5,6 @@
<field name="name">Contract to Renew</field>
<field name="icon">fa-car</field>
<field name="res_model_id" ref="fleet.model_fleet_vehicle_log_contract"/>
- <field name="is_master_data">True</field>
</record>
<record id="mt_fleet_driver_updated" model="mail.message.subtype">
diff --git a/addons/hr_expense/data/mail_data.xml b/addons/hr_expense/data/mail_data.xml
index 06c497b4176..735771fbff7 100644
--- a/addons/hr_expense/data/mail_data.xml
+++ b/addons/hr_expense/data/mail_data.xml
@@ -6,7 +6,6 @@
<field name="name">Expense Approval</field>
<field name="icon">fa-dollar</field>
<field name="res_model_id" ref="hr_expense.model_hr_expense_sheet"/>
- <field name="is_master_data">True</field>
</record>
<!-- default alias for expenses -->
diff --git a/addons/hr_holidays/data/mail_data.xml b/addons/hr_holidays/data/mail_data.xml
index a57701e195c..2beaae128f1 100644
--- a/addons/hr_holidays/data/mail_data.xml
+++ b/addons/hr_holidays/data/mail_data.xml
@@ -6,13 +6,11 @@
<field name="name">Time Off Approval</field>
<field name="icon">fa-sun-o</field>
<field name="res_model_id" ref="hr_holidays.model_hr_leave"/>
- <field name="is_master_data">True</field>
</record>
<record id="mail_act_leave_second_approval" model="mail.activity.type">
<field name="name">Time Off Second Approve</field>
<field name="icon">fa-sun-o</field>
<field name="res_model_id" ref="hr_holidays.model_hr_leave"/>
- <field name="is_master_data">True</field>
</record>
<!-- Leave specific activities -->
@@ -20,13 +18,11 @@
<field name="name">Allocation Approval</field>
<field name="icon">fa-sun-o</field>
<field name="res_model_id" ref="hr_holidays.model_hr_leave_allocation"/>
- <field name="is_master_data">True</field>
</record>
<record id="mail_act_leave_allocation_second_approval" model="mail.activity.type">
<field name="name">Allocation Second Approve</field>
<field name="icon">fa-sun-o</field>
<field name="res_model_id" ref="hr_holidays.model_hr_leave_allocation"/>
- <field name="is_master_data">True</field>
</record>
<!-- Holidays-related subtypes for messaging / Chatter -->
@@ -58,4 +54,4 @@
<field name="description">Allocation Request</field>
</record>
</data>
-</odoo> \ No newline at end of file
+</odoo>
diff --git a/addons/mail/data/mail_activity_data.xml b/addons/mail/data/mail_activity_data.xml
index f3594e44fc2..f05d7695ec1 100644
--- a/addons/mail/data/mail_activity_data.xml
+++ b/addons/mail/data/mail_activity_data.xml
@@ -11,20 +11,17 @@
<field name="icon">fa-phone</field>
<field name="delay_count">2</field>
<field name="sequence">6</field>
- <field name="is_master_data">True</field>
</record>
<record id="mail_activity_data_meeting" model="mail.activity.type">
<field name="name">Meeting</field>
<field name="icon">fa-users</field>
<field name="sequence">9</field>
- <field name="is_master_data">True</field>
</record>
<record id="mail_activity_data_todo" model="mail.activity.type">
<field name="name">To Do</field>
<field name="icon">fa-tasks</field>
<field name="delay_count">5</field>
<field name="sequence">12</field>
- <field name="is_master_data">True</field>
</record>
<record id="mail_activity_data_upload_document" model="mail.activity.type">
<field name="name">Upload Document</field>
@@ -39,7 +36,6 @@
<field name="delay_count">0</field>
<field name="sequence">99</field>
<field name="decoration_type">warning</field>
- <field name="is_master_data">True</field>
</record>
</data>
</odoo>
diff --git a/addons/mail/models/mail_activity.py b/addons/mail/models/mail_activity.py
index 70072a16785..f3d351f678f 100644
--- a/addons/mail/models/mail_activity.py
+++ b/addons/mail/models/mail_activity.py
@@ -78,7 +78,6 @@ class MailActivityType(models.Model):
initial_res_model_id = fields.Many2one('ir.model', 'Initial model', compute="_compute_initial_res_model_id", store=False,
help='Technical field to keep trace of the model at the beginning of the edition for UX related behaviour')
res_model_change = fields.Boolean(string="Model has change", help="Technical field for UX related behaviour", default=False, store=False)
- is_master_data = fields.Boolean(string="Master data", help="This field is used to prevent master data from the deletion.")
@api.onchange('res_model_id')
def _onchange_res_model_id(self):
@@ -91,9 +90,8 @@ class MailActivityType(models.Model):
@api.multi
def unlink(self):
- for activity_type in self:
- if activity_type.is_master_data:
- raise exceptions.ValidationError("You can not delete activity type that are used as master data.")
+ if any(self.get_external_id().values()):
+ raise exceptions.ValidationError("You can not delete activity type that are used as master data.")
return super(MailActivityType, self).unlink()
diff --git a/addons/mail/views/mail_activity_views.xml b/addons/mail/views/mail_activity_views.xml
index 0ee562df52e..1e494532e60 100644
--- a/addons/mail/views/mail_activity_views.xml
+++ b/addons/mail/views/mail_activity_views.xml
@@ -32,7 +32,6 @@
</div>
<field name="delay_from"/>
</div>
- <field name="is_master_data" groups="base.group_no_one"/>
</group>
<group name="activity_planning">
<field name="force_next"/>
diff --git a/addons/maintenance/data/mail_data.xml b/addons/maintenance/data/mail_data.xml
index d298a0fb55d..dd80a831723 100644
--- a/addons/maintenance/data/mail_data.xml
+++ b/addons/maintenance/data/mail_data.xml
@@ -6,7 +6,6 @@
<field name="name">Maintenance Request</field>
<field name="icon">fa-wrench</field>
<field name="res_model_id" ref="maintenance.model_maintenance_request"/>
- <field name="is_master_data">True</field>
</record>
<!-- email alias for maintenance requests -->
diff --git a/addons/product_expiry/data/product_expiry_data.xml b/addons/product_expiry/data/product_expiry_data.xml
index 62d95fb701f..f0effeaaa77 100644
--- a/addons/product_expiry/data/product_expiry_data.xml
+++ b/addons/product_expiry/data/product_expiry_data.xml
@@ -10,7 +10,6 @@
<field name="res_model_id" ref="stock.model_stock_production_lot"/>
<field name="icon">fa-tasks</field>
<field name="delay_count">0</field>
- <field name="is_master_data">True</field>
</record>
</odoo>
diff --git a/addons/sale/data/mail_data.xml b/addons/sale/data/mail_data.xml
index 70db8f8c5d2..b39a793f83b 100644
--- a/addons/sale/data/mail_data.xml
+++ b/addons/sale/data/mail_data.xml
@@ -6,7 +6,6 @@
<field name="name">Order Upsell</field>
<field name="icon">fa-line-chart</field>
<field name="res_model_id" ref="sale.model_sale_order"/>
- <field name="is_master_data">True</field>
</record>
<!-- Sale-related subtypes for messaging / Chatter -->