Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/快速订单Bug修复

# Conflicts:
#	web_widget_model_viewer/__manifest__.py

sf_tool_management/models/base.py

@@ -13,7 +13,7 @@ class FunctionalCuttingToolEntity(models.Model):
     _description = '功能刀具列表'
 
     code = fields.Char('编码')
-    name = fields.Char('名称')
+    name = fields.Char('名称', required=True, size=20)
     mrs_cutting_tool_model_id = fields.Many2one('sf.cutting.tool.model', string='刀具型号')
     mrs_cutting_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', tracking=True,
                                                group_expand='_read_group_mrs_cutting_tool_type_ids')

sf_tool_management/views/tool_base_views.xml

@@ -29,12 +29,12 @@
                     <sheet>
                         <div class="oe_title">
                             <h1>
-                                <field name="name" invisible="False"/>
+                                <field name="name" invisible="False" placeholder="请输入20字以内的名称"/>
                             </h1>
                         </div>
                         <group>
                             <group>
-                                <field name="code" readonly="1"/>
+                                <field name="code" readonly="1" nolabel="True"/>
                                 <field name="mrs_cutting_tool_type_id"/>
 
                                 <field name="mrs_cutting_tool_integral_model_ids"

zpl_print/__manifest__.py

@@ -22,6 +22,7 @@
             'jikimo_sfs/zpl_print/static/src/scss/changes.scss'
         ]
     },
+    'license': 'LGPL-3',
     'installable': True,
     'application': False,
     'auto_install': False,