diff --git a/currency_rate_update/model/company.py b/currency_rate_update/model/company.py index e012be7bb..6a9533aec 100644 --- a/currency_rate_update/model/company.py +++ b/currency_rate_update/model/company.py @@ -58,4 +58,4 @@ class res_company(models.Model): services_to_use = fields.One2many( 'currency.rate.update.service', 'company_id', - 'Currency update services') + string='Currency update services') diff --git a/currency_rate_update/model/currency_rate_update.py b/currency_rate_update/model/currency_rate_update.py index a616e5170..03fdffb1c 100644 --- a/currency_rate_update/model/currency_rate_update.py +++ b/currency_rate_update/model/currency_rate_update.py @@ -25,7 +25,7 @@ from datetime import datetime, time from dateutil.relativedelta import relativedelta from openerp import models, fields, api, _ -from openerp.exceptions import Warning +from openerp import exceptions from ..services.currency_getter import Currency_getter_factory @@ -114,13 +114,13 @@ class Currency_rate_update_service(models.Model): @api.constrains('max_delta_days') def _check_max_delta_days(self): if self.max_delta_days < 0: - raise Warning(_('Max delta days must be >= 0')) + raise exceptions.Warning(_('Max delta days must be >= 0')) @api.one @api.constrains('interval_number') def _check_interval_number(self): if self.interval_number < 0: - raise Warning(_('Interval number must be >= 0')) + raise exceptions.Warning(_('Interval number must be >= 0')) @api.onchange('interval_number') def _onchange_interval_number(self): @@ -236,9 +236,9 @@ class Currency_rate_update_service(models.Model): if main_currencies: main_curr = main_currencies[0] else: - raise Warning(_('There is no base currency set!')) + raise exceptions.Warning(_('There is no base currency set!')) if main_curr.rate != 1: - raise Warning(_('Base currency rate should be 1.00!')) + raise exceptions.Warning(_('Base currency rate should be 1.00!')) note = self.note or '' try: # We initalize the class that will handle the request diff --git a/currency_rate_update/services/currency_getter.py b/currency_rate_update/services/currency_getter.py index e2d24435c..833d89d60 100644 --- a/currency_rate_update/services/currency_getter.py +++ b/currency_rate_update/services/currency_getter.py @@ -73,7 +73,7 @@ class Currency_getter_factory(): 'RO_BNR_getter', ] if class_name in allowed: - exec "from update_service_%s import %s" % \ + exec "from .update_service_%s import %s" % \ (class_name.replace('_getter', ''), class_name) class_def = eval(class_name) return class_def() diff --git a/currency_rate_update/services/update_service_CA_BOC.py b/currency_rate_update/services/update_service_CA_BOC.py index 80f53c819..7d7071a4e 100644 --- a/currency_rate_update/services/update_service_CA_BOC.py +++ b/currency_rate_update/services/update_service_CA_BOC.py @@ -20,7 +20,7 @@ # along with this program. If not, see . # ############################################################################## -from currency_getter_interface import Currency_getter_interface +from .currency_getter_interface import Currency_getter_interface from openerp import _ from openerp.exceptions import except_orm diff --git a/currency_rate_update/services/update_service_CH_ADMIN.py b/currency_rate_update/services/update_service_CH_ADMIN.py index 110ad5c5a..1dd1d025a 100644 --- a/currency_rate_update/services/update_service_CH_ADMIN.py +++ b/currency_rate_update/services/update_service_CH_ADMIN.py @@ -20,7 +20,7 @@ # along with this program. If not, see . # ############################################################################## -from currency_getter_interface import Currency_getter_interface +from .currency_getter_interface import Currency_getter_interface import logging _logger = logging.getLogger(__name__) diff --git a/currency_rate_update/services/update_service_ECB.py b/currency_rate_update/services/update_service_ECB.py index ceddce108..d5e815030 100644 --- a/currency_rate_update/services/update_service_ECB.py +++ b/currency_rate_update/services/update_service_ECB.py @@ -20,7 +20,7 @@ # along with this program. If not, see . # ############################################################################## -from currency_getter_interface import Currency_getter_interface +from .currency_getter_interface import Currency_getter_interface from datetime import datetime from openerp.tools import DEFAULT_SERVER_DATE_FORMAT diff --git a/currency_rate_update/services/update_service_MX_BdM.py b/currency_rate_update/services/update_service_MX_BdM.py index 8e3680a18..f923bce38 100644 --- a/currency_rate_update/services/update_service_MX_BdM.py +++ b/currency_rate_update/services/update_service_MX_BdM.py @@ -21,7 +21,7 @@ # ############################################################################## -from currency_getter_interface import Currency_getter_interface +from .currency_getter_interface import Currency_getter_interface import logging _logger = logging.getLogger(__name__) diff --git a/currency_rate_update/services/update_service_PL_NBP.py b/currency_rate_update/services/update_service_PL_NBP.py index 0f57cc265..e354540b4 100644 --- a/currency_rate_update/services/update_service_PL_NBP.py +++ b/currency_rate_update/services/update_service_PL_NBP.py @@ -20,7 +20,7 @@ # along with this program. If not, see . # ############################################################################## -from currency_getter_interface import Currency_getter_interface +from .currency_getter_interface import Currency_getter_interface from datetime import datetime from openerp.tools import DEFAULT_SERVER_DATE_FORMAT diff --git a/currency_rate_update/services/update_service_RO_BNR.py b/currency_rate_update/services/update_service_RO_BNR.py index 2427c4426..c27d2b971 100644 --- a/currency_rate_update/services/update_service_RO_BNR.py +++ b/currency_rate_update/services/update_service_RO_BNR.py @@ -20,7 +20,7 @@ # along with this program. If not, see . # ############################################################################## -from currency_getter_interface import Currency_getter_interface +from .currency_getter_interface import Currency_getter_interface from datetime import datetime, timedelta diff --git a/currency_rate_update/services/update_service_YAHOO.py b/currency_rate_update/services/update_service_YAHOO.py index 7ed18a954..e0b8bdd51 100644 --- a/currency_rate_update/services/update_service_YAHOO.py +++ b/currency_rate_update/services/update_service_YAHOO.py @@ -21,7 +21,7 @@ # ############################################################################## -from currency_getter_interface import Currency_getter_interface +from .currency_getter_interface import Currency_getter_interface class YAHOO_getter(Currency_getter_interface):