Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具管理

sf_base/models/fixture.py

@@ -29,7 +29,7 @@ class FixtureModel(models.Model):
     code = fields.Char(string='编码')
     name = fields.Char(string="名称", size=15)
     fixture_material_id = fields.Many2one('sf.fixture.material', string="夹具物料", )
-    fixture_material_type = fields.Char(string="夹具物料类型", related='fixture_material_id.name')
+    fixture_material_type = fields.Char(string="夹具物料类型", related='fixture_material_id.name', store=True)
     multi_mounting_type_id = fields.Many2one('sf.multi_mounting.type', string="联装类型")
     brand_id = fields.Many2one('sf.machine.brand', string="品牌")
     manufacturer_model_number = fields.Char(string="厂家型号")

sf_base/views/fixture_view.xml

@@ -197,15 +197,13 @@
                            attrs='{"invisible": [("fixture_material_type","not in",("气动托盘","转接板(锁板)托盘","磁吸托盘","虎钳托盘","零点卡盘"))]}'>
                         <group>
                             <label for="length" string="尺寸[mm]"/>
-                            <div class="o_address_format">
+                            <div class="test_model">
                                 <label for="length" string="长"/>
                                 <field name="length" class="o_address_zip"
                                        options="{'format': false}"/>
-                                <span>&amp;nbsp;</span>
                                 <label for="width" string="宽"/>
                                 <field name="width" class="o_address_zip"
                                        options="{'format': false}"/>
-                                <span>&amp;nbsp;</span>
                                 <label for="height" string="高"/>
                                 <field name="height" class="o_address_zip"
                                        options="{'format': false}"/>
@@ -213,18 +211,16 @@
                             <field name="weight"></field>
                             <label for="length" string="夹持工件最大尺寸[mm]"
                                    attrs='{"invisible": [("fixture_material_type","=",("零点卡盘"))]}'/>
-                            <div class="o_address_format"
+                            <div class="test_model"
                                  attrs='{"invisible": [("fixture_material_type","=",("零点卡盘"))]}'>
                                 <label for="clamp_workpiece_length_max" string="长"/>
                                 <field name="clamp_workpiece_length_max" class="o_address_zip"
                                        options="{'format': false}"
                                        attrs="{'required': [('fixture_material_type', 'in',('气动托盘','转接板(锁板)托盘','磁吸托盘','虎钳托盘'))]}"/>
-                                <span>&amp;nbsp;</span>
                                 <label for="clamp_workpiece_width_max" string="宽"/>
                                 <field name="clamp_workpiece_width_max" class="o_address_zip"
                                        options="{'format': false}"
                                        attrs="{'required': [('fixture_material_type', 'in',('气动托盘','转接板(锁板)托盘','磁吸托盘','虎钳托盘'))]}"/>
-                                <span>&amp;nbsp;</span>
                                 <label for="clamp_workpiece_height_max" string="高"/>
                                 <field name="clamp_workpiece_height_max" class="o_address_zip"
                                        options="{'format': false}"

sf_dlm/views/product_template_view.xml

@@ -355,8 +355,16 @@
                     <filter name="finish_product" string="成品" domain="[('categ_id.type','=','成品')]"/>
                     <filter name="embryo" string="坯料" domain="[('categ_id.type','=','坯料')]"/>
                     <filter name="raw_bom" string="原材料" domain="[('categ_id.type','=','原材料')]"/>
+                    <!--                    <searchpanel>-->
+                    <!--                        <field name="categ_id" icon="fa-building" enable_counters="1"/>-->
+                    <!--                    </searchpanel>-->
+                </xpath>
+                <xpath expr="//search" position="inside">
+                    <searchpanel>
+                        <field name="categ_id" icon="fa-building" enable_counters="1"/>
+                    </searchpanel>
                 </xpath>
             </field>
-        </record>
+        </record>                                                                                                                                                                
     </data>
 </odoo>

sf_manufacturing/views/mrp_workcenter_views.xml

@@ -56,7 +56,7 @@
         </field>
     </record>
     <record id="mrp_workcenter_kanban_action1" model="ir.actions.act_window">
-        <field name="name">工作中心看板</field>
+        <field name="name">生产线驾驶舱</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">mrp.workcenter</field>
         <field name="view_mode">kanban,form</field>
@@ -76,7 +76,7 @@
     </record>
 
     <menuitem id="menu_mrp_dashboard"
-              name="工作中心看板"
+              name="生产线驾驶舱"
               action="mrp_workcenter_kanban_action1"
               groups="mrp.group_mrp_routings"
               parent="mrp.menu_mrp_root"

sf_plan_management/views/operations_rename_menu.xml

@@ -2,7 +2,7 @@
 <odoo>
     <data>
         <record id="mrp.menu_mrp_manufacturing" model="ir.ui.menu">
-            <field name="name">计划管理</field>
+            <field name="name">Operations1</field>
         </record>
 
         <record id="mrp_workorder.mrp_workorder_menu_planning" model="ir.ui.menu">