[MERGE] Fixes related to server removal of osv_memory

bzr revid: odo@openerp.com-20110927213803-rj2hujpigijhvvpl

diff --cc addons/stock/wizard/stock_move.py
index 1e3d26b,0859eda..1a65587
--- 1/addons/stock/wizard/stock_move.py
--- 2/addons/stock/wizard/stock_move.py
+++ b/addons/stock/wizard/stock_move.py
@@@ -182,17 -174,10 +174,10 @@@ class split_in_production_lot(osv.osv_m
       }
  
      def split_lot(self, cr, uid, ids, context=None):
-         """ To split a lot
-         @param self: The object pointer.
-         @param cr: A database cursor
-         @param uid: ID of the user currently logged in
-         @param ids: An ID or list of IDs if we want more than one
-         @param context: A standard dictionary
-         @return:
-         """
+         """ To split a lot"""
          if context is None:
              context = {}
 -        self.split(cr, uid, ids, context.get('active_ids'), context=context)
 +        res = self.split(cr, uid, ids, context.get('active_ids'), context=context)
          return {'type': 'ir.actions.act_window_close'}
  
      def split(self, cr, uid, ids, move_ids, context=None):