From b4715952cbf6428131d2bd44a1a720947105400b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@odoo.com>
Date: Thu, 16 Aug 2018 13:56:10 +0200
Subject: [PATCH] [FIX] mail: fix server action view requiring not required
 fields

Some fields are required only when defining an activity-based server
action. Required domain was not correctly written leading to server
actions being blocked.
---
 addons/mail/views/ir_actions_views.xml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/addons/mail/views/ir_actions_views.xml b/addons/mail/views/ir_actions_views.xml
index a5a7a0dd6bd..9a83ebf0316 100644
--- a/addons/mail/views/ir_actions_views.xml
+++ b/addons/mail/views/ir_actions_views.xml
@@ -21,8 +21,14 @@
                                     <field name="activity_date_deadline_range_type"/>
                                 </div>
                                 <field name="activity_user_type"/>
-                                <field name="activity_user_field_name" attrs="{'invisible': [('activity_user_type', '=', 'specific')], 'required': [('activity_user_type', '=', 'generic')]}"/>
-                                <field name="activity_user_id" attrs="{'invisible': [('activity_user_type', '=', 'generic')], 'required': [('activity_user_type', '=', 'specific')]}"/>
+                                <field name="activity_user_field_name" attrs="{
+                                    'invisible': [('activity_user_type', '=', 'specific')],
+                                    'required': [('state', '=', 'next_activity'), ('activity_user_type', '=', 'generic')]
+                                }"/>
+                                <field name="activity_user_id" attrs="{
+                                    'invisible': [('activity_user_type', '=', 'generic')],
+                                    'required': [('state', '=', 'next_activity'), ('activity_user_type', '=', 'specific')]
+                                }"/>
                             </group>
                         </group>
                         <field name="activity_note" placeholder="Log a note..."/>