Rename last values
parent
ef904b820c
commit
b19a2eae7e
|
@ -17,13 +17,13 @@ msgstr ""
|
||||||
"X-Launchpad-Export-Date: 2014-06-06 06:36+0000\n"
|
"X-Launchpad-Export-Date: 2014-06-06 06:36+0000\n"
|
||||||
"X-Generator: Launchpad (build 17031)\n"
|
"X-Generator: Launchpad (build 17031)\n"
|
||||||
|
|
||||||
#. module: account_statement_transactionid
|
#. module: account_move_transactionid_import
|
||||||
#: code:addons/account_statement_transactionid/account_move.py:65
|
#: code:addons/account_move_transactionid_import/account_move.py:65
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Line named \"%s\" (Ref:%s) was matched by more than one partner."
|
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."
|
msgstr "La línea llamada \"%s\" (Ref: %s) se casó con más de una empresa."
|
||||||
|
|
||||||
#. module: account_statement_transactionid
|
#. module: account_move_transactionid_import
|
||||||
#: model:ir.model,name:account_statement_transactionid.model_account_move_completion_rule
|
#: model:ir.model,name:account_move_transactionid_import.model_account_move_completion_rule
|
||||||
msgid "account.move.completion.rule"
|
msgid "account.move.completion.rule"
|
||||||
msgstr "account.move.completion.rule"
|
msgstr "account.move.completion.rule"
|
||||||
|
|
|
@ -1,15 +1,14 @@
|
||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
# © 2011-2016 Camptocamp SA
|
# © 2011-2016 Camptocamp SA
|
||||||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html)
|
# 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):
|
class AccountJournal(models.Model):
|
||||||
_inherit = "account.journal"
|
_inherit = "account.journal"
|
||||||
|
|
||||||
def _get_import_type_selection(self):
|
import_type = fields.Selection(
|
||||||
"""Has to be inherited to add parser"""
|
selection_add=[
|
||||||
res = super(AccountJournal, self)._get_import_type_selection()
|
('generic_csvxls_transaction',
|
||||||
res.append(('generic_csvxls_transaction',
|
'Generic .csv/.xls based on SO transaction ID')
|
||||||
'Generic .csv/.xls based on SO transaction ID'))
|
])
|
||||||
return res
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
# © 2011-2016 Camptocamp SA
|
# © 2011-2016 Camptocamp SA
|
||||||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html)
|
# 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 \
|
from openerp.addons.account_move_base_import.models.account_move import \
|
||||||
ErrorTooManyPartner
|
ErrorTooManyPartner
|
||||||
|
|
||||||
|
@ -11,15 +11,13 @@ class AccountMoveCompletionRule(models.Model):
|
||||||
|
|
||||||
_inherit = "account.move.completion.rule"
|
_inherit = "account.move.completion.rule"
|
||||||
|
|
||||||
def _get_functions(self):
|
function_to_call = fields.Selection(
|
||||||
res = super(AccountMoveCompletionRule, self)._get_functions()
|
selection_add=[
|
||||||
res += [
|
|
||||||
('get_from_transaction_ref_and_so',
|
('get_from_transaction_ref_and_so',
|
||||||
'Match Sales Order using transaction ref'),
|
'Match Sales Order using transaction ref'),
|
||||||
('get_from_transaction_ref_and_invoice',
|
('get_from_transaction_ref_and_invoice',
|
||||||
'Match Invoice using transaction ref'),
|
'Match Invoice using transaction ref')
|
||||||
]
|
])
|
||||||
return res
|
|
||||||
|
|
||||||
def get_from_transaction_ref_and_so(self, line):
|
def get_from_transaction_ref_and_so(self, line):
|
||||||
"""
|
"""
|
||||||
|
|
|
@ -5,10 +5,10 @@
|
||||||
used_for_completion: True
|
used_for_completion: True
|
||||||
rule_ids:
|
rule_ids:
|
||||||
- bank_statement_completion_rule_4
|
- bank_statement_completion_rule_4
|
||||||
- account_statement_base_import.bank_statement_completion_rule_4
|
- account_move_base_import.bank_statement_completion_rule_4
|
||||||
- account_statement_base_import.bank_statement_completion_rule_5
|
- account_move_base_import.bank_statement_completion_rule_5
|
||||||
- account_statement_base_import.bank_statement_completion_rule_2
|
- account_move_base_import.bank_statement_completion_rule_2
|
||||||
- account_statement_base_import.bank_statement_completion_rule_3
|
- account_move_base_import.bank_statement_completion_rule_3
|
||||||
-
|
-
|
||||||
Now I create a move. I create statment lines separately because I need
|
Now I create a move. I create statment lines separately because I need
|
||||||
to find each one by XML id
|
to find each one by XML id
|
||||||
|
|
Loading…
Reference in New Issue