diff --git a/stock_picking_invoice_link_usability/__init__.py b/stock_picking_invoice_link_usability/__init__.py
new file mode 100644
index 0000000..633f866
--- /dev/null
+++ b/stock_picking_invoice_link_usability/__init__.py
@@ -0,0 +1,2 @@
+# -*- coding: utf-8 -*-
+
diff --git a/stock_picking_invoice_link_usability/__openerp__.py b/stock_picking_invoice_link_usability/__openerp__.py
new file mode 100644
index 0000000..c092993
--- /dev/null
+++ b/stock_picking_invoice_link_usability/__openerp__.py
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+# Copyright (C) 2018 Akretion (http://www.akretion.com)
+# @author Alexis de Lattre <alexis.delattre@akretion.com>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+{
+    'name': 'Stock Picking Invoice Link Usability',
+    'version': '8.0.1.0.0',
+    'category': 'Inventory, Logistic, Storage',
+    'license': 'AGPL-3',
+    'summary': 'Small view improvements on stock_picking_invoice_link_usability',
+    'description': """
+Stock Picking Invoice Link Usability
+====================================
+
+I proposed some view modifications for the OCA module stock_picking_invoice_link_usabilityin this PR https://github.com/OCA/stock-logistics-workflow/pull/303  but it was refused, so I decided to develop this additional usability module.
+
+This module has been written by Alexis de Lattre from Akretion <alexis.delattre@akretion.com>.
+    """,
+    'author': 'Akretion',
+    'website': 'http://www.akretion.com',
+    'depends': ['stock_picking_invoice_link', 'stock_usability'],
+    'data': [
+        'stock_view.xml',
+        ],
+    'installable': True,
+}
diff --git a/stock_picking_invoice_link_usability/stock_view.xml b/stock_picking_invoice_link_usability/stock_view.xml
new file mode 100644
index 0000000..132e2bf
--- /dev/null
+++ b/stock_picking_invoice_link_usability/stock_view.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+
+<!-- stock.picking -->
+<record id="view_picking_form" model="ir.ui.view">
+    <field name="model">stock.picking</field>
+    <field name="inherit_id" ref="stock_picking_invoice_link.view_picking_form"/>
+    <field name="arch" type="xml">
+        <field name="invoice_ids" position="replace"/>
+        <notebook position="inside">
+            <page string="Invoices" name="invoice"
+                  groups="account.group_account_invoice"
+                   attrs="{'invisible': [('invoice_state', '!=', 'invoiced')]}">
+                <field name="invoice_ids"/>
+            </page>
+        </notebook>
+    </field>
+</record>
+
+<!-- stock.move -->
+<record id="view_move_form" model="ir.ui.view">
+    <field name="model">stock.move</field>
+    <field name="inherit_id" ref="stock_picking_invoice_link.view_move_form"/>
+    <field name="arch" type="xml">
+        <field name="invoice_line_ids" position="replace"/>
+    </field>
+</record>
+
+<record id="view_move_form_usability" model="ir.ui.view">
+    <field name="model">stock.move</field>
+    <field name="inherit_id" ref="stock_usability.view_move_form"/>
+    <field name="arch" type="xml">
+        <notebook position="inside">
+            <page name="invoice_lines" string="Invoice Lines" groups="account.group_account_invoice">
+                <field name="invoice_line_ids"/>
+            </page>
+        </notebook>
+    </field>
+</record>
+
+<record id="view_move_picking_form" model="ir.ui.view">
+    <field name="model">stock.move</field>
+    <field name="inherit_id" ref="stock_picking_invoice_link.view_move_picking_form"/>
+    <field name="arch" type="xml">
+        <field name="invoice_line_ids" position="replace"/>
+    </field>
+</record>
+
+<record id="view_move_picking_form_usability" model="ir.ui.view">
+    <field name="model">stock.move</field>
+    <field name="inherit_id" ref="stock_usability.view_move_picking_form"/>
+    <field name="arch" type="xml">
+        <notebook position="inside">
+            <page name="invoice_lines" string="Invoice Lines" groups="account.group_account_invoice">
+                <field name="invoice_line_ids"/>
+            </page>
+        </notebook>
+    </field>
+</record>
+
+
+</data>
+</openerp>