Merge remote-tracking branch 'origin/master'

app_odoo_customize/models/app_theme_config_settings.py

@@ -278,6 +278,7 @@ class AppThemeConfigSettings(models.TransientModel):
             ['stock.move', ],
             ['stock.pack.operation', ],
             ['stock.picking', ],
+            ['stock.picking.wave', ],
             ['stock.scrap', ],
             ['stock.inventory.line', ],
             ['stock.inventory', ],
@@ -297,9 +298,9 @@ class AppThemeConfigSettings(models.TransientModel):
                 '|', ('code', '=', 'stock.lot.tracking'),
                 '|', ('code', '=', 'stock.orderpoint'),
                 '|', ('code', '=', 'stock.picking'),
+                '|', ('code', '=', 'picking.wave'),
                 '|', ('code', '=', 'stock.quant.package'),
                 '|', ('code', '=', 'stock.scrap'),
-                '|', ('code', '=', 'stock.picking'),
                 '|', ('prefix', '=', 'WH/IN/'),
                 '|', ('prefix', '=', 'WH/INT/'),
                 '|', ('prefix', '=', 'WH/OUT/'),
@@ -319,6 +320,7 @@ class AppThemeConfigSettings(models.TransientModel):
                   "or code ='stock.quant.package'" \
                   "or code ='stock.scrap'" \
                   "or code ='stock.picking'" \
+                  "or code ='picking.wave'" \
                   "or prefix ='WH/IN/'" \
                   "or prefix ='WH/INT/'" \
                   "or prefix ='WH/OUT/'" \

app_product_type_sequence/i18n/zh_CN.po

@@ -202,6 +202,11 @@ msgstr "路线"
 msgid "Sequence Prefix"
 msgstr "编号前缀"
 
+#. module: app_product_type_sequence
+#: model:ir.model.fields,field_description:app_product_type_sequence.field_product_internal_type_sequence
+msgid "Sequence"
+msgstr "显示顺序"
+
 #. module: app_product_type_sequence
 #: code:addons/app_product_type_sequence/models/product_internal_type.py:35
 #: selection:product.internal.type,type:0

app_product_type_sequence/models/product_template.py

@@ -64,7 +64,7 @@ class ProductTemplate(models.Model):
         else:
             pass
 
-        if 'default_code' in vals and vals['default_code']:
+        if vals['default_code']:
             vals['default_code_stored'] = vals['default_code']
 
         return super(ProductTemplate, self).create(vals)

app_product_type_sequence/views/product_internal_type_view.xml

@@ -68,15 +68,14 @@
             <field name="view_mode">tree,form</field>
         </record>
 
-        <menuitem action="app_product_type_sequence.internal_type_action" id="menu_internal_type_action_sys" parent="base.menu_ir_property"/>
+        <menuitem action="internal_type_action" id="menu_internal_type_action_sys" parent="base.next_id_5"/>
-
+        <menuitem action="internal_type_action" id="menu_internal_type_action_sale"
-        <menuitem action="app_product_type_sequence.internal_type_action" id="menu_internal_type_action_sale"
                   parent="sale.prod_config_main" sequence="6" groups="base.group_no_one"/>
 
-        <menuitem action="app_product_type_sequence.internal_type_action" id="menu_internal_type_action_purchase"
+        <menuitem action="internal_type_action" id="menu_internal_type_action_purchase"
                   parent="purchase.menu_product_in_config_purchase" sequence="3" groups="base.group_no_one"/>
 
-        <menuitem action="app_product_type_sequence.internal_type_action" id="menu_internal_type_action_stock"
+        <menuitem action="internal_type_action" id="menu_internal_type_action_stock"
                   parent="stock.menu_product_in_config_stock" sequence="3" groups="base.group_no_one"/>
     </data>
 </openerp>