From 14dbf4d28e0fc0676a3d79f165dc18f80b736ade Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Thu, 3 Feb 2011 19:34:03 +0530 Subject: [PATCH 1/6] [IMP] stock: Add context and chech for Read method22 bzr revid: aag@tinyerp.co.in-20110203140403-bmtd0opgmq3iyq0n --- addons/stock/wizard/stock_invoice_onshipping.py | 2 +- addons/stock/wizard/stock_location_product.py | 2 +- addons/stock/wizard/stock_return_picking.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/stock/wizard/stock_invoice_onshipping.py b/addons/stock/wizard/stock_invoice_onshipping.py index c7eab1eef4d..b58fec91930 100644 --- a/addons/stock/wizard/stock_invoice_onshipping.py +++ b/addons/stock/wizard/stock_invoice_onshipping.py @@ -115,7 +115,7 @@ class stock_invoice_onshipping(osv.osv_memory): if context is None: context = {} picking_pool = self.pool.get('stock.picking') - onshipdata_obj = self.read(cr, uid, ids, ['journal_id', 'group', 'invoice_date']) + onshipdata_obj = self.read(cr, uid, ids, ['journal_id', 'group', 'invoice_date'], context=context) if context.get('new_picking', False): onshipdata_obj['id'] = onshipdata_obj.new_picking onshipdata_obj[ids] = onshipdata_obj.new_picking diff --git a/addons/stock/wizard/stock_location_product.py b/addons/stock/wizard/stock_location_product.py index 5ac4aa0f944..ba1f74ee0a1 100644 --- a/addons/stock/wizard/stock_location_product.py +++ b/addons/stock/wizard/stock_location_product.py @@ -39,7 +39,7 @@ class stock_location_product(osv.osv_memory): @return: Invoice type """ mod_obj = self.pool.get('ir.model.data') - for location_obj in self.read(cr, uid, ids, ['from_date', 'to_date']): + for location_obj in self.read(cr, uid, ids, ['from_date', 'to_date'], context=context): return { 'name': False, 'view_type': 'form', diff --git a/addons/stock/wizard/stock_return_picking.py b/addons/stock/wizard/stock_return_picking.py index 2dd9063fe7e..34d912ce786 100644 --- a/addons/stock/wizard/stock_return_picking.py +++ b/addons/stock/wizard/stock_return_picking.py @@ -151,7 +151,7 @@ class stock_return_picking(osv.osv_memory): wf_service = netsvc.LocalService("workflow") 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) new_picking = None date_cur = time.strftime('%Y-%m-%d %H:%M:%S') From 6af654f7bf5ebb32788f8ec583d358b74a77bcd5 Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Fri, 4 Feb 2011 13:13:05 +0530 Subject: [PATCH 2/6] [IMP] survey: Add context and chech for Read method is working bzr revid: aag@tinyerp.co.in-20110204074305-tscrng9ju5sha0zv --- addons/survey/wizard/survey_browse_answer.py | 3 ++- addons/survey/wizard/survey_print.py | 4 ++-- addons/survey/wizard/survey_print_answer.py | 2 +- addons/survey/wizard/survey_print_statistics.py | 2 +- addons/survey/wizard/survey_selection.py | 4 ++-- addons/survey/wizard/survey_send_invitation.py | 2 +- 6 files changed, 9 insertions(+), 8 deletions(-) diff --git a/addons/survey/wizard/survey_browse_answer.py b/addons/survey/wizard/survey_browse_answer.py index 52664eb48cc..7b73c180cac 100644 --- a/addons/survey/wizard/survey_browse_answer.py +++ b/addons/survey/wizard/survey_browse_answer.py @@ -61,9 +61,10 @@ class survey_browse_answer(osv.osv_memory): @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']: + record['response_id'] = record['response_id'][0] res_id = [(record['response_id'])] else: sur_response_obj = self.pool.get('survey.response') diff --git a/addons/survey/wizard/survey_print.py b/addons/survey/wizard/survey_print.py index ed6479885dc..ddaec0a4600 100644 --- a/addons/survey/wizard/survey_print.py +++ b/addons/survey/wizard/survey_print.py @@ -56,9 +56,9 @@ class survey_print(osv.osv_memory): @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' diff --git a/addons/survey/wizard/survey_print_answer.py b/addons/survey/wizard/survey_print_answer.py index 8375868e9db..02db236d233 100644 --- a/addons/survey/wizard/survey_print_answer.py +++ b/addons/survey/wizard/survey_print_answer.py @@ -59,7 +59,7 @@ class survey_print_answer(osv.osv_memory): 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' diff --git a/addons/survey/wizard/survey_print_statistics.py b/addons/survey/wizard/survey_print_statistics.py index 9c10d138e0e..10b321fcf45 100644 --- a/addons/survey/wizard/survey_print_statistics.py +++ b/addons/survey/wizard/survey_print_statistics.py @@ -44,7 +44,7 @@ class survey_print_statistics(osv.osv_memory): 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' diff --git a/addons/survey/wizard/survey_selection.py b/addons/survey/wizard/survey_selection.py index 04b829077f3..4d246c2b0c3 100644 --- a/addons/survey/wizard/survey_selection.py +++ b/addons/survey/wizard/survey_selection.py @@ -122,7 +122,7 @@ class survey_name_wiz(osv.osv_memory): 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 @@ class survey_name_wiz(osv.osv_memory): 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.")) diff --git a/addons/survey/wizard/survey_send_invitation.py b/addons/survey/wizard/survey_send_invitation.py index 361f7388f6f..f091653c499 100644 --- a/addons/survey/wizard/survey_send_invitation.py +++ b/addons/survey/wizard/survey_send_invitation.py @@ -97,7 +97,7 @@ class survey_send_invitation(osv.osv_memory): 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') From d94b60c23fe8d1954ccfbd7d809262abad529c9e Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Fri, 4 Feb 2011 15:59:10 +0530 Subject: [PATCH 3/6] [IMP] Board: Add context and chech for Read method is working bzr revid: aag@tinyerp.co.in-20110204102910-y70hzv9cwweecknp --- addons/board/wizard/board_menu_create.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/board/wizard/board_menu_create.py b/addons/board/wizard/board_menu_create.py index 10d4d80a7f3..61f6a8f5ee4 100644 --- a/addons/board/wizard/board_menu_create.py +++ b/addons/board/wizard/board_menu_create.py @@ -70,7 +70,8 @@ class board_menu_create(osv.osv_memory): }) 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): + 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'), From e1f5c71713b8bc6e708ee396b427a654855d4c59 Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Mon, 7 Feb 2011 15:22:40 +0530 Subject: [PATCH 4/6] [IMP] stock: Add context and check for osv memory wiz for Read method bzr revid: aag@tinyerp.co.in-20110207095240-i04x6f4cvbjzeqmy --- addons/stock/wizard/stock_move.py | 2 +- addons/stock/wizard/stock_split_move.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/stock/wizard/stock_move.py b/addons/stock/wizard/stock_move.py index 8cfdc648349..a6afe93a1e3 100644 --- a/addons/stock/wizard/stock_move.py +++ b/addons/stock/wizard/stock_move.py @@ -43,7 +43,7 @@ class stock_move_track(osv.osv_memory): @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'} diff --git a/addons/stock/wizard/stock_split_move.py b/addons/stock/wizard/stock_split_move.py index aa7e4c17e15..ce02a212179 100644 --- a/addons/stock/wizard/stock_split_move.py +++ b/addons/stock/wizard/stock_split_move.py @@ -107,7 +107,7 @@ class stock_split_move_line(osv.osv_memory): 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: From a37471db1571f6d0f57ff4b08993774a59f35fb2 Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Tue, 8 Feb 2011 12:24:26 +0530 Subject: [PATCH 5/6] [IMP] Survey,Board: use isinstance in osv wiz bzr revid: aag@tinyerp.co.in-20110208065426-75gwcq141k2ds9qk --- addons/board/wizard/board_menu_create.py | 3 ++- addons/survey/wizard/survey_browse_answer.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/addons/board/wizard/board_menu_create.py b/addons/board/wizard/board_menu_create.py index 61f6a8f5ee4..73a8337bdb7 100644 --- a/addons/board/wizard/board_menu_create.py +++ b/addons/board/wizard/board_menu_create.py @@ -71,7 +71,8 @@ class board_menu_create(osv.osv_memory): obj_menu = self.pool.get('ir.ui.menu') #start Loop for data in self.read(cr, uid, ids, context=context): - data['menu_parent_id'] = data['menu_parent_id'][0] + 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'), diff --git a/addons/survey/wizard/survey_browse_answer.py b/addons/survey/wizard/survey_browse_answer.py index 7b73c180cac..13ff39cc6be 100644 --- a/addons/survey/wizard/survey_browse_answer.py +++ b/addons/survey/wizard/survey_browse_answer.py @@ -64,7 +64,8 @@ class survey_browse_answer(osv.osv_memory): record = self.read(cr, uid, ids, [],context=context) record = record and record[0] or {} if record['response_id']: - record['response_id'] = record['response_id'][0] + 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') From 013cf332f33087694ca5be984daff3cb974c6386 Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Tue, 8 Feb 2011 16:34:12 +0530 Subject: [PATCH 6/6] [FIX] Product:Now context is transmitted in price_get function call lp bug: https://launchpad.net/bugs/709275 fixed bzr revid: aag@tinyerp.co.in-20110208110412-02ypx3gk0i1o2uxx --- addons/product/pricelist.py | 6 +++--- addons/product/product.py | 4 ++-- addons/product/report/pricelist.py | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py index cf4d129b666..72525e4c583 100644 --- a/addons/product/pricelist.py +++ b/addons/product/pricelist.py @@ -262,7 +262,7 @@ class product_pricelist(osv.osv): price = currency_obj.compute(cr, uid, price_type.currency_id.id, res['currency_id'], product_obj.price_get(cr, uid, [product_id], - price_type.field)[product_id], round=False, context=context) + price_type.field, context=context)[product_id], round=False, context=context) if price >= 0.0: price_limit = price @@ -385,7 +385,7 @@ class product_pricelist(osv.osv): else: price_tmp = self.price_get(cr, uid, [res['base_pricelist_id']], prod_id, - qty)[res['base_pricelist_id']] + qty, context=context)[res['base_pricelist_id']] ptype_src = self.browse(cr, uid, res['base_pricelist_id']).currency_id.id price = currency_obj.compute(cr, uid, ptype_src, @@ -413,7 +413,7 @@ class product_pricelist(osv.osv): price = currency_obj.compute(cr, uid, price_type.currency_id.id, res['currency_id'], product_obj.price_get(cr, uid, [prod_id], - price_type.field)[prod_id], round=False, context=context) + price_type.field, context=context)[prod_id], round=False, context=context) if price: price_limit = price diff --git a/addons/product/product.py b/addons/product/product.py index 801e647e3f2..bbf3ea1b646 100644 --- a/addons/product/product.py +++ b/addons/product/product.py @@ -766,12 +766,12 @@ class product_supplierinfo(osv.osv): currency_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.currency_id.id for supplier in partner_pool.browse(cr, uid, supplier_ids, context=context): # Compute price from standard price of product - price = product_pool.price_get(cr, uid, [product_id], 'standard_price')[product_id] + price = product_pool.price_get(cr, uid, [product_id], 'standard_price', context=context)[product_id] # Compute price from Purchase pricelist of supplier pricelist_id = supplier.property_product_pricelist_purchase.id if pricelist_id: - price = pricelist_pool.price_get(cr, uid, [pricelist_id], product_id, product_qty).setdefault(pricelist_id, 0) + price = pricelist_pool.price_get(cr, uid, [pricelist_id], product_id, product_qty, context=context).setdefault(pricelist_id, 0) price = currency_pool.compute(cr, uid, pricelist_pool.browse(cr, uid, pricelist_id).currency_id.id, currency_id, price) # Compute price from supplier pricelist which are in Supplier Information diff --git a/addons/product/report/pricelist.py b/addons/product/report/pricelist.py index 068aed7df1c..a6360c8ef19 100644 --- a/addons/product/report/pricelist.py +++ b/addons/product/report/pricelist.py @@ -90,7 +90,7 @@ class report_custom(report_rml): pro.append('' % (x['name'])) temp = [] for q in qty: - price_dict = pool.get('product.pricelist').price_get(cr, uid, [price_list_id], x['id'], q) + price_dict = pool.get('product.pricelist').price_get(cr, uid, [price_list_id], x['id'], q, context=context) if price_dict[price_list_id]: price = price_dict[price_list_id] else: