diff --git a/sale.py b/sale.py
index 7c712fb..c97fcf4 100644
--- a/sale.py
+++ b/sale.py
@@ -60,14 +60,14 @@ class Sale(metaclass=PoolMeta):
         super(Sale, cls).__setup__()
         cls.party.states['readonly'] = Bool(Eval('invoice_number'))
         cls.state_string = super(Sale, cls).state.translated('state')
-        # for fname in cls.self_pick_up.on_change:
-        #     if fname not in cls.shop.on_change:
-        #         cls.shop.on_change.add(fname)
-        #     if fname not in cls.party.on_change:
-        #         cls.party.on_change.add(fname)
-        # for fname in cls.party.on_change:
-        #     if fname not in cls.self_pick_up.on_change:
-        #         cls.self_pick_up.on_change.add(fname)
+        for fname in cls.self_pick_up.on_change:
+            if fname not in cls.shop.on_change:
+                cls.shop.on_change.add(fname)
+            if fname not in cls.party.on_change:
+                cls.party.on_change.add(fname)
+        for fname in cls.party.on_change:
+            if fname not in cls.self_pick_up.on_change:
+                cls.self_pick_up.on_change.add(fname)
         # for fname in (
         #     'invoice_method', 'shipment_method'):
         #     fstates = getattr(cls, fname).states