Merge branch 'develop' into feature/tree视图表格样式修改

# Conflicts:
#	sf_manufacturing/static/src/js/kanban_change.js
#	sf_manufacturing/static/src/scss/kanban_change.scss
#	sf_manufacturing/views/mrp_workcenter_views.xml

sf_manufacturing/views/mrp_workcenter_views.xml

@@ -129,10 +129,7 @@
                     <field name="oee_target"/>
                     <field name="production_line_show"/>
                     <templates>
-                        <t t-name="kanban-box" t-if="record.production_line_show != 'test'">
-                        <div t-on-click='console.log(production_line_show)'>
-
-                        </div>
+                        <t t-name="kanban-box" t-if="record.production_line_id.value == record.production_line_show.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">
@@ -298,6 +295,7 @@
             </field>
         </field>
     </record>
+<<<<<<< HEAD
 <!--     测试searchpanel -->
     <record id="view_location_search_sf11111_inherit" model="ir.ui.view">
         <field name="name">mrp.workcenter.inherit</field>
@@ -315,4 +313,6 @@
 
 
 
+=======
+>>>>>>> develop
 </odoo>