merging from the trunk

bzr revid: mga@tinyerp.com-20081215084651-ids1c726kg0l03fs

addons/membership/membership.py

@@ -437,7 +437,7 @@ class Partner(osv.osv):
 #       'membership_state': fields.function(_membership_state, method=True, string='Current membership state',
 #           type='selection', selection=STATE, fnct_search=_membership_state_search),
         'membership_state': fields.function(_membership_state, method=True, string='Current membership state',
-            type='selection',selection=STATE,store={'account.invoice':(_membership_state_search_inv,['state'])}),
+            type='selection',selection=STATE,store={'account.invoice':(_membership_state_search_inv,['state'], 10)}),
 #       'associate_member': fields.many2one('res.partner', 'Associate member'),
         'free_member': fields.boolean('Free member'),
         'membership_start': fields.function(_membership_start, method=True,

addons/mrp_operations/mrp_operations.py

@@ -294,7 +294,7 @@ class mrp_operations_operation(osv.osv):
         'code_id':fields.many2one('mrp_operations.operation.code','Code',required=True),
         'date_start': fields.datetime('Start Date'),
         'date_finished': fields.datetime('End Date'),
-        'order_date': fields.function(_get_order_date,method=True,string='Order Date',type='date',store={'mrp.production':(_order_date_search_production,['date_planned'])}),
+        'order_date': fields.function(_get_order_date,method=True,string='Order Date',type='date',store={'mrp.production':(_order_date_search_production,['date_planned'], 10)}),
         }
     _defaults={
               'date_start': lambda *a:DateTime.now().strftime('%Y-%m-%d %H:%M:%S')