From e8e3ba96dc1b8db4db692510d8dcc0e170f1a23a Mon Sep 17 00:00:00 2001
From: Kaushalya Mandaliya <kma@odoo.com>
Date: Mon, 19 Aug 2019 09:52:50 +0000
Subject: [FIX] mrp: work order overlap issue when applying group by status

workcenter overview kanban view card width is not same for all cards,
also kanban card overlap in grouped view, to fix this apply width on
o_kanban_record class instead of inline css, also apply width in
o_kanban_group to have same width for all cards in grouped view

task-2052465

closes odoo/odoo#35803

Signed-off-by: Simon Lejeune (sle) <sle@openerp.com>


Co-authored-by: Mohammed Shekha <msh@odoo.com>
---
 addons/mrp/static/src/scss/mrp_workorder_kanban.scss | 10 ++++++++++
 addons/mrp/views/mrp_templates.xml                   |  1 +
 addons/mrp/views/mrp_workcenter_views.xml            |  2 +-
 addons/mrp/views/mrp_workorder_views.xml             |  4 ++--
 4 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 addons/mrp/static/src/scss/mrp_workorder_kanban.scss

diff --git a/addons/mrp/static/src/scss/mrp_workorder_kanban.scss b/addons/mrp/static/src/scss/mrp_workorder_kanban.scss
new file mode 100644
index 00000000000..d2580da46d8
--- /dev/null
+++ b/addons/mrp/static/src/scss/mrp_workorder_kanban.scss
@@ -0,0 +1,10 @@
+.o_kanban_dashboard.o_kanban_view {
+    &.o_mrp_workorder_kanban,&.o_workcenter_kanban {
+        .o_kanban_group:not(.o_column_folded) {
+            width: 400px + $o-kanban-group-padding;
+        }
+        .o_kanban_record {
+            width: 400px;
+        }
+    }
+}
\ No newline at end of file
diff --git a/addons/mrp/views/mrp_templates.xml b/addons/mrp/views/mrp_templates.xml
index 59604b0183c..bdf3c619b4d 100644
--- a/addons/mrp/views/mrp_templates.xml
+++ b/addons/mrp/views/mrp_templates.xml
@@ -2,6 +2,7 @@
 <odoo>
     <template id="assets_backend" name="mrp assets" inherit_id="web.assets_backend">
         <xpath expr="." position="inside">
+            <link rel="stylesheet" type="text/scss" href="/mrp/static/src/scss/mrp_workorder_kanban.scss" />
             <script type="text/javascript" src="/mrp/static/src/js/mrp.js"></script>
             <script type="text/javascript" src="/mrp/static/src/js/mrp_bom_report.js"></script>
         </xpath>
diff --git a/addons/mrp/views/mrp_workcenter_views.xml b/addons/mrp/views/mrp_workcenter_views.xml
index 6a8535057ea..fd1a8ea82bf 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="#{!selection_mode ? 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 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/mrp_workorder_views.xml b/addons/mrp/views/mrp_workorder_views.xml
index 9612689cb59..f160ec9cae4 100644
--- a/addons/mrp/views/mrp_workorder_views.xml
+++ b/addons/mrp/views/mrp_workorder_views.xml
@@ -353,7 +353,7 @@
         <field name="name">mrp.production.work.order.kanban</field>
         <field name="model">mrp.workorder</field>
         <field name="arch" type="xml">
-            <kanban class="oe_background_grey o_kanban_dashboard" create="0">
+            <kanban class="oe_background_grey o_kanban_dashboard o_mrp_workorder_kanban" create="0">
                 <field name="name"/>
                 <field name="production_id"/>
                 <field name="state"/>
@@ -367,7 +367,7 @@
                 <field name="product_uom_id"/>
                 <templates>
                     <t t-name="kanban-box">
-                        <div style="width: 400px;" class="oe_kanban_global_click">
+                        <div class="oe_kanban_global_click">
                             <div class="o_kanban_card_header o_kanban_record_top">
                                 <div class="o_kanban_record_headings o_kanban_card_header_title">
                                     <strong class="o_primary ml8">
-- 
cgit v1.2.3