diff --git a/packing.py b/packing.py
index 033e095f72..aeccbcefd1 100644
--- a/packing.py
+++ b/packing.py
@@ -467,10 +467,6 @@ class PackingOut(OSV):
             states={
                 'readonly': "state != 'draft'",
             }, domain=[('type', '=', 'warehouse')])
-    customer_location = fields.Many2One('stock.location', "Customer Location",
-            required=True, states={
-                'readonly': "state != 'draft'",
-            }, domain="[('type', '=', 'customer')]")
     outgoing_moves = fields.Function('get_outgoing_moves', type='one2many',
             relation='stock.move', string='Outgoing Moves',
             fnct_inv='set_outgoing_moves',
@@ -517,16 +513,12 @@ class PackingOut(OSV):
 
     def on_change_customer(self, cursor, user, ids, values, context=None):
         if not values.get('customer'):
-            return {'delivery_address': False,
-                    'customer_location': False}
+            return {'delivery_address': False}
         party_obj = self.pool.get("party.party")
         address_id = party_obj.address_get(cursor, user, values['customer'],
                 type='delivery', context=context)
-        party = party_obj.browse(cursor, user, values['customer'], context=context)
         return {
-                'delivery_address': address_id,
-                'customer_location': party.customer_location.id,
-            }
+                'delivery_address': address_id}
 
     def get_outgoing_moves(self, cursor, user, ids, name, arg, context=None):
         res = {}
diff --git a/packing.xml b/packing.xml
index 5de912e25c..e7df60b894 100644
--- a/packing.xml
+++ b/packing.xml
@@ -303,14 +303,12 @@ this repository contains the full copyright notices and license terms. -->
                         <field name="customer"/>
                         <label name="delivery_address"/>
                         <field name="delivery_address"/>
-                        <label name="warehouse"/>
-                        <field name="warehouse"/>
-                        <label name="customer_location"/>
-                        <field name="customer_location"/>
                         <label name="planned_date"/>
                         <field name="planned_date"/>
                         <label name="effective_date"/>
                         <field name="effective_date"/>
+                        <label name="warehouse"/>
+                        <field name="warehouse"/>
                         <notebook colspan="4">
                             <page string="Inventory Moves" id="inventory_moves">
                                 <field name="inventory_moves" colspan="4"/>