From bc54a3e3288c5eec4fecb6d28359c214c59087f7 Mon Sep 17 00:00:00 2001
From: guohuadeng <guohuadeng@hotmail.com>
Date: Sun, 31 Dec 2017 17:04:07 +0800
Subject: [PATCH 1/4] fix

---
 app_product_type_sequence/data/product_sequence.xml      | 6 +++---
 .../views/product_internal_type_view.xml                 | 9 ++++-----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/app_product_type_sequence/data/product_sequence.xml b/app_product_type_sequence/data/product_sequence.xml
index f36a27f1..e30981cf 100644
--- a/app_product_type_sequence/data/product_sequence.xml
+++ b/app_product_type_sequence/data/product_sequence.xml
@@ -42,7 +42,7 @@
         <record id="seq_sourced_product" model="ir.sequence">
             <field name="name">Sequence for Sourced Product</field>
             <field name="code">product.product</field>
-            <field name="prefix">CL%(y)s%(month)s</field>
+            <field name="prefix">WL%(y)s%(month)s</field>
             <field name="padding">5</field>
             <field name="company_id" eval="False"/>
             <field name="initial">True</field>
@@ -89,13 +89,13 @@
         <!--其它外购品，如五金-->
         <record id="internal_type_sourced_product" model="product.internal.type">
             <field name="name">Sourced Product</field>
-            <field name="ref">cl</field>
+            <field name="ref">wl</field>
             <field name="sequence">4</field>
             <field name="type">product</field>
             <field name="sale_ok">1</field>
             <field name="purchase_ok">1</field>
             <field name="route_ids" eval="[(6,0, [ref('purchase.route_warehouse0_buy'),ref('stock.route_warehouse0_mto')])]"/>
-            <field name="description">Set prefix as "CL" in link sequence</field>
+            <field name="description">Set prefix as "WL" in link sequence</field>
             <field name="link_sequence" ref="seq_sourced_product"/>
         </record>
         <!-- 服务与费用 Service-->
diff --git a/app_product_type_sequence/views/product_internal_type_view.xml b/app_product_type_sequence/views/product_internal_type_view.xml
index b6b9dc97..0af8523d 100644
--- a/app_product_type_sequence/views/product_internal_type_view.xml
+++ b/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="app_product_type_sequence.internal_type_action" id="menu_internal_type_action_sale"
+        <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"
                   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>

From e9048a8ad3c57bed31a8174a8bb7405b03ef6512 Mon Sep 17 00:00:00 2001
From: guohuadeng <guohuadeng@hotmail.com>
Date: Sun, 31 Dec 2017 17:34:54 +0800
Subject: [PATCH 2/4] update trans

---
 app_product_type_sequence/i18n/zh_CN.po | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app_product_type_sequence/i18n/zh_CN.po b/app_product_type_sequence/i18n/zh_CN.po
index 09729dce..6e5c7abf 100644
--- a/app_product_type_sequence/i18n/zh_CN.po
+++ b/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

From 7cea0737c2cf2b7cf5b339474d5492b79e4bc64c Mon Sep 17 00:00:00 2001
From: guohuadeng <guohuadeng@hotmail.com>
Date: Sat, 6 Jan 2018 16:35:03 +0800
Subject: [PATCH 3/4] fix default_code_store

---
 app_product_type_sequence/models/product_template.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app_product_type_sequence/models/product_template.py b/app_product_type_sequence/models/product_template.py
index ff8213c6..74d65450 100644
--- a/app_product_type_sequence/models/product_template.py
+++ b/app_product_type_sequence/models/product_template.py
@@ -50,7 +50,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)

From a14e7a3810aeb1843a1f0e0b788a0ae1d4c38fba Mon Sep 17 00:00:00 2001
From: guohuadeng <guohuadeng@hotmail.com>
Date: Sun, 7 Jan 2018 05:03:01 +0800
Subject: [PATCH 4/4] update picking.wave

---
 app_odoo_customize/models/app_theme_config_settings.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app_odoo_customize/models/app_theme_config_settings.py b/app_odoo_customize/models/app_theme_config_settings.py
index d74043f2..b207f278 100644
--- a/app_odoo_customize/models/app_theme_config_settings.py
+++ b/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/'" \