diff --git a/base_fix_display_address/__init__.py b/base_fix_display_address/__init__.py
new file mode 100644
index 0000000..5cd3b43
--- /dev/null
+++ b/base_fix_display_address/__init__.py
@@ -0,0 +1,23 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    Base Fix Display Address module for OpenERP
+#    Copyright (C) 2014 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/>.
+#
+##############################################################################
+
+from . import partner
diff --git a/base_fix_display_address/__openerp__.py b/base_fix_display_address/__openerp__.py
new file mode 100644
index 0000000..a7eb0c5
--- /dev/null
+++ b/base_fix_display_address/__openerp__.py
@@ -0,0 +1,44 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    Base Fix Display Address module for OpenERP
+#    Copyright (C) 2014 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': 'Base Fix Display Address',
+    'version': '0.1',
+    'category': 'Hidden',
+    'license': 'AGPL-3',
+    'summary': "Avoid the empty line in address when street2 is not set",
+    'description': """
+Base Fix Display Address
+========================
+
+This module fixes the "empty line in address when street2 is not set" issue when using the method display_address in reports.
+
+Please contact Alexis de Lattre from Akretion <alexis.delattre@akretion.com> for any help or question about this module.
+    """,
+    'author': 'Akretion',
+    'website': 'http://www.akretion.com',
+    'depends': ['base'],
+    'data': [],
+    'installable': True,
+    'active': False,
+}
diff --git a/base_fix_display_address/partner.py b/base_fix_display_address/partner.py
new file mode 100644
index 0000000..205eaa4
--- /dev/null
+++ b/base_fix_display_address/partner.py
@@ -0,0 +1,36 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    Base Fix Display Address module for OpenERP
+#    Copyright (C) 2014 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/>.
+#
+##############################################################################
+
+from openerp.osv import orm
+
+
+class res_partner(orm.Model):
+    _inherit = 'res.partner'
+
+    def _display_address(
+            self, cr, uid, address, without_company=False, context=None):
+        '''Remove empty street2 line'''
+        res = super(res_partner, self)._display_address(
+            cr, uid, address, without_company=without_company, context=context)
+        if res and "\n\n" in res:
+            res = res.replace('\n\n', '\n')
+        return res