Rename last values

pull/271/head
Matthieu Dietrich 2016-05-24 13:47:33 +02:00 committed by Yannick Vaucher
parent ef904b820c
commit b19a2eae7e
4 changed files with 19 additions and 22 deletions

View File

@ -17,13 +17,13 @@ msgstr ""
"X-Launchpad-Export-Date: 2014-06-06 06:36+0000\n"
"X-Generator: Launchpad (build 17031)\n"
#. module: account_statement_transactionid
#: code:addons/account_statement_transactionid/account_move.py:65
#. module: account_move_transactionid_import
#: code:addons/account_move_transactionid_import/account_move.py:65
#, python-format
msgid "Line named \"%s\" (Ref:%s) was matched by more than one partner."
msgstr "La línea llamada \"%s\" (Ref: %s) se casó con más de una empresa."
#. module: account_statement_transactionid
#: model:ir.model,name:account_statement_transactionid.model_account_move_completion_rule
#. module: account_move_transactionid_import
#: model:ir.model,name:account_move_transactionid_import.model_account_move_completion_rule
msgid "account.move.completion.rule"
msgstr "account.move.completion.rule"

View File

@ -1,15 +1,14 @@
# -*- 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
class AccountJournal(models.Model):
_inherit = "account.journal"
def _get_import_type_selection(self):
"""Has to be inherited to add parser"""
res = super(AccountJournal, self)._get_import_type_selection()
res.append(('generic_csvxls_transaction',
'Generic .csv/.xls based on SO transaction ID'))
return res
import_type = fields.Selection(
selection_add=[
('generic_csvxls_transaction',
'Generic .csv/.xls based on SO transaction ID')
])

View File

@ -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,15 +11,13 @@ class AccountMoveCompletionRule(models.Model):
_inherit = "account.move.completion.rule"
def _get_functions(self):
res = super(AccountMoveCompletionRule, self)._get_functions()
res += [
function_to_call = fields.Selection(
selection_add=[
('get_from_transaction_ref_and_so',
'Match Sales Order using transaction ref'),
('get_from_transaction_ref_and_invoice',
'Match Invoice using transaction ref'),
]
return res
'Match Invoice using transaction ref')
])
def get_from_transaction_ref_and_so(self, line):
"""

View File

@ -5,10 +5,10 @@
used_for_completion: True
rule_ids:
- bank_statement_completion_rule_4
- 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
-
Now I create a move. I create statment lines separately because I need
to find each one by XML id