From ef904b820c2e47bc0570f72bc2bafec093f82252 Mon Sep 17 00:00:00 2001 From: Matthieu Dietrich Date: Tue, 24 May 2016 11:51:51 +0200 Subject: [PATCH 01/19] Remane import modules --- account_move_transactionid_import/README.rst | 54 +++++++++++++ account_move_transactionid_import/__init__.py | 5 ++ .../__openerp__.py | 28 +++++++ .../data/completion_rule_data.xml | 16 ++++ .../data/statement.csv | 4 + .../data/statement.xls | Bin 0 -> 7680 bytes ...account_statement_transactionid_import.pot | 27 +++++++ account_move_transactionid_import/i18n/es.po | 29 +++++++ .../models/__init__.py | 5 ++ .../models/account_journal.py | 15 ++++ .../models/account_move.py | 76 ++++++++++++++++++ .../parser/__init__.py | 4 + .../parser/transactionid_file_parser.py | 71 ++++++++++++++++ .../completion_invoice_transactionid_test.yml | 44 ++++++++++ .../test/completion_transactionid_test.yml | 48 +++++++++++ .../test/invoice.yml | 25 ++++++ .../test/sale.yml | 21 +++++ 17 files changed, 472 insertions(+) create mode 100644 account_move_transactionid_import/README.rst create mode 100644 account_move_transactionid_import/__init__.py create mode 100644 account_move_transactionid_import/__openerp__.py create mode 100644 account_move_transactionid_import/data/completion_rule_data.xml create mode 100644 account_move_transactionid_import/data/statement.csv create mode 100644 account_move_transactionid_import/data/statement.xls create mode 100644 account_move_transactionid_import/i18n/account_statement_transactionid_import.pot create mode 100644 account_move_transactionid_import/i18n/es.po create mode 100644 account_move_transactionid_import/models/__init__.py create mode 100644 account_move_transactionid_import/models/account_journal.py create mode 100644 account_move_transactionid_import/models/account_move.py create mode 100644 account_move_transactionid_import/parser/__init__.py create mode 100644 account_move_transactionid_import/parser/transactionid_file_parser.py create mode 100644 account_move_transactionid_import/test/completion_invoice_transactionid_test.yml create mode 100644 account_move_transactionid_import/test/completion_transactionid_test.yml create mode 100644 account_move_transactionid_import/test/invoice.yml create mode 100644 account_move_transactionid_import/test/sale.yml diff --git a/account_move_transactionid_import/README.rst b/account_move_transactionid_import/README.rst new file mode 100644 index 00000000..2da1e2c1 --- /dev/null +++ b/account_move_transactionid_import/README.rst @@ -0,0 +1,54 @@ +.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 + +==================================== +Bank statement transaction ID import +==================================== + +This module extends the functionality of +account_statement_base_import, in order to add both importation +and auto-completion for the "transaction_ref" field added in +base_transaction_id. + +.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas + :alt: Try me on Runbot + :target: https://runbot.odoo-community.org/runbot/98/9.0 + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues +`_. In case of +trouble, please check there if your issue has already been reported. If you +spotted it first, help us smashing it by providing a detailed and welcomed +feedback. + +Credits +======= + +Images +------ + +* Odoo Community Association: `Icon `_. + +Contributors +------------ + +* Joël Grand-Guillaume +* Matthieu Dietrich + +Maintainer +---------- + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +This module is maintained by the OCA. + +OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use. + +To contribute to this module, please visit https://odoo-community.org. diff --git a/account_move_transactionid_import/__init__.py b/account_move_transactionid_import/__init__.py new file mode 100644 index 00000000..728557cc --- /dev/null +++ b/account_move_transactionid_import/__init__.py @@ -0,0 +1,5 @@ +# -*- coding: utf-8 -*- +# © 2011-2016 Camptocamp SA +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) +from . import parser +from . import models diff --git a/account_move_transactionid_import/__openerp__.py b/account_move_transactionid_import/__openerp__.py new file mode 100644 index 00000000..869581e8 --- /dev/null +++ b/account_move_transactionid_import/__openerp__.py @@ -0,0 +1,28 @@ +# -*- coding: utf-8 -*- +# © 2011-2016 Camptocamp SA +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) +{ + 'name': "Bank statement transactionID import", + 'version': '9.0.1.0.0', + 'author': "Camptocamp,Odoo Community Association (OCA)", + 'maintainer': 'Camptocamp', + 'category': 'Finance', + 'complexity': 'normal', + 'depends': [ + 'account_move_base_import', + 'base_transaction_id' + ], + 'data': [ + 'data/completion_rule_data.xml' + ], + 'test': [ + 'test/sale.yml', + 'test/completion_transactionid_test.yml', + 'test/invoice.yml', + 'test/completion_invoice_transactionid_test.yml', + ], + 'website': 'http://www.camptocamp.com', + 'installable': True, + 'auto_install': False, + 'license': 'AGPL-3', +} diff --git a/account_move_transactionid_import/data/completion_rule_data.xml b/account_move_transactionid_import/data/completion_rule_data.xml new file mode 100644 index 00000000..1f993602 --- /dev/null +++ b/account_move_transactionid_import/data/completion_rule_data.xml @@ -0,0 +1,16 @@ + + + + + Match from Sales Order using transaction ref + 30 + get_from_transaction_ref_and_so + + + + Match from Invoice using transaction ref + 40 + get_from_transaction_ref_and_invoice + + + diff --git a/account_move_transactionid_import/data/statement.csv b/account_move_transactionid_import/data/statement.csv new file mode 100644 index 00000000..ecda301b --- /dev/null +++ b/account_move_transactionid_import/data/statement.csv @@ -0,0 +1,4 @@ +"transaction_ref";"date";"amount";"commission_amount";"label" +50969286;2011-03-07 13:45:14;118.4;-11.84;"label a" +51065326;2011-03-05 13:45:14;189;-15.12;"label b" +51179306;2011-03-02 17:45:14;189;-15.12;"label c" diff --git a/account_move_transactionid_import/data/statement.xls b/account_move_transactionid_import/data/statement.xls new file mode 100644 index 0000000000000000000000000000000000000000..2d1ac86589ad767dddc46a85b8f849fa806d7c7f GIT binary patch literal 7680 zcmeHMYiyHM7=FKAM#l#0#+YNk_!uxYw!tnkHZHDX8;r!kGErkff?erGp!YVP#Xed)MVt5Vd>`2}&VnUkSXebnl&`3^(J7@-O zhWpAjv|tgf0M~p9U;{FNsX!LMGSkA(J7|cLUA@H&bcqi?zv$8?{df+@6IkKYLjg1< zR(vWoW9>yM<;N>C*?x2e#+xg?kDY(oZ`yG)Fy8*B?dSfV4&(qh0wfp617-mEz)YY3 zxCbZ%W&uUOY+w#B7bphi0Xi@rC;=7#3xP#IDXTqCRJ=xMAPPD}=bF)YXr+A@TW8R{`#Jw$+?;y`6 zXV^(#iq@jq^hmdAzu1y3$9W2`Z`;_`)qH=kr9fWcZfk8_*3q%-5ri#zd;7|cj$+F^ zIe~qtExwk|ca)Lf#5B(rAJk3JPo%8}_l$pD3T3gm)(3 zby(qo+*mmRwN&F>m>b8RxHVtt98=!t59F6c(; zQP2E6FMk`?6f_yO9m$sP?|u#IRA#11LG z$^#S!stv+yI52I0;7q+C2b8nTj-gfmfU|$l>GFGg{aXjzJ!o^A)9=RUoPEBbem@L? z%h%WE860E*gM$n2b#}YGaNn0#H`X`SHq^t8C`xydtf{VFURN6>yA@fpqOqLOPgoHWq<=QPPtBJuUjwe+@~7Yui{d4rcQ+`O^ajFWk~O2Qa|$4JlBdG==4WQnZxWSft<{Cmya^>An-R^Mp+wi_Me`OY z+{g2yc`S_fLY9#i6MZs6C5=0r%|zv5x}ExnvN=MI8LO-w!%=DDIVx~0cT?R04gXHW z$Z7EOD9Ff}kfS6cXGV@PjGP7jAeWap)+mH*Y!dXEvoK3GmY#g5_Uj)VXK|AAlrIwV zd-NOk{Spe9!?i5%A-St5gYC>wcT~!tiWxGV|H_cTxh#_3QLIQ@mm@Mv=)-KRpdo|3 zo1^ZxlwnpfUVd`))RC|Zb3z$rC4)-;vvg9ugY8H|wS$zarWFIt5p%E_`5dt*bD>FQ z&{z+UF~KBLRXt7)XXHLpp1h+>mqV56Qt?Z8T@EjIF6Ao5Xb8z(*p1%kCgN1ke`TS& zeq(Yus7xtr%)f0UW0o1mF0&rH%$W7Gml<{bT4vRRL&Zikxx8uF-HBh`>e%JQp_lgZ zqRvDvZ;WmvO=`Hsnz7Zn>+Lq$ML2jWmUX;ycX(U_zCmA)UvJy(a(ng06;+$*9C+Qz zn6CBo^cYtrqfXi}ES}M5+BJ;|qp(%nr1624^x}b|*RF5cZa?*$O)3_j{)QH{5HI)* zg70?$thpPYUEB}wlsN=&9fkoK(^mm_K=L*~TR8&I7vv3$R`N1HcZ)Y5`Z^TOHnQ=g z{3|z&Zx(Emf!{A~CryX2!|C^L_qd1jR*&01;Bjpa%Vm2Urvr!tMVEnyk@!bZzRoUl+F*@%38n6t_Q zGKBH>;p-E>{cpg(06l6=$oTOk%m*fUC=0hwdz\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: account_statement_transactionid_import +#: code:addons/account_statement_transactionid_import/account_move.py:65 +#, python-format +msgid "Line named \"%s\" was matched by more than one partner." +msgstr "" + +#. module: account_statement_transactionid_import +#: model:ir.model,name:account_statement_transactionid_import.model_account_move_completion_rule +msgid "account.move.completion.rule" +msgstr "" diff --git a/account_move_transactionid_import/i18n/es.po b/account_move_transactionid_import/i18n/es.po new file mode 100644 index 00000000..bdf10323 --- /dev/null +++ b/account_move_transactionid_import/i18n/es.po @@ -0,0 +1,29 @@ +# Spanish translation for banking-addons +# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014 +# This file is distributed under the same license as the banking-addons package. +# FIRST AUTHOR , 2014. +# +msgid "" +msgstr "" +"Project-Id-Version: banking-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2014-01-21 12:02+0000\n" +"PO-Revision-Date: 2014-06-05 22:41+0000\n" +"Last-Translator: Pedro Manuel Baeza \n" +"Language-Team: Spanish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"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 +#, 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 +msgid "account.move.completion.rule" +msgstr "account.move.completion.rule" diff --git a/account_move_transactionid_import/models/__init__.py b/account_move_transactionid_import/models/__init__.py new file mode 100644 index 00000000..079b873d --- /dev/null +++ b/account_move_transactionid_import/models/__init__.py @@ -0,0 +1,5 @@ +# -*- coding: utf-8 -*- +# © 2011-2016 Camptocamp SA +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) +from . import account_journal +from . import account_move diff --git a/account_move_transactionid_import/models/account_journal.py b/account_move_transactionid_import/models/account_journal.py new file mode 100644 index 00000000..f8dda41b --- /dev/null +++ b/account_move_transactionid_import/models/account_journal.py @@ -0,0 +1,15 @@ +# -*- coding: utf-8 -*- +# © 2011-2016 Camptocamp SA +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) +from openerp import 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 diff --git a/account_move_transactionid_import/models/account_move.py b/account_move_transactionid_import/models/account_move.py new file mode 100644 index 00000000..e2a31bb9 --- /dev/null +++ b/account_move_transactionid_import/models/account_move.py @@ -0,0 +1,76 @@ +# -*- 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.addons.account_move_base_import.models.account_move import \ + ErrorTooManyPartner + + +class AccountMoveCompletionRule(models.Model): + """Add a rule based on transaction ID""" + + _inherit = "account.move.completion.rule" + + def _get_functions(self): + res = super(AccountMoveCompletionRule, self)._get_functions() + res += [ + ('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 + + def get_from_transaction_ref_and_so(self, line): + """ + Match the partner based on the transaction ID field of the SO. + Then, call the generic st_line method to complete other values. + In that case, we always fullfill the reference of the line with the SO + name. + :param dict st_line: read of the concerned account.bank.statement.line + :return: + A dict of value that can be passed directly to the write method of + the statement line or {} + {'partner_id': value, + 'account_id' : value, + ...} + """ + res = {} + so_obj = self.env['sale.order'] + sales = so_obj.search([('transaction_id', '=', line.transaction_ref)]) + if len(sales) > 1: + raise ErrorTooManyPartner( + _('Line named "%s" was matched by more than ' + 'one partner.') % line.name) + if len(sales) == 1: + sale = sales[0] + res['partner_id'] = sale.partner_id.id + return res + + def get_from_transaction_ref_and_invoice(self, line): + """Match the partner based on the transaction ID field of the invoice. + Then, call the generic st_line method to complete other values. + + In that case, we always fullfill the reference of the line with the + invoice name. + + :param dict st_line: read of the concerned account.bank.statement.line + :return: + A dict of value that can be passed directly to the write method of + the statement line or {} + {'partner_id': value, + 'account_id' : value, + ...} + """ + res = {} + invoice_obj = self.env['account.invoice'] + invoices = invoice_obj.search( + [('transaction_id', '=', line.transaction_ref)]) + if len(invoices) > 1: + raise ErrorTooManyPartner( + _('Line named "%s" was matched by more than ' + 'one partner.') % line.name) + elif len(invoices) == 1: + invoice = invoices[0] + res['partner_id'] = invoice.commercial_partner_id.id + return res diff --git a/account_move_transactionid_import/parser/__init__.py b/account_move_transactionid_import/parser/__init__.py new file mode 100644 index 00000000..9102553c --- /dev/null +++ b/account_move_transactionid_import/parser/__init__.py @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- +# © 2011-2016 Camptocamp SA +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) +from . import transactionid_file_parser diff --git a/account_move_transactionid_import/parser/transactionid_file_parser.py b/account_move_transactionid_import/parser/transactionid_file_parser.py new file mode 100644 index 00000000..a11501c3 --- /dev/null +++ b/account_move_transactionid_import/parser/transactionid_file_parser.py @@ -0,0 +1,71 @@ +# -*- coding: utf-8 -*- +# © 2011-2016 Camptocamp SA +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) +import datetime +from openerp.tools import ustr +from openerp.addons.account_move_base_import.parser.file_parser import ( + FileParser, float_or_zero +) + + +class TransactionIDFileParser(FileParser): + """TransactionID parser that use a define format in csv or xls to import + bank statement. + """ + + def __init__(self, profile, ftype='csv', extra_fields=None, header=None, + **kwargs): + """Add transaction_id in header keys + :param char: profile: Reference to the profile + :param char: ftype: extension of the file (could be csv or xls) + :param dict: extra_fields: extra fields to add to the conversion + dict. In the format {fieldname: fieldtype} + :param list: header : specify header fields if the csv file has no + header + """ + conversion_dict = { + 'transaction_ref': ustr, + 'label': ustr, + 'date': datetime.datetime, + 'amount': float_or_zero, + 'commission_amount': float_or_zero, + } + super(TransactionIDFileParser, self).__init__( + profile, extra_fields=conversion_dict, ftype=ftype, header=header, + **kwargs) + + @classmethod + def parser_for(cls, parser_name): + """Used by the new_bank_statement_parser class factory. Return true if + the providen name is generic_csvxls_transaction + """ + return parser_name == 'generic_csvxls_transaction' + + def get_move_line_vals(self, line, *args, **kwargs): + """This method must return a dict of vals that can be passed to create + method of statement line in order to record it. It is the + responsibility of every parser to give this dict of vals, so each one + can implement his own way of recording the lines. + :param: line: a dict of vals that represent a line of + result_row_list + :return: dict of values to give to the create method of statement + line, it MUST contain at least: + { + 'name':value, + 'date':value, + 'amount':value, + 'ref':value, + 'label':value, + 'commission_amount':value, + } + In this generic parser, the commission is given for every line, so we + store it for each one. + """ + amount = line.get('amount', 0.0) + return { + 'name': line.get('label', '/'), + 'date_maturity': line.get('date', datetime.datetime.now().date()), + 'credit': amount > 0.0 and amount or 0.0, + 'debit': amount < 0.0 and amount or 0.0, + 'transaction_ref': line.get('transaction_ref', '/'), + } diff --git a/account_move_transactionid_import/test/completion_invoice_transactionid_test.yml b/account_move_transactionid_import/test/completion_invoice_transactionid_test.yml new file mode 100644 index 00000000..ebfc3206 --- /dev/null +++ b/account_move_transactionid_import/test/completion_invoice_transactionid_test.yml @@ -0,0 +1,44 @@ +- + In order to test the banking framework, I first need to create a journal +- + !record {model: account.journal, id: account.bank_journal}: + used_for_completion: True + rule_ids: + - bank_statement_completion_rule_trans_id_invoice +- + Now I create a move. I create statment lines separately because I need + to find each one by XML id +- + !record {model: account.move, id: move_invoice_transactionid_test1}: + name: Move with transaction ID + journal_id: account.bank_journal + company_id: base.main_company +- + I create a move line for a SO with transaction ID +- + !record {model: account.move.line, id: move_line_invoice_transactionid}: + name: Test autocompletion based on invoice with transaction ID + account_id: account.a_sale + move_id: move_invoice_transactionid_test1 + transaction_ref: XXX77Z + date_maturity: !eval time.strftime('%Y-%m-%d') + credit: 0.0 +- + and add the correct amount +- + !python {model: account.move.line}: | + context['check_move_validity'] = False + model.write(cr, uid, [ref('move_line_invoice_transactionid')], + {'credit': 450.0}, + context) +- + I run the auto complete +- + !python {model: account.move}: | + result = self.button_auto_completion(cr, uid, [ref("move_invoice_transactionid_test1")]) +- + Now I can check that all is nice and shiny, line 1. I expect the invoice has been + recognised from the transaction ID. +- + !assert {model: account.move.line, id: move_line_invoice_transactionid, string: Check completion by Invoice transaction ID}: + - partner_id.name == u'Agrolait' diff --git a/account_move_transactionid_import/test/completion_transactionid_test.yml b/account_move_transactionid_import/test/completion_transactionid_test.yml new file mode 100644 index 00000000..889be36c --- /dev/null +++ b/account_move_transactionid_import/test/completion_transactionid_test.yml @@ -0,0 +1,48 @@ +- + In order to test the banking framework, I first need to create a journal +- + !record {model: account.journal, id: account.bank_journal}: + 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 +- + Now I create a move. I create statment lines separately because I need + to find each one by XML id +- + !record {model: account.move, id: move_transactionid_test1}: + name: Move with transaction ID + journal_id: account.bank_journal + company_id: base.main_company +- + I create a move line for a SO with transaction ID +- + !record {model: account.move.line, id: move_line_transactionid}: + name: Test autocompletion based on SO with transaction ID + account_id: account.a_sale + move_id: move_transactionid_test1 + transaction_ref: XXX66Z + date_maturity: !eval "'%s-01-06' %(datetime.now().year)" + credit: 0.0 +- + and add the correct amount +- + !python {model: account.move.line}: | + context['check_move_validity'] = False + model.write(cr, uid, [ref('move_line_transactionid')], + {'credit': 118.4}, + context) +- + I run the auto complete +- + !python {model: account.move}: | + result = self.button_auto_completion(cr, uid, [ref("move_transactionid_test1")]) +- + Now I can check that all is nice and shiny, line 1. I expect the SO has been + recognised from the transaction ID. +- + !assert {model: account.move.line, id: move_line_transactionid, string: Check completion by SO transaction ID}: + - partner_id.name == u'Agrolait' diff --git a/account_move_transactionid_import/test/invoice.yml b/account_move_transactionid_import/test/invoice.yml new file mode 100644 index 00000000..61c10aa2 --- /dev/null +++ b/account_move_transactionid_import/test/invoice.yml @@ -0,0 +1,25 @@ +- + I create a new invoice with transaction ID +- + !record {model: account.invoice, id: invoice_with_transaction_id}: + company_id: base.main_company + currency_id: base.EUR + partner_id: base.res_partner_2 + transaction_id: XXX77Z + invoice_line_ids: + - name: '[PCSC234] PC Assemble SC234' + price_unit: 450.0 + quantity: 1.0 + product_id: product.product_product_3 + uom_id: product.product_uom_unit + journal_id: account.bank_journal + reference_type: none +- + I confirm the Invoice +- + !workflow {model: account.invoice, action: invoice_open, ref: invoice_with_transaction_id} +- + I check that the invoice state is "Open" +- + !assert {model: account.invoice, id: invoice_with_transaction_id}: + - state == 'open' diff --git a/account_move_transactionid_import/test/sale.yml b/account_move_transactionid_import/test/sale.yml new file mode 100644 index 00000000..d712f8ad --- /dev/null +++ b/account_move_transactionid_import/test/sale.yml @@ -0,0 +1,21 @@ +- + I import account minimal data +- + !python {model: account.invoice}: | + openerp.tools.convert_file(cr, + 'account', + openerp.modules.get_module_resource( + 'account', + 'test', + 'account_minimal_test.xml'), + {}, 'init', False, 'test') +- + I create a new Sale Order with transaction ID +- + !record {model: sale.order, id: so_with_transaction_id}: + partner_id: base.res_partner_2 + note: Invoice after delivery + transaction_id: XXX66Z + order_line: + - product_id: product.product_product_7 + product_uom_qty: 8 From b19a2eae7ee0177f7d17c864c3b209c18ebcbe59 Mon Sep 17 00:00:00 2001 From: Matthieu Dietrich Date: Tue, 24 May 2016 13:47:33 +0200 Subject: [PATCH 02/19] Rename last values --- account_move_transactionid_import/i18n/es.po | 8 ++++---- .../models/account_journal.py | 13 ++++++------- .../models/account_move.py | 12 +++++------- .../test/completion_transactionid_test.yml | 8 ++++---- 4 files changed, 19 insertions(+), 22 deletions(-) diff --git a/account_move_transactionid_import/i18n/es.po b/account_move_transactionid_import/i18n/es.po index bdf10323..f5d5b75e 100644 --- a/account_move_transactionid_import/i18n/es.po +++ b/account_move_transactionid_import/i18n/es.po @@ -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" diff --git a/account_move_transactionid_import/models/account_journal.py b/account_move_transactionid_import/models/account_journal.py index f8dda41b..3ddda9f9 100644 --- a/account_move_transactionid_import/models/account_journal.py +++ b/account_move_transactionid_import/models/account_journal.py @@ -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') + ]) diff --git a/account_move_transactionid_import/models/account_move.py b/account_move_transactionid_import/models/account_move.py index e2a31bb9..48e20a5a 100644 --- a/account_move_transactionid_import/models/account_move.py +++ b/account_move_transactionid_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,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): """ diff --git a/account_move_transactionid_import/test/completion_transactionid_test.yml b/account_move_transactionid_import/test/completion_transactionid_test.yml index 889be36c..b96acf2e 100644 --- a/account_move_transactionid_import/test/completion_transactionid_test.yml +++ b/account_move_transactionid_import/test/completion_transactionid_test.yml @@ -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 From 2c904f097500abf75424d2dbad7f5bbeb9f84953 Mon Sep 17 00:00:00 2001 From: Matthieu Dietrich Date: Thu, 26 May 2016 16:38:20 +0200 Subject: [PATCH 03/19] Corrections --- account_move_transactionid_import/models/account_move.py | 1 + 1 file changed, 1 insertion(+) diff --git a/account_move_transactionid_import/models/account_move.py b/account_move_transactionid_import/models/account_move.py index 48e20a5a..c074b292 100644 --- a/account_move_transactionid_import/models/account_move.py +++ b/account_move_transactionid_import/models/account_move.py @@ -71,4 +71,5 @@ class AccountMoveCompletionRule(models.Model): elif len(invoices) == 1: invoice = invoices[0] res['partner_id'] = invoice.commercial_partner_id.id + res['account_id'] = invoice.account_id.id return res From 03f344009b8d321c2ab9b420f70e14292928e4a2 Mon Sep 17 00:00:00 2001 From: Matthieu Dietrich Date: Fri, 27 May 2016 09:59:45 +0200 Subject: [PATCH 04/19] Remove last mentions of statement --- account_move_transactionid_import/README.rst | 8 ++++---- account_move_transactionid_import/__openerp__.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/account_move_transactionid_import/README.rst b/account_move_transactionid_import/README.rst index 2da1e2c1..693fd8d2 100644 --- a/account_move_transactionid_import/README.rst +++ b/account_move_transactionid_import/README.rst @@ -2,12 +2,12 @@ :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 -==================================== -Bank statement transaction ID import -==================================== +=================================== +Journal Entry transaction ID import +=================================== This module extends the functionality of -account_statement_base_import, in order to add both importation +account_move_base_import, in order to add both importation and auto-completion for the "transaction_ref" field added in base_transaction_id. diff --git a/account_move_transactionid_import/__openerp__.py b/account_move_transactionid_import/__openerp__.py index 869581e8..d7d441f3 100644 --- a/account_move_transactionid_import/__openerp__.py +++ b/account_move_transactionid_import/__openerp__.py @@ -2,7 +2,7 @@ # © 2011-2016 Camptocamp SA # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) { - 'name': "Bank statement transactionID import", + 'name': "Journal Entry transactionID import", 'version': '9.0.1.0.0', 'author': "Camptocamp,Odoo Community Association (OCA)", 'maintainer': 'Camptocamp', From e0a6d519269022db0d89967dd3b29fc6d36c9ef8 Mon Sep 17 00:00:00 2001 From: Matthieu Dietrich Date: Tue, 21 Jun 2016 10:52:11 +0200 Subject: [PATCH 05/19] Set "Transaction_id" field in CSV/XLS file --- .../data/completion_rule_data.xml | 8 ++++---- .../data/statement.csv | 2 +- .../data/statement.xls | Bin 7680 -> 7680 bytes .../models/account_move.py | 16 ++++++++-------- .../parser/transactionid_file_parser.py | 4 ++-- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/account_move_transactionid_import/data/completion_rule_data.xml b/account_move_transactionid_import/data/completion_rule_data.xml index 1f993602..0c1bbd48 100644 --- a/account_move_transactionid_import/data/completion_rule_data.xml +++ b/account_move_transactionid_import/data/completion_rule_data.xml @@ -2,15 +2,15 @@ - Match from Sales Order using transaction ref + Match from Sales Order using transaction ID 30 - get_from_transaction_ref_and_so + get_from_transaction_id_and_so - Match from Invoice using transaction ref + Match from Invoice using transaction ID 40 - get_from_transaction_ref_and_invoice + get_from_transaction_id_and_invoice diff --git a/account_move_transactionid_import/data/statement.csv b/account_move_transactionid_import/data/statement.csv index ecda301b..491df223 100644 --- a/account_move_transactionid_import/data/statement.csv +++ b/account_move_transactionid_import/data/statement.csv @@ -1,4 +1,4 @@ -"transaction_ref";"date";"amount";"commission_amount";"label" +"transaction_id";"date";"amount";"commission_amount";"label" 50969286;2011-03-07 13:45:14;118.4;-11.84;"label a" 51065326;2011-03-05 13:45:14;189;-15.12;"label b" 51179306;2011-03-02 17:45:14;189;-15.12;"label c" diff --git a/account_move_transactionid_import/data/statement.xls b/account_move_transactionid_import/data/statement.xls index 2d1ac86589ad767dddc46a85b8f849fa806d7c7f..b734058bca21505a8f6f5d105734fa34aa6cdea0 100644 GIT binary patch delta 134 zcmZp$X|UOFok!D!jR6Qa7~E1zGjnoM4O|6X`EwZE7hYtX+{j|F PN#X|+ 0.0 and amount or 0.0, 'debit': amount < 0.0 and amount or 0.0, - 'transaction_ref': line.get('transaction_ref', '/'), + 'transaction_ref': line.get('transaction_id', '/'), } From 3ad655a258508af71b502c2dae3a84c371eba355 Mon Sep 17 00:00:00 2001 From: Matthieu Dietrich Date: Mon, 4 Jul 2016 10:27:00 +0200 Subject: [PATCH 06/19] Fix issue from last commit: field on move line is "transaction_ref" --- account_move_transactionid_import/models/account_move.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/account_move_transactionid_import/models/account_move.py b/account_move_transactionid_import/models/account_move.py index 6d8bb3e5..6880abee 100644 --- a/account_move_transactionid_import/models/account_move.py +++ b/account_move_transactionid_import/models/account_move.py @@ -35,7 +35,7 @@ class AccountMoveCompletionRule(models.Model): """ res = {} so_obj = self.env['sale.order'] - sales = so_obj.search([('transaction_id', '=', line.transaction_id)]) + sales = so_obj.search([('transaction_id', '=', line.transaction_ref)]) if len(sales) > 1: raise ErrorTooManyPartner( _('Line named "%s" was matched by more than ' @@ -63,7 +63,7 @@ class AccountMoveCompletionRule(models.Model): res = {} invoice_obj = self.env['account.invoice'] invoices = invoice_obj.search( - [('transaction_id', '=', line.transaction_id)]) + [('transaction_id', '=', line.transaction_ref)]) if len(invoices) > 1: raise ErrorTooManyPartner( _('Line named "%s" was matched by more than ' From 700b4292371e15b19c0b4b400243637762afed18 Mon Sep 17 00:00:00 2001 From: OCA Transbot Date: Sat, 9 Jul 2016 04:43:07 -0400 Subject: [PATCH 07/19] OCA Transbot updated translations from Transifex --- account_move_transactionid_import/i18n/de.po | 36 ++++++++++++++++ account_move_transactionid_import/i18n/en.po | 33 +++++++++++++++ account_move_transactionid_import/i18n/es.po | 41 +++++++++++-------- account_move_transactionid_import/i18n/fr.po | 36 ++++++++++++++++ .../i18n/hr_HR.po | 36 ++++++++++++++++ account_move_transactionid_import/i18n/it.po | 36 ++++++++++++++++ .../i18n/pt_BR.po | 36 ++++++++++++++++ account_move_transactionid_import/i18n/sl.po | 36 ++++++++++++++++ 8 files changed, 273 insertions(+), 17 deletions(-) create mode 100644 account_move_transactionid_import/i18n/de.po create mode 100644 account_move_transactionid_import/i18n/en.po create mode 100644 account_move_transactionid_import/i18n/fr.po create mode 100644 account_move_transactionid_import/i18n/hr_HR.po create mode 100644 account_move_transactionid_import/i18n/it.po create mode 100644 account_move_transactionid_import/i18n/pt_BR.po create mode 100644 account_move_transactionid_import/i18n/sl.po diff --git a/account_move_transactionid_import/i18n/de.po b/account_move_transactionid_import/i18n/de.po new file mode 100644 index 00000000..cc59d9ed --- /dev/null +++ b/account_move_transactionid_import/i18n/de.po @@ -0,0 +1,36 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_move_transactionid_import +# +# Translators: +# Rudolf Schnapka , 2016 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 9.0c\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-07-08 02:45+0000\n" +"PO-Revision-Date: 2016-07-08 02:45+0000\n" +"Last-Translator: Rudolf Schnapka , 2016\n" +"Language-Team: German (https://www.transifex.com/oca/teams/23907/de/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: de\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: account_move_transactionid_import +#: model:ir.model,name:account_move_transactionid_import.model_account_journal +msgid "Journal" +msgstr "Journal" + +#. module: account_move_transactionid_import +#: code:addons/account_move_transactionid_import/models/account_move.py:41 +#: code:addons/account_move_transactionid_import/models/account_move.py:69 +#, python-format +msgid "Line named \"%s\" was matched by more than one partner." +msgstr "" + +#. module: account_move_transactionid_import +#: model:ir.model,name:account_move_transactionid_import.model_account_move_completion_rule +msgid "account.move.completion.rule" +msgstr "" diff --git a/account_move_transactionid_import/i18n/en.po b/account_move_transactionid_import/i18n/en.po new file mode 100644 index 00000000..3180410b --- /dev/null +++ b/account_move_transactionid_import/i18n/en.po @@ -0,0 +1,33 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_move_transactionid_import +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 9.0c\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-07-08 02:45+0000\n" +"PO-Revision-Date: 2016-07-08 02:45+0000\n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: account_move_transactionid_import +#: model:ir.model,name:account_move_transactionid_import.model_account_journal +msgid "Journal" +msgstr "Journal" + +#. module: account_move_transactionid_import +#: code:addons/account_move_transactionid_import/models/account_move.py:41 +#: code:addons/account_move_transactionid_import/models/account_move.py:69 +#, python-format +msgid "Line named \"%s\" was matched by more than one partner." +msgstr "Line named \"%s\" was matched by more than one partner." + +#. 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" diff --git a/account_move_transactionid_import/i18n/es.po b/account_move_transactionid_import/i18n/es.po index f5d5b75e..eca13c54 100644 --- a/account_move_transactionid_import/i18n/es.po +++ b/account_move_transactionid_import/i18n/es.po @@ -1,27 +1,34 @@ -# Spanish translation for banking-addons -# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014 -# This file is distributed under the same license as the banking-addons package. -# FIRST AUTHOR , 2014. -# +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_move_transactionid_import +# +# Translators: +# OCA Transbot , 2016 msgid "" msgstr "" -"Project-Id-Version: banking-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2014-01-21 12:02+0000\n" -"PO-Revision-Date: 2014-06-05 22:41+0000\n" -"Last-Translator: Pedro Manuel Baeza \n" -"Language-Team: Spanish \n" +"Project-Id-Version: Odoo Server 9.0c\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-07-08 02:45+0000\n" +"PO-Revision-Date: 2016-07-08 02:45+0000\n" +"Last-Translator: OCA Transbot , 2016\n" +"Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-06-06 06:36+0000\n" -"X-Generator: Launchpad (build 17031)\n" +"Content-Transfer-Encoding: \n" +"Language: es\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: account_move_transactionid_import -#: code:addons/account_move_transactionid_import/account_move.py:65 +#: model:ir.model,name:account_move_transactionid_import.model_account_journal +msgid "Journal" +msgstr "" + +#. module: account_move_transactionid_import +#: code:addons/account_move_transactionid_import/models/account_move.py:41 +#: code:addons/account_move_transactionid_import/models/account_move.py:69 #, 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." +msgid "Line named \"%s\" was matched by more than one partner." +msgstr "" #. module: account_move_transactionid_import #: model:ir.model,name:account_move_transactionid_import.model_account_move_completion_rule diff --git a/account_move_transactionid_import/i18n/fr.po b/account_move_transactionid_import/i18n/fr.po new file mode 100644 index 00000000..e1411cc5 --- /dev/null +++ b/account_move_transactionid_import/i18n/fr.po @@ -0,0 +1,36 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_move_transactionid_import +# +# Translators: +# OCA Transbot , 2016 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 9.0c\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-07-08 02:45+0000\n" +"PO-Revision-Date: 2016-07-08 02:45+0000\n" +"Last-Translator: OCA Transbot , 2016\n" +"Language-Team: French (https://www.transifex.com/oca/teams/23907/fr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: fr\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#. module: account_move_transactionid_import +#: model:ir.model,name:account_move_transactionid_import.model_account_journal +msgid "Journal" +msgstr "Journal" + +#. module: account_move_transactionid_import +#: code:addons/account_move_transactionid_import/models/account_move.py:41 +#: code:addons/account_move_transactionid_import/models/account_move.py:69 +#, python-format +msgid "Line named \"%s\" was matched by more than one partner." +msgstr "" + +#. module: account_move_transactionid_import +#: model:ir.model,name:account_move_transactionid_import.model_account_move_completion_rule +msgid "account.move.completion.rule" +msgstr "" diff --git a/account_move_transactionid_import/i18n/hr_HR.po b/account_move_transactionid_import/i18n/hr_HR.po new file mode 100644 index 00000000..2c876862 --- /dev/null +++ b/account_move_transactionid_import/i18n/hr_HR.po @@ -0,0 +1,36 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_move_transactionid_import +# +# Translators: +# Bole , 2016 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 9.0c\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-07-08 02:45+0000\n" +"PO-Revision-Date: 2016-07-08 02:45+0000\n" +"Last-Translator: Bole , 2016\n" +"Language-Team: Croatian (Croatia) (https://www.transifex.com/oca/teams/23907/hr_HR/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: hr_HR\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" + +#. module: account_move_transactionid_import +#: model:ir.model,name:account_move_transactionid_import.model_account_journal +msgid "Journal" +msgstr "Dnevnik" + +#. module: account_move_transactionid_import +#: code:addons/account_move_transactionid_import/models/account_move.py:41 +#: code:addons/account_move_transactionid_import/models/account_move.py:69 +#, python-format +msgid "Line named \"%s\" was matched by more than one partner." +msgstr "" + +#. module: account_move_transactionid_import +#: model:ir.model,name:account_move_transactionid_import.model_account_move_completion_rule +msgid "account.move.completion.rule" +msgstr "" diff --git a/account_move_transactionid_import/i18n/it.po b/account_move_transactionid_import/i18n/it.po new file mode 100644 index 00000000..473957bc --- /dev/null +++ b/account_move_transactionid_import/i18n/it.po @@ -0,0 +1,36 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_move_transactionid_import +# +# Translators: +# Andrea Cometa , 2016 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 9.0c\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-09-28 11:33+0000\n" +"PO-Revision-Date: 2016-09-28 11:33+0000\n" +"Last-Translator: Andrea Cometa , 2016\n" +"Language-Team: Italian (https://www.transifex.com/oca/teams/23907/it/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: it\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: account_move_transactionid_import +#: model:ir.model,name:account_move_transactionid_import.model_account_journal +msgid "Journal" +msgstr "Sezionale" + +#. module: account_move_transactionid_import +#: code:addons/account_move_transactionid_import/models/account_move.py:41 +#: code:addons/account_move_transactionid_import/models/account_move.py:69 +#, python-format +msgid "Line named \"%s\" was matched by more than one partner." +msgstr "" + +#. module: account_move_transactionid_import +#: model:ir.model,name:account_move_transactionid_import.model_account_move_completion_rule +msgid "account.move.completion.rule" +msgstr "" diff --git a/account_move_transactionid_import/i18n/pt_BR.po b/account_move_transactionid_import/i18n/pt_BR.po new file mode 100644 index 00000000..b5528f40 --- /dev/null +++ b/account_move_transactionid_import/i18n/pt_BR.po @@ -0,0 +1,36 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_move_transactionid_import +# +# Translators: +# Claudio Araujo Santos , 2016 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 9.0c\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-07-08 02:45+0000\n" +"PO-Revision-Date: 2016-07-08 02:45+0000\n" +"Last-Translator: Claudio Araujo Santos , 2016\n" +"Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/teams/23907/pt_BR/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: pt_BR\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#. module: account_move_transactionid_import +#: model:ir.model,name:account_move_transactionid_import.model_account_journal +msgid "Journal" +msgstr "Diário" + +#. module: account_move_transactionid_import +#: code:addons/account_move_transactionid_import/models/account_move.py:41 +#: code:addons/account_move_transactionid_import/models/account_move.py:69 +#, python-format +msgid "Line named \"%s\" was matched by more than one partner." +msgstr "" + +#. module: account_move_transactionid_import +#: model:ir.model,name:account_move_transactionid_import.model_account_move_completion_rule +msgid "account.move.completion.rule" +msgstr "" diff --git a/account_move_transactionid_import/i18n/sl.po b/account_move_transactionid_import/i18n/sl.po new file mode 100644 index 00000000..96fecf1b --- /dev/null +++ b/account_move_transactionid_import/i18n/sl.po @@ -0,0 +1,36 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_move_transactionid_import +# +# Translators: +# OCA Transbot , 2016 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 9.0c\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-07-08 02:45+0000\n" +"PO-Revision-Date: 2016-07-08 02:45+0000\n" +"Last-Translator: OCA Transbot , 2016\n" +"Language-Team: Slovenian (https://www.transifex.com/oca/teams/23907/sl/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: sl\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" + +#. module: account_move_transactionid_import +#: model:ir.model,name:account_move_transactionid_import.model_account_journal +msgid "Journal" +msgstr "Dnevnik" + +#. module: account_move_transactionid_import +#: code:addons/account_move_transactionid_import/models/account_move.py:41 +#: code:addons/account_move_transactionid_import/models/account_move.py:69 +#, python-format +msgid "Line named \"%s\" was matched by more than one partner." +msgstr "" + +#. module: account_move_transactionid_import +#: model:ir.model,name:account_move_transactionid_import.model_account_move_completion_rule +msgid "account.move.completion.rule" +msgstr "" From 20618bf483b30cc99b029b14136556f64248c87a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul=20=28ACSONE=29?= Date: Mon, 15 Aug 2016 18:54:48 +0200 Subject: [PATCH 08/19] [FIX] remove en.po that was erroneously created by transbot --- account_move_transactionid_import/i18n/en.po | 33 -------------------- 1 file changed, 33 deletions(-) delete mode 100644 account_move_transactionid_import/i18n/en.po diff --git a/account_move_transactionid_import/i18n/en.po b/account_move_transactionid_import/i18n/en.po deleted file mode 100644 index 3180410b..00000000 --- a/account_move_transactionid_import/i18n/en.po +++ /dev/null @@ -1,33 +0,0 @@ -# Translation of Odoo Server. -# This file contains the translation of the following modules: -# * account_move_transactionid_import -# -msgid "" -msgstr "" -"Project-Id-Version: Odoo Server 9.0c\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-07-08 02:45+0000\n" -"PO-Revision-Date: 2016-07-08 02:45+0000\n" -"Last-Translator: <>\n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: \n" - -#. module: account_move_transactionid_import -#: model:ir.model,name:account_move_transactionid_import.model_account_journal -msgid "Journal" -msgstr "Journal" - -#. module: account_move_transactionid_import -#: code:addons/account_move_transactionid_import/models/account_move.py:41 -#: code:addons/account_move_transactionid_import/models/account_move.py:69 -#, python-format -msgid "Line named \"%s\" was matched by more than one partner." -msgstr "Line named \"%s\" was matched by more than one partner." - -#. 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" From eb00e93f6a392f93c1ee31e82e938c18df07d42a Mon Sep 17 00:00:00 2001 From: Matthieu Dietrich Date: Wed, 7 Sep 2016 16:33:53 +0200 Subject: [PATCH 09/19] Correct debit amount --- .../parser/transactionid_file_parser.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/account_move_transactionid_import/parser/transactionid_file_parser.py b/account_move_transactionid_import/parser/transactionid_file_parser.py index 93846764..12e66040 100644 --- a/account_move_transactionid_import/parser/transactionid_file_parser.py +++ b/account_move_transactionid_import/parser/transactionid_file_parser.py @@ -66,6 +66,6 @@ class TransactionIDFileParser(FileParser): 'name': line.get('label', '/'), 'date_maturity': line.get('date', datetime.datetime.now().date()), 'credit': amount > 0.0 and amount or 0.0, - 'debit': amount < 0.0 and amount or 0.0, + 'debit': amount < 0.0 and -amount or 0.0, 'transaction_ref': line.get('transaction_id', '/'), } From 662912fb8972bb2363a9589b431abebe9b4658b7 Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Thu, 6 Oct 2016 14:48:11 +0200 Subject: [PATCH 10/19] [MIG] Make modules uninstallable --- account_move_transactionid_import/__openerp__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/account_move_transactionid_import/__openerp__.py b/account_move_transactionid_import/__openerp__.py index d7d441f3..370d34d7 100644 --- a/account_move_transactionid_import/__openerp__.py +++ b/account_move_transactionid_import/__openerp__.py @@ -22,7 +22,7 @@ 'test/completion_invoice_transactionid_test.yml', ], 'website': 'http://www.camptocamp.com', - 'installable': True, + 'installable': False, 'auto_install': False, 'license': 'AGPL-3', } From 448c970fb38f20c52866b327ae08e09704275e2a Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Thu, 6 Oct 2016 14:48:14 +0200 Subject: [PATCH 11/19] [MIG] Rename manifest files --- .../{__openerp__.py => __manifest__.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename account_move_transactionid_import/{__openerp__.py => __manifest__.py} (100%) diff --git a/account_move_transactionid_import/__openerp__.py b/account_move_transactionid_import/__manifest__.py similarity index 100% rename from account_move_transactionid_import/__openerp__.py rename to account_move_transactionid_import/__manifest__.py From 56c29255fee8e64d33fb0f0dde0ac27cbd461dd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul=20=28ACSONE=29?= Date: Fri, 15 Jun 2018 23:01:20 +0200 Subject: [PATCH 12/19] remove obsolete .pot files [ci skip] --- ...account_statement_transactionid_import.pot | 27 ------------------- 1 file changed, 27 deletions(-) delete mode 100644 account_move_transactionid_import/i18n/account_statement_transactionid_import.pot diff --git a/account_move_transactionid_import/i18n/account_statement_transactionid_import.pot b/account_move_transactionid_import/i18n/account_statement_transactionid_import.pot deleted file mode 100644 index 6141807a..00000000 --- a/account_move_transactionid_import/i18n/account_statement_transactionid_import.pot +++ /dev/null @@ -1,27 +0,0 @@ -# Translation of OpenERP Server. -# This file contains the translation of the following modules: -# * account_statement_transactionid_import -# -msgid "" -msgstr "" -"Project-Id-Version: OpenERP Server 7.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-01-21 12:02+0000\n" -"PO-Revision-Date: 2014-01-21 12:02+0000\n" -"Last-Translator: <>\n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: \n" - -#. module: account_statement_transactionid_import -#: code:addons/account_statement_transactionid_import/account_move.py:65 -#, python-format -msgid "Line named \"%s\" was matched by more than one partner." -msgstr "" - -#. module: account_statement_transactionid_import -#: model:ir.model,name:account_statement_transactionid_import.model_account_move_completion_rule -msgid "account.move.completion.rule" -msgstr "" From 99825230fee9f68385b49be327cd9ddaca8fb948 Mon Sep 17 00:00:00 2001 From: Thierry Ducrest Date: Thu, 11 Jul 2019 15:09:49 +0200 Subject: [PATCH 13/19] [MIG] account_move_transactionid_import to 12.0 --- account_move_transactionid_import/__init__.py | 1 - .../__manifest__.py | 11 +- .../models/__init__.py | 1 - .../models/account_journal.py | 5 +- .../models/account_move.py | 10 +- .../parser/__init__.py | 1 - .../parser/transactionid_file_parser.py | 9 +- .../readme/CONTRIBUTORS.rst | 2 + .../readme/DESCRIPTION.rst | 4 + .../completion_invoice_transactionid_test.yml | 44 ------ .../test/completion_transactionid_test.yml | 48 ------ .../test/invoice.yml | 25 --- .../test/sale.yml | 21 --- .../tests/__init__.py | 1 + .../tests/test_completion_transaction_id.py | 147 ++++++++++++++++++ 15 files changed, 166 insertions(+), 164 deletions(-) create mode 100644 account_move_transactionid_import/readme/CONTRIBUTORS.rst create mode 100644 account_move_transactionid_import/readme/DESCRIPTION.rst delete mode 100644 account_move_transactionid_import/test/completion_invoice_transactionid_test.yml delete mode 100644 account_move_transactionid_import/test/completion_transactionid_test.yml delete mode 100644 account_move_transactionid_import/test/invoice.yml delete mode 100644 account_move_transactionid_import/test/sale.yml create mode 100644 account_move_transactionid_import/tests/__init__.py create mode 100644 account_move_transactionid_import/tests/test_completion_transaction_id.py diff --git a/account_move_transactionid_import/__init__.py b/account_move_transactionid_import/__init__.py index 728557cc..6f860c64 100644 --- a/account_move_transactionid_import/__init__.py +++ b/account_move_transactionid_import/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # © 2011-2016 Camptocamp SA # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) from . import parser diff --git a/account_move_transactionid_import/__manifest__.py b/account_move_transactionid_import/__manifest__.py index 370d34d7..e4ba6bb3 100644 --- a/account_move_transactionid_import/__manifest__.py +++ b/account_move_transactionid_import/__manifest__.py @@ -1,9 +1,8 @@ -# -*- coding: utf-8 -*- # © 2011-2016 Camptocamp SA # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) { 'name': "Journal Entry transactionID import", - 'version': '9.0.1.0.0', + 'version': '12.0.1.0.0', 'author': "Camptocamp,Odoo Community Association (OCA)", 'maintainer': 'Camptocamp', 'category': 'Finance', @@ -15,14 +14,8 @@ 'data': [ 'data/completion_rule_data.xml' ], - 'test': [ - 'test/sale.yml', - 'test/completion_transactionid_test.yml', - 'test/invoice.yml', - 'test/completion_invoice_transactionid_test.yml', - ], 'website': 'http://www.camptocamp.com', - 'installable': False, + 'installable': True, 'auto_install': False, 'license': 'AGPL-3', } diff --git a/account_move_transactionid_import/models/__init__.py b/account_move_transactionid_import/models/__init__.py index 079b873d..431266db 100644 --- a/account_move_transactionid_import/models/__init__.py +++ b/account_move_transactionid_import/models/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # © 2011-2016 Camptocamp SA # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) from . import account_journal diff --git a/account_move_transactionid_import/models/account_journal.py b/account_move_transactionid_import/models/account_journal.py index 3ddda9f9..919d2490 100644 --- a/account_move_transactionid_import/models/account_journal.py +++ b/account_move_transactionid_import/models/account_journal.py @@ -1,7 +1,6 @@ -# -*- coding: utf-8 -*- -# © 2011-2016 Camptocamp SA +# © 2011-2019 Camptocamp SA # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) -from openerp import fields, models +from odoo import fields, models class AccountJournal(models.Model): diff --git a/account_move_transactionid_import/models/account_move.py b/account_move_transactionid_import/models/account_move.py index 6880abee..b4344029 100644 --- a/account_move_transactionid_import/models/account_move.py +++ b/account_move_transactionid_import/models/account_move.py @@ -1,8 +1,7 @@ -# -*- coding: utf-8 -*- -# © 2011-2016 Camptocamp SA +# © 2011-2019 Camptocamp SA # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) -from openerp import _, fields, models -from openerp.addons.account_move_base_import.models.account_move import \ +from odoo import _, fields, models +from odoo.addons.account_move_base_import.models.account_move import \ ErrorTooManyPartner @@ -41,8 +40,7 @@ class AccountMoveCompletionRule(models.Model): _('Line named "%s" was matched by more than ' 'one partner.') % line.name) if len(sales) == 1: - sale = sales[0] - res['partner_id'] = sale.partner_id.id + res['partner_id'] = sales[0].partner_id.id return res def get_from_transaction_id_and_invoice(self, line): diff --git a/account_move_transactionid_import/parser/__init__.py b/account_move_transactionid_import/parser/__init__.py index 9102553c..f8a86141 100644 --- a/account_move_transactionid_import/parser/__init__.py +++ b/account_move_transactionid_import/parser/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # © 2011-2016 Camptocamp SA # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) from . import transactionid_file_parser diff --git a/account_move_transactionid_import/parser/transactionid_file_parser.py b/account_move_transactionid_import/parser/transactionid_file_parser.py index 12e66040..e57b4366 100644 --- a/account_move_transactionid_import/parser/transactionid_file_parser.py +++ b/account_move_transactionid_import/parser/transactionid_file_parser.py @@ -1,9 +1,8 @@ -# -*- coding: utf-8 -*- -# © 2011-2016 Camptocamp SA +# © 2011-2019 Camptocamp SA # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) import datetime -from openerp.tools import ustr -from openerp.addons.account_move_base_import.parser.file_parser import ( +from odoo.tools import ustr +from odoo.addons.account_move_base_import.parser.file_parser import ( FileParser, float_or_zero ) @@ -30,7 +29,7 @@ class TransactionIDFileParser(FileParser): 'amount': float_or_zero, 'commission_amount': float_or_zero, } - super(TransactionIDFileParser, self).__init__( + super().__init__( profile, extra_fields=conversion_dict, ftype=ftype, header=header, **kwargs) diff --git a/account_move_transactionid_import/readme/CONTRIBUTORS.rst b/account_move_transactionid_import/readme/CONTRIBUTORS.rst new file mode 100644 index 00000000..ddef6481 --- /dev/null +++ b/account_move_transactionid_import/readme/CONTRIBUTORS.rst @@ -0,0 +1,2 @@ +* Joël Grand-Guillaume +* Matthieu Dietrich diff --git a/account_move_transactionid_import/readme/DESCRIPTION.rst b/account_move_transactionid_import/readme/DESCRIPTION.rst new file mode 100644 index 00000000..bd23488e --- /dev/null +++ b/account_move_transactionid_import/readme/DESCRIPTION.rst @@ -0,0 +1,4 @@ +This module extends the functionality of +account_move_base_import, in order to add both importation +and auto-completion for the "transaction_ref" field added in +base_transaction_id. diff --git a/account_move_transactionid_import/test/completion_invoice_transactionid_test.yml b/account_move_transactionid_import/test/completion_invoice_transactionid_test.yml deleted file mode 100644 index ebfc3206..00000000 --- a/account_move_transactionid_import/test/completion_invoice_transactionid_test.yml +++ /dev/null @@ -1,44 +0,0 @@ -- - In order to test the banking framework, I first need to create a journal -- - !record {model: account.journal, id: account.bank_journal}: - used_for_completion: True - rule_ids: - - bank_statement_completion_rule_trans_id_invoice -- - Now I create a move. I create statment lines separately because I need - to find each one by XML id -- - !record {model: account.move, id: move_invoice_transactionid_test1}: - name: Move with transaction ID - journal_id: account.bank_journal - company_id: base.main_company -- - I create a move line for a SO with transaction ID -- - !record {model: account.move.line, id: move_line_invoice_transactionid}: - name: Test autocompletion based on invoice with transaction ID - account_id: account.a_sale - move_id: move_invoice_transactionid_test1 - transaction_ref: XXX77Z - date_maturity: !eval time.strftime('%Y-%m-%d') - credit: 0.0 -- - and add the correct amount -- - !python {model: account.move.line}: | - context['check_move_validity'] = False - model.write(cr, uid, [ref('move_line_invoice_transactionid')], - {'credit': 450.0}, - context) -- - I run the auto complete -- - !python {model: account.move}: | - result = self.button_auto_completion(cr, uid, [ref("move_invoice_transactionid_test1")]) -- - Now I can check that all is nice and shiny, line 1. I expect the invoice has been - recognised from the transaction ID. -- - !assert {model: account.move.line, id: move_line_invoice_transactionid, string: Check completion by Invoice transaction ID}: - - partner_id.name == u'Agrolait' diff --git a/account_move_transactionid_import/test/completion_transactionid_test.yml b/account_move_transactionid_import/test/completion_transactionid_test.yml deleted file mode 100644 index b96acf2e..00000000 --- a/account_move_transactionid_import/test/completion_transactionid_test.yml +++ /dev/null @@ -1,48 +0,0 @@ -- - In order to test the banking framework, I first need to create a journal -- - !record {model: account.journal, id: account.bank_journal}: - used_for_completion: True - rule_ids: - - bank_statement_completion_rule_4 - - 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 -- - !record {model: account.move, id: move_transactionid_test1}: - name: Move with transaction ID - journal_id: account.bank_journal - company_id: base.main_company -- - I create a move line for a SO with transaction ID -- - !record {model: account.move.line, id: move_line_transactionid}: - name: Test autocompletion based on SO with transaction ID - account_id: account.a_sale - move_id: move_transactionid_test1 - transaction_ref: XXX66Z - date_maturity: !eval "'%s-01-06' %(datetime.now().year)" - credit: 0.0 -- - and add the correct amount -- - !python {model: account.move.line}: | - context['check_move_validity'] = False - model.write(cr, uid, [ref('move_line_transactionid')], - {'credit': 118.4}, - context) -- - I run the auto complete -- - !python {model: account.move}: | - result = self.button_auto_completion(cr, uid, [ref("move_transactionid_test1")]) -- - Now I can check that all is nice and shiny, line 1. I expect the SO has been - recognised from the transaction ID. -- - !assert {model: account.move.line, id: move_line_transactionid, string: Check completion by SO transaction ID}: - - partner_id.name == u'Agrolait' diff --git a/account_move_transactionid_import/test/invoice.yml b/account_move_transactionid_import/test/invoice.yml deleted file mode 100644 index 61c10aa2..00000000 --- a/account_move_transactionid_import/test/invoice.yml +++ /dev/null @@ -1,25 +0,0 @@ -- - I create a new invoice with transaction ID -- - !record {model: account.invoice, id: invoice_with_transaction_id}: - company_id: base.main_company - currency_id: base.EUR - partner_id: base.res_partner_2 - transaction_id: XXX77Z - invoice_line_ids: - - name: '[PCSC234] PC Assemble SC234' - price_unit: 450.0 - quantity: 1.0 - product_id: product.product_product_3 - uom_id: product.product_uom_unit - journal_id: account.bank_journal - reference_type: none -- - I confirm the Invoice -- - !workflow {model: account.invoice, action: invoice_open, ref: invoice_with_transaction_id} -- - I check that the invoice state is "Open" -- - !assert {model: account.invoice, id: invoice_with_transaction_id}: - - state == 'open' diff --git a/account_move_transactionid_import/test/sale.yml b/account_move_transactionid_import/test/sale.yml deleted file mode 100644 index d712f8ad..00000000 --- a/account_move_transactionid_import/test/sale.yml +++ /dev/null @@ -1,21 +0,0 @@ -- - I import account minimal data -- - !python {model: account.invoice}: | - openerp.tools.convert_file(cr, - 'account', - openerp.modules.get_module_resource( - 'account', - 'test', - 'account_minimal_test.xml'), - {}, 'init', False, 'test') -- - I create a new Sale Order with transaction ID -- - !record {model: sale.order, id: so_with_transaction_id}: - partner_id: base.res_partner_2 - note: Invoice after delivery - transaction_id: XXX66Z - order_line: - - product_id: product.product_product_7 - product_uom_qty: 8 diff --git a/account_move_transactionid_import/tests/__init__.py b/account_move_transactionid_import/tests/__init__.py new file mode 100644 index 00000000..f14d0f36 --- /dev/null +++ b/account_move_transactionid_import/tests/__init__.py @@ -0,0 +1 @@ +from . import test_completion_transaction_id diff --git a/account_move_transactionid_import/tests/test_completion_transaction_id.py b/account_move_transactionid_import/tests/test_completion_transaction_id.py new file mode 100644 index 00000000..f8029f3d --- /dev/null +++ b/account_move_transactionid_import/tests/test_completion_transaction_id.py @@ -0,0 +1,147 @@ +# Copyright 2019 Camptocamp SA +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) + +from datetime import datetime +from odoo.modules import get_resource_path +from odoo.tests import SingleTransactionCase +from odoo.tools import convert_file + + +class TestCompletionTransactionId(SingleTransactionCase): + @classmethod + def setUpClass(cls): + super().setUpClass() + convert_file( + cls.cr, + 'account', + get_resource_path('account', 'test', 'account_minimal_test.xml'), + {}, + 'init', + False, + 'test', + ) + cls.partner = cls.env.ref('base.res_partner_2') + cls.journal = cls.env.ref('account.bank_journal') + cls.journal.used_for_completion = True + cls.move = cls.env['account.move'].create( + {'name': 'Move with transaction ID', 'journal_id': cls.journal.id} + ) + cls.move_line = cls.env['account.move.line'].create( + { + 'name': 'Test autocompletion on invoice with transaction ID', + 'account_id': cls.env.ref('account.a_sale').id, + 'move_id': cls.move.id, + 'transaction_ref': 'XXX66Z', + 'date_maturity': '{}-01-06'.format(datetime.now().year), + 'credit': 0.0, + } + ) + + def test_sale_order_transaction_id(self): + self.move_line.transaction_ref = 'XXX66Z' + self.journal.rule_ids = [ + ( + 4, + self.env.ref( + 'account_move_transactionid_import.' + 'bank_statement_completion_rule_4' + ).id, + False, + ), + ( + 4, + self.env.ref( + 'account_move_base_import.bank_statement_completion_rule_2' + ).id, + False, + ), + ( + 4, + self.env.ref( + 'account_move_base_import.bank_statement_completion_rule_3' + ).id, + False, + ), + ( + 4, + self.env.ref( + 'account_move_base_import.bank_statement_completion_rule_4' + ).id, + False, + ), + ( + 4, + self.env.ref( + 'account_move_base_import.bank_statement_completion_rule_5' + ).id, + False, + ), + ] + self.move_line.with_context({'check_move_validity': False}).write( + {'credit': 118.4} + ) + so = self.env['sale.order'].create( + { + 'partner_id': self.partner.id, + 'note': 'Invoice after delivery', + 'transaction_id': 'XXX66Z', + 'order_line': [ + ( + 0, + 0, + { + 'product_id': self.env.ref( + 'product.product_product_7' + ).id, + 'product_uom_qty': 8, + }, + ) + ], + } + ) + self.assertEqual(so.transaction_id, 'XXX66Z') + self.move.button_auto_completion() + self.assertEqual(self.move_line.partner_id.name, self.partner.name) + + def test_new_invoice_with_transaction_id(self): + self.move_line.transaction_ref = 'XXX77Z' + self.move_line.partner_id = None + self.journal.rule_ids = [ + ( + 4, + self.env.ref( + 'account_move_transactionid_import.' + 'bank_statement_completion_rule_trans_id_invoice' + ).id, + False, + ) + ] + invoice = self.env['account.invoice'].create( + { + 'currency_id': self.env.ref('base.EUR').id, + 'partner_id': self.partner.id, + 'transaction_id': 'XXX77Z', + 'reference_type': None, + 'journal_id': self.journal.id, + 'invoice_line_ids': [ + ( + 0, + 0, + { + 'name': '[PCSC234] PC Assemble SC234', + 'price_unit': 450.0, + 'quantity': 1.0, + 'product_id': self.env.ref( + 'product.product_product_3' + ).id, + 'uom_id': self.env.ref('uom.product_uom_unit').id, + 'account_id': self.env.ref('account.a_sale').id, + }, + ) + ], + } + ) + invoice.action_invoice_open() + self.assertEqual(invoice.state, 'open') + self.move.button_auto_completion() + self.assertEqual(self.move_line.partner_id, self.partner) From 9866bc63a3d1086b4668719cf897f73508bcc69d Mon Sep 17 00:00:00 2001 From: sebalix Date: Mon, 5 Aug 2019 15:46:14 +0200 Subject: [PATCH 14/19] [FIX] account_move_transactionid_import: set the account from partner --- account_move_transactionid_import/models/account_move.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/account_move_transactionid_import/models/account_move.py b/account_move_transactionid_import/models/account_move.py index b4344029..2ad3a3b5 100644 --- a/account_move_transactionid_import/models/account_move.py +++ b/account_move_transactionid_import/models/account_move.py @@ -40,7 +40,9 @@ class AccountMoveCompletionRule(models.Model): _('Line named "%s" was matched by more than ' 'one partner.') % line.name) if len(sales) == 1: - res['partner_id'] = sales[0].partner_id.id + partner = sales[0].partner_id + res['partner_id'] = partner.id + res['account_id'] = partner.property_account_receivable_id.id return res def get_from_transaction_id_and_invoice(self, line): From 4a9353c637cbe5afd3c568146f36aacea8306162 Mon Sep 17 00:00:00 2001 From: oca-travis Date: Tue, 13 Aug 2019 13:07:20 +0000 Subject: [PATCH 15/19] [UPD] Update account_move_base_import.pot --- .../i18n/account_move_base_import.pot | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/account_move_base_import/i18n/account_move_base_import.pot b/account_move_base_import/i18n/account_move_base_import.pot index a00370a4..7217c8d0 100644 --- a/account_move_base_import/i18n/account_move_base_import.pot +++ b/account_move_base_import/i18n/account_move_base_import.pot @@ -203,6 +203,11 @@ msgstr "" msgid "Generic .csv/.xls based on SO Name" msgstr "" +#. module: account_move_base_import +#: selection:account.journal,import_type:0 +msgid "Generic .csv/.xls based on SO transaction ID" +msgstr "" + #. module: account_move_base_import #: model:ir.model.fields,field_description:account_move_base_import.field_account_move_completion_rule__id #: model:ir.model.fields,field_description:account_move_base_import.field_credit_statement_import__id @@ -340,6 +345,16 @@ msgstr "" msgid "Lower means parsed first." msgstr "" +#. module: account_move_base_import +#: selection:account.move.completion.rule,function_to_call:0 +msgid "Match Invoice using transaction ID" +msgstr "" + +#. module: account_move_base_import +#: selection:account.move.completion.rule,function_to_call:0 +msgid "Match Sales Order using transaction ID" +msgstr "" + #. module: account_move_base_import #: model:ir.model.fields,field_description:account_move_base_import.field_account_move_completion_rule__function_to_call msgid "Method" From b44bcd15e37bf68608c742499dda19ed36579fce Mon Sep 17 00:00:00 2001 From: oca-travis Date: Tue, 13 Aug 2019 13:07:21 +0000 Subject: [PATCH 16/19] [UPD] Update account_move_transactionid_import.pot --- .../account_move_transactionid_import.pot | 87 +++++++++++++++++++ account_move_transactionid_import/i18n/de.po | 67 ++++++++++++-- account_move_transactionid_import/i18n/es.po | 70 +++++++++++++-- account_move_transactionid_import/i18n/fr.po | 67 ++++++++++++-- .../i18n/hr_HR.po | 73 ++++++++++++++-- account_move_transactionid_import/i18n/it.po | 67 ++++++++++++-- .../i18n/pt_BR.po | 73 ++++++++++++++-- account_move_transactionid_import/i18n/sl.po | 70 +++++++++++++-- 8 files changed, 533 insertions(+), 41 deletions(-) create mode 100644 account_move_transactionid_import/i18n/account_move_transactionid_import.pot diff --git a/account_move_transactionid_import/i18n/account_move_transactionid_import.pot b/account_move_transactionid_import/i18n/account_move_transactionid_import.pot new file mode 100644 index 00000000..4809bbd2 --- /dev/null +++ b/account_move_transactionid_import/i18n/account_move_transactionid_import.pot @@ -0,0 +1,87 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_move_transactionid_import +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 12.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: account_move_transactionid_import +#: model:ir.model,name:account_move_transactionid_import.model_account_move_completion_rule +msgid "Account move completion method" +msgstr "" + +#. module: account_move_transactionid_import +#: model:ir.model.fields,help:account_move_transactionid_import.field_account_journal__import_type +msgid "Choose here the method by which you want to import account moves for this journal." +msgstr "" + +#. module: account_move_transactionid_import +#: selection:account.move.completion.rule,function_to_call:0 +msgid "From line name (based on customer invoice number)" +msgstr "" + +#. module: account_move_transactionid_import +#: selection:account.move.completion.rule,function_to_call:0 +msgid "From line name (based on partner field)" +msgstr "" + +#. module: account_move_transactionid_import +#: selection:account.move.completion.rule,function_to_call:0 +msgid "From line name (based on partner name)" +msgstr "" + +#. module: account_move_transactionid_import +#: selection:account.move.completion.rule,function_to_call:0 +msgid "From line name (based on supplier invoice number)" +msgstr "" + +#. module: account_move_transactionid_import +#: selection:account.journal,import_type:0 +msgid "Generic .csv/.xls based on SO Name" +msgstr "" + +#. module: account_move_transactionid_import +#: selection:account.journal,import_type:0 +msgid "Generic .csv/.xls based on SO transaction ID" +msgstr "" + +#. module: account_move_transactionid_import +#: model:ir.model,name:account_move_transactionid_import.model_account_journal +msgid "Journal" +msgstr "" + +#. module: account_move_transactionid_import +#: code:addons/account_move_transactionid_import/models/account_move.py:40 +#: code:addons/account_move_transactionid_import/models/account_move.py:69 +#, python-format +msgid "Line named \"%s\" was matched by more than one partner." +msgstr "" + +#. module: account_move_transactionid_import +#: selection:account.move.completion.rule,function_to_call:0 +msgid "Match Invoice using transaction ID" +msgstr "" + +#. module: account_move_transactionid_import +#: selection:account.move.completion.rule,function_to_call:0 +msgid "Match Sales Order using transaction ID" +msgstr "" + +#. module: account_move_transactionid_import +#: model:ir.model.fields,field_description:account_move_transactionid_import.field_account_move_completion_rule__function_to_call +msgid "Method" +msgstr "" + +#. module: account_move_transactionid_import +#: model:ir.model.fields,field_description:account_move_transactionid_import.field_account_journal__import_type +msgid "Type of import" +msgstr "" + diff --git a/account_move_transactionid_import/i18n/de.po b/account_move_transactionid_import/i18n/de.po index cc59d9ed..46a24890 100644 --- a/account_move_transactionid_import/i18n/de.po +++ b/account_move_transactionid_import/i18n/de.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * account_move_transactionid_import -# +# # Translators: # Rudolf Schnapka , 2016 msgid "" @@ -12,25 +12,82 @@ msgstr "" "PO-Revision-Date: 2016-07-08 02:45+0000\n" "Last-Translator: Rudolf Schnapka , 2016\n" "Language-Team: German (https://www.transifex.com/oca/teams/23907/de/)\n" +"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#. module: account_move_transactionid_import +#: model:ir.model,name:account_move_transactionid_import.model_account_move_completion_rule +msgid "Account move completion method" +msgstr "" + +#. module: account_move_transactionid_import +#: model:ir.model.fields,help:account_move_transactionid_import.field_account_journal__import_type +msgid "" +"Choose here the method by which you want to import account moves for this " +"journal." +msgstr "" + +#. module: account_move_transactionid_import +#: selection:account.move.completion.rule,function_to_call:0 +msgid "From line name (based on customer invoice number)" +msgstr "" + +#. module: account_move_transactionid_import +#: selection:account.move.completion.rule,function_to_call:0 +msgid "From line name (based on partner field)" +msgstr "" + +#. module: account_move_transactionid_import +#: selection:account.move.completion.rule,function_to_call:0 +msgid "From line name (based on partner name)" +msgstr "" + +#. module: account_move_transactionid_import +#: selection:account.move.completion.rule,function_to_call:0 +msgid "From line name (based on supplier invoice number)" +msgstr "" + +#. module: account_move_transactionid_import +#: selection:account.journal,import_type:0 +msgid "Generic .csv/.xls based on SO Name" +msgstr "" + +#. module: account_move_transactionid_import +#: selection:account.journal,import_type:0 +msgid "Generic .csv/.xls based on SO transaction ID" +msgstr "" + #. module: account_move_transactionid_import #: model:ir.model,name:account_move_transactionid_import.model_account_journal msgid "Journal" msgstr "Journal" #. module: account_move_transactionid_import -#: code:addons/account_move_transactionid_import/models/account_move.py:41 +#: code:addons/account_move_transactionid_import/models/account_move.py:40 #: code:addons/account_move_transactionid_import/models/account_move.py:69 #, python-format msgid "Line named \"%s\" was matched by more than one partner." msgstr "" #. module: account_move_transactionid_import -#: model:ir.model,name:account_move_transactionid_import.model_account_move_completion_rule -msgid "account.move.completion.rule" +#: selection:account.move.completion.rule,function_to_call:0 +msgid "Match Invoice using transaction ID" +msgstr "" + +#. module: account_move_transactionid_import +#: selection:account.move.completion.rule,function_to_call:0 +msgid "Match Sales Order using transaction ID" +msgstr "" + +#. module: account_move_transactionid_import +#: model:ir.model.fields,field_description:account_move_transactionid_import.field_account_move_completion_rule__function_to_call +msgid "Method" +msgstr "" + +#. module: account_move_transactionid_import +#: model:ir.model.fields,field_description:account_move_transactionid_import.field_account_journal__import_type +msgid "Type of import" msgstr "" diff --git a/account_move_transactionid_import/i18n/es.po b/account_move_transactionid_import/i18n/es.po index eca13c54..c86db905 100644 --- a/account_move_transactionid_import/i18n/es.po +++ b/account_move_transactionid_import/i18n/es.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * account_move_transactionid_import -# +# # Translators: # OCA Transbot , 2016 msgid "" @@ -12,25 +12,83 @@ msgstr "" "PO-Revision-Date: 2016-07-08 02:45+0000\n" "Last-Translator: OCA Transbot , 2016\n" "Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n" +"Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#. module: account_move_transactionid_import +#: model:ir.model,name:account_move_transactionid_import.model_account_move_completion_rule +#, fuzzy +msgid "Account move completion method" +msgstr "account.move.completion.rule" + +#. module: account_move_transactionid_import +#: model:ir.model.fields,help:account_move_transactionid_import.field_account_journal__import_type +msgid "" +"Choose here the method by which you want to import account moves for this " +"journal." +msgstr "" + +#. module: account_move_transactionid_import +#: selection:account.move.completion.rule,function_to_call:0 +msgid "From line name (based on customer invoice number)" +msgstr "" + +#. module: account_move_transactionid_import +#: selection:account.move.completion.rule,function_to_call:0 +msgid "From line name (based on partner field)" +msgstr "" + +#. module: account_move_transactionid_import +#: selection:account.move.completion.rule,function_to_call:0 +msgid "From line name (based on partner name)" +msgstr "" + +#. module: account_move_transactionid_import +#: selection:account.move.completion.rule,function_to_call:0 +msgid "From line name (based on supplier invoice number)" +msgstr "" + +#. module: account_move_transactionid_import +#: selection:account.journal,import_type:0 +msgid "Generic .csv/.xls based on SO Name" +msgstr "" + +#. module: account_move_transactionid_import +#: selection:account.journal,import_type:0 +msgid "Generic .csv/.xls based on SO transaction ID" +msgstr "" + #. module: account_move_transactionid_import #: model:ir.model,name:account_move_transactionid_import.model_account_journal msgid "Journal" msgstr "" #. module: account_move_transactionid_import -#: code:addons/account_move_transactionid_import/models/account_move.py:41 +#: code:addons/account_move_transactionid_import/models/account_move.py:40 #: code:addons/account_move_transactionid_import/models/account_move.py:69 #, python-format msgid "Line named \"%s\" was matched by more than one partner." msgstr "" #. 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" +#: selection:account.move.completion.rule,function_to_call:0 +msgid "Match Invoice using transaction ID" +msgstr "" + +#. module: account_move_transactionid_import +#: selection:account.move.completion.rule,function_to_call:0 +msgid "Match Sales Order using transaction ID" +msgstr "" + +#. module: account_move_transactionid_import +#: model:ir.model.fields,field_description:account_move_transactionid_import.field_account_move_completion_rule__function_to_call +msgid "Method" +msgstr "" + +#. module: account_move_transactionid_import +#: model:ir.model.fields,field_description:account_move_transactionid_import.field_account_journal__import_type +msgid "Type of import" +msgstr "" diff --git a/account_move_transactionid_import/i18n/fr.po b/account_move_transactionid_import/i18n/fr.po index e1411cc5..6ff32237 100644 --- a/account_move_transactionid_import/i18n/fr.po +++ b/account_move_transactionid_import/i18n/fr.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * account_move_transactionid_import -# +# # Translators: # OCA Transbot , 2016 msgid "" @@ -12,25 +12,82 @@ msgstr "" "PO-Revision-Date: 2016-07-08 02:45+0000\n" "Last-Translator: OCA Transbot , 2016\n" "Language-Team: French (https://www.transifex.com/oca/teams/23907/fr/)\n" +"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" +#. module: account_move_transactionid_import +#: model:ir.model,name:account_move_transactionid_import.model_account_move_completion_rule +msgid "Account move completion method" +msgstr "" + +#. module: account_move_transactionid_import +#: model:ir.model.fields,help:account_move_transactionid_import.field_account_journal__import_type +msgid "" +"Choose here the method by which you want to import account moves for this " +"journal." +msgstr "" + +#. module: account_move_transactionid_import +#: selection:account.move.completion.rule,function_to_call:0 +msgid "From line name (based on customer invoice number)" +msgstr "" + +#. module: account_move_transactionid_import +#: selection:account.move.completion.rule,function_to_call:0 +msgid "From line name (based on partner field)" +msgstr "" + +#. module: account_move_transactionid_import +#: selection:account.move.completion.rule,function_to_call:0 +msgid "From line name (based on partner name)" +msgstr "" + +#. module: account_move_transactionid_import +#: selection:account.move.completion.rule,function_to_call:0 +msgid "From line name (based on supplier invoice number)" +msgstr "" + +#. module: account_move_transactionid_import +#: selection:account.journal,import_type:0 +msgid "Generic .csv/.xls based on SO Name" +msgstr "" + +#. module: account_move_transactionid_import +#: selection:account.journal,import_type:0 +msgid "Generic .csv/.xls based on SO transaction ID" +msgstr "" + #. module: account_move_transactionid_import #: model:ir.model,name:account_move_transactionid_import.model_account_journal msgid "Journal" msgstr "Journal" #. module: account_move_transactionid_import -#: code:addons/account_move_transactionid_import/models/account_move.py:41 +#: code:addons/account_move_transactionid_import/models/account_move.py:40 #: code:addons/account_move_transactionid_import/models/account_move.py:69 #, python-format msgid "Line named \"%s\" was matched by more than one partner." msgstr "" #. module: account_move_transactionid_import -#: model:ir.model,name:account_move_transactionid_import.model_account_move_completion_rule -msgid "account.move.completion.rule" +#: selection:account.move.completion.rule,function_to_call:0 +msgid "Match Invoice using transaction ID" +msgstr "" + +#. module: account_move_transactionid_import +#: selection:account.move.completion.rule,function_to_call:0 +msgid "Match Sales Order using transaction ID" +msgstr "" + +#. module: account_move_transactionid_import +#: model:ir.model.fields,field_description:account_move_transactionid_import.field_account_move_completion_rule__function_to_call +msgid "Method" +msgstr "" + +#. module: account_move_transactionid_import +#: model:ir.model.fields,field_description:account_move_transactionid_import.field_account_journal__import_type +msgid "Type of import" msgstr "" diff --git a/account_move_transactionid_import/i18n/hr_HR.po b/account_move_transactionid_import/i18n/hr_HR.po index 2c876862..ae22592a 100644 --- a/account_move_transactionid_import/i18n/hr_HR.po +++ b/account_move_transactionid_import/i18n/hr_HR.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * account_move_transactionid_import -# +# # Translators: # Bole , 2016 msgid "" @@ -11,12 +11,56 @@ msgstr "" "POT-Creation-Date: 2016-07-08 02:45+0000\n" "PO-Revision-Date: 2016-07-08 02:45+0000\n" "Last-Translator: Bole , 2016\n" -"Language-Team: Croatian (Croatia) (https://www.transifex.com/oca/teams/23907/hr_HR/)\n" +"Language-Team: Croatian (Croatia) (https://www.transifex.com/oca/teams/23907/" +"hr_HR/)\n" +"Language: hr_HR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: hr_HR\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" + +#. module: account_move_transactionid_import +#: model:ir.model,name:account_move_transactionid_import.model_account_move_completion_rule +msgid "Account move completion method" +msgstr "" + +#. module: account_move_transactionid_import +#: model:ir.model.fields,help:account_move_transactionid_import.field_account_journal__import_type +msgid "" +"Choose here the method by which you want to import account moves for this " +"journal." +msgstr "" + +#. module: account_move_transactionid_import +#: selection:account.move.completion.rule,function_to_call:0 +msgid "From line name (based on customer invoice number)" +msgstr "" + +#. module: account_move_transactionid_import +#: selection:account.move.completion.rule,function_to_call:0 +msgid "From line name (based on partner field)" +msgstr "" + +#. module: account_move_transactionid_import +#: selection:account.move.completion.rule,function_to_call:0 +msgid "From line name (based on partner name)" +msgstr "" + +#. module: account_move_transactionid_import +#: selection:account.move.completion.rule,function_to_call:0 +msgid "From line name (based on supplier invoice number)" +msgstr "" + +#. module: account_move_transactionid_import +#: selection:account.journal,import_type:0 +msgid "Generic .csv/.xls based on SO Name" +msgstr "" + +#. module: account_move_transactionid_import +#: selection:account.journal,import_type:0 +msgid "Generic .csv/.xls based on SO transaction ID" +msgstr "" #. module: account_move_transactionid_import #: model:ir.model,name:account_move_transactionid_import.model_account_journal @@ -24,13 +68,28 @@ msgid "Journal" msgstr "Dnevnik" #. module: account_move_transactionid_import -#: code:addons/account_move_transactionid_import/models/account_move.py:41 +#: code:addons/account_move_transactionid_import/models/account_move.py:40 #: code:addons/account_move_transactionid_import/models/account_move.py:69 #, python-format msgid "Line named \"%s\" was matched by more than one partner." msgstr "" #. module: account_move_transactionid_import -#: model:ir.model,name:account_move_transactionid_import.model_account_move_completion_rule -msgid "account.move.completion.rule" +#: selection:account.move.completion.rule,function_to_call:0 +msgid "Match Invoice using transaction ID" +msgstr "" + +#. module: account_move_transactionid_import +#: selection:account.move.completion.rule,function_to_call:0 +msgid "Match Sales Order using transaction ID" +msgstr "" + +#. module: account_move_transactionid_import +#: model:ir.model.fields,field_description:account_move_transactionid_import.field_account_move_completion_rule__function_to_call +msgid "Method" +msgstr "" + +#. module: account_move_transactionid_import +#: model:ir.model.fields,field_description:account_move_transactionid_import.field_account_journal__import_type +msgid "Type of import" msgstr "" diff --git a/account_move_transactionid_import/i18n/it.po b/account_move_transactionid_import/i18n/it.po index 473957bc..4f814a8b 100644 --- a/account_move_transactionid_import/i18n/it.po +++ b/account_move_transactionid_import/i18n/it.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * account_move_transactionid_import -# +# # Translators: # Andrea Cometa , 2016 msgid "" @@ -12,25 +12,82 @@ msgstr "" "PO-Revision-Date: 2016-09-28 11:33+0000\n" "Last-Translator: Andrea Cometa , 2016\n" "Language-Team: Italian (https://www.transifex.com/oca/teams/23907/it/)\n" +"Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#. module: account_move_transactionid_import +#: model:ir.model,name:account_move_transactionid_import.model_account_move_completion_rule +msgid "Account move completion method" +msgstr "" + +#. module: account_move_transactionid_import +#: model:ir.model.fields,help:account_move_transactionid_import.field_account_journal__import_type +msgid "" +"Choose here the method by which you want to import account moves for this " +"journal." +msgstr "" + +#. module: account_move_transactionid_import +#: selection:account.move.completion.rule,function_to_call:0 +msgid "From line name (based on customer invoice number)" +msgstr "" + +#. module: account_move_transactionid_import +#: selection:account.move.completion.rule,function_to_call:0 +msgid "From line name (based on partner field)" +msgstr "" + +#. module: account_move_transactionid_import +#: selection:account.move.completion.rule,function_to_call:0 +msgid "From line name (based on partner name)" +msgstr "" + +#. module: account_move_transactionid_import +#: selection:account.move.completion.rule,function_to_call:0 +msgid "From line name (based on supplier invoice number)" +msgstr "" + +#. module: account_move_transactionid_import +#: selection:account.journal,import_type:0 +msgid "Generic .csv/.xls based on SO Name" +msgstr "" + +#. module: account_move_transactionid_import +#: selection:account.journal,import_type:0 +msgid "Generic .csv/.xls based on SO transaction ID" +msgstr "" + #. module: account_move_transactionid_import #: model:ir.model,name:account_move_transactionid_import.model_account_journal msgid "Journal" msgstr "Sezionale" #. module: account_move_transactionid_import -#: code:addons/account_move_transactionid_import/models/account_move.py:41 +#: code:addons/account_move_transactionid_import/models/account_move.py:40 #: code:addons/account_move_transactionid_import/models/account_move.py:69 #, python-format msgid "Line named \"%s\" was matched by more than one partner." msgstr "" #. module: account_move_transactionid_import -#: model:ir.model,name:account_move_transactionid_import.model_account_move_completion_rule -msgid "account.move.completion.rule" +#: selection:account.move.completion.rule,function_to_call:0 +msgid "Match Invoice using transaction ID" +msgstr "" + +#. module: account_move_transactionid_import +#: selection:account.move.completion.rule,function_to_call:0 +msgid "Match Sales Order using transaction ID" +msgstr "" + +#. module: account_move_transactionid_import +#: model:ir.model.fields,field_description:account_move_transactionid_import.field_account_move_completion_rule__function_to_call +msgid "Method" +msgstr "" + +#. module: account_move_transactionid_import +#: model:ir.model.fields,field_description:account_move_transactionid_import.field_account_journal__import_type +msgid "Type of import" msgstr "" diff --git a/account_move_transactionid_import/i18n/pt_BR.po b/account_move_transactionid_import/i18n/pt_BR.po index b5528f40..27034b77 100644 --- a/account_move_transactionid_import/i18n/pt_BR.po +++ b/account_move_transactionid_import/i18n/pt_BR.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * account_move_transactionid_import -# +# # Translators: # Claudio Araujo Santos , 2016 msgid "" @@ -10,27 +10,86 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-07-08 02:45+0000\n" "PO-Revision-Date: 2016-07-08 02:45+0000\n" -"Last-Translator: Claudio Araujo Santos , 2016\n" -"Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/teams/23907/pt_BR/)\n" +"Last-Translator: Claudio Araujo Santos , " +"2016\n" +"Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/" +"teams/23907/pt_BR/)\n" +"Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: pt_BR\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" +#. module: account_move_transactionid_import +#: model:ir.model,name:account_move_transactionid_import.model_account_move_completion_rule +msgid "Account move completion method" +msgstr "" + +#. module: account_move_transactionid_import +#: model:ir.model.fields,help:account_move_transactionid_import.field_account_journal__import_type +msgid "" +"Choose here the method by which you want to import account moves for this " +"journal." +msgstr "" + +#. module: account_move_transactionid_import +#: selection:account.move.completion.rule,function_to_call:0 +msgid "From line name (based on customer invoice number)" +msgstr "" + +#. module: account_move_transactionid_import +#: selection:account.move.completion.rule,function_to_call:0 +msgid "From line name (based on partner field)" +msgstr "" + +#. module: account_move_transactionid_import +#: selection:account.move.completion.rule,function_to_call:0 +msgid "From line name (based on partner name)" +msgstr "" + +#. module: account_move_transactionid_import +#: selection:account.move.completion.rule,function_to_call:0 +msgid "From line name (based on supplier invoice number)" +msgstr "" + +#. module: account_move_transactionid_import +#: selection:account.journal,import_type:0 +msgid "Generic .csv/.xls based on SO Name" +msgstr "" + +#. module: account_move_transactionid_import +#: selection:account.journal,import_type:0 +msgid "Generic .csv/.xls based on SO transaction ID" +msgstr "" + #. module: account_move_transactionid_import #: model:ir.model,name:account_move_transactionid_import.model_account_journal msgid "Journal" msgstr "Diário" #. module: account_move_transactionid_import -#: code:addons/account_move_transactionid_import/models/account_move.py:41 +#: code:addons/account_move_transactionid_import/models/account_move.py:40 #: code:addons/account_move_transactionid_import/models/account_move.py:69 #, python-format msgid "Line named \"%s\" was matched by more than one partner." msgstr "" #. module: account_move_transactionid_import -#: model:ir.model,name:account_move_transactionid_import.model_account_move_completion_rule -msgid "account.move.completion.rule" +#: selection:account.move.completion.rule,function_to_call:0 +msgid "Match Invoice using transaction ID" +msgstr "" + +#. module: account_move_transactionid_import +#: selection:account.move.completion.rule,function_to_call:0 +msgid "Match Sales Order using transaction ID" +msgstr "" + +#. module: account_move_transactionid_import +#: model:ir.model.fields,field_description:account_move_transactionid_import.field_account_move_completion_rule__function_to_call +msgid "Method" +msgstr "" + +#. module: account_move_transactionid_import +#: model:ir.model.fields,field_description:account_move_transactionid_import.field_account_journal__import_type +msgid "Type of import" msgstr "" diff --git a/account_move_transactionid_import/i18n/sl.po b/account_move_transactionid_import/i18n/sl.po index 96fecf1b..856d60f6 100644 --- a/account_move_transactionid_import/i18n/sl.po +++ b/account_move_transactionid_import/i18n/sl.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * account_move_transactionid_import -# +# # Translators: # OCA Transbot , 2016 msgid "" @@ -12,11 +12,54 @@ msgstr "" "PO-Revision-Date: 2016-07-08 02:45+0000\n" "Last-Translator: OCA Transbot , 2016\n" "Language-Team: Slovenian (https://www.transifex.com/oca/teams/23907/sl/)\n" +"Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: sl\n" -"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" +"%100==4 ? 2 : 3);\n" + +#. module: account_move_transactionid_import +#: model:ir.model,name:account_move_transactionid_import.model_account_move_completion_rule +msgid "Account move completion method" +msgstr "" + +#. module: account_move_transactionid_import +#: model:ir.model.fields,help:account_move_transactionid_import.field_account_journal__import_type +msgid "" +"Choose here the method by which you want to import account moves for this " +"journal." +msgstr "" + +#. module: account_move_transactionid_import +#: selection:account.move.completion.rule,function_to_call:0 +msgid "From line name (based on customer invoice number)" +msgstr "" + +#. module: account_move_transactionid_import +#: selection:account.move.completion.rule,function_to_call:0 +msgid "From line name (based on partner field)" +msgstr "" + +#. module: account_move_transactionid_import +#: selection:account.move.completion.rule,function_to_call:0 +msgid "From line name (based on partner name)" +msgstr "" + +#. module: account_move_transactionid_import +#: selection:account.move.completion.rule,function_to_call:0 +msgid "From line name (based on supplier invoice number)" +msgstr "" + +#. module: account_move_transactionid_import +#: selection:account.journal,import_type:0 +msgid "Generic .csv/.xls based on SO Name" +msgstr "" + +#. module: account_move_transactionid_import +#: selection:account.journal,import_type:0 +msgid "Generic .csv/.xls based on SO transaction ID" +msgstr "" #. module: account_move_transactionid_import #: model:ir.model,name:account_move_transactionid_import.model_account_journal @@ -24,13 +67,28 @@ msgid "Journal" msgstr "Dnevnik" #. module: account_move_transactionid_import -#: code:addons/account_move_transactionid_import/models/account_move.py:41 +#: code:addons/account_move_transactionid_import/models/account_move.py:40 #: code:addons/account_move_transactionid_import/models/account_move.py:69 #, python-format msgid "Line named \"%s\" was matched by more than one partner." msgstr "" #. module: account_move_transactionid_import -#: model:ir.model,name:account_move_transactionid_import.model_account_move_completion_rule -msgid "account.move.completion.rule" +#: selection:account.move.completion.rule,function_to_call:0 +msgid "Match Invoice using transaction ID" +msgstr "" + +#. module: account_move_transactionid_import +#: selection:account.move.completion.rule,function_to_call:0 +msgid "Match Sales Order using transaction ID" +msgstr "" + +#. module: account_move_transactionid_import +#: model:ir.model.fields,field_description:account_move_transactionid_import.field_account_move_completion_rule__function_to_call +msgid "Method" +msgstr "" + +#. module: account_move_transactionid_import +#: model:ir.model.fields,field_description:account_move_transactionid_import.field_account_journal__import_type +msgid "Type of import" msgstr "" From 8b20dfaf618b51be532dc779642b0e70768d254b Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Tue, 13 Aug 2019 13:22:40 +0000 Subject: [PATCH 17/19] [UPD] README.rst --- account_move_transactionid_import/README.rst | 69 ++- .../static/description/index.html | 423 ++++++++++++++++++ 2 files changed, 469 insertions(+), 23 deletions(-) create mode 100644 account_move_transactionid_import/static/description/index.html diff --git a/account_move_transactionid_import/README.rst b/account_move_transactionid_import/README.rst index 693fd8d2..897d5bc8 100644 --- a/account_move_transactionid_import/README.rst +++ b/account_move_transactionid_import/README.rst @@ -1,54 +1,77 @@ -.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg - :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html - :alt: License: AGPL-3 +================================== +Journal Entry transactionID import +================================== -=================================== -Journal Entry transaction ID import -=================================== +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png + :target: https://odoo-community.org/page/development-status + :alt: Beta +.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Faccount--reconcile-lightgray.png?logo=github + :target: https://github.com/OCA/account-reconcile/tree/12.0/account_move_transactionid_import + :alt: OCA/account-reconcile +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/account-reconcile-12-0/account-reconcile-12-0-account_move_transactionid_import + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/98/12.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| This module extends the functionality of account_move_base_import, in order to add both importation and auto-completion for the "transaction_ref" field added in base_transaction_id. -.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas - :alt: Try me on Runbot - :target: https://runbot.odoo-community.org/runbot/98/9.0 +**Table of contents** + +.. contents:: + :local: Bug Tracker =========== -Bugs are tracked on `GitHub Issues -`_. In case of -trouble, please check there if your issue has already been reported. If you -spotted it first, help us smashing it by providing a detailed and welcomed -feedback. +Bugs are tracked on `GitHub Issues `_. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. Credits ======= -Images ------- +Authors +~~~~~~~ -* Odoo Community Association: `Icon `_. +* Camptocamp Contributors ------------- +~~~~~~~~~~~~ * Joël Grand-Guillaume * Matthieu Dietrich -Maintainer ----------- +Maintainers +~~~~~~~~~~~ + +This module is maintained by the OCA. .. image:: https://odoo-community.org/logo.png :alt: Odoo Community Association :target: https://odoo-community.org -This module is maintained by the OCA. - OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use. -To contribute to this module, please visit https://odoo-community.org. +This module is part of the `OCA/account-reconcile `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/account_move_transactionid_import/static/description/index.html b/account_move_transactionid_import/static/description/index.html new file mode 100644 index 00000000..17762127 --- /dev/null +++ b/account_move_transactionid_import/static/description/index.html @@ -0,0 +1,423 @@ + + + + + + +Journal Entry transactionID import + + + +
+

