From 66a694e226c787863a2f63472ab53c502abe0614 Mon Sep 17 00:00:00 2001 From: Luc De Meyer Date: Thu, 12 Apr 2018 21:07:50 +0200 Subject: [PATCH] [10.0] FIX _company_warning() --- intrastat_product/__manifest__.py | 2 +- .../models/intrastat_product_declaration.py | 19 ++++++++++++++----- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/intrastat_product/__manifest__.py b/intrastat_product/__manifest__.py index 7714430..02387b0 100644 --- a/intrastat_product/__manifest__.py +++ b/intrastat_product/__manifest__.py @@ -6,7 +6,7 @@ { 'name': 'Intrastat Product', - 'version': '10.0.1.2.0', + 'version': '10.0.1.2.1', 'category': 'Intrastat', 'license': 'AGPL-3', 'summary': 'Base module for Intrastat Product', diff --git a/intrastat_product/models/intrastat_product_declaration.py b/intrastat_product/models/intrastat_product_declaration.py index 43053d0..099648a 100644 --- a/intrastat_product/models/intrastat_product_declaration.py +++ b/intrastat_product/models/intrastat_product_declaration.py @@ -206,10 +206,19 @@ class IntrastatProductDeclaration(models.Model): return super(IntrastatProductDeclaration, self).copy(default) def _company_warning(self, msg): - action = self.env.ref('base.action_res_company_form') + """ + Deprecated function. + """ + _logger.warning( + 'intrastat.product.declaration, _company_warning() is deprecated.' + ) + self._account_config_warning(msg) + + def _account_config_warning(self, msg): + action = self.env.ref('account.action_account_config') raise RedirectWarning( msg, action.id, - _('Go to company configuration screen')) + _('Go to Accounting Configuration Settings screen')) def _get_partner_country(self, inv_line): country = inv_line.invoice_id.src_dest_country_id \ @@ -377,7 +386,7 @@ class IntrastatProductDeclaration(models.Model): "The default Intrastat Transport Mode " "of the Company is not set, " "please configure it first.") - self._company_warning(msg) + self._account_config_warning(msg) return transport def _get_incoterm(self, inv_line): @@ -388,7 +397,7 @@ class IntrastatProductDeclaration(models.Model): "The default Incoterm " "of the Company is not set, " "please configure it first.") - self._company_warning(msg) + self._account_config_warning(msg) return incoterm def _get_product_origin_country(self, inv_line): @@ -524,7 +533,7 @@ class IntrastatProductDeclaration(models.Model): continue else: _logger.info( - 'Skipping invoice line %s qty %s' + 'Skipping invoice line %s qty %s ' 'of invoice %s. Reason: no product nor hs_code' % (inv_line.name, inv_line.quantity, invoice.number)) continue