From f436a651cf62c0194f062620317d5accda0edfa9 Mon Sep 17 00:00:00 2001
From: Alexis de Lattre <alexis.delattre@akretion.com>
Date: Mon, 4 Jan 2016 10:09:19 +0100
Subject: [PATCH] Minor changes

---
 base_fix_display_address/__init__.py    | 22 +---------------------
 base_fix_display_address/__openerp__.py |  1 -
 base_fix_display_address/partner.py     |  8 ++++----
 stock_usability/stock_view.xml          |  8 --------
 4 files changed, 5 insertions(+), 34 deletions(-)

diff --git a/base_fix_display_address/__init__.py b/base_fix_display_address/__init__.py
index 5cd3b43..61cf8b2 100644
--- a/base_fix_display_address/__init__.py
+++ b/base_fix_display_address/__init__.py
@@ -1,23 +1,3 @@
-# -*- 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/>.
-#
-##############################################################################
+# -*- coding: utf-8 -*-
 
 from . import partner
diff --git a/base_fix_display_address/__openerp__.py b/base_fix_display_address/__openerp__.py
index a7eb0c5..b8f37cb 100644
--- a/base_fix_display_address/__openerp__.py
+++ b/base_fix_display_address/__openerp__.py
@@ -40,5 +40,4 @@ Please contact Alexis de Lattre from Akretion <alexis.delattre@akretion.com> for
     'depends': ['base'],
     'data': [],
     'installable': True,
-    'active': False,
 }
diff --git a/base_fix_display_address/partner.py b/base_fix_display_address/partner.py
index 0a13522..b200748 100644
--- a/base_fix_display_address/partner.py
+++ b/base_fix_display_address/partner.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
 ##############################################################################
 #
 #    Base Fix Display Address module for OpenERP
@@ -20,16 +20,16 @@
 #
 ##############################################################################
 
-from openerp.osv import orm
+from openerp import models
 
 
-class res_partner(orm.Model):
+class ResPartner(models.Model):
     _inherit = 'res.partner'
 
     def _display_address(
             self, cr, uid, address, without_company=False, context=None):
         '''Remove empty lines'''
-        res = super(res_partner, self)._display_address(
+        res = super(ResPartner, self)._display_address(
             cr, uid, address, without_company=without_company, context=context)
         while "\n\n" in res:
             res = res.replace('\n\n', '\n')
diff --git a/stock_usability/stock_view.xml b/stock_usability/stock_view.xml
index 9b91030..d45c8f3 100644
--- a/stock_usability/stock_view.xml
+++ b/stock_usability/stock_view.xml
@@ -242,14 +242,6 @@ in the quantities for his reception -->
     <field name="model">stock.move</field>
     <field name="inherit_id" ref="stock.view_move_tree_receipt_picking"/>
     <field name="arch" type="xml">
-        <field name="partner_id" position="attributes">
-            <attribute name="string">Destination Address</attribute>
-            <!-- The partner_id field on stock.move has a label "Destination Address"
-            but a stupid guy has put a string="Supplier" on the tree view
-            And, as this field is very often empty, the users think there is a bug
-            because the supplier is not set ! -->
-date_expected
-        </field>
         <field name="date_expected" position="attributes">
             <attribute name="invisible">0</attribute>
         </field>