From f134b34999cd21453ef95b6f8ad09d3068209ede Mon Sep 17 00:00:00 2001 From: Ivan Yelizariev Date: Fri, 7 Oct 2016 11:55:50 +0500 Subject: [PATCH] [MIG] fix imports for 10.0 --- account_partner_merge/partner_merge.py | 4 ++-- base_continent/base_continent.py | 4 ++-- base_continent/country.py | 4 ++-- base_continent/partner.py | 4 ++-- base_partner_sequence/partner.py | 4 ++-- firstname_display_name_trigger/res_partner.py | 4 ++-- partner_auto_salesman/res_partner.py | 4 ++-- .../models/res_partner.py | 2 +- partner_helper/partner.py | 4 ++-- partner_relations/model/res_partner.py | 16 ++++++++-------- partner_relations/model/res_partner_relation.py | 6 +++--- .../model/res_partner_relation_type_selection.py | 6 +++--- passport/res_partner.py | 4 ++-- passport/res_passport.py | 4 ++-- portal_partner_merge/wizard/portal_wizard.py | 4 ++-- res_partner_affiliate/res_partner.py | 4 ++-- 16 files changed, 39 insertions(+), 39 deletions(-) diff --git a/account_partner_merge/partner_merge.py b/account_partner_merge/partner_merge.py index 3ec61dff0..30bede534 100644 --- a/account_partner_merge/partner_merge.py +++ b/account_partner_merge/partner_merge.py @@ -18,10 +18,10 @@ # along with this program. If not, see . # ############################################################################## -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): diff --git a/base_continent/base_continent.py b/base_continent/base_continent.py index c48051841..494336387 100644 --- a/base_continent/base_continent.py +++ b/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): diff --git a/base_continent/country.py b/base_continent/country.py index b4395763b..24d509e30 100644 --- a/base_continent/country.py +++ b/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): diff --git a/base_continent/partner.py b/base_continent/partner.py index a5656652c..8676bb249 100644 --- a/base_continent/partner.py +++ b/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): diff --git a/base_partner_sequence/partner.py b/base_partner_sequence/partner.py index 9f66b41d5..d782456f0 100644 --- a/base_partner_sequence/partner.py +++ b/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' diff --git a/firstname_display_name_trigger/res_partner.py b/firstname_display_name_trigger/res_partner.py index f57c07e35..9e62b9129 100644 --- a/firstname_display_name_trigger/res_partner.py +++ b/firstname_display_name_trigger/res_partner.py @@ -18,10 +18,10 @@ # along with this program. If not, see . # ############################################################################## -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): diff --git a/partner_auto_salesman/res_partner.py b/partner_auto_salesman/res_partner.py index 09dd1743a..ed7e92328 100644 --- a/partner_auto_salesman/res_partner.py +++ b/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} diff --git a/partner_contact_in_several_companies/models/res_partner.py b/partner_contact_in_several_companies/models/res_partner.py index 580463498..420be89ec 100644 --- a/partner_contact_in_several_companies/models/res_partner.py +++ b/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): diff --git a/partner_helper/partner.py b/partner_helper/partner.py index 569bf5dc7..a7f932411 100644 --- a/partner_helper/partner.py +++ b/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( diff --git a/partner_relations/model/res_partner.py b/partner_relations/model/res_partner.py index 1e9706edf..3ab849cc4 100644 --- a/partner_relations/model/res_partner.py +++ b/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, diff --git a/partner_relations/model/res_partner_relation.py b/partner_relations/model/res_partner_relation.py index 3ebb19b05..463801e96 100644 --- a/partner_relations/model/res_partner_relation.py +++ b/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, diff --git a/partner_relations/model/res_partner_relation_type_selection.py b/partner_relations/model/res_partner_relation_type_selection.py index e8f8f0a48..31f813801 100644 --- a/partner_relations/model/res_partner_relation_type_selection.py +++ b/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 = [ diff --git a/passport/res_partner.py b/passport/res_partner.py index 3ad15e2d3..764623004 100644 --- a/passport/res_partner.py +++ b/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( diff --git a/passport/res_passport.py b/passport/res_passport.py index 3089e9597..e7f211d48 100644 --- a/passport/res_passport.py +++ b/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 = { diff --git a/portal_partner_merge/wizard/portal_wizard.py b/portal_partner_merge/wizard/portal_wizard.py index a5f5d5394..5ac6f66c8 100644 --- a/portal_partner_merge/wizard/portal_wizard.py +++ b/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): diff --git a/res_partner_affiliate/res_partner.py b/res_partner_affiliate/res_partner.py index 259c86e46..9d5e8c5d4 100644 --- a/res_partner_affiliate/res_partner.py +++ b/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 """