diff --git a/sale.py b/sale.py
index 6f6f4b5..f792a00 100644
--- a/sale.py
+++ b/sale.py
@@ -97,24 +97,20 @@ class SaleLine(metaclass=PoolMeta):
     unit_digits = fields.Function(fields.Integer('Unit Digits'),
         'on_change_with_unit_digits')
 
-    
-    @fields.depends('sale','_parent_sale.shipment_address')
-    def default_address_equipment(self, name=None):
-        #raise UserError(str((self.sale)))
-        self.address_equipment = self.sale.shipment_address.id
-        return self.address_equipment
-    
+     
     def on_change_with_unit_digits(self, name=None):
         if self.unit:
             return self.unit.digits
         return 2
 
-    @fields.depends('equipment', methods=['on_change_product'])
+    @fields.depends('equipment', 'sale', '_parent_sale.shipment_address', methods=['on_change_product'])
     def on_change_equipment(self):
         if self.equipment:
             self.product = self.equipment.product.id
+            self.address_equipment = self.sale.shipment_address.id
             self.on_change_product()        
         else:
+            self.address_equipment = None
             self.product = None
             self.unit= None
             self.quantity = None