Merge lp:~openerp-commiter/openobject-addons/trunk-addons-aag into lp:~openerp/openobject-addons/trunk-fix-osvmem-read

[Atik Agewan(OpenERP)]

Improvement in Read method in Osv memory wizard

[Rucha (Open ERP) (rpa-openerp)]

review: Needs Fixing

[Atik Agewan(OpenERP) (aag-openerp)]

improvement in use isinstance in osv wiz

review: Needs Resubmitting

=== modified file 'board/wizard/board_menu_create.py'
--- board/wizard/board_menu_create.py	2011-01-14 00:11:01 +0000
+++ board/wizard/board_menu_create.py	2011-02-08 06:58:13 +0000
@@ -70,7 +70,9 @@
                 })
         obj_menu = self.pool.get('ir.ui.menu')
         #start Loop
-        for data in self.read(cr, uid, ids):
+        for data in self.read(cr, uid, ids, context=context):
+            if isinstance(data['menu_parent_id'], tuple):
+                data['menu_parent_id'] = data['menu_parent_id'][0]
             obj_menu.create(cr, uid, {
                 'name': data.get('menu_name'),
                 'parent_id': data.get('menu_parent_id'),

=== modified file 'stock/wizard/stock_move.py'
--- stock/wizard/stock_move.py	2011-02-01 21:08:39 +0000
+++ stock/wizard/stock_move.py	2011-02-08 06:58:13 +0000
@@ -43,7 +43,7 @@
         @param context: A standard dictionary
         @return:
         """
-        datas = self.read(cr, uid, ids)[0]
+        datas = self.read(cr, uid, ids, context=context)[0]
         move_obj = self.pool.get('stock.move')
         move_obj._track_lines(cr, uid, context['active_id'], datas, context=context)
         return {'type': 'ir.actions.act_window_close'}

=== modified file 'stock/wizard/stock_split_move.py'
--- stock/wizard/stock_split_move.py	2011-01-14 00:11:01 +0000
+++ stock/wizard/stock_split_move.py	2011-02-08 06:58:13 +0000
@@ -107,7 +107,7 @@
         record_id = context and context.get('active_id', False) or False
         pick_obj = self.pool.get('stock.picking')
         pick = pick_obj.browse(cr, uid, record_id, context=context)
-        data = self.read(cr, uid, ids[0])
+        data = self.read(cr, uid, ids[0], context=context)
         for move in pick.move_lines:
             quantity = data['move%s' % move.id]
             if 0 < quantity < move.product_qty:

=== modified file 'survey/wizard/survey_browse_answer.py'
--- survey/wizard/survey_browse_answer.py	2011-01-14 00:11:01 +0000
+++ survey/wizard/survey_browse_answer.py	2011-02-08 06:58:13 +0000
@@ -61,9 +61,11 @@
         @return : Dictionary value for Open the browse answer wizard.
         """
         if context is None: context = {}
-        record = self.read(cr, uid, ids, [])
+        record = self.read(cr, uid, ids, [],context=context)
         record = record and record[0] or {} 
         if record['response_id']:
+            if isinstance(record['response_id'], tuple):
+                record['response_id'] = record['response_id'][0]
             res_id = [(record['response_id'])]
         else:
             sur_response_obj = self.pool.get('survey.response')

=== modified file 'survey/wizard/survey_print.py'
--- survey/wizard/survey_print.py	2011-01-14 00:11:01 +0000
+++ survey/wizard/survey_print.py	2011-02-08 06:58:13 +0000
@@ -56,9 +56,9 @@
         @return : Dictionary value for print survey form.
         """
 
-        datas = {'ids' : self.read(cr, uid, ids, [], context)[0]['survey_ids']}
+        datas = {'ids' : self.read(cr, uid, ids, [], context=context)[0]['survey_ids']}
         res = self.read(cr, uid, ids, ['survey_title', 'orientation', 'paper_size',\
-                             'page_number', 'without_pagebreak'], context)
+                             'page_number', 'without_pagebreak'], context=context)
         res = res and res[0] or {}
         datas['form'] = res
         datas['model'] = 'survey.print'

=== modified file 'survey/wizard/survey_print_answer.py'
--- survey/wizard/survey_print_answer.py	2011-01-14 00:11:01 +0000
+++ survey/wizard/survey_print_answer.py	2011-02-08 06:58:13 +0000
@@ -59,7 +59,7 @@
             context = {}
         datas = {'ids': context.get('active_ids', [])}
         res = self.read(cr, uid, ids, ['response_ids', 'orientation', 'paper_size',\
-                             'page_number', 'without_pagebreak'], context)
+                             'page_number', 'without_pagebreak'], context=context)
         res = res and res[0] or {}
         datas['form'] = res
         datas['model'] = 'survey.print.answer'

=== modified file 'survey/wizard/survey_print_statistics.py'
--- survey/wizard/survey_print_statistics.py	2011-01-14 00:11:01 +0000
+++ survey/wizard/survey_print_statistics.py	2011-02-08 06:58:13 +0000
@@ -44,7 +44,7 @@
         if context is None:
             context = {}
         datas = {'ids': context.get('active_ids', [])}
-        res = self.read(cr, uid, ids, ['survey_ids'], context)
+        res = self.read(cr, uid, ids, ['survey_ids'], context=context)
         res = res and res[0] or {}
         datas['form'] = res
         datas['model'] = 'survey.print.statistics'

=== modified file 'survey/wizard/survey_selection.py'
--- survey/wizard/survey_selection.py	2011-01-14 00:11:01 +0000
+++ survey/wizard/survey_selection.py	2011-02-08 06:58:13 +0000
@@ -122,7 +122,7 @@
         search_obj = self.pool.get('ir.ui.view')
         if context is None: context = {}
 
-        sur_id = self.read(cr, uid, ids, [])[0]
+        sur_id = self.read(cr, uid, ids, [], context=context)[0]
         survey_id = sur_id['survey_id']
         context.update({'survey_id': survey_id, 'sur_name_id': sur_id['id']})
         cr.execute('select count(id) from survey_history where user_id=%s\
@@ -133,7 +133,7 @@
         if user_limit and res >= user_limit:
             raise osv.except_osv(_('Warning !'),_("You can not give response for this survey more than %s times") % (user_limit))
 
-        sur_rec = survey_obj.read(cr,uid,self.read(cr,uid,ids)[0]['survey_id'])
+        sur_rec = survey_obj.read(cr,uid,self.read(cr,uid,ids, context=context)[0]['survey_id'])
         if sur_rec['max_response_limit'] and sur_rec['max_response_limit'] <= sur_rec['tot_start_survey']:
             raise osv.except_osv(_('Warning !'),_("You can not give more response. Please contact the author of this survey for further assistance."))
 

=== modified file 'survey/wizard/survey_send_invitation.py'
--- survey/wizard/survey_send_invitation.py	2011-01-14 00:11:01 +0000
+++ survey/wizard/survey_send_invitation.py	2011-02-08 06:58:13 +0000
@@ -97,7 +97,7 @@
         if context is None:
             context = {}
         record = self.read(cr, uid, ids, [])
-        survey_ids =  context.get('active_ids', [])
+        survey_ids =  context.get('active_ids', [], context=context)
         record = record and record[0]
         partner_ids = record['partner_ids']
         user_ref= self.pool.get('res.users')