diff --git a/account_invoice_groupby_commercial_partner/__init__.py b/account_invoice_groupby_commercial_partner/__init__.py
new file mode 100644
index 0000000..dae354a
--- /dev/null
+++ b/account_invoice_groupby_commercial_partner/__init__.py
@@ -0,0 +1 @@
+# -*- encoding: utf-8 -*-
diff --git a/account_invoice_groupby_commercial_partner/__openerp__.py b/account_invoice_groupby_commercial_partner/__openerp__.py
new file mode 100644
index 0000000..4df417f
--- /dev/null
+++ b/account_invoice_groupby_commercial_partner/__openerp__.py
@@ -0,0 +1,43 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    Account Invoice Groupby Commercial Partner module for Odoo
+#    Copyright (C) 2015 Akretion (http://www.akretion.com)
+#    @author Alexis de Lattre <alexis.delattre@akretion.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+
+{
+    'name': 'Account Invoice Groupby Commercial Partner',
+    'version': '0.1',
+    'category': 'Accounting & Finance',
+    'license': 'AGPL-3',
+    'summary': 'Group by commercial partner instead of partner in invoices',
+    'description': """
+Account Invoice Group-by Commercial Partner
+===========================================
+
+By default Odoo v8 makes a groupby on partner_id on invoice ; this module changes this to groupby commercial_partner_id.
+
+This module has been written by Alexis de Lattre from Akretion <alexis.delattre@akretion.com>.
+    """,
+    'author': 'Akretion',
+    'website': 'http://www.akretion.com',
+    'depends': ['account'],
+    'data': ['account_invoice_view.xml'],
+    'installable': True,
+}
diff --git a/account_invoice_groupby_commercial_partner/account_invoice_view.xml b/account_invoice_groupby_commercial_partner/account_invoice_view.xml
new file mode 100644
index 0000000..0a6f998
--- /dev/null
+++ b/account_invoice_groupby_commercial_partner/account_invoice_view.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+   Copyright (C) 2015 Akretion (http://www.akretion.com/)
+   @author: Alexis de Lattre <alexis.delattre@akretion.com>
+   The licence is in the file __openerp__.py
+-->
+
+<openerp>
+<data>
+
+<record id="view_account_invoice_filter" model="ir.ui.view">
+    <field name="name">account.invoice.groupby.commercial.partner</field>
+    <field name="model">account.invoice</field>
+    <field name="inherit_id" ref="account.view_account_invoice_filter"/>
+    <field name="arch" type="xml">
+        <filter name="group_by_partner_id" position="attributes">
+            <attribute name="context">{'group_by':'commercial_partner_id'}</attribute>
+        </filter>
+    </field>
+</record>
+
+</data>
+</openerp>