From 1cdb853759cc05ff2602c171417c49629f5040aa Mon Sep 17 00:00:00 2001 From: Matthieu Dietrich Date: Tue, 24 May 2016 13:47:33 +0200 Subject: [PATCH] Rename last values --- account_move_so_import/i18n/es.po | 8 ++++---- account_move_so_import/models/account_move.py | 10 ++++------ account_move_so_import/test/completion_so_test.yml | 8 ++++---- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/account_move_so_import/i18n/es.po b/account_move_so_import/i18n/es.po index 4ff0d2ad..2e52cf6e 100644 --- a/account_move_so_import/i18n/es.po +++ b/account_move_so_import/i18n/es.po @@ -17,8 +17,8 @@ msgstr "" "X-Launchpad-Export-Date: 2014-06-06 06:36+0000\n" "X-Generator: Launchpad (build 17031)\n" -#. module: account_statement_so_completion -#: code:addons/account_statement_so_completion/statement.py:77 +#. module: account_move_so_import +#: code:addons/account_move_so_import/statement.py:77 #, python-format msgid "" "Line named \"%s\" (Ref:%s) was matched by more than one partner while " @@ -27,7 +27,7 @@ msgstr "" "La línea llamada \"%s\" (Ref: %s) se casó con más de una empresa al buscar " "por referencia de pedido." -#. module: account_statement_so_completion -#: model:ir.model,name:account_statement_so_completion.model_account_statement_completion_rule +#. module: account_move_so_import +#: model:ir.model,name:account_move_so_import.model_account_statement_completion_rule msgid "account.statement.completion.rule" msgstr "account.statement.completion.rule" diff --git a/account_move_so_import/models/account_move.py b/account_move_so_import/models/account_move.py index c4317167..4a86367f 100644 --- a/account_move_so_import/models/account_move.py +++ b/account_move_so_import/models/account_move.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # © 2011-2016 Camptocamp SA # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) -from openerp import _, models +from openerp import _, fields, models from openerp.addons.account_move_base_import.models.account_move \ import ErrorTooManyPartner @@ -11,12 +11,10 @@ class AccountMoveCompletionRule(models.Model): _name = "account.move.completion.rule" _inherit = "account.move.completion.rule" - def _get_functions(self): - res = super(AccountMoveCompletionRule, self)._get_functions() - res.append( + function_to_call = fields.Selection( + selection_add=[ ('get_from_name_and_so', 'From line name (based on SO number)') - ) - return res + ]) # Should be private but data are initialised with no update XML def get_from_name_and_so(self, line): diff --git a/account_move_so_import/test/completion_so_test.yml b/account_move_so_import/test/completion_so_test.yml index e445b507..dea8601e 100644 --- a/account_move_so_import/test/completion_so_test.yml +++ b/account_move_so_import/test/completion_so_test.yml @@ -16,10 +16,10 @@ !record {model: account.journal, id: account.bank_journal}: used_for_completion: True rule_ids: - - account_statement_base_import.bank_statement_completion_rule_4 - - account_statement_base_import.bank_statement_completion_rule_5 - - account_statement_base_import.bank_statement_completion_rule_2 - - account_statement_base_import.bank_statement_completion_rule_3 + - account_move_base_import.bank_statement_completion_rule_4 + - account_move_base_import.bank_statement_completion_rule_5 + - account_move_base_import.bank_statement_completion_rule_2 + - account_move_base_import.bank_statement_completion_rule_3 - bank_statement_completion_rule_1 - Now I create a statement. I create statment lines separately because I need