From d5dd6284dd3697f47f06a376861106e937f273b1 Mon Sep 17 00:00:00 2001 From: qsm-odoo <qsm@odoo.com> Date: Thu, 10 Sep 2015 15:36:12 +0200 Subject: [PATCH] [IMP/FIX] web: CRM next activity section layout --- addons/crm/crm_lead_view.xml | 54 ++++++++++++++++++++---------------- 1 file changed, 30 insertions(+), 24 deletions(-) diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index 71b21f4518af..dad3896087d3 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -476,30 +476,36 @@ <label for="next_activity_id"/> <div> <field name="last_activity_id" invisible="1"/> - <field name="next_activity_id" - class="oe_inline" options="{'no_create': True, 'no_open': True}" - domain="['|',('team_id','=',False),('team_id','=',team_id)]" - on_change="onchange_next_activity_id(next_activity_id)"/> - <span attrs="{'invisible': ['|', ('last_activity_id','=',False), ('next_activity_id', '<>', False)]}" class="oe_edit_only"> - <button name="log_next_activity_1" type="object" class="btn-link" attrs="{'invisible': [('next_activity_1','=',False)]}"> - <field name="next_activity_1" class="oe_inline" readonly="1"/> - </button> - <button name="log_next_activity_2" type="object" class="btn-link" attrs="{'invisible': [('next_activity_2','=',False)]}"> - <field name="next_activity_2" class="oe_inline" readonly="1"/> - </button> - <button name="log_next_activity_3" type="object" class="btn-link" attrs="{'invisible': [('next_activity_3','=',False)]}"> - <field name="next_activity_3" class="oe_inline" readonly="1"/> - </button> - </span> - <span class="oe_form_field oe_read_only oe_inline" - attrs="{'invisible': ['|', ('next_activity_id', '=', False), ('date_action', '=', False)]}"> on </span> - <field name="date_action" nolabel="1" attrs="{'invisible': [('next_activity_id', '=', False)]}" placeholder="Choose a date..." class="oe_inline"/> - <span class="oe_form_field oe_read_only oe_inline">: </span> - <field name="title_action" nolabel="1" placeholder="e.g. Discuss proposal" - attrs="{'invisible': [('next_activity_id', '=', False)]}"/> - <div class="oe_edit_only" attrs="{'invisible': [('next_activity_id', '=', False)]}"> - <button name="log_next_activity_done" string="Done" type="object" class="btn-link"/> - <button name="cancel_next_activity" string="Cancel" type="object" class="btn-link"/> + + <div class="o_row"> + <field name="next_activity_id" + options="{'no_create': True, 'no_open': True}" + domain="['|',('team_id','=',False),('team_id','=',team_id)]" + on_change="onchange_next_activity_id(next_activity_id)"/> + <span attrs="{'invisible': ['|', ('last_activity_id','=',False), ('next_activity_id', '<>', False)]}" class="oe_edit_only"> + <button name="log_next_activity_1" type="object" class="btn-link" attrs="{'invisible': [('next_activity_1','=',False)]}"> + <field name="next_activity_1" readonly="1"/> + </button> + <button name="log_next_activity_2" type="object" class="btn-link" attrs="{'invisible': [('next_activity_2','=',False)]}"> + <field name="next_activity_2" readonly="1"/> + </button> + <button name="log_next_activity_3" type="object" class="btn-link" attrs="{'invisible': [('next_activity_3','=',False)]}"> + <field name="next_activity_3" readonly="1"/> + </button> + </span> + <span class="oe_read_only oe_form_field" + attrs="{'invisible': ['|', ('next_activity_id', '=', False), ('date_action', '=', False)]}"> on </span> + <field name="date_action" attrs="{'invisible': [('next_activity_id', '=', False)]}" placeholder="Choose a date..."/> + <span class="oe_read_only oe_form_field" + attrs="{'invisible': ['|', ('next_activity_id', '=', False), ('title_action', '=', False)]}">: </span> + </div> + <div class="o_row"> + <field name="title_action" placeholder="e.g. Discuss proposal" + attrs="{'invisible': [('next_activity_id', '=', False)]}"/> + <span class="oe_edit_only" attrs="{'invisible': [('next_activity_id', '=', False)]}"> + <button name="log_next_activity_done" string="Done" type="object" class="btn-link"/> + <button name="cancel_next_activity" string="Cancel" type="object" class="btn-link"/> + </span> </div> </div> <field name="date_deadline"/> -- GitLab