diff --git a/account_move_line_tax_editable/README.rst b/account_move_line_tax_editable/README.rst
new file mode 100644
index 00000000..70a74b9e
--- /dev/null
+++ b/account_move_line_tax_editable/README.rst
@@ -0,0 +1,41 @@
+.. 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
+
+==============================
+Account Move Line Tax Editable
+==============================
+
+Allows to edit taxes on account move lines
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues
+<https://github.com/OCA/{project_repo}/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
+=======
+
+Contributors
+------------
+
+* Thomas Binsfeld <thomas.binsfeld@acsone.eu>
+* Benjamin Willig <benjamin.willig@acsone.eu>
+
+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_line_tax_editable/__init__.py b/account_move_line_tax_editable/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/account_move_line_tax_editable/__manifest__.py b/account_move_line_tax_editable/__manifest__.py
new file mode 100644
index 00000000..5b1603e7
--- /dev/null
+++ b/account_move_line_tax_editable/__manifest__.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+# Copyright 2017 ACSONE SA/NV
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+{
+    'name': 'Account Move Line Tax Editable',
+    'summary': """
+        Allows to edit taxes on account move lines""",
+    'version': '10.0.1.0.0',
+    'license': 'AGPL-3',
+    'author': 'ACSONE SA/NV,Odoo Community Association (OCA)',
+    'website': 'https://www.acsone.eu',
+    'depends': [
+        'account',
+    ],
+    'data': [
+        'views/account_move.xml',
+        'views/account_move_line.xml',
+    ],
+    'demo': [
+    ],
+}
diff --git a/account_move_line_tax_editable/static/description/icon.png b/account_move_line_tax_editable/static/description/icon.png
new file mode 100644
index 00000000..3a0328b5
Binary files /dev/null and b/account_move_line_tax_editable/static/description/icon.png differ
diff --git a/account_move_line_tax_editable/views/account_move.xml b/account_move_line_tax_editable/views/account_move.xml
new file mode 100644
index 00000000..104ab95e
--- /dev/null
+++ b/account_move_line_tax_editable/views/account_move.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2017 ACSONE SA/NV
+     License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
+
+<odoo>
+<data>
+
+    <record model="ir.ui.view" id="account_move_form_view">
+        <field name="name">account.move.form (in account_move_line_tax_editable)</field>
+        <field name="model">account.move</field>
+        <field name="inherit_id" ref="account.view_move_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='line_ids']/tree/field[@name='name']" position="after">
+                <field name="tax_line_id"/>
+                <field name="tax_ids" widget="many2many_tags"/>
+            </xpath>
+        </field>
+    </record>
+
+</data>
+</odoo>
diff --git a/account_move_line_tax_editable/views/account_move_line.xml b/account_move_line_tax_editable/views/account_move_line.xml
new file mode 100644
index 00000000..110de0f6
--- /dev/null
+++ b/account_move_line_tax_editable/views/account_move_line.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2017 ACSONE SA/NV
+     License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
+
+<odoo>
+<data>
+
+    <record model="ir.ui.view" id="account_move_line_form_view">
+        <field name="name">account.move.line.form (in account_move_line_tax_editable)</field>
+        <field name="model">account.move.line</field>
+        <field name="inherit_id" ref="account.view_move_line_form"/>
+        <field name="arch" type="xml">
+            <field name="tax_line_id" position="attributes">
+                <attribute name="readonly">0</attribute>
+            </field>
+            <field name="tax_ids" position="attributes">
+                <attribute name="readonly">0</attribute>
+            </field>
+        </field>
+    </record>
+
+</data>
+</odoo>