From f8a1adcfe5d80e6b7b1adb8f8adcc185d4cd896c Mon Sep 17 00:00:00 2001
From: ivan deng <guohuadeng@hotmail.com>
Date: Wed, 20 Dec 2017 03:26:07 +0800
Subject: [PATCH] =?UTF-8?q?fix=20seq=EF=BC=8C=E5=A4=9A=E5=85=AC=E5=8F=B8?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app_product_type_sequence/__openerp__.py      |  2 +-
 .../data/product_sequence_dp.xml              | 21 ++++++++++++++++++-
 .../models/product_internal_type.py           |  6 +++---
 .../views/product_internal_type_view.xml      |  2 +-
 .../views/product_product_view.xml            |  1 -
 .../views/product_template_view.xml           |  3 +--
 6 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/app_product_type_sequence/__openerp__.py b/app_product_type_sequence/__openerp__.py
index b9ad70f3..a57a71ca 100644
--- a/app_product_type_sequence/__openerp__.py
+++ b/app_product_type_sequence/__openerp__.py
@@ -54,7 +54,7 @@
     'data': [
         # 视图
         "security/ir.model.access.csv",
-        # "security/security.xml",
+        "security/security.xml",
         'views/product_template_view.xml',
         'views/product_product_view.xml',
         'views/product_category_view.xml',
diff --git a/app_product_type_sequence/data/product_sequence_dp.xml b/app_product_type_sequence/data/product_sequence_dp.xml
index d8a23aae..4b8b3ff3 100644
--- a/app_product_type_sequence/data/product_sequence_dp.xml
+++ b/app_product_type_sequence/data/product_sequence_dp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <data noupdate="1">
+    <data noupdate="0">
         <!-- 更新序号规则 Auto Internal Reference. -->
         <!-- 所有的 All Products. -->
         <record id="seq_product_auto" model="ir.sequence">
@@ -38,6 +38,15 @@
             <field name="company_id" eval="False"/>
             <field name="initial">True</field>
         </record>
+        <!-- 服务与费用 Service-->
+        <record id="seq_service" model="ir.sequence">
+            <field name="name">Service</field>
+            <field name="code">product.product</field>
+            <field name="prefix">V%(y)s%(month)s</field>
+            <field name="padding">5</field>
+            <field name="company_id" eval="False"/>
+            <field name="initial">True</field>
+        </record>
     </data>
     <data noupdate="0">
         <!-- internal_type 数据-->
@@ -71,6 +80,16 @@
             <field name="description">Set prefix as "S" in link sequence</field>
             <field name="link_sequence" ref="seq_sourced_product"/>
         </record>
+        <record id="internal_type_service" model="product.internal.type">
+            <field name="name">Service</field>
+            <field name="ref">v</field>
+            <field name="type">service</field>
+            <field name="sale_ok">1</field>
+            <field name="purchase_ok">1</field>
+            <field name="route_ids" eval="[(5)]"/>
+            <field name="description">Set prefix as "V" in link sequence</field>
+            <field name="link_sequence" ref="seq_service"/>
+        </record>
 
         <!--设置产品默认值为制造产品-->
         <record id="product_internal_type_default" model="ir.values">
diff --git a/app_product_type_sequence/models/product_internal_type.py b/app_product_type_sequence/models/product_internal_type.py
index 9eaf84de..b8b172ad 100644
--- a/app_product_type_sequence/models/product_internal_type.py
+++ b/app_product_type_sequence/models/product_internal_type.py
@@ -51,9 +51,9 @@ class ProductInternalType(models.Model):
         domain=[('product_selectable', '=', True)],
         help="Depending on the modules installed, this will allow you to define the route of the product: whether it will be bought, manufactured, MTO/MTS,...")
 
-    # company_id = fields.Many2one(
-    #     'res.company', 'Company',
-    #     default=lambda self: self.env.user.company_id.id, index=1)
+    company_id = fields.Many2one(
+        'res.company', 'Company',
+        default=lambda self: self.env.user.company_id.id, index=1)
 
     _sql_constraints = [
         ('uniq_ref',
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 1edac2ce..c65edcd1 100644
--- a/app_product_type_sequence/views/product_internal_type_view.xml
+++ b/app_product_type_sequence/views/product_internal_type_view.xml
@@ -66,7 +66,7 @@
             <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.next_id_5"/>
+        <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"
                   parent="sale.prod_config_main" sequence="6" groups="base.group_no_one"/>
diff --git a/app_product_type_sequence/views/product_product_view.xml b/app_product_type_sequence/views/product_product_view.xml
index 542e2a9b..834bb3ef 100644
--- a/app_product_type_sequence/views/product_product_view.xml
+++ b/app_product_type_sequence/views/product_product_view.xml
@@ -9,7 +9,6 @@
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='name']" position="after">
                     <field name="internal_type"/>
-                    <field name="id"/>
                 </xpath>
             </field>
         </record>
diff --git a/app_product_type_sequence/views/product_template_view.xml b/app_product_type_sequence/views/product_template_view.xml
index 45ed4a3b..a26a5e81 100644
--- a/app_product_type_sequence/views/product_template_view.xml
+++ b/app_product_type_sequence/views/product_template_view.xml
@@ -9,7 +9,6 @@
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='type']" position="before">
                     <field name="internal_type"/>
-                    <field name="id"/>
                 </xpath>
             </field>
         </record>
@@ -23,7 +22,7 @@
                     <div>
                         <h4>
                             <label class="oe_edit_only" for="internal_type"/>
-                            <field name="internal_type" options="{'no_create': True,'no_open': True}"/>
+                            <field name="internal_type" options="{'no_create': True,'no_open': True}" required="1"/>
                         </h4>
                     </div>
                 </xpath>