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"
diff --git a/account_move_transactionid_import/README.rst b/account_move_transactionid_import/README.rst
new file mode 100644
index 00000000..897d5bc8
--- /dev/null
+++ b/account_move_transactionid_import/README.rst
@@ -0,0 +1,77 @@
+==================================
+Journal Entry transactionID 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.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/OCA/account-reconcile/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 <https://github.com/OCA/account-reconcile/issues/new?body=module:%20account_move_transactionid_import%0Aversion:%2012.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+
+Do not contact contributors directly about support or help with technical issues.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* Camptocamp
+
+Contributors
+~~~~~~~~~~~~
+
+* Joël Grand-Guillaume <joel.grandguillaume@camptocamp.com>
+* Matthieu Dietrich <matthieu.dietrich@camptocamp.com>
+
+Maintainers
+~~~~~~~~~~~
+
+This module is maintained by the OCA.
+
+.. image:: https://odoo-community.org/logo.png
+   :alt: Odoo Community Association
+   :target: https://odoo-community.org
+
+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 <https://github.com/OCA/account-reconcile/tree/12.0/account_move_transactionid_import>`_ 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/__init__.py b/account_move_transactionid_import/__init__.py
new file mode 100644
index 00000000..6f860c64
--- /dev/null
+++ b/account_move_transactionid_import/__init__.py
@@ -0,0 +1,4 @@
+# © 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/__manifest__.py b/account_move_transactionid_import/__manifest__.py
new file mode 100644
index 00000000..e4ba6bb3
--- /dev/null
+++ b/account_move_transactionid_import/__manifest__.py
@@ -0,0 +1,21 @@
+# © 2011-2016 Camptocamp SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html)
+{
+    'name': "Journal Entry transactionID import",
+    'version': '12.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'
+    ],
+    '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..0c1bbd48
--- /dev/null
+++ b/account_move_transactionid_import/data/completion_rule_data.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo noupdate="1">
+
+    <record id="bank_statement_completion_rule_4" model="account.move.completion.rule">
+         <field name="name">Match from Sales Order using transaction ID</field>
+         <field name="sequence">30</field>
+         <field name="function_to_call">get_from_transaction_id_and_so</field>
+     </record>
+
+     <record id="bank_statement_completion_rule_trans_id_invoice" model="account.move.completion.rule">
+         <field name="name">Match from Invoice using transaction ID</field>
+         <field name="sequence">40</field>
+         <field name="function_to_call">get_from_transaction_id_and_invoice</field>
+     </record>
+    
+ </odoo>
diff --git a/account_move_transactionid_import/data/statement.csv b/account_move_transactionid_import/data/statement.csv
new file mode 100644
index 00000000..491df223
--- /dev/null
+++ b/account_move_transactionid_import/data/statement.csv
@@ -0,0 +1,4 @@
+"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
new file mode 100644
index 00000000..b734058b
Binary files /dev/null and b/account_move_transactionid_import/data/statement.xls differ
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
new file mode 100644
index 00000000..46a24890
--- /dev/null
+++ b/account_move_transactionid_import/i18n/de.po
@@ -0,0 +1,93 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * account_move_transactionid_import
+#
+# Translators:
+# Rudolf Schnapka <rs@techno-flex.de>, 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 <rs@techno-flex.de>, 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"
+"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: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/es.po b/account_move_transactionid_import/i18n/es.po
new file mode 100644
index 00000000..c86db905
--- /dev/null
+++ b/account_move_transactionid_import/i18n/es.po
@@ -0,0 +1,94 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * account_move_transactionid_import
+#
+# Translators:
+# OCA Transbot <transbot@odoo-community.org>, 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 <transbot@odoo-community.org>, 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"
+"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: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/fr.po b/account_move_transactionid_import/i18n/fr.po
new file mode 100644
index 00000000..6ff32237
--- /dev/null
+++ b/account_move_transactionid_import/i18n/fr.po
@@ -0,0 +1,93 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * account_move_transactionid_import
+#
+# Translators:
+# OCA Transbot <transbot@odoo-community.org>, 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 <transbot@odoo-community.org>, 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"
+"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: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/hr_HR.po b/account_move_transactionid_import/i18n/hr_HR.po
new file mode 100644
index 00000000..ae22592a
--- /dev/null
+++ b/account_move_transactionid_import/i18n/hr_HR.po
@@ -0,0 +1,95 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * account_move_transactionid_import
+#
+# Translators:
+# Bole <bole@dajmi5.com>, 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 <bole@dajmi5.com>, 2016\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"
+"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
+msgid "Journal"
+msgstr "Dnevnik"
+
+#. 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/it.po b/account_move_transactionid_import/i18n/it.po
new file mode 100644
index 00000000..4f814a8b
--- /dev/null
+++ b/account_move_transactionid_import/i18n/it.po
@@ -0,0 +1,93 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * account_move_transactionid_import
+#
+# Translators:
+# Andrea Cometa <a.cometa@apuliasoftware.it>, 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 <a.cometa@apuliasoftware.it>, 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"
+"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: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/pt_BR.po b/account_move_transactionid_import/i18n/pt_BR.po
new file mode 100644
index 00000000..27034b77
--- /dev/null
+++ b/account_move_transactionid_import/i18n/pt_BR.po
@@ -0,0 +1,95 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * account_move_transactionid_import
+#
+# Translators:
+# Claudio Araujo Santos <claudioaraujosantos@gmail.com>, 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 <claudioaraujosantos@gmail.com>, "
+"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"
+"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: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/sl.po b/account_move_transactionid_import/i18n/sl.po
new file mode 100644
index 00000000..856d60f6
--- /dev/null
+++ b/account_move_transactionid_import/i18n/sl.po
@@ -0,0 +1,94 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * account_move_transactionid_import
+#
+# Translators:
+# OCA Transbot <transbot@odoo-community.org>, 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 <transbot@odoo-community.org>, 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"
+"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
+msgid "Journal"
+msgstr "Dnevnik"
+
+#. 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/models/__init__.py b/account_move_transactionid_import/models/__init__.py
new file mode 100644
index 00000000..431266db
--- /dev/null
+++ b/account_move_transactionid_import/models/__init__.py
@@ -0,0 +1,4 @@
+# © 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..919d2490
--- /dev/null
+++ b/account_move_transactionid_import/models/account_journal.py
@@ -0,0 +1,13 @@
+# © 2011-2019 Camptocamp SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html)
+from odoo import fields, models
+
+
+class AccountJournal(models.Model):
+    _inherit = "account.journal"
+
+    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
new file mode 100644
index 00000000..2ad3a3b5
--- /dev/null
+++ b/account_move_transactionid_import/models/account_move.py
@@ -0,0 +1,75 @@
+# © 2011-2019 Camptocamp SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html)
+from odoo import _, fields, models
+from odoo.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"
+
+    function_to_call = fields.Selection(
+        selection_add=[
+            ('get_from_transaction_id_and_so',
+             'Match Sales Order using transaction ID'),
+            ('get_from_transaction_id_and_invoice',
+             'Match Invoice using transaction ID')
+        ])
+
+    def get_from_transaction_id_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:
+            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):
+        """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
+            res['account_id'] = invoice.account_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..f8a86141
--- /dev/null
+++ b/account_move_transactionid_import/parser/__init__.py
@@ -0,0 +1,3 @@
+# © 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..e57b4366
--- /dev/null
+++ b/account_move_transactionid_import/parser/transactionid_file_parser.py
@@ -0,0 +1,70 @@
+# © 2011-2019 Camptocamp SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html)
+import datetime
+from odoo.tools import ustr
+from odoo.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_id': ustr,
+            'label': ustr,
+            'date': datetime.datetime,
+            'amount': float_or_zero,
+            'commission_amount': float_or_zero,
+        }
+        super().__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_id', '/'),
+        }
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 <joel.grandguillaume@camptocamp.com>
+* Matthieu Dietrich <matthieu.dietrich@camptocamp.com>
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/static/description/icon.png b/account_move_transactionid_import/static/description/icon.png
new file mode 100644
index 00000000..3a0328b5
Binary files /dev/null and b/account_move_transactionid_import/static/description/icon.png differ
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 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" />
+<title>Journal Entry transactionID import</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 7952 2016-07-26 18:15:59Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+
+See http://docutils.sf.net/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: grey; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="journal-entry-transactionid-import">
+<h1 class="title">Journal Entry transactionID import</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/account-reconcile/tree/12.0/account_move_transactionid_import"><img alt="OCA/account-reconcile" src="https://img.shields.io/badge/github-OCA%2Faccount--reconcile-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/account-reconcile-12-0/account-reconcile-12-0-account_move_transactionid_import"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/98/12.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
+<p>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.</p>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#bug-tracker" id="id1">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="id2">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="id3">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="id4">Contributors</a></li>
+<li><a class="reference internal" href="#maintainers" id="id5">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#id1">Bug Tracker</a></h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/account-reconcile/issues">GitHub Issues</a>.
+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
+<a class="reference external" href="https://github.com/OCA/account-reconcile/issues/new?body=module:%20account_move_transactionid_import%0Aversion:%2012.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<p>Do not contact contributors directly about support or help with technical issues.</p>
+</div>
+<div class="section" id="credits">
+<h1><a class="toc-backref" href="#id2">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#id3">Authors</a></h2>
+<ul class="simple">
+<li>Camptocamp</li>
+</ul>
+</div>
+<div class="section" id="contributors">
+<h2><a class="toc-backref" href="#id4">Contributors</a></h2>
+<ul class="simple">
+<li>Joël Grand-Guillaume &lt;<a class="reference external" href="mailto:joel.grandguillaume&#64;camptocamp.com">joel.grandguillaume&#64;camptocamp.com</a>&gt;</li>
+<li>Matthieu Dietrich &lt;<a class="reference external" href="mailto:matthieu.dietrich&#64;camptocamp.com">matthieu.dietrich&#64;camptocamp.com</a>&gt;</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#id5">Maintainers</a></h2>
+<p>This module is maintained by the OCA.</p>
+<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
+<p>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.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/account-reconcile/tree/12.0/account_move_transactionid_import">OCA/account-reconcile</a> project on GitHub.</p>
+<p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
+</div>
+</div>
+</div>
+</body>
+</html>
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)
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,
+)