[MIG] sale_layout_multi_company: Migration to 10.0

OCA · Mar 26, 2018 · 3690fee · 3690fee
1 parent 66be459
commit 3690fee
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 40 deletions.
diff --git a/sale_layout_multi_company/README.rst b/sale_layout_multi_company/README.rst
@@ -13,7 +13,7 @@ Usage
 
 .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas
    :alt: Try me on Runbot
-   :target: https://runbot.odoo-community.org/runbot/133/8.0
+   :target: https://runbot.odoo-community.org/runbot/133/10.0
 
 Bug Tracker
 ===========

diff --git a/sale_layout_multi_company/__openerp__.py → sale_layout_multi_company/__manifest__.py b/sale_layout_multi_company/__openerp__.py → sale_layout_multi_company/__manifest__.py
@@ -5,15 +5,15 @@
 {
     "name": "Sale Layout - Multi company",
     "summary": "Multi company features for sale_layout",
-    "version": "8.0.1.0.0",
+    "version": "10.0.1.0.0",
     "category": "Sales Management",
     "website": "https://www.agilebg.com",
     "author": "Agile Business Group, Odoo Community Association (OCA)",
     "license": "AGPL-3",
     "application": False,
     "installable": True,
     "depends": [
-        "sale_layout",
+        "sale"
     ],
     "data": [
         "views/sale_layout_view.xml",

diff --git a/sale_layout_multi_company/models/sale_layout.py b/sale_layout_multi_company/models/sale_layout.py
@@ -2,17 +2,16 @@
 # Copyright 2016 Lorenzo Battistini - Agile Business Group
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from openerp import models, fields, api
+from odoo import models, fields, api
 
 
 class SaleLayoutCategory(models.Model):
-    _inherit = 'sale_layout.category'
+    _inherit = 'sale.layout_category'
 
     @api.model
     def _default_company_id(self):
-        company = self.env['res.company']
-        return company.browse(company._company_default_get(
-            'sale_layout.category'))
+        return self.env['res.company']. \
+            _company_default_get('sale.layout_category')
 
     company_id = fields.Many2one(
         'res.company', string='Company', change_default=True,

diff --git a/sale_layout_multi_company/security/record_rules.xml b/sale_layout_multi_company/security/record_rules.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
-<data noupdate="1">
-    <record id="account_move_comp_rule" model="ir.rule">
-        <field name="name">Sale layout multi company</field>
-        <field name="model_id" ref="model_sale_layout_category"/>
-        <field name="global" eval="True"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
-    </record>
-</data>
-</openerp>
+<odoo>
+    <data noupdate="1">
+        <record id="account_move_comp_rule" model="ir.rule">
+            <field name="name">Sale layout multi company</field>
+            <field name="model_id" ref="model_sale_layout_category"/>
+            <field name="global" eval="True"/>
+            <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+        </record>
+    </data>
+</odoo>
diff --git a/sale_layout_multi_company/views/sale_layout_view.xml b/sale_layout_multi_company/views/sale_layout_view.xml
@@ -1,25 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <record id="report_configuration_form_view_company" model="ir.ui.view">
-            <field name="name">report_configuration_form_view_company</field>
-            <field name="model">sale_layout.category</field>
-            <field name="inherit_id" ref="sale_layout.report_configuration_form_view"></field>
-            <field name="arch" type="xml">
-                <field name="sequence" position="after">
-                    <field name="company_id" groups="base.group_multi_company" widget="selection"></field>
-                </field>
+<odoo>
+    <record id="report_configuration_form_view_company" model="ir.ui.view">
+        <field name="name">report_configuration_form_view_company</field>
+        <field name="model">sale.layout_category</field>
+        <field name="inherit_id" ref="sale.report_configuration_form_view"/>
+        <field name="arch" type="xml">
+            <field name="sequence" position="after">
+                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
             </field>
-        </record>
-        <record id="report_configuration_tree_view_company" model="ir.ui.view">
-            <field name="name">report_configuration_tree_view_company</field>
-            <field name="model">sale_layout.category</field>
-            <field name="inherit_id" ref="sale_layout.report_configuration_tree_view"></field>
-            <field name="arch" type="xml">
-                <field name="sequence" position="after">
-                    <field name="company_id" groups="base.group_multi_company"></field>
-                </field>
+        </field>
+    </record>
+
+    <record id="report_configuration_tree_view_company" model="ir.ui.view">
+        <field name="name">report_configuration_tree_view_company</field>
+        <field name="model">sale.layout_category</field>
+        <field name="inherit_id" ref="sale.report_configuration_tree_view"/>
+        <field name="arch" type="xml">
+            <field name="sequence" position="after">
+                <field name="company_id" groups="base.group_multi_company"/>
             </field>
-        </record>
-    </data>
-</openerp>
+        </field>
+    </record>
+</odoo>