diff options
| author | Mohammed Shekha <msh@openerp.com> | 2019-06-27 13:16:26 +0000 |
|---|---|---|
| committer | Adrien Dieudonne <adr@odoo.com> | 2019-08-09 09:01:19 +0000 |
| commit | 25ebd80b40d52d8e6c59f264179dba35753f69da (patch) | |
| tree | 4e01341a327292e6b9a1566b89acb924ac4aa593 /addons | |
| parent | 597142d12c35e2cfe40323f76b3d6c7645d7638f (diff) | |
[IMP] *: add selection_mode condition to show/hide elements in kanban
If we use a kanban view to select a record we want to hide those elements:
dropdown boxes, buttons, anchors, some widgets, kanban color.
When it was too much change and used the new attribute
"kanban_view_ref" to explicitly define which view to open in selection_mode.
When also had to create previously unexisting kanban for
fleet.vehicle.model to show name and brand.
Task ID : 1924779
Diffstat (limited to 'addons')
33 files changed, 84 insertions, 63 deletions
diff --git a/addons/account/views/account_journal_dashboard_view.xml b/addons/account/views/account_journal_dashboard_view.xml index 691354faa0f..c91c8e1f902 100644 --- a/addons/account/views/account_journal_dashboard_view.xml +++ b/addons/account/views/account_journal_dashboard_view.xml @@ -14,7 +14,7 @@ <field name="activity_state"/> <templates> <t t-name="kanban-box"> - <div t-attf-class="#{kanban_color(record.color.raw_value)}"> + <div t-attf-class="#{!selection_mode ? kanban_color(record.color.raw_value) : ''}"> <t t-value="JSON.parse(record.kanban_dashboard.raw_value)" t-set="dashboard"/> <t t-value="record.type.raw_value" t-set="journal_type"/> <t t-call="JournalTop"/> diff --git a/addons/analytic/views/analytic_account_views.xml b/addons/analytic/views/analytic_account_views.xml index 8505e72cefa..e4893f51bd1 100644 --- a/addons/analytic/views/analytic_account_views.xml +++ b/addons/analytic/views/analytic_account_views.xml @@ -205,14 +205,14 @@ <templates> <t t-name="kanban-box"> <div t-attf-class="oe_kanban_card oe_kanban_global_click"> - <div class="text-center"> + <div t-attf-class="#{!selection_mode ? 'text-center' : ''}"> <strong><span><field name="display_name"/></span></strong> </div> <hr class="mt8 mb8"/> <div class="row"> - <div class="col-12 text-center"> + <div t-attf-class="col-12 #{!selection_mode ? 'text-center' : ''}"> <span> - <strong>Balance: <field name="balance" widget="monetary"/></strong> + Balance: <field name="balance" widget="monetary"/> </span> </div> </div> diff --git a/addons/crm/views/crm_lead_views.xml b/addons/crm/views/crm_lead_views.xml index de5abd619b3..fb2c8958962 100644 --- a/addons/crm/views/crm_lead_views.xml +++ b/addons/crm/views/crm_lead_views.xml @@ -393,7 +393,7 @@ <progressbar field="activity_state" colors='{"planned": "success", "today": "warning", "overdue": "danger"}' sum_field="planned_revenue" help="This bar allows to filter the opportunities based on scheduled activities."/> <templates> <t t-name="kanban-box"> - <div t-attf-class="#{kanban_color(record.color.raw_value)} oe_kanban_global_click"> + <div t-attf-class="#{!selection_mode ? kanban_color(record.color.raw_value) : ''} oe_kanban_global_click"> <div class="o_dropdown_kanban dropdown"> <a class="dropdown-toggle o-no-caret btn" role="button" data-toggle="dropdown" href="#" aria-label="Dropdown menu" title="Dropdown menu"> diff --git a/addons/crm/views/crm_stage_views.xml b/addons/crm/views/crm_stage_views.xml index 5d5a61ac036..95e2a321990 100644 --- a/addons/crm/views/crm_stage_views.xml +++ b/addons/crm/views/crm_stage_views.xml @@ -46,7 +46,7 @@ <group> <field name="is_won"/> <field name="fold"/> - <field name="team_id" options='{"no_open": True, "no_create": True}' attrs="{'invisible': [('team_count', '<=', 1)]}"/> + <field name="team_id" options='{"no_open": True, "no_create": True}' attrs="{'invisible': [('team_count', '<=', 1)]}" kanban_view_ref="%(sales_team.crm_team_view_kanban)s"/> </group> <field name="team_count" invisible="1"/> </group> diff --git a/addons/crm/wizard/crm_lead_to_opportunity_views.xml b/addons/crm/wizard/crm_lead_to_opportunity_views.xml index aeab3adc26e..bbf770ba0fd 100644 --- a/addons/crm/wizard/crm_lead_to_opportunity_views.xml +++ b/addons/crm/wizard/crm_lead_to_opportunity_views.xml @@ -25,7 +25,7 @@ <field name="phone"/> <field name="stage_id"/> <field name="user_id"/> - <field name="team_id"/> + <field name="team_id" kanban_view_ref="%(sales_team.crm_team_view_kanban)s"/> </tree> </field> </group> @@ -54,7 +54,7 @@ <field name="deduplicate" class="oe_inline"/> </group> <group string="Assign these opportunities to"> - <field name="team_id"/> + <field name="team_id" kanban_view_ref="%(sales_team.crm_team_view_kanban)s"/> <field name="user_ids" widget="many2many_tags" domain="[('share', '=', False)]"/> <field name="force_assignation"/> </group> diff --git a/addons/crm/wizard/crm_merge_opportunities_views.xml b/addons/crm/wizard/crm_merge_opportunities_views.xml index 6581dfb3dc0..dc2808058a7 100644 --- a/addons/crm/wizard/crm_merge_opportunities_views.xml +++ b/addons/crm/wizard/crm_merge_opportunities_views.xml @@ -8,7 +8,7 @@ <form string="Merge Leads/Opportunities"> <group string="Assign opportunities to"> <field name="user_id" class="oe_inline"/> - <field name="team_id" class="oe_inline"/> + <field name="team_id" class="oe_inline" kanban_view_ref="%(sales_team.crm_team_view_kanban)s"/> </group> <group string="Select Leads/Opportunities"> <field name="opportunity_ids" nolabel="1"> diff --git a/addons/crm_iap_lead/views/crm_iap_lead_views.xml b/addons/crm_iap_lead/views/crm_iap_lead_views.xml index eb85a63d910..2132352703e 100644 --- a/addons/crm_iap_lead/views/crm_iap_lead_views.xml +++ b/addons/crm_iap_lead/views/crm_iap_lead_views.xml @@ -50,7 +50,7 @@ </group> <group name="lead_info" string="Lead Information"> <field name="lead_type" groups="crm.group_use_lead" invisible="context.get('is_modal')" attrs="{'readonly': [('state', '!=', 'draft')]}"/> - <field name="team_id" attrs="{'readonly': [('state', '!=', 'draft')]}"/> + <field name="team_id" attrs="{'readonly': [('state', '!=', 'draft')]}" kanban_view_ref="%(sales_team.crm_team_view_kanban)s"/> <field name="user_id" attrs="{'readonly': [('state', '!=', 'draft')]}"/> <field name="tag_ids" widget="many2many_tags" attrs="{'readonly': [('state', '!=', 'draft')]}"/> </group> diff --git a/addons/crm_iap_lead_website/views/crm_reveal_views.xml b/addons/crm_iap_lead_website/views/crm_reveal_views.xml index 374c32c4d70..88c43fd3b9d 100644 --- a/addons/crm_iap_lead_website/views/crm_reveal_views.xml +++ b/addons/crm_iap_lead_website/views/crm_reveal_views.xml @@ -75,7 +75,7 @@ <group> <field name="lead_type" groups="crm.group_use_lead"/> <field name="suffix"/> - <field name="team_id"/> + <field name="team_id" kanban_view_ref="%(sales_team.crm_team_view_kanban)s"/> <field name="user_id"/> </group> <group> diff --git a/addons/event/views/event_views.xml b/addons/event/views/event_views.xml index e0dc30a1a1c..731a911f92f 100644 --- a/addons/event/views/event_views.xml +++ b/addons/event/views/event_views.xml @@ -315,7 +315,7 @@ <field name="color"/> <templates> <t t-name="kanban-box"> - <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click"> + <div t-attf-class="{{!selection_mode ? 'oe_kanban_color_' + kanban_getcolor(record.color.raw_value) : ''}} oe_kanban_card oe_kanban_global_click"> <div class="o_dropdown_kanban dropdown"> <a class="dropdown-toggle o-no-caret btn" role="button" data-toggle="dropdown" href="#" aria-label="Dropdown menu" title="Dropdown menu"> diff --git a/addons/fleet/views/fleet_vehicle_model_views.xml b/addons/fleet/views/fleet_vehicle_model_views.xml index 862d8eb111f..9f69f06f91e 100644 --- a/addons/fleet/views/fleet_vehicle_model_views.xml +++ b/addons/fleet/views/fleet_vehicle_model_views.xml @@ -58,6 +58,23 @@ </field> </record> + <record id='fleet_vehicle_model_view_kanban' model='ir.ui.view'> + <field name="name">fleet.vehicle.model.kanban</field> + <field name="model">fleet.vehicle.model</field> + <field name="arch" type="xml"> + <kanban string="Models"> + <templates> + <t t-name="kanban-box"> + <div class="oe_kanban_details"> + <div><strong><field name="name"/></strong></div> + <div><field name="brand_id"/></div> + </div> + </t> + </templates> + </kanban> + </field> + </record> + <record id='fleet_vehicle_model_view_search' model='ir.ui.view'> <field name="name">fleet.vehicle.model.search</field> <field name="model">fleet.vehicle.model</field> diff --git a/addons/fleet/views/fleet_vehicle_views.xml b/addons/fleet/views/fleet_vehicle_views.xml index dba89a9ab5b..3f48f00c97a 100644 --- a/addons/fleet/views/fleet_vehicle_views.xml +++ b/addons/fleet/views/fleet_vehicle_views.xml @@ -247,7 +247,7 @@ </li> </ul> </div> - <div class="o_kanban_button"> + <div class="o_kanban_button" t-if="!selection_mode"> <a t-if="record.contract_count.raw_value>0" data-type="object" data-name="return_action_to_open" href="#" class="oe_kanban_action oe_kanban_action_a" data-context='{"xml_id":"fleet_vehicle_log_contract_action"}'> @@ -261,7 +261,7 @@ </span> </a> </div> - <div class="o_kanban_inline_block"> + <div class="o_kanban_inline_block" t-if="!selection_mode"> <field name="activity_ids" widget="kanban_activity"/> </div> </div> diff --git a/addons/gamification/views/badge.xml b/addons/gamification/views/badge.xml index d0980d3e0b7..10c424115a3 100644 --- a/addons/gamification/views/badge.xml +++ b/addons/gamification/views/badge.xml @@ -138,7 +138,7 @@ </t> </div> </div> - <div t-if="record.remaining_sending.value != 0" class="o_kanban_button"> + <div t-if="record.remaining_sending.value != 0 and !selection_mode" class="o_kanban_button"> <button type="action" name="%(action_grant_wizard)d" class="oe_highlight btn btn-primary">Grant</button> </div> </div> diff --git a/addons/hr/views/hr_department_views.xml b/addons/hr/views/hr_department_views.xml index c6613c7df8c..f2897bc3ef4 100644 --- a/addons/hr/views/hr_department_views.xml +++ b/addons/hr/views/hr_department_views.xml @@ -62,17 +62,17 @@ <field name="color"/> <templates> <t t-name="kanban-box"> - <div t-attf-class="#{kanban_color(record.color.raw_value)}"> + <div t-attf-class="#{!selection_mode ? kanban_color(record.color.raw_value) : ''}"> <div t-attf-class="o_kanban_card_header"> <div class="o_kanban_card_header_title"> <div class="o_primary"><field name="name"/></div> <div class="o_secondary"><field name="company_id" groups="base.group_multi_company"/></div> </div> - <div class="o_kanban_manage_button_section"> + <div class="o_kanban_manage_button_section" t-if="!selection_mode"> <a class="o_kanban_manage_toggle_button" href="#"><i class="fa fa-ellipsis-v" role="img" aria-label="Manage" title="Manage"/></a> </div> </div> - <div class="container o_kanban_card_content"> + <div class="container o_kanban_card_content" t-if="!selection_mode"> <div class="row"> <div class="col-6 o_kanban_primary_left"> <button class="btn btn-primary" name="%(act_employee_from_department)d" type="action">Employees</button> diff --git a/addons/hr/views/hr_job_views.xml b/addons/hr/views/hr_job_views.xml index 4034f866d05..3371f4ae5ab 100644 --- a/addons/hr/views/hr_job_views.xml +++ b/addons/hr/views/hr_job_views.xml @@ -69,7 +69,7 @@ <div> <span><field name="department_id"/>&nbsp;</span> </div> - <div> + <div t-if="!selection_mode"> <span>Vacancies : <field name="expected_employees"/></span> <span t-att-class="record.state.raw_value == 'recruit' and 'float-right badge badge-success' or 'float-right badge badge-danger'"> <field name="state"/> diff --git a/addons/hr_contract/views/hr_contract_views.xml b/addons/hr_contract/views/hr_contract_views.xml index 467b856f6f0..1f930df66d5 100644 --- a/addons/hr_contract/views/hr_contract_views.xml +++ b/addons/hr_contract/views/hr_contract_views.xml @@ -241,7 +241,7 @@ <templates> <t t-name="kanban-box"> <div class="oe_kanban_card oe_kanban_global_click"> - <div class="o_dropdown_kanban dropdown" groups="base.group_user"> + <div class="o_dropdown_kanban dropdown" t-if="!selection_mode" groups="base.group_user"> <a class="dropdown-toggle o-no-caret btn" role="button" data-toggle="dropdown" href="#" aria-label="Dropdown menu" title="Dropdown menu"> <span class="fa fa-ellipsis-v"/> </a> diff --git a/addons/hr_recruitment/views/hr_job_views.xml b/addons/hr_recruitment/views/hr_job_views.xml index f48e273c025..588ff30892a 100644 --- a/addons/hr_recruitment/views/hr_job_views.xml +++ b/addons/hr_recruitment/views/hr_job_views.xml @@ -26,7 +26,7 @@ <field name="user_id"/> <templates> <t t-name="kanban-box"> - <div t-attf-class="#{kanban_color(record.color.raw_value)}"> + <div t-attf-class="#{!selection_mode ? kanban_color(record.color.raw_value) : ''}"> <div t-attf-class="o_kanban_card_header"> <div class="o_kanban_card_header_title"> <div class="o_primary col-12"><t t-esc="record.name.value"/></div> diff --git a/addons/hr_recruitment/views/hr_recruitment_views.xml b/addons/hr_recruitment/views/hr_recruitment_views.xml index 4ba8c73c2cb..8785287a3b7 100644 --- a/addons/hr_recruitment/views/hr_recruitment_views.xml +++ b/addons/hr_recruitment/views/hr_recruitment_views.xml @@ -289,7 +289,7 @@ <progressbar field="activity_state" colors='{"planned": "success", "overdue": "danger", "today": "warning"}'/> <templates> <t t-name="kanban-box"> - <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click oe_applicant_kanban oe_semantic_html_override"> + <div t-attf-class="{{!selection_mode ? 'oe_kanban_color_' + kanban_getcolor(record.color.raw_value) : ''}} oe_kanban_card oe_kanban_global_click oe_applicant_kanban oe_semantic_html_override"> <div class="o_dropdown_kanban dropdown"> <a class="dropdown-toggle o-no-caret btn" role="button" data-toggle="dropdown" href="#" aria-label="Dropdown menu" title="Dropdown menu"> <span class="fa fa-ellipsis-v"/> diff --git a/addons/hr_work_entry/views/hr_work_entry_views.xml b/addons/hr_work_entry/views/hr_work_entry_views.xml index dc987c1b9d0..bfcca473186 100644 --- a/addons/hr_work_entry/views/hr_work_entry_views.xml +++ b/addons/hr_work_entry/views/hr_work_entry_views.xml @@ -148,8 +148,8 @@ <field name="color"/> <templates> <t t-name="kanban-box"> - <div t-attf-class="#{kanban_color(record.color.raw_value)} oe_kanban_global_click"> - <div class="o_dropdown_kanban dropdown"> + <div t-attf-class="#{!selection_mode ? kanban_color(record.color.raw_value) : ''} oe_kanban_global_click"> + <div class="o_dropdown_kanban dropdown" t-if="!selection_mode"> <a class="dropdown-toggle o-no-caret btn" role="button" data-toggle="dropdown" href="#" aria-label="Dropdown menu" title="Dropdown menu"> <span class="fa fa-bars fa-lg"/> </a> diff --git a/addons/maintenance/views/maintenance_views.xml b/addons/maintenance/views/maintenance_views.xml index 25e3c56110e..a05ae873800 100644 --- a/addons/maintenance/views/maintenance_views.xml +++ b/addons/maintenance/views/maintenance_views.xml @@ -131,7 +131,7 @@ </ul> </t> <t t-name="kanban-box"> - <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click oe_semantic_html_override"> + <div t-attf-class="{{!selection_mode ? 'oe_kanban_color_' + kanban_getcolor(record.color.raw_value) : ''}} oe_kanban_card oe_kanban_global_click oe_semantic_html_override"> <div class="o_dropdown_kanban dropdown"> <a role="button" class="dropdown-toggle o-no-caret btn" data-toggle="dropdown" href="#" aria-label="Dropdown menu" title="Dropdown menu"> @@ -432,8 +432,8 @@ </ul> </t> <t t-name="kanban-box"> - <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click"> - <div class="o_dropdown_kanban dropdown"> + <div t-attf-class="{{!selection_mode ? 'oe_kanban_color_' + kanban_getcolor(record.color.raw_value) : ''}} oe_kanban_card oe_kanban_global_click"> + <div class="o_dropdown_kanban dropdown" t-if="!selection_mode"> <a role="button" class="dropdown-toggle o-no-caret btn" data-toggle="dropdown" href="#" aria-label="Dropdown menu" title="Dropdown menu"> <span class="fa fa-ellipsis-v"/> @@ -455,15 +455,15 @@ </div> <div class="o_kanban_record_bottom"> <div class="oe_kanban_bottom_left"> - <div class="badge badge-danger" t-if="record.maintenance_open_count.raw_value" > + <div class="badge badge-danger" t-if="!selection_mode and record.maintenance_open_count.raw_value" > <t t-raw="record.maintenance_open_count.raw_value"/> Request </div> - <div class="badge badge-secondary" t-if="record.next_action_date.raw_value" > + <div class="badge badge-secondary" t-if="!selection_mode and record.next_action_date.raw_value" > <t t-raw="moment(record.next_action_date.raw_value).format('MMMM Do')"/> </div> </div> <div class="oe_kanban_bottom_right"> - <div class="o_kanban_inline_block"> + <div class="o_kanban_inline_block" t-if="!selection_mode"> <field name="activity_ids" widget="kanban_activity" /> </div> <img t-att-src="kanban_image('res.users', 'image_64', record.owner_user_id.raw_value)" t-att-title="record.owner_user_id.value" t-att-alt="record.owner_user_id.value" width="27" height="27" class="oe_kanban_avatar"/> @@ -819,7 +819,7 @@ <field name="todo_request_count_unscheduled"/> <templates> <t t-name="kanban-box"> - <div t-attf-class="#{kanban_color(record.color.raw_value)}"> + <div t-attf-class="#{!selection_mode ? kanban_color(record.color.raw_value) : ''}"> <div t-attf-class="o_kanban_card_header"> <div class="o_kanban_card_header_title"> <div class="o_primary"> diff --git a/addons/mass_mailing/views/mailing_mailing_views.xml b/addons/mass_mailing/views/mailing_mailing_views.xml index 680e0dfd112..0242e7e193b 100644 --- a/addons/mass_mailing/views/mailing_mailing_views.xml +++ b/addons/mass_mailing/views/mailing_mailing_views.xml @@ -236,8 +236,8 @@ <field name='active'/> <templates> <t t-name="kanban-box"> - <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click oe_kanban_mass_mailing"> - <div class="o_dropdown_kanban dropdown"> + <div t-attf-class="{{!selection_mode ? 'oe_kanban_color_' + kanban_getcolor(record.color.raw_value) : ''}} oe_kanban_card oe_kanban_global_click oe_kanban_mass_mailing"> + <div class="o_dropdown_kanban dropdown" t-if="!selection_mode"> <a role="button" class="dropdown-toggle o-no-caret btn" data-toggle="dropdown" href="#" aria-label="Dropdown menu" title="Dropdown menu"> <span class="fa fa-ellipsis-v"/> </a> @@ -262,7 +262,7 @@ </div> </div> </div> - <div class="o_kanban_record_body" attrs="{'invisible': [('sent_date', '=', False)]}"> + <div class="o_kanban_record_body" t-if="!selection_mode" attrs="{'invisible': [('sent_date', '=', False)]}"> <t t-if="record.sent_date"> <div class="row"> <div class="col-8"> diff --git a/addons/mrp/views/mrp_workcenter_views.xml b/addons/mrp/views/mrp_workcenter_views.xml index 024ed07bb9f..a80edf7372b 100644 --- a/addons/mrp/views/mrp_workcenter_views.xml +++ b/addons/mrp/views/mrp_workcenter_views.xml @@ -150,7 +150,7 @@ <field name="oee_target"/> <templates> <t t-name="kanban-box"> - <div style="width: 400px;" t-attf-class="#{kanban_color(record.color.raw_value)}"> + <div style="width: 400px;" t-attf-class="#{!selection_mode ? kanban_color(record.color.raw_value) : ''}"> <div t-attf-class="o_kanban_card_header o_kanban_record_top"> <div class="o_kanban_record_headings o_kanban_card_header_title"> <span class="o_primary ml8" style="display: inline-block"> diff --git a/addons/mrp/views/stock_picking_views.xml b/addons/mrp/views/stock_picking_views.xml index 97298d93e05..7f2f8612502 100644 --- a/addons/mrp/views/stock_picking_views.xml +++ b/addons/mrp/views/stock_picking_views.xml @@ -12,20 +12,21 @@ </field> <xpath expr='//div[@name="stock_picking"]' position="after"> - <div t-if="record.code.raw_value == 'mrp_operation'" t-attf-class="#{kanban_color(record.color.raw_value)}"> + <div t-if="record.code.raw_value == 'mrp_operation'" t-attf-class="#{!selection_mode ? kanban_color(record.color.raw_value) : ''}"> <div> <div t-attf-class="o_kanban_card_header"> <div class="o_kanban_card_header_title"> - <a type="object" name="get_mrp_stock_picking_action_picking_type" class="o_primary"> + <a type="object" name="get_mrp_stock_picking_action_picking_type" class="o_primary" t-if="!selection_mode"> <field name="name"/> </a> + <span class="o_primary" t-if="selection_mode"><field name="name"/></span> <div class="o_secondary"><field class="o_secondary" name="warehouse_id"/></div> </div> - <div class="o_kanban_manage_button_section"> + <div class="o_kanban_manage_button_section" t-if="!selection_mode"> <a class="o_kanban_manage_toggle_button" href="#"><i class="fa fa-ellipsis-v" role="img" aria-label="Manage" title="Manage"/></a> </div> </div> - <div class="container o_kanban_card_content"> + <div class="container o_kanban_card_content" t-if="!selection_mode"> <div class="row"> <div class="col-6 o_kanban_primary_left"> <button class="btn btn-primary" name="%(mrp_production_action_picking_deshboard)d" type="action" context="{'search_default_todo': 1}"> diff --git a/addons/note/views/note_views.xml b/addons/note/views/note_views.xml index cd504340dc9..051b7abe0e2 100644 --- a/addons/note/views/note_views.xml +++ b/addons/note/views/note_views.xml @@ -92,7 +92,7 @@ <templates> <t t-name="kanban-box"> - <div t-attf-class="#{kanban_color(record.color.raw_value)} oe_kanban_global_click_edit oe_semantic_html_override oe_kanban_card"> + <div t-attf-class="#{!selection_mode ? kanban_color(record.color.raw_value) : ''} oe_kanban_global_click_edit oe_semantic_html_override oe_kanban_card"> <field name="tag_ids" widget="many2many_tags" options="{'color_field': 'color'}"/> diff --git a/addons/payment/views/payment_views.xml b/addons/payment/views/payment_views.xml index 0be3849727c..774222c4c6d 100644 --- a/addons/payment/views/payment_views.xml +++ b/addons/payment/views/payment_views.xml @@ -167,9 +167,9 @@ <t t-if="installed"> <field name="environment" widget="label_selection" options="{'classes': {'test': 'warning', 'production': 'success'}}"/> </t> - <button t-if="!installed" type="object" class="btn btn-secondary float-right" name="button_immediate_install">Install</button> - <button t-if="installed and !record.website_published.raw_value" type="edit" class="btn btn-primary float-right">Activate</button> - <button t-if="installed and record.website_published.raw_value" type="edit" class="btn btn-primary float-right">Configure</button> + <button t-if="!installed and !selection_mode" type="object" class="btn btn-secondary float-right" name="button_immediate_install">Install</button> + <button t-if="installed and !record.website_published.raw_value and !selection_mode" type="edit" class="btn btn-primary float-right">Activate</button> + <button t-if="installed and record.website_published.raw_value and !selection_mode" type="edit" class="btn btn-primary float-right">Configure</button> </div> </div> </t> diff --git a/addons/pos_sale/views/pos_config_views.xml b/addons/pos_sale/views/pos_config_views.xml index 2acacdeaa22..54ae37ab128 100644 --- a/addons/pos_sale/views/pos_config_views.xml +++ b/addons/pos_sale/views/pos_config_views.xml @@ -15,7 +15,7 @@ <div class="text-muted"> Sales are reported to the following sales team </div> - <field name="crm_team_id" domain="['|', ('company_id', '=', company_id), ('company_id', '=', False)]"/> + <field name="crm_team_id" kanban_view_ref="%(sales_team.crm_team_view_kanban)s" domain="['|', ('company_id', '=', company_id), ('company_id', '=', False)]"/> </div> </div> </div> diff --git a/addons/pos_sale/views/sales_team_views.xml b/addons/pos_sale/views/sales_team_views.xml index b3031cc03d8..fe03eb11c4d 100644 --- a/addons/pos_sale/views/sales_team_views.xml +++ b/addons/pos_sale/views/sales_team_views.xml @@ -6,7 +6,7 @@ <field name="inherit_id" ref="point_of_sale.view_pos_session_search"/> <field name="arch" type="xml"> <xpath expr="//field[@name='config_id']" position="after"> - <field name="crm_team_id"/> + <field name="crm_team_id" kanban_view_ref="%(sales_team.crm_team_view_kanban)s"/> </xpath> </field> </record> @@ -25,7 +25,7 @@ <field name="inherit_id" ref="point_of_sale.view_pos_config_search"/> <field name="arch" type="xml"> <xpath expr="//field[@name='name']" position="after"> - <field name="crm_team_id"/> + <field name="crm_team_id" kanban_view_ref="%(sales_team.crm_team_view_kanban)s"/> </xpath> </field> </record> diff --git a/addons/project/views/project_views.xml b/addons/project/views/project_views.xml index d37af598471..b876b1867a1 100644 --- a/addons/project/views/project_views.xml +++ b/addons/project/views/project_views.xml @@ -560,7 +560,7 @@ <progressbar field="kanban_state" colors='{"done": "success", "blocked": "danger"}'/> <templates> <t t-name="kanban-box"> - <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click"> + <div t-attf-class="{{!selection_mode ? 'oe_kanban_color_' + kanban_getcolor(record.color.raw_value) : ''}} oe_kanban_card oe_kanban_global_click"> <div class="oe_kanban_content"> <div class="o_kanban_record_top"> <div class="o_kanban_record_headings"> @@ -573,7 +573,7 @@ <t t-else="record.email_from.raw_value"><span><field name="email_from"/></span></t> </small> </div> - <div class="o_dropdown_kanban dropdown" groups="base.group_user"> + <div class="o_dropdown_kanban dropdown" t-if="!selection_mode" groups="base.group_user"> <a role="button" class="dropdown-toggle o-no-caret btn" data-toggle="dropdown" href="#" aria-label="Dropdown menu" title="Dropdown menu"> <span class="fa fa-ellipsis-v"/> </a> @@ -593,7 +593,7 @@ <field name="displayed_image_id" widget="attachment_image"/> </div> </div> - <div class="o_kanban_record_bottom"> + <div class="o_kanban_record_bottom" t-if="!selection_mode"> <div class="oe_kanban_bottom_left"> <field name="priority" widget="priority"/> <field name="activity_ids" widget="kanban_activity"/> @@ -606,7 +606,7 @@ <span style="font-weight:bold;" class="fa fa-fw mt4 fa-frown-o text-danger" t-if="record.rating_last_value.value == 1" title="Latest Rating: Higly Dissatisfied" role="img" aria-label="Sad face"/> </b> </div> - <div class="oe_kanban_bottom_right"> + <div class="oe_kanban_bottom_right" t-if="!selection_mode"> <field name="kanban_state" widget="state_selection" groups="base.group_user"/> <img t-att-src="kanban_image('res.users', 'image_64', record.user_id.raw_value)" t-att-title="record.user_id.value" t-att-alt="record.user_id.value" width="24" height="24" class="oe_kanban_avatar"/> </div> diff --git a/addons/sale/views/sale_views.xml b/addons/sale/views/sale_views.xml index 0c2e2703cce..55816e2aca9 100644 --- a/addons/sale/views/sale_views.xml +++ b/addons/sale/views/sale_views.xml @@ -608,7 +608,7 @@ <group name="sales_person" string="Sales"> <field name="date_order" attrs="{'invisible': [('state', 'in', ['sale', 'done', 'cancel'])]}" string="Quotation Date" groups="base.group_no_one"/> <field name="user_id"/> - <field name="team_id" options="{'no_create': True}"/> + <field name="team_id" kanban_view_ref="%(sales_team.crm_team_view_kanban)s" options="{'no_create': True}"/> <field name="company_id" options="{'no_create': True}" groups="base.group_multi_company"/> <field name="require_signature" groups="base.group_no_one"/> <field name="require_payment" groups="base.group_no_one"/> @@ -1135,7 +1135,7 @@ <attribute name="groups">product.group_discount_per_so_line</attribute> </xpath> <xpath expr="//group[@name='sale_info_group']" position="inside"> - <field name="team_id"/> + <field name="team_id" kanban_view_ref="%(sales_team.crm_team_view_kanban)s"/> </xpath> <xpath expr="//group[@id='other_tab_group']" position="inside"> <group string="Marketing" diff --git a/addons/sales_team/views/sales_team_dashboard.xml b/addons/sales_team/views/sales_team_dashboard.xml index c940e235073..647d58dd4d7 100644 --- a/addons/sales_team/views/sales_team_dashboard.xml +++ b/addons/sales_team/views/sales_team_dashboard.xml @@ -13,7 +13,7 @@ <field name="is_favorite"/> <templates> <t t-name="kanban-box"> - <div t-attf-class="#{kanban_color(record.color.raw_value)}"> + <div t-attf-class="#{!selection_mode ? kanban_color(record.color.raw_value) : ''}"> <div t-attf-class="o_kanban_card_header"> <div class="o_kanban_card_header_title"> <div class="o_primary"><field name="name"/></div> diff --git a/addons/stock/views/stock_picking_views.xml b/addons/stock/views/stock_picking_views.xml index dfdc08c6178..2154c22da70 100644 --- a/addons/stock/views/stock_picking_views.xml +++ b/addons/stock/views/stock_picking_views.xml @@ -562,22 +562,25 @@ action = action_values <field name="count_picking_backorders"/> <templates> <t t-name="kanban-box"> - <div t-if="['incoming', 'outgoing', 'internal'].indexOf(record.code.raw_value) > -1" t-attf-class="#{kanban_color(record.color.raw_value)}" name="stock_picking"> + <div t-if="['incoming', 'outgoing', 'internal'].indexOf(record.code.raw_value) > -1" t-attf-class="#{!selection_mode ? kanban_color(record.color.raw_value) : ''}" name="stock_picking"> <div> <div t-attf-class="o_kanban_card_header"> <div class="o_kanban_card_header_title"> - <div class="o_primary"> + <div class="o_primary" t-if="!selection_mode"> <a type="object" name="get_stock_picking_action_picking_type"> <field name="name"/> </a> </div> + <div class="o_primary" t-if="selection_mode"> + <field name="name"/> + </div> <div class="o_secondary"><field class="o_secondary" name="warehouse_id"/></div> </div> - <div class="o_kanban_manage_button_section"> + <div class="o_kanban_manage_button_section" t-if="!selection_mode"> <a class="o_kanban_manage_toggle_button" href="#"><i class="fa fa-ellipsis-v" role="img" aria-label="Manage" title="Manage"/></a> </div> </div> - <div class="container o_kanban_card_content"> + <div class="container o_kanban_card_content" t-if="!selection_mode"> <div class="row"> <div class="col-6 o_kanban_primary_left"> <button class="btn btn-primary" name="get_action_picking_tree_ready" type="object"> diff --git a/addons/survey/views/survey_survey_views.xml b/addons/survey/views/survey_survey_views.xml index 604e36e5d8c..8453fd337e2 100644 --- a/addons/survey/views/survey_survey_views.xml +++ b/addons/survey/views/survey_survey_views.xml @@ -156,8 +156,8 @@ <field name="activity_ids" /> <field name="activity_state" /> <templates> - <div t-name="kanban-box" t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click o_kanban_card_survey"> - <div class="o_dropdown_kanban dropdown" t-if="widget.editable"> + <div t-name="kanban-box" t-attf-class="{{!selection_mode ? 'oe_kanban_color_' + kanban_getcolor(record.color.raw_value) : ''}} oe_kanban_card oe_kanban_global_click o_kanban_card_survey"> + <div class="o_dropdown_kanban dropdown" t-if="widget.editable and !selection_mode"> <a role="button" class="dropdown-toggle o-no-caret btn" data-toggle="dropdown" href="#" aria-label="Dropdown menu" title="Dropdown menu"> <span class="fa fa-ellipsis-v"/> @@ -176,7 +176,7 @@ </div> <div class="col-2"><i t-if="record.certificate.raw_value === true" title="Certification" class="certification_icon fa fa-trophy"></i></div> </div> - <div class="o_kanban_record_bottom"> + <div class="o_kanban_record_bottom" t-if="!selection_mode"> <ul class="list-unstyled"> <li> <a type="object" name="action_test_survey">Test</a> @@ -190,7 +190,7 @@ </li> </ul> </div> - <div class="o_kanban_record_bottom"> + <div class="o_kanban_record_bottom" t-if="!selection_mode"> <div class="oe_kanban_bottom_left"/> <div class="oe_kanban_bottom_right"> <field name="activity_ids" widget="kanban_activity" /> diff --git a/addons/website_event_track/views/event_track_views.xml b/addons/website_event_track/views/event_track_views.xml index 1f2e3e226aa..27ceb972af7 100644 --- a/addons/website_event_track/views/event_track_views.xml +++ b/addons/website_event_track/views/event_track_views.xml @@ -16,7 +16,7 @@ <field name="activity_state"/> <progressbar field="kanban_state" colors='{"done": "success", "blocked": "danger"}'/> <t t-name="kanban-box"> - <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click"> + <div t-attf-class="{{!selection_mode ? 'oe_kanban_color_' + kanban_getcolor(record.color.raw_value) : ''}} oe_kanban_card oe_kanban_global_click"> <div class="o_dropdown_kanban dropdown" groups="base.group_user"> <a role="button" class="dropdown-toggle o-no-caret btn" data-toggle="dropdown" href="#" aria-label="Dropdown menu" title="Dropdown menu"> diff --git a/addons/website_sale/views/res_config_settings_views.xml b/addons/website_sale/views/res_config_settings_views.xml index 5dc7508987f..bb82764a9d6 100644 --- a/addons/website_sale/views/res_config_settings_views.xml +++ b/addons/website_sale/views/res_config_settings_views.xml @@ -299,7 +299,7 @@ <div class="content-group"> <div class="row mt16"> <label class="o_light_label col-lg-3" string="Sales Team" for="salesteam_id"/> - <field name="salesteam_id" /> + <field name="salesteam_id" kanban_view_ref="%(sales_team.crm_team_view_kanban)s" /> </div> <div class="row"> <label class="o_light_label col-lg-3" for="salesperson_id"/> |
