diff --git a/base_transaction_id/__manifest__.py b/base_transaction_id/__manifest__.py
index e4a7fbe5..a6ae14ca 100644
--- a/base_transaction_id/__manifest__.py
+++ b/base_transaction_id/__manifest__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*
-# © 2012 Yannick Vaucher (Camptocamp)
+# © 2012 Yannick Vaucher, Camptocamp SA
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 {'name': 'Base transaction id for financial institutes',
  'version': '10.0.1.0.0',
@@ -18,4 +18,4 @@
  ],
  'installable': True,
  'license': 'AGPL-3',
-}
+ }
diff --git a/base_transaction_id/models/account_bank_statement_line.py b/base_transaction_id/models/account_bank_statement_line.py
index cade55e6..b2a4ff93 100644
--- a/base_transaction_id/models/account_bank_statement_line.py
+++ b/base_transaction_id/models/account_bank_statement_line.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# © 2016 Yannick Vaucher (Camptocamp)
+# © 2016 Yannick Vaucher (Camptocamp SA)
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 from odoo import api, models
 
diff --git a/base_transaction_id/views/base_transaction_id.xml b/base_transaction_id/views/base_transaction_id.xml
index a89ab0da..d3bbcaf8 100644
--- a/base_transaction_id/views/base_transaction_id.xml
+++ b/base_transaction_id/views/base_transaction_id.xml
@@ -6,4 +6,3 @@
     </xpath>
   </template>
 </odoo>
-
diff --git a/base_transaction_id/views/invoice.xml b/base_transaction_id/views/invoice.xml
index bb23acb6..ba27b5c5 100644
--- a/base_transaction_id/views/invoice.xml
+++ b/base_transaction_id/views/invoice.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-  <record model="ir.ui.view" id="invoice_form">
-    <field name="name">base_transaction_id.customer.invoice.form</field>
+  <record model="ir.ui.view" id="invoice_view_custom">
+    <field name="name">customer.invoice.transaction.inherit</field>
     <field name="model">account.invoice</field>
     <field name="inherit_id" ref="account.invoice_form"/>
     <field name="arch" type="xml">
-      <field name="origin" position="after">
+      <xpath expr="//page[@name='other_info']/group/group/field[@name='origin']" position="after">
           <field name="transaction_id"/>
-      </field>
+      </xpath>
     </field>
   </record>
 
-  <record model="ir.ui.view" id="invoice_tree">
-    <field name="name">base_transaction_id.customer.account.invoice.tree</field>
+  <record model="ir.ui.view" id="invoice_tree_custom">
+    <field name="name">account.invoice.tree_inherit</field>
     <field name="model">account.invoice</field>
     <field name="inherit_id" ref="account.invoice_tree"/>
     <field name="arch" type="xml">