Journal Entry transactionID import

+ + +

Beta License: AGPL-3 OCA/account-reconcile Translate me on Weblate Try me on Runbot

+

This module extends the functionality of +account_move_base_import, in order to add both importation +and auto-completion for the “transaction_ref” field added in +base_transaction_id.

+

Table of contents

+ +
+

Bug Tracker

+

Bugs are tracked on GitHub Issues. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed +feedback.

+

Do not contact contributors directly about support or help with technical issues.

+
+
+

Credits

+
+

Authors

+
    +
  • Camptocamp
    • +
+
+
+

Contributors

+ +
+
+

Maintainers

+

This module is maintained by the OCA.

+Odoo Community Association +

OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use.

+

This module is part of the OCA/account-reconcile project on GitHub.

+

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

+
+
+
+ + From e1d06a455f8492fa4cd1c1acb25f8e07484e8fd0 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Tue, 13 Aug 2019 13:22:40 +0000 Subject: [PATCH 18/19] [ADD] icon.png --- .../static/description/icon.png | Bin 0 -> 9455 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 account_move_transactionid_import/static/description/icon.png diff --git a/account_move_transactionid_import/static/description/icon.png b/account_move_transactionid_import/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 From 3e54fdf99e2b498f02b76a0392f34d3a680e7ce4 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Tue, 13 Aug 2019 13:22:40 +0000 Subject: [PATCH 19/19] [ADD] setup.py --- setup/_metapackage/VERSION.txt | 2 +- setup/_metapackage/setup.py | 1 + .../odoo/addons/account_move_transactionid_import | 1 + setup/account_move_transactionid_import/setup.py | 6 ++++++ 4 files changed, 9 insertions(+), 1 deletion(-) create mode 120000 setup/account_move_transactionid_import/odoo/addons/account_move_transactionid_import create mode 100644 setup/account_move_transactionid_import/setup.py diff --git a/setup/_metapackage/VERSION.txt b/setup/_metapackage/VERSION.txt index 950d149c..ae984d1d 100644 --- a/setup/_metapackage/VERSION.txt +++ b/setup/_metapackage/VERSION.txt @@ -1 +1 @@ -12.0.20190813.0 \ No newline at end of file +12.0.20190813.1 \ No newline at end of file diff --git a/setup/_metapackage/setup.py b/setup/_metapackage/setup.py index ea785ad9..d7f05599 100644 --- a/setup/_metapackage/setup.py +++ b/setup/_metapackage/setup.py @@ -12,6 +12,7 @@ setuptools.setup( 'odoo12-addon-account_mass_reconcile', 'odoo12-addon-account_move_base_import', 'odoo12-addon-account_move_reconcile_helper', + 'odoo12-addon-account_move_transactionid_import', 'odoo12-addon-account_partner_reconcile', 'odoo12-addon-account_reconcile_restrict_partner_mismatch', 'odoo12-addon-bank_statement_foreign_currency', diff --git a/setup/account_move_transactionid_import/odoo/addons/account_move_transactionid_import b/setup/account_move_transactionid_import/odoo/addons/account_move_transactionid_import new file mode 120000 index 00000000..3ab3f514 --- /dev/null +++ b/setup/account_move_transactionid_import/odoo/addons/account_move_transactionid_import @@ -0,0 +1 @@ +../../../../account_move_transactionid_import \ No newline at end of file diff --git a/setup/account_move_transactionid_import/setup.py b/setup/account_move_transactionid_import/setup.py new file mode 100644 index 00000000..28c57bb6 --- /dev/null +++ b/setup/account_move_transactionid_import/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +)