[MIG] fix imports for 10.0

account_partner_merge/partner_merge.py

@@ -18,10 +18,10 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-from openerp.osv import orm
+from odoo import models
 
 
-class MergePartnerAutomatic(orm.TransientModel):
+class MergePartnerAutomatic(models.TransientModel):
     _inherit = 'base.partner.merge.automatic.wizard'
 
     def _update_values(self, cr, uid, src_partners, dst_partner, context=None):

base_continent/base_continent.py

@@ -19,8 +19,8 @@
 #
 ##############################################################################
 
-from openerp.osv.orm import Model
-from openerp.osv import fields
+from openerp.models.orm import Model
+from openerp import fields
 
 
 class Continent(Model):

base_continent/country.py

@@ -19,8 +19,8 @@
 #
 ##############################################################################
 
-from openerp.osv.orm import Model
-from openerp.osv import fields
+from openerp.models.orm import Model
+from openerp import fields
 
 
 class Country(Model):

base_continent/partner.py

@@ -19,8 +19,8 @@
 #
 ##############################################################################
 
-from openerp.osv.orm import Model
-from openerp.osv import fields
+from openerp.models.orm import Model
+from openerp import fields
 
 
 class Partner(Model):

base_partner_sequence/partner.py

@@ -21,10 +21,10 @@
 #
 ##############################################################################
 
-from openerp.osv import orm
+from odoo import models
 
 
-class ResPartner(orm.Model):
+class ResPartner(models.Model):
     """Assigns 'ref' from a sequence on creation and copying"""
 
     _inherit = 'res.partner'

firstname_display_name_trigger/res_partner.py

@@ -18,10 +18,10 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-from openerp.osv import orm, fields
+from openerp import fields
 
 
-class ResPartner(orm.Model):
+class ResPartner(models.Model):
     _inherit = 'res.partner'
 
     def _display_name_compute(self, cr, uid, ids, name, args, context=None):

partner_auto_salesman/res_partner.py

@@ -19,9 +19,9 @@
 #
 ##############################################################################
 
-from openerp.osv import orm
+from odoo import models
 
 
-class res_partner(orm.Model):
+class res_partner(models.Model):
     _inherit = 'res.partner'
     _defaults = {'user_id': lambda self, cr, uid, context: uid}

partner_contact_in_several_companies/models/res_partner.py

@@ -2,7 +2,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 from openerp import fields, models, _, api
-from openerp.osv import expression
+from openerp import expression
 
 
 class ResPartner(models.Model):

partner_helper/partner.py

@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-from openerp.osv import orm
+from odoo import models
 
 
 def split_char(char, output_number, size):
@@ -39,7 +39,7 @@ def split_char(char, output_number, size):
     return result
 
 
-class ResPartner(orm.Model):
+class ResPartner(models.Model):
     _inherit = "res.partner"
 
     def _get_split_address(

partner_relations/model/res_partner.py

@@ -20,8 +20,8 @@
 #
 ##############################################################################
 import time
-from openerp import osv, models, fields, exceptions, api
-from openerp.osv.expression import is_leaf, AND, OR, FALSE_LEAF
+from openerp import models, models, fields, exceptions, api
+from openerp.models.expression import is_leaf, AND, OR, FALSE_LEAF
 from openerp.tools import DEFAULT_SERVER_DATE_FORMAT
 from openerp.tools.translate import _
 
@@ -217,7 +217,7 @@ class ResPartner(models.Model):
         return result
 
     _columns = {
-        'relation_ids': osv.fields.function(
+        'relation_ids': models.fields.function(
             lambda self, *args, **kwargs: self._get_relation_ids(
                 *args, **kwargs),
             fnct_inv=_set_relation_ids,
@@ -225,33 +225,33 @@ class ResPartner(models.Model):
             string='Relations',
             selectable=False,
         ),
-        'relation_all_ids': osv.fields.one2many(
+        'relation_all_ids': models.fields.one2many(
             'res.partner.relation.all', 'this_partner_id',
             string='All relations with current partner',
             auto_join=True,
             selectable=False,
         ),
-        'search_relation_id': osv.fields.function(
+        'search_relation_id': models.fields.function(
             lambda self, cr, uid, ids, *args: dict([
                 (i, False) for i in ids]),
             fnct_search=_search_relation_id,
             string='Has relation of type',
             type='many2one', obj='res.partner.relation.type.selection'
         ),
-        'search_relation_partner_id': osv.fields.function(
+        'search_relation_partner_id': models.fields.function(
             lambda self, cr, uid, ids, *args: dict([
                 (i, False) for i in ids]),
             fnct_search=_search_related_partner_id,
             string='Has relation with',
             type='many2one', obj='res.partner'
         ),
-        'search_relation_date': osv.fields.function(
+        'search_relation_date': models.fields.function(
             lambda self, cr, uid, ids, *args: dict([
                 (i, False) for i in ids]),
             fnct_search=_search_relation_date,
             string='Relation valid', type='date'
         ),
-        'search_relation_partner_category_id': osv.fields.function(
+        'search_relation_partner_category_id': models.fields.function(
             lambda self, cr, uid, ids, *args: dict([
                 (i, False) for i in ids]),
             fnct_search=_search_related_partner_category_id,

partner_relations/model/res_partner_relation.py

@@ -20,7 +20,7 @@
 #
 ##############################################################################
 
-from openerp import osv, models, fields, api, exceptions, _
+from openerp import models, models, fields, api, exceptions, _
 
 from . import get_partner_type
 
@@ -73,14 +73,14 @@ class ResPartnerRelation(models.Model):
         ])
 
     _columns = {
-        'type_selection_id': osv.fields.function(
+        'type_selection_id': models.fields.function(
             _get_computed_fields,
             multi="computed_fields",
             fnct_inv=lambda *args: None,
             type='many2one', obj='res.partner.relation.type.selection',
             string='Type',
         ),
-        'partner_id_display': osv.fields.function(
+        'partner_id_display': models.fields.function(
             _get_computed_fields,
             multi="computed_fields",
             fnct_inv=lambda *args: None,

partner_relations/model/res_partner_relation_type_selection.py

@@ -29,14 +29,14 @@ ResPartnerRelationTypeSelection.caller_name asc;
 '''
 
 from openerp import api
-from openerp.osv import fields
-from openerp.osv import orm
+from openerp import fields
+from odoo import models
 from openerp.tools import drop_view_if_exists
 from .res_partner_relation_type import ResPartnerRelationType
 from . import PADDING
 
 
-class ResPartnerRelationTypeSelection(orm.Model):
+class ResPartnerRelationTypeSelection(models.Model):
     '''Virtual relation types'''
 
     _RECORD_TYPES = [

passport/res_partner.py

@@ -20,10 +20,10 @@
 #
 ##############################################################################
 
-from openerp.osv import orm, fields
+from openerp import fields
 
 
-class res_partner(orm.Model):
+class res_partner(models.Model):
     _inherit = 'res.partner'
     _columns = {
         'passport_ids': fields.one2many(

passport/res_passport.py

@@ -20,10 +20,10 @@
 #
 ##############################################################################
 
-from openerp.osv import fields, orm
+from openerp import fields
 
 
-class res_passport(orm.Model):
+class res_passport(models.Model):
     _description = 'Passport'
     _name = 'res.passport'
     _columns = {

portal_partner_merge/wizard/portal_wizard.py

@@ -19,11 +19,11 @@
 #
 ##############################################################################
 
-from openerp.osv import orm
+from odoo import models
 from openerp.tools.translate import _
 
 
-class wizard_user(orm.TransientModel):
+class wizard_user(models.TransientModel):
     _inherit = 'portal.wizard.user'
 
     def get_error_messages(self, cr, uid, ids, context=None):

res_partner_affiliate/res_partner.py

@@ -19,10 +19,10 @@
 #
 ##############################################################################
 
-from openerp.osv import orm, fields
+from openerp import fields
 
 
-class ResPartner(orm.Model):
+class ResPartner(models.Model):
     """
     Add relation affiliate_ids
     """