From a313f724ba3843a512046768c7f69821cbda1464 Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Tue, 15 Feb 2011 14:50:57 +0530
Subject: [PATCH 01/10] [IMP]: Account: improvement in osv memory wizards

bzr revid: rha@tinyerp.com-20110215092057-lpki1kg79dnya96g
---
 .../wizard/account_automatic_reconcile.py     | 31 +++++++++----------
 .../wizard/account_fiscalyear_close.py        | 21 ++++++-------
 .../account/wizard/account_invoice_refund.py  | 22 ++++++-------
 addons/account/wizard/account_move_journal.py |  2 +-
 .../wizard/account_open_closed_fiscalyear.py  |  6 ++--
 .../account/wizard/account_report_common.py   |  2 +-
 .../wizard/account_validate_account_move.py   |  7 ++---
 addons/account/wizard/account_vat.py          |  2 +-
 .../wizard/account_followup_print.py          | 19 ++++++------
 .../wizard/account_payment_order.py           |  8 ++---
 10 files changed, 54 insertions(+), 66 deletions(-)

diff --git a/addons/account/wizard/account_automatic_reconcile.py b/addons/account/wizard/account_automatic_reconcile.py
index 13fef1fde0d..b9e5363e7d2 100644
--- a/addons/account/wizard/account_automatic_reconcile.py
+++ b/addons/account/wizard/account_automatic_reconcile.py
@@ -143,18 +143,15 @@ class account_automatic_reconcile(osv.osv_memory):
         obj_model = self.pool.get('ir.model.data')
         if context is None:
             context = {}
-        form = self.read(cr, uid, ids, [])[0]
-        for m2o_field in ['journal_id','period_id','writeoff_acc_id']:
-            if form[m2o_field] and isinstance(form[m2o_field], tuple):
-                form[m2o_field] = form[m2o_field][0]
-        max_amount = form.get('max_amount', False) and form.get('max_amount') or 0.0
-        power = form['power']
-        allow_write_off = form['allow_write_off']
+        form = self.browse(cr, uid, ids, context=context)[0]
+        max_amount = form.max_amount or 0.0
+        power = form.power
+        allow_write_off = form.allow_write_off
         reconciled = unreconciled = 0
-        if not form['account_ids']:
+        if not form.account_ids:
             raise osv.except_osv(_('UserError'), _('You must select accounts to reconcile'))
-        for account_id in form['account_ids']:
-            params = (account_id,)
+        for account_id in form.account_ids:
+            params = (account_id.id,)
             if not allow_write_off:
                 query = """SELECT partner_id FROM account_move_line WHERE account_id=%s AND reconcile_id IS NULL
                 AND state <> 'draft' GROUP BY partner_id
@@ -175,12 +172,12 @@ class account_automatic_reconcile(osv.osv_memory):
                     "AND partner_id=%s " \
                     "AND state <> 'draft' " \
                     "AND reconcile_id IS NULL",
-                    (account_id, partner_id))
+                    (account_id.id, partner_id))
                 line_ids = [id for (id,) in cr.fetchall()]
                 if line_ids:
                     reconciled += len(line_ids)
                     if allow_write_off:
-                        move_line_obj.reconcile(cr, uid, line_ids, 'auto', form['writeoff_acc_id'], form['period_id'], form['journal_id'], context)
+                        move_line_obj.reconcile(cr, uid, line_ids, 'auto', form.writeoff_acc_id.id, form.period_id.id, form.journal_id.id, context)
                     else:
                         move_line_obj.reconcile_partial(cr, uid, line_ids, 'manual', context=context)
 
@@ -194,7 +191,7 @@ class account_automatic_reconcile(osv.osv_memory):
                 "AND partner_id IS NOT NULL " \
                 "GROUP BY partner_id " \
                 "HAVING count(*)>1",
-                (account_id,))
+                (account_id.id,))
             partner_ids = [id for (id,) in cr.fetchall()]
             #filter?
             for partner_id in partner_ids:
@@ -208,7 +205,7 @@ class account_automatic_reconcile(osv.osv_memory):
                     "AND state <> 'draft' " \
                     "AND debit > 0 " \
                     "ORDER BY date_maturity",
-                    (account_id, partner_id))
+                    (account_id.id, partner_id))
                 debits = cr.fetchall()
 
                 # get the list of unreconciled 'credit transactions' for this partner
@@ -221,10 +218,10 @@ class account_automatic_reconcile(osv.osv_memory):
                     "AND state <> 'draft' " \
                     "AND credit > 0 " \
                     "ORDER BY date_maturity",
-                    (account_id, partner_id))
+                    (account_id.id, partner_id))
                 credits = cr.fetchall()
 
-                (rec, unrec) = self.do_reconcile(cr, uid, credits, debits, max_amount, power, form['writeoff_acc_id'], form['period_id'], form['journal_id'], context)
+                (rec, unrec) = self.do_reconcile(cr, uid, credits, debits, max_amount, power, form.writeoff_acc_id.id, form.period_id.id, form.journal_id.id, context)
                 reconciled += rec
                 unreconciled += unrec
 
@@ -237,7 +234,7 @@ class account_automatic_reconcile(osv.osv_memory):
                 "WHERE account_id=%s " \
                 "AND reconcile_id IS NULL " \
                 "AND state <> 'draft' " + partner_filter,
-                (account_id,))
+                (account_id.id,))
             additional_unrec = cr.fetchone()[0]
             unreconciled = unreconciled + additional_unrec
         context.update({'reconciled': reconciled, 'unreconciled': unreconciled})
diff --git a/addons/account/wizard/account_fiscalyear_close.py b/addons/account/wizard/account_fiscalyear_close.py
index bd635839afb..89e28950535 100644
--- a/addons/account/wizard/account_fiscalyear_close.py
+++ b/addons/account/wizard/account_fiscalyear_close.py
@@ -56,25 +56,22 @@ class account_fiscalyear_close(osv.osv_memory):
         obj_acc_account = self.pool.get('account.account')
         obj_acc_journal_period = self.pool.get('account.journal.period')
 
-        data = self.read(cr, uid, ids, context=context)
-        for m2o_field in ['fy_id','fy2_id','journal_id','period_id']:
-            if isinstance(data[0][m2o_field], tuple):
-                data[0][m2o_field] = data[0][m2o_field][0]
+        data = self.browse(cr, uid, ids, context=context)
 
         if context is None:
             context = {}
-        fy_id = data[0]['fy_id']
+        fy_id = data[0].fy_id.id
 
-        cr.execute("SELECT id FROM account_period WHERE date_stop < (SELECT date_start FROM account_fiscalyear WHERE id = %s)", (str(data[0]['fy2_id']),))
+        cr.execute("SELECT id FROM account_period WHERE date_stop < (SELECT date_start FROM account_fiscalyear WHERE id = %s)", (str(data[0].fy2_id.id),))
         fy_period_set = ','.join(map(lambda id: str(id[0]), cr.fetchall()))
         cr.execute("SELECT id FROM account_period WHERE date_start > (SELECT date_stop FROM account_fiscalyear WHERE id = %s)", (str(fy_id),))
         fy2_period_set = ','.join(map(lambda id: str(id[0]), cr.fetchall()))
 
-        period = obj_acc_period.browse(cr, uid, data[0]['period_id'], context=context)
-        new_fyear = obj_acc_fiscalyear.browse(cr, uid, data[0]['fy2_id'], context=context)
-        old_fyear = obj_acc_fiscalyear.browse(cr, uid, data[0]['fy_id'], context=context)
+        period = obj_acc_period.browse(cr, uid, data[0].period_id.id, context=context)
+        new_fyear = obj_acc_fiscalyear.browse(cr, uid, data[0].fy2_id.id, context=context)
+        old_fyear = obj_acc_fiscalyear.browse(cr, uid, fy_id, context=context)
 
-        new_journal = data[0]['journal_id']
+        new_journal = data[0].journal_id.id
         new_journal = obj_acc_journal.browse(cr, uid, new_journal, context=context)
 
         if not new_journal.default_credit_account_id or not new_journal.default_debit_account_id:
@@ -110,7 +107,7 @@ class account_fiscalyear_close(osv.osv_memory):
                     obj_acc_move_line.create(cr, uid, {
                         'debit': account.balance>0 and account.balance,
                         'credit': account.balance<0 and -account.balance,
-                        'name': data[0]['report_name'],
+                        'name': data[0].report_name,
                         'date': period.date_start,
                         'journal_id': new_journal.id,
                         'period_id': period.id,
@@ -207,7 +204,7 @@ class account_fiscalyear_close(osv.osv_memory):
 
         if ids:
             obj_acc_move_line.reconcile(cr, uid, ids, context=context)
-        new_period = data[0]['period_id']
+        new_period = data[0].period_id.id
         ids = obj_acc_journal_period.search(cr, uid, [('journal_id','=',new_journal.id),('period_id','=',new_period)])
         if not ids:
             ids = [obj_acc_journal_period.create(cr, uid, {
diff --git a/addons/account/wizard/account_invoice_refund.py b/addons/account/wizard/account_invoice_refund.py
index edc2b1d99c9..97e15e1a071 100644
--- a/addons/account/wizard/account_invoice_refund.py
+++ b/addons/account/wizard/account_invoice_refund.py
@@ -88,13 +88,13 @@ class account_invoice_refund(osv.osv_memory):
         if context is None:
             context = {}
 
-        for form in  self.read(cr, uid, ids, context=context):
+        for form in self.browse(cr, uid, ids, context=context):
             created_inv = []
             date = False
             period = False
             description = False
             company = res_users_obj.browse(cr, uid, uid, context=context).company_id
-            journal_id = form.get('journal_id', False)
+            journal_id = form.journal_id.id
             if isinstance(journal_id, tuple):
                 journal_id = journal_id[0]
             for inv in inv_obj.browse(cr, uid, context.get('active_ids'), context=context):
@@ -102,19 +102,17 @@ class account_invoice_refund(osv.osv_memory):
                     raise osv.except_osv(_('Error !'), _('Can not %s draft/proforma/cancel invoice.') % (mode))
                 if inv.reconciled and mode in ('cancel', 'modify'):
                     raise osv.except_osv(_('Error !'), _('Can not %s invoice which is already reconciled, invoice should be unreconciled first. You can only Refund this invoice') % (mode))
-                if form['period']:
-                    period = form['period']
-                    if isinstance(period, tuple):
-                        period = period[0]
+                if form.period.id:
+                    period = form.period.id
                 else:
                     period = inv.period_id and inv.period_id.id or False
 
                 if not journal_id:
                     journal_id = inv.journal_id.id
 
-                if form['date']:
-                    date = form['date']
-                    if not form['period']:
+                if form.date:
+                    date = form.date
+                    if not form.period.id:
                             cr.execute("select name from ir_model_fields \
                                             where model = 'account.period' \
                                             and name = 'company_id'")
@@ -132,8 +130,8 @@ class account_invoice_refund(osv.osv_memory):
                                 period = res[0]
                 else:
                     date = inv.date_invoice
-                if form['description']:
-                    description = form['description']
+                if form.description:
+                    description = form.description
                 else:
                     description = inv.name
 
@@ -215,7 +213,7 @@ class account_invoice_refund(osv.osv_memory):
             return result
 
     def invoice_refund(self, cr, uid, ids, context=None):
-        data_refund = self.read(cr, uid, ids, [],context=context)[0]['filter_refund']
+        data_refund = self.read(cr, uid, ids, ['filter_refund'],context=context)[0]['filter_refund']
         return self.compute_refund(cr, uid, ids, data_refund, context=context)
 
 
diff --git a/addons/account/wizard/account_move_journal.py b/addons/account/wizard/account_move_journal.py
index db179ff00ff..dec34e6e717 100644
--- a/addons/account/wizard/account_move_journal.py
+++ b/addons/account/wizard/account_move_journal.py
@@ -148,7 +148,7 @@ class account_move_journal(osv.osv_memory):
 
         journal_id = self._get_journal(cr, uid, context)
         period_id = self._get_period(cr, uid, context)
-        target_move = self.read(cr, uid, ids, [], context=context)[0]['target_move']
+        target_move = self.read(cr, uid, ids, ['target_move'], context=context)[0]['target_move']
 
         name = _("Journal Items")
         if journal_id:
diff --git a/addons/account/wizard/account_open_closed_fiscalyear.py b/addons/account/wizard/account_open_closed_fiscalyear.py
index e4562d02ca9..d6151676187 100644
--- a/addons/account/wizard/account_open_closed_fiscalyear.py
+++ b/addons/account/wizard/account_open_closed_fiscalyear.py
@@ -34,10 +34,8 @@ class account_open_closed_fiscalyear(osv.osv_memory):
         fy_obj = self.pool.get('account.fiscalyear')
         move_obj = self.pool.get('account.move')
 
-        data = self.read(cr, uid, ids, [], context=context)[0]
-        if isinstance(data['fyear_id'], tuple):
-            data['fyear_id'] = data['fyear_id'][0]
-        data_fyear = fy_obj.browse(cr, uid, data['fyear_id'], context=context)
+        data = self.browse(cr, uid, ids, context=context)[0]
+        data_fyear = fy_obj.browse(cr, uid, data.fyear_id.id, context=context)
         if not data_fyear.end_journal_period_id:
             raise osv.except_osv(_('Error !'), _('No End of year journal defined for the fiscal year'))
         period_journal = data_fyear.end_journal_period_id
diff --git a/addons/account/wizard/account_report_common.py b/addons/account/wizard/account_report_common.py
index f7d7cac1c77..7a8a0365208 100644
--- a/addons/account/wizard/account_report_common.py
+++ b/addons/account/wizard/account_report_common.py
@@ -132,7 +132,7 @@ class account_common_report(osv.osv_memory):
         data['ids'] = context.get('active_ids', [])
         data['model'] = context.get('active_model', 'ir.ui.menu')
         data['form'] = self.read(cr, uid, ids, ['date_from',  'date_to',  'fiscalyear_id', 'journal_ids', 'period_from', 'period_to',  'filter',  'chart_account_id', 'target_move'], context=context)[0]
-        for field in data['form'].keys():
+        for field in ['fiscalyear_id', 'chart_account_id', 'period_from', 'period_to']:
             if isinstance(data['form'][field], tuple):
                 data['form'][field] = data['form'][field][0]
         used_context = self._build_contexts(cr, uid, ids, data, context=context)
diff --git a/addons/account/wizard/account_validate_account_move.py b/addons/account/wizard/account_validate_account_move.py
index c2fcfbfd5ab..818442a6b3b 100644
--- a/addons/account/wizard/account_validate_account_move.py
+++ b/addons/account/wizard/account_validate_account_move.py
@@ -33,11 +33,8 @@ class validate_account_move(osv.osv_memory):
         obj_move = self.pool.get('account.move')
         if context is None:
             context = {}
-        data = self.read(cr, uid, ids, context=context)[0]
-        for field in data.keys():
-            if isinstance(data[field], tuple):
-                data[field] = data[field][0]
-        ids_move = obj_move.search(cr, uid, [('state','=','draft'),('journal_id','=',data['journal_id']),('period_id','=',data['period_id'])])
+        data = self.browse(cr, uid, ids, context=context)[0]
+        ids_move = obj_move.search(cr, uid, [('state','=','draft'),('journal_id','=',data.journal_id.id),('period_id','=',data.period_id.id)])
         if not ids_move:
             raise osv.except_osv(_('Warning'), _('Specified Journal does not have any account move entries in draft state for this period'))
         obj_move.button_validate(cr, uid, ids_move, context=context)
diff --git a/addons/account/wizard/account_vat.py b/addons/account/wizard/account_vat.py
index 3e77979cd3b..3aecfb04a30 100644
--- a/addons/account/wizard/account_vat.py
+++ b/addons/account/wizard/account_vat.py
@@ -46,7 +46,7 @@ class account_vat_declaration(osv.osv_memory):
             context = {}
         datas = {'ids': context.get('active_ids', [])}
         datas['model'] = 'account.tax.code'
-        datas['form'] = self.read(cr, uid, ids)[0]
+        datas['form'] = self.read(cr, uid, ids, context=context)[0]
         for field in datas['form'].keys():
             if isinstance(datas['form'][field], tuple):
                 datas['form'][field] = datas['form'][field][0]
diff --git a/addons/account_followup/wizard/account_followup_print.py b/addons/account_followup/wizard/account_followup_print.py
index e8f5e976389..3a062202bfa 100644
--- a/addons/account_followup/wizard/account_followup_print.py
+++ b/addons/account_followup/wizard/account_followup_print.py
@@ -146,7 +146,7 @@ class account_followup_print_all(osv.osv_memory):
         if context is None:
             context = {}
         if ids:
-            data = self.read(cr, uid, ids, [], context=context)[0]
+            data = self.browse(cr, uid, ids, context=context)[0]
         cr.execute(
             "SELECT l.partner_id, l.followup_line_id,l.date_maturity, l.date, l.id "\
             "FROM account_move_line AS l "\
@@ -162,8 +162,8 @@ class account_followup_print_all(osv.osv_memory):
         move_lines = cr.fetchall()
         old = None
         fups = {}
-        fup_id = 'followup_id' in context and context['followup_id'] or data['followup_id']
-        date = 'date' in context and context['date'] or data['date']
+        fup_id = 'followup_id' in context and context['followup_id'] or data.followup_id.id
+        date = 'date' in context and context['date'] or data.date
 
         current_date = datetime.date(*time.strptime(date,
             '%Y-%m-%d')[:3])
@@ -208,14 +208,15 @@ class account_followup_print_all(osv.osv_memory):
 
         if context is None:
             context = {}
-        data = self.read(cr, uid, ids, [], context=context)[0]
+        data = self.browse(cr, uid, ids, context=context)[0]
+        partner_ids = [partner_id.id for partner_id in data.partner_ids]
         model_data_ids = mod_obj.search(cr, uid, [('model','=','ir.ui.view'),('name','=','view_account_followup_print_all_msg')], context=context)
         resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
-        if data['email_conf']:
+        if data.email_conf:
             msg_sent = ''
             msg_unsent = ''
             data_user = user_obj.browse(cr, uid, uid, context=context)
-            move_lines = line_obj.browse(cr, uid, data['partner_ids'], context=context)
+            move_lines = line_obj.browse(cr, uid, partner_ids, context=context)
             partners = []
             dict_lines = {}
             for line in move_lines:
@@ -235,8 +236,8 @@ class account_followup_print_all(osv.osv_memory):
                             if adr.email:
                                 dest = [adr.email]
                 src = tools.config.options['email_from']
-                if not data['partner_lang']:
-                    body = data['email_body']
+                if not data.partner_lang:
+                    body = data.email_body
                 else:
                     cxt = context.copy()
                     cxt['lang'] = partner.lang
@@ -272,7 +273,7 @@ class account_followup_print_all(osv.osv_memory):
                     'date':time.strftime('%Y-%m-%d'),
                 }
                 body = body%val
-                sub = tools.ustr(data['email_subject'])
+                sub = tools.ustr(data.email_subject)
                 msg = ''
                 if dest:
                     try:
diff --git a/addons/account_payment/wizard/account_payment_order.py b/addons/account_payment/wizard/account_payment_order.py
index eb0d8b21926..d1137078c32 100644
--- a/addons/account_payment/wizard/account_payment_order.py
+++ b/addons/account_payment/wizard/account_payment_order.py
@@ -62,8 +62,8 @@ class payment_order_create(osv.osv_memory):
         payment_obj = self.pool.get('payment.line')
         if context is None:
             context = {}
-        data = self.read(cr, uid, ids, [], context=context)[0]
-        line_ids = data['entries']
+        data = self.browse(cr, uid, ids, context=context)[0]
+        line_ids = [entry.id for entry in data.entries]
         if not line_ids:
             return {'type': 'ir.actions.act_window_close'}
 
@@ -97,8 +97,8 @@ class payment_order_create(osv.osv_memory):
         mod_obj = self.pool.get('ir.model.data')
         if context is None:
             context = {}
-        data = self.read(cr, uid, ids, [], context=context)[0]
-        search_due_date = data['duedate']
+        data = self.browse(cr, uid, ids, context=context)[0]
+        search_due_date = data.duedate
 #        payment = self.pool.get('payment.order').browse(cr, uid, context['active_id'], context=context)
 
         # Search for move line to pay:

From c1cd88b1d9647208f62e7c7eba0aea0ef2c20912 Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Tue, 15 Feb 2011 16:09:43 +0530
Subject: [PATCH 02/10] [IMP]: Task-2009 improve osv memory wizard

bzr revid: ksa@tinyerp.co.in-20110215103943-uj1pse2yv0dncpfi
---
 addons/hr_timesheet/wizard/hr_timesheet_print_employee.py   | 4 +++-
 .../wizard/hr_timesheet_final_invoice_create.py             | 3 +++
 addons/mrp/wizard/mrp_product_produce.py                    | 4 ++--
 .../wizard/project_scrum_backlog_create_task.py             | 3 +++
 addons/project_scrum/wizard/project_scrum_backlog_sprint.py | 3 +++
 .../wizard/purchase_requisition_partner.py                  | 6 +++++-
 6 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_employee.py b/addons/hr_timesheet/wizard/hr_timesheet_print_employee.py
index 9775a8518ff..51af2444661 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_employee.py
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_employee.py
@@ -31,7 +31,7 @@ class analytical_timesheet_employee(osv.osv_memory):
                                   'Month', required=True),
         'year': fields.integer('Year', required=True),
         'employee_id': fields.many2one('hr.employee', 'Employee', required=True)
-    
+
                 }
 
     def _get_user(self, cr, uid, context=None):
@@ -50,6 +50,8 @@ class analytical_timesheet_employee(osv.osv_memory):
 
     def print_report(self, cr, uid, ids, context=None):
         data = self.read(cr, uid, ids, context=context)[0]
+        if isinstance(data['employee_id'], tuple):
+            data['employee_id'] = data['employee_id'][0]
         datas = {
              'ids': [],
              'model': 'hr.employee',
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py
index 8f1ef4ef261..cebcf072794 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py
@@ -59,6 +59,9 @@ class final_invoice_create(osv.osv_memory):
         res = mod_obj.read(cr, uid, result, ['res_id'], context=context)
 
         data = self.read(cr, uid, ids, [], context=context)[0]
+        if isinstance(data['balance_product'], tuple):
+            data['balance_product'] = data['balance_product'][0]
+
         account_ids = 'active_ids' in context and context['active_ids'] or []
 
         for account in analytic_account_obj.browse(cr, uid, account_ids, context=context):
diff --git a/addons/mrp/wizard/mrp_product_produce.py b/addons/mrp/wizard/mrp_product_produce.py
index 6052cdb56f7..811c707eb2a 100644
--- a/addons/mrp/wizard/mrp_product_produce.py
+++ b/addons/mrp/wizard/mrp_product_produce.py
@@ -70,10 +70,10 @@ class mrp_product_produce(osv.osv_memory):
             context = {}
         prod_obj = self.pool.get('mrp.production')
         move_ids = context.get('active_ids', [])
-        for data in self.read(cr, uid, ids, context=context):
+        for data in self.browse(cr, uid, ids, context=context):
             for move_id in move_ids:
                 prod_obj.action_produce(cr, uid, move_id,
-                                    data['product_qty'], data['mode'], context=context)
+                                    data.product_qty, data.mode, context=context)
         return {}
 
 mrp_product_produce()
diff --git a/addons/project_scrum/wizard/project_scrum_backlog_create_task.py b/addons/project_scrum/wizard/project_scrum_backlog_create_task.py
index afa4f40a5f8..3a13b43ae19 100644
--- a/addons/project_scrum/wizard/project_scrum_backlog_create_task.py
+++ b/addons/project_scrum/wizard/project_scrum_backlog_create_task.py
@@ -35,6 +35,9 @@ class backlog_create_task(osv.osv_memory):
         ids_task = []
 
         data = self.read(cr, uid, ids, [], context=context)[0]
+        if isinstance(data['user_id'], tuple):
+            data['user_id'] = data['user_id'][0]
+
         backlogs = backlog_id.browse(cr, uid, context['active_ids'], context=context)
         result = mod_obj._get_id(cr, uid, 'project', 'view_task_search_form')
         id = mod_obj.read(cr, uid, result, ['res_id'])
diff --git a/addons/project_scrum/wizard/project_scrum_backlog_sprint.py b/addons/project_scrum/wizard/project_scrum_backlog_sprint.py
index 591e1d5da62..f953f886e5c 100644
--- a/addons/project_scrum/wizard/project_scrum_backlog_sprint.py
+++ b/addons/project_scrum/wizard/project_scrum_backlog_sprint.py
@@ -42,6 +42,9 @@ class backlog_sprint_assign(osv.osv_memory):
         if context is None:
             context = {}
         data = self.read(cr, uid, ids, [], context=context)[0]
+        if isinstance(data['sprint_id'], tuple):
+            data['sprint_id'] = data['sprint_id'][0]
+
         for backlog in backlog_obj.browse(cr, uid, context['active_ids'], context=context):
             backlog_ids.append(backlog.id)
             if data['convert_to_task']:
diff --git a/addons/purchase_requisition/wizard/purchase_requisition_partner.py b/addons/purchase_requisition/wizard/purchase_requisition_partner.py
index 8dba2ab2eae..9ff7a769a72 100644
--- a/addons/purchase_requisition/wizard/purchase_requisition_partner.py
+++ b/addons/purchase_requisition/wizard/purchase_requisition_partner.py
@@ -67,7 +67,11 @@ class purchase_requisition_partner(osv.osv_memory):
             context = {}
         record_ids = context and context.get('active_ids', False)
         if record_ids:
-            data =  self.read(cr, uid, ids)
+            data =  self.read(cr, uid, ids,context=context)
+            for m2o_field in ['partner_id','partner_address_id']:
+                if isinstance(data[0][m2o_field], tuple):
+                    data[0][m2o_field] = data[0][m2o_field][0]
+
             company = self.pool.get('res.users').browse(cr, uid, uid, context).company_id
             order_obj = self.pool.get('purchase.order')
             order_line_obj = self.pool.get('purchase.order.line')

From 63f66fdec1adee23b4d8e6aa679d8b43de855f96 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Tue, 15 Feb 2011 16:25:09 +0530
Subject: [PATCH 03/10] [IMP] BOARD,STOCK,SURVEY :Improvement in OSV wiz
 ,Realated Read method

bzr revid: aag@tinyerp.co.in-20110215105509-pjve7asi0r63knec
---
 addons/board/wizard/board_menu_create.py      |  6 ++--
 addons/stock/i18n/stock.pot                   |  5 ----
 addons/stock/wizard/stock_move.py             | 29 -------------------
 addons/stock/wizard/stock_move_view.xml       | 28 ------------------
 addons/stock/wizard/stock_split_move.py       |  2 +-
 addons/survey/wizard/survey_browse_answer.py  | 15 +++++-----
 addons/survey/wizard/survey_print.py          |  5 ++--
 addons/survey/wizard/survey_print_answer.py   |  2 +-
 .../survey/wizard/survey_print_statistics.py  |  2 +-
 addons/survey/wizard/survey_selection.py      |  6 ++--
 .../survey/wizard/survey_send_invitation.py   |  2 +-
 11 files changed, 19 insertions(+), 83 deletions(-)

diff --git a/addons/board/wizard/board_menu_create.py b/addons/board/wizard/board_menu_create.py
index 10d4d80a7f3..3c46c7e4092 100644
--- a/addons/board/wizard/board_menu_create.py
+++ b/addons/board/wizard/board_menu_create.py
@@ -70,10 +70,10 @@ 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.browse(cr, uid, ids, context=context):
             obj_menu.create(cr, uid, {
-                'name': data.get('menu_name'),
-                'parent_id': data.get('menu_parent_id'),
+                'name': data.menu_name,
+                'parent_id': data.menu_parent_id.id,
                 'icon': 'STOCK_SELECT_COLOR',
                 'action': 'ir.actions.act_window,' + str(action_id)
                 }, context=context)
diff --git a/addons/stock/i18n/stock.pot b/addons/stock/i18n/stock.pot
index 4af2dea7948..cad8800f31a 100644
--- a/addons/stock/i18n/stock.pot
+++ b/addons/stock/i18n/stock.pot
@@ -1114,7 +1114,6 @@ msgstr ""
 #: view:stock.invoice.onshipping:0
 #: view:stock.location.product:0
 #: view:stock.move:0
-#: view:stock.move.track:0
 #: view:stock.picking:0
 #: view:stock.split.into:0
 msgid "_Cancel"
@@ -1693,7 +1692,6 @@ msgid "Search Inventory"
 msgstr ""
 
 #. module: stock
-#: field:stock.move.track,quantity:0
 msgid "Quantity per lot"
 msgstr ""
 
@@ -1920,7 +1918,6 @@ msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.track_line_old
-#: view:stock.move.track:0
 msgid "Tracking a move"
 msgstr ""
 
@@ -2461,7 +2458,6 @@ msgid "If checked, products contained in child locations of selected location wi
 msgstr ""
 
 #. module: stock
-#: field:stock.move.track,tracking_prefix:0
 msgid "Tracking prefix"
 msgstr ""
 
@@ -2901,7 +2897,6 @@ msgstr ""
 #: view:stock.move.consume:0
 #: view:stock.move.scrap:0
 #: view:stock.move.split:0
-#: view:stock.move.track:0
 #: view:stock.split.into:0
 msgid "Ok"
 msgstr ""
diff --git a/addons/stock/wizard/stock_move.py b/addons/stock/wizard/stock_move.py
index d0bbc73863d..875f78d7641 100644
--- a/addons/stock/wizard/stock_move.py
+++ b/addons/stock/wizard/stock_move.py
@@ -21,35 +21,6 @@
 
 from osv import fields, osv
 
-class stock_move_track(osv.osv_memory):
-    _name = "stock.move.track"
-    _description = "Track moves"
-
-    _columns = {
-        'tracking_prefix': fields.char('Tracking prefix', size=64),
-        'quantity': fields.float("Quantity per lot")
-    }
-
-    _defaults = {
-        'quantity': lambda *x: 1
-    }
-
-    def track_lines(self, cr, uid, ids, context=None):
-        """ To track stock moves lines
-        @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:
-        """
-        datas = self.read(cr, uid, ids)[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'}
-
-stock_move_track()
-
 class stock_move_consume(osv.osv_memory):
     _name = "stock.move.consume"
     _description = "Consume Products"
diff --git a/addons/stock/wizard/stock_move_view.xml b/addons/stock/wizard/stock_move_view.xml
index baaa581b4f3..7f0048ad219 100644
--- a/addons/stock/wizard/stock_move_view.xml
+++ b/addons/stock/wizard/stock_move_view.xml
@@ -2,34 +2,6 @@
 <openerp>
     <data>
 
-        <record id="view_stock_move_track_wizard" model="ir.ui.view">
-                <field name="name">Tracking a move</field>
-                <field name="model">stock.move.track</field>
-                <field name="type">form</field>
-                <field name="arch" type="xml">
-                    <form string="Tracking a move">
-                        <field name="tracking_prefix" colspan="4"/>
-                        <field name="quantity" colspan="4"/>
-                        <newline/>
-                        <separator string="" colspan="4" />
-                        <button icon='gtk-cancel' special="cancel"
-                            string="_Cancel" />
-                        <button name="track_lines" string="Ok"
-                            type="object" icon="gtk-ok" />
-                    </form>
-                </field>
-            </record>
-
-            <record id="track_line_old" model="ir.actions.act_window">
-                <field name="name">Tracking a move</field>
-                <field name="type">ir.actions.act_window</field>
-                <field name="res_model">stock.move.track</field>
-                <field name="view_type">form</field>
-                <field name="view_mode">form</field>
-                <field name="target">new</field>
-            </record>
-
-
         <!--  Consume, scrap move -->
 
         <record id="view_stock_move_consume_wizard" model="ir.ui.view">
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:
diff --git a/addons/survey/wizard/survey_browse_answer.py b/addons/survey/wizard/survey_browse_answer.py
index 52664eb48cc..6b1e3034974 100644
--- a/addons/survey/wizard/survey_browse_answer.py
+++ b/addons/survey/wizard/survey_browse_answer.py
@@ -61,14 +61,13 @@ 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 = record and record[0] or {} 
-        if record['response_id']:
-            res_id = [(record['response_id'])]
-        else:
-            sur_response_obj = self.pool.get('survey.response')
-            res_id = sur_response_obj.search(cr, uid, [('survey_id', '=',int(record['survey_id']))])
-        context.update({'active' : True,'survey_id' : record['survey_id'], 'response_id' : res_id, 'response_no' : 0})
+        sur_response_obj = self.pool.get('survey.response')
+        for record in self.browse(cr, uid, ids,context=context):
+            if record.response_id.id:
+                res_id = record.response_id.id
+            else:
+                res_id = sur_response_obj.search(cr, uid, [('survey_id', '=',record.survey_id)])[0]
+        context.update({'active' : True,'survey_id' : record.survey_id, 'response_id' : [res_id], 'response_no' : 0})
         search_obj = self.pool.get('ir.ui.view')
         search_id = search_obj.search(cr,uid,[('model','=','survey.question.wiz'),('name','=','Survey Search')])
         return {
diff --git a/addons/survey/wizard/survey_print.py b/addons/survey/wizard/survey_print.py
index ed6479885dc..87767f34a68 100644
--- a/addons/survey/wizard/survey_print.py
+++ b/addons/survey/wizard/survey_print.py
@@ -55,10 +55,9 @@ class survey_print(osv.osv_memory):
         @param context: A standard dictionary for contextual values
         @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, ['survey_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..264c53ce41e 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, ['survey_id'], 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,8 +133,8 @@ 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'])
-        if sur_rec['max_response_limit'] and sur_rec['max_response_limit'] <= sur_rec['tot_start_survey']:
+        sur_rec = survey_obj.browse(cr,uid,ids,context=context)[0]
+        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."))
 
         search_id = search_obj.search(cr,uid,[('model','=','survey.question.wiz'),('name','=','Survey Search')])
diff --git a/addons/survey/wizard/survey_send_invitation.py b/addons/survey/wizard/survey_send_invitation.py
index 361f7388f6f..4cf66d28cb3 100644
--- a/addons/survey/wizard/survey_send_invitation.py
+++ b/addons/survey/wizard/survey_send_invitation.py
@@ -96,7 +96,7 @@ class survey_send_invitation(osv.osv_memory):
     def action_send(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
-        record = self.read(cr, uid, ids, [])
+        record = self.read(cr, uid, ids, [],context=context)
         survey_ids =  context.get('active_ids', [])
         record = record and record[0]
         partner_ids = record['partner_ids']

From 8acc47465ebf3eee53f33d03089ff4ace28698c9 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Tue, 15 Feb 2011 16:30:54 +0530
Subject: [PATCH 04/10] [IMP] project_scrum :Improvement in OSV wiz , Read
 method converted to browse

bzr revid: aag@tinyerp.co.in-20110215110054-hrd1eo3z5x3d7lo3
---
 .../wizard/project_scrum_backlog_sprint.py          | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/addons/project_scrum/wizard/project_scrum_backlog_sprint.py b/addons/project_scrum/wizard/project_scrum_backlog_sprint.py
index f953f886e5c..9e79057161d 100644
--- a/addons/project_scrum/wizard/project_scrum_backlog_sprint.py
+++ b/addons/project_scrum/wizard/project_scrum_backlog_sprint.py
@@ -41,13 +41,10 @@ class backlog_sprint_assign(osv.osv_memory):
         backlog_ids = []
         if context is None:
             context = {}
-        data = self.read(cr, uid, ids, [], context=context)[0]
-        if isinstance(data['sprint_id'], tuple):
-            data['sprint_id'] = data['sprint_id'][0]
-
+        data = self.browse(cr, uid, ids,context=context)[0]
         for backlog in backlog_obj.browse(cr, uid, context['active_ids'], context=context):
             backlog_ids.append(backlog.id)
-            if data['convert_to_task']:
+            if data.convert_to_task:
                 task_id = task.create(cr, uid, {
                     'product_backlog_id': backlog.id,
                     'name': backlog.name,
@@ -59,12 +56,12 @@ class backlog_sprint_assign(osv.osv_memory):
                 })
                 message = _('Product Backlog') + " '" + backlog.name + "' "+ _("is converted into Task %d."%(task_id,))
                 self.log(cr, uid, backlog.id, message)
-            if data['state_open'] and backlog.state == "draft":
+            if data.state_open and backlog.state == "draft":
                 backlog_obj.write(cr, uid, backlog.id, {'state':'open'})
-            sprint = sprint_obj.browse(cr, uid, data['sprint_id'], context=context)
+            sprint = sprint_obj.browse(cr, uid, data.sprint_id.id, context=context)
             message = _('Product Backlog') + " '" + backlog.name + "' "+ _("is assigned sprint:%s"%(sprint.name))
             self.log(cr, uid, backlog.id, message)
-        backlog_obj.write(cr, uid, backlog_ids, {'sprint_id': data['sprint_id']}, context=context)
+        backlog_obj.write(cr, uid, backlog_ids, {'sprint_id': data.sprint_id.id}, context=context)
         return {'type': 'ir.actions.act_window_close'}
 
 backlog_sprint_assign()

From fa56ea2efa4043a49c425e355f2729492d1248fb Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Tue, 15 Feb 2011 17:07:03 +0530
Subject: [PATCH 05/10] [IMP] purchase_requisition :Improvement in OSV wiz ,
 Read method converted to browse

bzr revid: aag@tinyerp.co.in-20110215113703-3u5wod3mcfuupcon
---
 .../wizard/purchase_requisition_partner.py             | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/addons/purchase_requisition/wizard/purchase_requisition_partner.py b/addons/purchase_requisition/wizard/purchase_requisition_partner.py
index 9ff7a769a72..ec93a280fd3 100644
--- a/addons/purchase_requisition/wizard/purchase_requisition_partner.py
+++ b/addons/purchase_requisition/wizard/purchase_requisition_partner.py
@@ -67,11 +67,7 @@ class purchase_requisition_partner(osv.osv_memory):
             context = {}
         record_ids = context and context.get('active_ids', False)
         if record_ids:
-            data =  self.read(cr, uid, ids,context=context)
-            for m2o_field in ['partner_id','partner_address_id']:
-                if isinstance(data[0][m2o_field], tuple):
-                    data[0][m2o_field] = data[0][m2o_field][0]
-
+            data =  self.browse(cr, uid, ids,context=context)[0]
             company = self.pool.get('res.users').browse(cr, uid, uid, context).company_id
             order_obj = self.pool.get('purchase.order')
             order_line_obj = self.pool.get('purchase.order.line')
@@ -81,10 +77,8 @@ class purchase_requisition_partner(osv.osv_memory):
             prod_obj = self.pool.get('product.product')
             tender_obj = self.pool.get('purchase.requisition')
             acc_pos_obj = self.pool.get('account.fiscal.position')
-            partner_id = data[0]['partner_id']
-
+            partner_id = data.partner_id.id
             supplier_data = partner_obj.browse(cr, uid, partner_id, context=context)
-
             address_id = partner_obj.address_get(cr, uid, [partner_id], ['delivery'])['delivery']
             list_line=[]
             purchase_order_line={}

From 157a089b3d60ba56df60ec397efdd3084a795de6 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Wed, 16 Feb 2011 11:31:46 +0530
Subject: [PATCH 06/10] [IMP] project_scrum :Improvement in OSV wiz-Merge
 Backlog , Read method converted to browse

bzr revid: aag@tinyerp.co.in-20110216060146-d3r8xm6k1ktlhew6
---
 .../project_scrum/wizard/project_scrum_backlog_merger.py  | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/addons/project_scrum/wizard/project_scrum_backlog_merger.py b/addons/project_scrum/wizard/project_scrum_backlog_merger.py
index c90ca26086b..c5501288fe0 100644
--- a/addons/project_scrum/wizard/project_scrum_backlog_merger.py
+++ b/addons/project_scrum/wizard/project_scrum_backlog_merger.py
@@ -66,15 +66,14 @@ class project_scrum_backlog_merge(osv.osv_memory):
             context = {}
         #This will check product backlog's project id if different then will accept a new id provided by the user.
         if 'scrum_projects' in context:
-            data = self.read(cr, uid, ids, [])[0]
-            if data['project_id'] == False:
+            data = self.browse(cr, uid, ids, [])[0]
+            if data.project_id.id == False:
                 raise osv.except_osv(_('Warning'),_('Please select any Project.'))
-            new_project_id = data['project_id']
+            new_project_id = data.project_id.id
         else:
             p_id = backlog_obj.read(cr, uid, context['active_id'], ['project_id'])
             new_project_id = p_id['project_id'][0]
         #To merge note and description of backlogs
-
         new_note = ''
         new_description = ''
         for backlogs in backlog_obj.browse(cr, uid, context['active_ids'], context=context):
@@ -93,7 +92,6 @@ class project_scrum_backlog_merge(osv.osv_memory):
             'project_id': new_project_id,
             'expected_hours': round(max(new_exp_hour))
         }, context=context)
-
         #To assing a new product backlog to merged tasks
         task_obj.write(cr, uid, task_lines, {'product_backlog_id': id_b})
         backlog_obj.unlink(cr, uid, context['active_ids'], context=context)

From 568a05a27ef0d14e94c7d1e27b4fb1a05a6cb569 Mon Sep 17 00:00:00 2001
From: "Rucha (Open ERP)" <rpa@tinyerp.com>
Date: Mon, 28 Feb 2011 16:38:58 +0530
Subject: [PATCH 07/10] [REF,IMP]: Code Improvement

bzr revid: rpa@tinyerp.com-20110228110858-ulzc93cayvfd7c1o
---
 addons/account/report/account_balance.py              |  2 --
 addons/account/wizard/account_change_currency.py      |  2 +-
 addons/account/wizard/account_invoice_refund.py       |  2 --
 .../account/wizard/account_open_closed_fiscalyear.py  |  9 ++++-----
 addons/account/wizard/account_tax_chart.py            |  8 +++-----
 addons/account_coda/wizard/account_coda_import.py     |  4 ++--
 .../wizard/hr_timesheet_final_invoice_create.py       | 11 +++++------
 addons/lunch/wizard/lunch_order_confirm.py            |  2 +-
 addons/point_of_sale/wizard/pos_return.py             |  2 +-
 .../wizard/purchase_requisition_partner.py            |  2 +-
 addons/survey/wizard/survey_selection.py              |  3 +--
 11 files changed, 19 insertions(+), 28 deletions(-)

diff --git a/addons/account/report/account_balance.py b/addons/account/report/account_balance.py
index 45e642cd59e..5d9cfac5699 100644
--- a/addons/account/report/account_balance.py
+++ b/addons/account/report/account_balance.py
@@ -71,8 +71,6 @@ class account_balance(report_sxw.rml_parse, common_report_header):
     def lines(self, form, ids=[], done=None):#, level=1):
         def _process_child(accounts, disp_acc, parent):
                 account_rec = [acct for acct in accounts if acct['id']==parent][0]
-                if isinstance(account_rec['parent_id'], tuple):
-                    account_rec['parent_id'] = account_rec['parent_id'][0]
                 currency_obj = self.pool.get('res.currency')
                 acc_id = self.pool.get('account.account').browse(self.cr, self.uid, account_rec['id'])
                 currency = acc_id.currency_id and acc_id.currency_id or acc_id.company_id.currency_id
diff --git a/addons/account/wizard/account_change_currency.py b/addons/account/wizard/account_change_currency.py
index 223ba327343..009352aa7c9 100644
--- a/addons/account/wizard/account_change_currency.py
+++ b/addons/account/wizard/account_change_currency.py
@@ -45,7 +45,7 @@ class account_change_currency(osv.osv_memory):
         obj_currency = self.pool.get('res.currency')
         if context is None:
             context = {}
-        data = self.browse(cr, uid, ids)[0]
+        data = self.browse(cr, uid, ids, context=context)[0]
         new_currency = data.currency_id.id
 
         invoice = obj_inv.browse(cr, uid, context['active_id'], context=context)
diff --git a/addons/account/wizard/account_invoice_refund.py b/addons/account/wizard/account_invoice_refund.py
index 97e15e1a071..08615eb6f9c 100644
--- a/addons/account/wizard/account_invoice_refund.py
+++ b/addons/account/wizard/account_invoice_refund.py
@@ -95,8 +95,6 @@ class account_invoice_refund(osv.osv_memory):
             description = False
             company = res_users_obj.browse(cr, uid, uid, context=context).company_id
             journal_id = form.journal_id.id
-            if isinstance(journal_id, tuple):
-                journal_id = journal_id[0]
             for inv in inv_obj.browse(cr, uid, context.get('active_ids'), context=context):
                 if inv.state in ['draft', 'proforma2', 'cancel']:
                     raise osv.except_osv(_('Error !'), _('Can not %s draft/proforma/cancel invoice.') % (mode))
diff --git a/addons/account/wizard/account_open_closed_fiscalyear.py b/addons/account/wizard/account_open_closed_fiscalyear.py
index d6151676187..d48a561473e 100644
--- a/addons/account/wizard/account_open_closed_fiscalyear.py
+++ b/addons/account/wizard/account_open_closed_fiscalyear.py
@@ -31,14 +31,13 @@ class account_open_closed_fiscalyear(osv.osv_memory):
     }
 
     def remove_entries(self, cr, uid, ids, context=None):
-        fy_obj = self.pool.get('account.fiscalyear')
         move_obj = self.pool.get('account.move')
 
         data = self.browse(cr, uid, ids, context=context)[0]
-        data_fyear = fy_obj.browse(cr, uid, data.fyear_id.id, context=context)
-        if not data_fyear.end_journal_period_id:
+        period_journal = data.fyear_id.end_journal_period_id or False
+        if not period_journal:
             raise osv.except_osv(_('Error !'), _('No End of year journal defined for the fiscal year'))
-        period_journal = data_fyear.end_journal_period_id
+
         ids_move = move_obj.search(cr, uid, [('journal_id','=',period_journal.journal_id.id),('period_id','=',period_journal.period_id.id)])
         if ids_move:
             cr.execute('delete from account_move where id IN %s', (tuple(ids_move),))
@@ -46,4 +45,4 @@ class account_open_closed_fiscalyear(osv.osv_memory):
 
 account_open_closed_fiscalyear()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_tax_chart.py b/addons/account/wizard/account_tax_chart.py
index fd9b887ee2b..adf09c4052c 100644
--- a/addons/account/wizard/account_tax_chart.py
+++ b/addons/account/wizard/account_tax_chart.py
@@ -59,16 +59,14 @@ class account_tax_chart(osv.osv_memory):
         id = result and result[1] or False
         result = act_obj.read(cr, uid, [id], context=context)[0]
         if data.period_id:
-            fiscalyear_id = period_obj.read(cr, uid, [data.period_id.id], context=context)[0]['fiscalyear_id'][0]
             result['context'] = str({'period_id': data.period_id.id, \
-                                     'fiscalyear_id': fiscalyear_id, \
+                                     'fiscalyear_id': data.period_id.fiscalyear_id.id, \
                                         'state': data.target_move})
+            period_code = data.period_id.code
+            result['name'] += period_code and (':' + period_code) or ''
         else:
             result['context'] = str({'state': data.target_move})
 
-        if data.period_id:
-            period_code = period_obj.read(cr, uid, [data.period_id.id], context=context)[0]['code']
-            result['name'] += period_code and (':' + period_code) or ''
         return result
 
     _defaults = {
diff --git a/addons/account_coda/wizard/account_coda_import.py b/addons/account_coda/wizard/account_coda_import.py
index 309a647ef47..8d9f29c3072 100644
--- a/addons/account_coda/wizard/account_coda_import.py
+++ b/addons/account_coda/wizard/account_coda_import.py
@@ -69,10 +69,10 @@ class account_coda_import(osv.osv_memory):
         if context is None:
             context = {}
 
-        data = self.browse(cr, uid, ids)[0]
+        data = self.browse(cr, uid, ids, context=context)[0]
 
         codafile = data.coda
-        journal_code = journal_obj.browse(cr, uid, data.journal_id.id, context=context).code
+        journal_code = data.journal_id.code
 
         period = account_period_obj.find(cr, uid, context=context)[0]
         def_pay_acc = data.def_payable.id
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py
index cebcf072794..45a4e107e40 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py
@@ -58,9 +58,8 @@ class final_invoice_create(osv.osv_memory):
         result = mod_obj._get_id(cr, uid, 'account', 'view_account_invoice_filter')
         res = mod_obj.read(cr, uid, result, ['res_id'], context=context)
 
-        data = self.read(cr, uid, ids, [], context=context)[0]
-        if isinstance(data['balance_product'], tuple):
-            data['balance_product'] = data['balance_product'][0]
+        data = self.browse(cr, uid, ids, context=context)[0]
+        balance_product = data.balance_product.id
 
         account_ids = 'active_ids' in context and context['active_ids'] or []
 
@@ -146,9 +145,9 @@ class final_invoice_create(osv.osv_memory):
                 }
                 invoice_line_obj.create(cr, uid, curr_line, context=context)
 
-            if not data['balance_product']:
+            if not balance_product:
                 raise osv.except_osv(_('Balance product needed'), _('Please fill a Balance product in the wizard'))
-            product = product_obj.browse(cr, uid, data['balance_product'], context2)
+            product = product_obj.browse(cr, uid, balance_product, context=context2)
             taxes = product.taxes_id
             tax = fiscal_pos_obj.map_tax(cr, uid, account.partner_id.property_account_position, taxes)
             account_id = product.product_tmpl_id.property_account_income.id or product.categ_id.property_account_income_categ.id
@@ -183,4 +182,4 @@ class final_invoice_create(osv.osv_memory):
 
 final_invoice_create()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/lunch/wizard/lunch_order_confirm.py b/addons/lunch/wizard/lunch_order_confirm.py
index 3dee0c3fd0d..279234897de 100644
--- a/addons/lunch/wizard/lunch_order_confirm.py
+++ b/addons/lunch/wizard/lunch_order_confirm.py
@@ -46,7 +46,7 @@ class lunch_order_confirm(osv.osv_memory):
         data = context and context.get('active_ids', []) or []
         order_ref = self.pool.get('lunch.order')
 
-        for confirm_obj in self.browse(cr, uid, ids):
+        for confirm_obj in self.browse(cr, uid, ids, context=context):
             order_ref.confirm(cr, uid, data, confirm_obj.confirm_cashbox.id, context)
             return {'type': 'ir.actions.act_window_close'}
 
diff --git a/addons/point_of_sale/wizard/pos_return.py b/addons/point_of_sale/wizard/pos_return.py
index 5db14e31358..360059e7954 100644
--- a/addons/point_of_sale/wizard/pos_return.py
+++ b/addons/point_of_sale/wizard/pos_return.py
@@ -353,7 +353,7 @@ class add_product(osv.osv_memory):
             data = return_boj.read(cr,uid,return_id,[])[0]
 
         wf_service = netsvc.LocalService("workflow")
-        self_data = self.browse(cr, uid, ids)[0]
+        self_data = self.browse(cr, uid, ids, context=context)[0]
         order_obj.add_product(cr, uid, active_ids[0], self_data.product_id.id, self_data.quantity, context=context)
         
         for order_id in order_obj.browse(cr, uid, active_ids, context=context):
diff --git a/addons/purchase_requisition/wizard/purchase_requisition_partner.py b/addons/purchase_requisition/wizard/purchase_requisition_partner.py
index ec93a280fd3..71d8b0bb749 100644
--- a/addons/purchase_requisition/wizard/purchase_requisition_partner.py
+++ b/addons/purchase_requisition/wizard/purchase_requisition_partner.py
@@ -78,7 +78,7 @@ class purchase_requisition_partner(osv.osv_memory):
             tender_obj = self.pool.get('purchase.requisition')
             acc_pos_obj = self.pool.get('account.fiscal.position')
             partner_id = data.partner_id.id
-            supplier_data = partner_obj.browse(cr, uid, partner_id, context=context)
+            supplier_data = data.partner_id
             address_id = partner_obj.address_get(cr, uid, [partner_id], ['delivery'])['delivery']
             list_line=[]
             purchase_order_line={}
diff --git a/addons/survey/wizard/survey_selection.py b/addons/survey/wizard/survey_selection.py
index 264c53ce41e..2412b5ca0f7 100644
--- a/addons/survey/wizard/survey_selection.py
+++ b/addons/survey/wizard/survey_selection.py
@@ -122,8 +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, ['survey_id'], context=context)[0]
-        survey_id = sur_id['survey_id']
+        survey_id = self.browse(cr, uid, ids, context=context)[0].survey_id.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\
                     and survey_id=%s' % (uid,survey_id))

From b45c384b1bed19d3d5637c675d03e3ac3114e951 Mon Sep 17 00:00:00 2001
From: "Rucha (Open ERP)" <rpa@tinyerp.com>
Date: Mon, 28 Feb 2011 16:55:35 +0530
Subject: [PATCH 08/10] [REVERT]: Reverted some changes of trunk-dev-addons2

bzr revid: rpa@tinyerp.com-20110228112535-8qedlwhmgmsvh6ho
---
 addons/mrp/mrp.py                             | 22 +----------
 addons/procurement/procurement_view.xml       |  5 +--
 addons/product/pricelist.py                   |  8 ++--
 addons/purchase/purchase.py                   |  2 +-
 addons/stock/stock.py                         | 26 ++++++-------
 .../stock/wizard/stock_invoice_onshipping.py  |  4 +-
 addons/stock/wizard/stock_move.py             | 37 +++++++++++++++++--
 addons/stock/wizard/stock_move_view.xml       | 28 ++++++++++++++
 addons/stock/wizard/stock_partial_picking.py  | 22 ++---------
 addons/survey/wizard/survey_browse_answer.py  | 15 ++++----
 10 files changed, 95 insertions(+), 74 deletions(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 322567674cb..1a927b57a91 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -240,29 +240,11 @@ class mrp_bom(osv.osv):
                 return False
             level -= 1
         return True
-
-    def _check_product(self, cr, uid, ids, context=None):
-        all_prod = []
-        bom_obj = self.pool.get('mrp.bom')
-        boms = self.browse(cr, uid, ids, context=context)
-        def check_bom(boms):
-            res = True
-            for bom in boms:
-                if bom.product_id.id in all_prod:
-                    res = res and False
-                all_prod.append(bom.product_id.id)
-                lines = bom.bom_lines
-                if lines:
-                    newboms = [a for a in lines if a not in boms]
-                    res = res and check_bom(newboms)
-            return res
-        return check_bom(boms)
-
     _constraints = [
-        (_check_recursion, 'Error ! You can not create recursive BoM.', ['parent_id']),
-        (_check_product, 'BoM line product should not be same as BoM product.', ['product_id']),
+        (_check_recursion, 'Error ! You can not create recursive BoM.', ['parent_id'])
     ]
 
+
     def onchange_product_id(self, cr, uid, ids, product_id, name, context=None):
         """ Changes UoM and name if product_id changes.
         @param name: Name of the field
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index 02cfae811eb..9c8ad70fe63 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -28,7 +28,6 @@
             <field name="name">procurement.order.tree.board</field>
             <field name="model">procurement.order</field>
             <field name="type">tree</field>
-            <field eval="20" name="priority"/>
             <field name="arch" type="xml">
                 <tree string="Procurement Lines" colors="red:date_planned&lt;current_date and state in ('exception');black:state=='running';darkgreen:state=='confirmed';gray:state in ['done','cancel'];blue:state in ('ready')">
                     <field name="date_planned" widget="date"/>
@@ -247,8 +246,8 @@
         <act_window
         context="{'search_default_warehouse_id': active_id}"
         id="act_stock_warehouse_2_stock_warehouse_orderpoint"
-        name="Minimum Stock Rules"
-        res_model="stock.warehouse.orderpoint"
+        name="Minimum Stock Rules" 
+        res_model="stock.warehouse.orderpoint" 
         src_model="stock.warehouse"
         groups="stock.group_stock_user"/>
 
diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py
index 72525e4c583..6899b673c70 100644
--- a/addons/product/pricelist.py
+++ b/addons/product/pricelist.py
@@ -262,9 +262,9 @@ 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, context=context)[product_id], round=False, context=context)
+                                        price_type.field)[product_id], round=False, context=context)
 
-                        if price >= 0.0:
+                        if price:
                             price_limit = price
 
                             price = price * (1.0+(res['price_discount'] or 0.0))
@@ -385,7 +385,7 @@ class product_pricelist(osv.osv):
                         else:
                             price_tmp = self.price_get(cr, uid,
                                     [res['base_pricelist_id']], prod_id,
-                                    qty, context=context)[res['base_pricelist_id']]
+                                    qty)[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, context=context)[prod_id], round=False, context=context)
+                                    price_type.field)[prod_id], round=False, context=context)
 
                     if price:
                         price_limit = price
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index fdedec3ee34..f2ef17a183d 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -170,7 +170,7 @@ class purchase_order(osv.osv):
         'partner_id':fields.many2one('res.partner', 'Supplier', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]}, change_default=True),
         'partner_address_id':fields.many2one('res.partner.address', 'Address', required=True,
             states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]},domain="[('partner_id', '=', partner_id)]"),
-        'dest_address_id':fields.many2one('res.partner.address', 'Destination Address', domain="[('partner_id', '!=', False)]",
+        'dest_address_id':fields.many2one('res.partner.address', 'Destination Address',
             states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]},
             help="Put an address if you want to deliver directly from the supplier to the customer." \
                 "In this case, it will remove the warehouse link and set the customer location."
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 2587f93a875..0d4df7afc63 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1166,7 +1166,8 @@ class stock_picking(osv.osv):
             for move in pick.move_lines:
                 if move.state in ('done', 'cancel'):
                     continue
-                partial_data = partial_datas.get('move%s'%(move.id), {})
+                partial_data = partial_datas.get('move%s'%(move.id), False)
+                assert partial_data, _('Missing partial picking data for move #%s') % (move.id)
                 product_qty = partial_data.get('product_qty',0.0)
                 move_product_qty[move.id] = product_qty
                 product_uom = partial_data.get('product_uom',False)
@@ -1247,9 +1248,9 @@ class stock_picking(osv.osv):
 
             if new_picking:
                 move_obj.write(cr, uid, [c.id for c in complete], {'picking_id': new_picking})
-            for move in complete:
-                if prodlot_ids.get(move.id):
-                    move_obj.write(cr, uid, move.id, {'prodlot_id': prodlot_ids[move.id]})
+                for move in complete:
+                    if prodlot_ids.get(move.id):
+                        move_obj.write(cr, uid, move.id, {'prodlot_id': prodlot_ids[move.id]})
             for move in too_many:
                 product_qty = move_product_qty[move.id]
                 defaults = {
@@ -1462,7 +1463,7 @@ class stock_move(osv.osv):
     _description = "Stock Move"
     _order = 'date_expected desc, id'
     _log_create = False
-
+    
     def action_partial_move(self, cr, uid, ids, context=None):
         if context is None: context = {}
         partial_id = self.pool.get("stock.partial.move").create(
@@ -1480,7 +1481,7 @@ class stock_move(osv.osv):
             'domain': '[]',
             'context': context
         }
-
+        
 
     def name_get(self, cr, uid, ids, context=None):
         res = []
@@ -1854,6 +1855,11 @@ class stock_move(osv.osv):
         """
         moves = self.browse(cr, uid, ids, context=context)
         self.write(cr, uid, ids, {'state': 'confirmed'})
+        res_obj = self.pool.get('res.company')
+        location_obj = self.pool.get('stock.location')
+        move_obj = self.pool.get('stock.move')
+        wf_service = netsvc.LocalService("workflow")
+
         self.create_chained_picking(cr, uid, moves, context)
         return []
 
@@ -1880,14 +1886,6 @@ class stock_move(osv.osv):
         @return: True
         """
         self.write(cr, uid, ids, {'state': 'confirmed'})
-
-        # fix for bug lp:707031
-        # called write of related picking because changing move availability does
-        # not trigger workflow of picking in order to change the state of picking
-        wf_service = netsvc.LocalService('workflow')
-        for move in self.browse(cr, uid, ids, context):
-            if move.picking_id:
-                wf_service.trg_write(uid, 'stock.picking', move.picking_id.id, cr)
         return True
 
     #
diff --git a/addons/stock/wizard/stock_invoice_onshipping.py b/addons/stock/wizard/stock_invoice_onshipping.py
index bb091fc6934..c7eab1eef4d 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'], context=context)
+        onshipdata_obj = self.read(cr, uid, ids, ['journal_id', 'group', 'invoice_date'])
         if context.get('new_picking', False):
             onshipdata_obj['id'] = onshipdata_obj.new_picking
             onshipdata_obj[ids] = onshipdata_obj.new_picking
@@ -127,7 +127,7 @@ class stock_invoice_onshipping(osv.osv_memory):
         res = picking_pool.action_invoice_create(cr, uid, active_ids,
               journal_id = onshipdata_obj[0]['journal_id'],
               group = onshipdata_obj[0]['group'],
-              type = context.get('inv_type'),
+              type = None,
               context=context)
         return res
 
diff --git a/addons/stock/wizard/stock_move.py b/addons/stock/wizard/stock_move.py
index 875f78d7641..8cfdc648349 100644
--- a/addons/stock/wizard/stock_move.py
+++ b/addons/stock/wizard/stock_move.py
@@ -21,6 +21,35 @@
 
 from osv import fields, osv
 
+class stock_move_track(osv.osv_memory):
+    _name = "stock.move.track"
+    _description = "Track moves"
+
+    _columns = {
+        'tracking_prefix': fields.char('Tracking prefix', size=64),
+        'quantity': fields.float("Quantity per lot")
+    }
+
+    _defaults = {
+        'quantity': lambda *x: 1
+    }
+
+    def track_lines(self, cr, uid, ids, context=None):
+        """ To track stock moves lines
+        @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:
+        """
+        datas = self.read(cr, uid, ids)[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'}
+
+stock_move_track()
+
 class stock_move_consume(osv.osv_memory):
     _name = "stock.move.consume"
     _description = "Consume Products"
@@ -69,9 +98,9 @@ class stock_move_consume(osv.osv_memory):
             context = {}
         move_obj = self.pool.get('stock.move')
         move_ids = context['active_ids']
-        for data in self.browse(cr, uid, ids):
+        for data in self.read(cr, uid, ids):
             move_obj.action_consume(cr, uid, move_ids,
-                             data.product_qty, data.location_id.id,
+                             data['product_qty'], data['location_id'],
                              context=context)
         return {'type': 'ir.actions.act_window_close'}
 
@@ -130,9 +159,9 @@ class stock_move_scrap(osv.osv_memory):
             context = {}
         move_obj = self.pool.get('stock.move')
         move_ids = context['active_ids']
-        for data in self.browse(cr, uid, ids):
+        for data in self.read(cr, uid, ids):
             move_obj.action_scrap(cr, uid, move_ids,
-                             data.product_qty, data.location_id.id,
+                             data['product_qty'], data['location_id'],
                              context=context)
         return {'type': 'ir.actions.act_window_close'}
 
diff --git a/addons/stock/wizard/stock_move_view.xml b/addons/stock/wizard/stock_move_view.xml
index 7f0048ad219..baaa581b4f3 100644
--- a/addons/stock/wizard/stock_move_view.xml
+++ b/addons/stock/wizard/stock_move_view.xml
@@ -2,6 +2,34 @@
 <openerp>
     <data>
 
+        <record id="view_stock_move_track_wizard" model="ir.ui.view">
+                <field name="name">Tracking a move</field>
+                <field name="model">stock.move.track</field>
+                <field name="type">form</field>
+                <field name="arch" type="xml">
+                    <form string="Tracking a move">
+                        <field name="tracking_prefix" colspan="4"/>
+                        <field name="quantity" colspan="4"/>
+                        <newline/>
+                        <separator string="" colspan="4" />
+                        <button icon='gtk-cancel' special="cancel"
+                            string="_Cancel" />
+                        <button name="track_lines" string="Ok"
+                            type="object" icon="gtk-ok" />
+                    </form>
+                </field>
+            </record>
+
+            <record id="track_line_old" model="ir.actions.act_window">
+                <field name="name">Tracking a move</field>
+                <field name="type">ir.actions.act_window</field>
+                <field name="res_model">stock.move.track</field>
+                <field name="view_type">form</field>
+                <field name="view_mode">form</field>
+                <field name="target">new</field>
+            </record>
+
+
         <!--  Consume, scrap move -->
 
         <record id="view_stock_move_consume_wizard" model="ir.ui.view">
diff --git a/addons/stock/wizard/stock_partial_picking.py b/addons/stock/wizard/stock_partial_picking.py
index cc858f0f726..9f644c981a8 100644
--- a/addons/stock/wizard/stock_partial_picking.py
+++ b/addons/stock/wizard/stock_partial_picking.py
@@ -67,9 +67,8 @@ class stock_partial_picking(osv.osv_memory):
             for m in pick.move_lines:
                 if m.state in ('done', 'cancel'):
                     continue
-                move_memory = self.__create_partial_picking_memory(m, pick_type)
-                if move_memory:
-                    result.append(move_memory)
+                result.append(self.__create_partial_picking_memory(m, pick_type))
+
         if 'product_moves_in' in fields:
             res.update({'product_moves_in': result})
         if 'product_moves_out' in fields:
@@ -125,27 +124,12 @@ class stock_partial_picking(osv.osv_memory):
             'prodlot_id' : picking.prodlot_id.id, 
             'move_id' : picking.id, 
         }
-        
+    
         if pick_type == 'in':
             move_memory.update({
                 'cost' : picking.product_id.standard_price, 
                 'currency' : picking.product_id.company_id and picking.product_id.company_id.currency_id and picking.product_id.company_id.currency_id.id or False, 
             })
-            
-        if pick_type == 'out':
-            type = picking.picking_id.move_type
-            qty_avl =  picking.product_id.qty_available   
-            if type == 'direct' :
-                if qty_avl <= 0.0 and  picking.state != 'assigned':
-                    move_memory = {}
-                if picking.product_qty > qty_avl and qty_avl > 0.0:
-                     move_memory.update({
-                    'quantity' : qty_avl, 
-                    })
-                if picking.state == 'assigned':
-                    move_memory.update({
-                    'quantity' : picking.product_qty, 
-                    })
         return move_memory
 
     def do_partial(self, cr, uid, ids, context=None):
diff --git a/addons/survey/wizard/survey_browse_answer.py b/addons/survey/wizard/survey_browse_answer.py
index 6b1e3034974..52664eb48cc 100644
--- a/addons/survey/wizard/survey_browse_answer.py
+++ b/addons/survey/wizard/survey_browse_answer.py
@@ -61,13 +61,14 @@ class survey_browse_answer(osv.osv_memory):
         @return : Dictionary value for Open the browse answer wizard.
         """
         if context is None: context = {}
-        sur_response_obj = self.pool.get('survey.response')
-        for record in self.browse(cr, uid, ids,context=context):
-            if record.response_id.id:
-                res_id = record.response_id.id
-            else:
-                res_id = sur_response_obj.search(cr, uid, [('survey_id', '=',record.survey_id)])[0]
-        context.update({'active' : True,'survey_id' : record.survey_id, 'response_id' : [res_id], 'response_no' : 0})
+        record = self.read(cr, uid, ids, [])
+        record = record and record[0] or {} 
+        if record['response_id']:
+            res_id = [(record['response_id'])]
+        else:
+            sur_response_obj = self.pool.get('survey.response')
+            res_id = sur_response_obj.search(cr, uid, [('survey_id', '=',int(record['survey_id']))])
+        context.update({'active' : True,'survey_id' : record['survey_id'], 'response_id' : res_id, 'response_no' : 0})
         search_obj = self.pool.get('ir.ui.view')
         search_id = search_obj.search(cr,uid,[('model','=','survey.question.wiz'),('name','=','Survey Search')])
         return {

From 7b2c1d285542908d14d459f260c99e4d10079d39 Mon Sep 17 00:00:00 2001
From: "Rucha (Open ERP)" <rpa@tinyerp.com>
Date: Tue, 1 Mar 2011 10:27:45 +0530
Subject: [PATCH 09/10] [REVERT]: Reverted unwanted changes of translation

bzr revid: rpa@tinyerp.com-20110301045745-b7jsfsoppjt5d9uy
---
 addons/stock/i18n/stock.pot | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/addons/stock/i18n/stock.pot b/addons/stock/i18n/stock.pot
index cad8800f31a..4af2dea7948 100644
--- a/addons/stock/i18n/stock.pot
+++ b/addons/stock/i18n/stock.pot
@@ -1114,6 +1114,7 @@ msgstr ""
 #: view:stock.invoice.onshipping:0
 #: view:stock.location.product:0
 #: view:stock.move:0
+#: view:stock.move.track:0
 #: view:stock.picking:0
 #: view:stock.split.into:0
 msgid "_Cancel"
@@ -1692,6 +1693,7 @@ msgid "Search Inventory"
 msgstr ""
 
 #. module: stock
+#: field:stock.move.track,quantity:0
 msgid "Quantity per lot"
 msgstr ""
 
@@ -1918,6 +1920,7 @@ msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.track_line_old
+#: view:stock.move.track:0
 msgid "Tracking a move"
 msgstr ""
 
@@ -2458,6 +2461,7 @@ msgid "If checked, products contained in child locations of selected location wi
 msgstr ""
 
 #. module: stock
+#: field:stock.move.track,tracking_prefix:0
 msgid "Tracking prefix"
 msgstr ""
 
@@ -2897,6 +2901,7 @@ msgstr ""
 #: view:stock.move.consume:0
 #: view:stock.move.scrap:0
 #: view:stock.move.split:0
+#: view:stock.move.track:0
 #: view:stock.split.into:0
 msgid "Ok"
 msgstr ""

From de02305285087badbac94cf4c08d450118ca1ecd Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Tue, 1 Mar 2011 18:18:41 +0530
Subject: [PATCH 10/10] 
 [REF]account,hr_timesheet,product,point_of_sale,project:isinstance remove

bzr revid: ron@tinyerp.com-20110301124841-5fc80dgsnwm76590
---
 .../wizard/account_crossovered_analytic.py                    | 3 +--
 .../account_invoice_layout/report/special_message_invoice.py  | 4 +---
 addons/hr_timesheet/wizard/hr_timesheet_print_employee.py     | 3 +--
 addons/point_of_sale/wizard/pos_payment.py                    | 3 +--
 addons/product/wizard/product_price.py                        | 3 +--
 addons/project/wizard/project_task_delegate.py                | 3 +--
 .../project_scrum/wizard/project_scrum_backlog_create_task.py | 3 +--
 7 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/addons/account_analytic_plans/wizard/account_crossovered_analytic.py b/addons/account_analytic_plans/wizard/account_crossovered_analytic.py
index 2974c160501..86fa1c888f5 100644
--- a/addons/account_analytic_plans/wizard/account_crossovered_analytic.py
+++ b/addons/account_analytic_plans/wizard/account_crossovered_analytic.py
@@ -45,8 +45,7 @@ class account_crossovered_analytic(osv.osv_memory):
         acc_ids = [x[0] for x in res]
 
         data = self.read(cr, uid, ids, [], context=context)[0]
-        if isinstance(data['ref'],tuple):
-            data['ref'] = data['ref'][0]
+        data['ref'] = data['ref'][0]
 
         obj_acc = self.pool.get('account.analytic.account').browse(cr, uid, data['ref'], context=context)
         name = obj_acc.name
diff --git a/addons/account_invoice_layout/report/special_message_invoice.py b/addons/account_invoice_layout/report/special_message_invoice.py
index 81298bb6a06..20943d01fe1 100644
--- a/addons/account_invoice_layout/report/special_message_invoice.py
+++ b/addons/account_invoice_layout/report/special_message_invoice.py
@@ -37,9 +37,7 @@ class account_invoice_with_message(report_sxw.rml_parse):
         self.context = context
 
     def spcl_msg(self, form):
-        msg_id = form['message']
-        if isinstance(msg_id, (tuple,list)):
-            msg_id = msg_id[0]
+        msg_id = form['message'][0]
         account_msg_data = pooler.get_pool(self.cr.dbname).get('notify.message').browse(self.cr, self.uid, msg_id)
         msg = account_msg_data.msg
         return msg
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_employee.py b/addons/hr_timesheet/wizard/hr_timesheet_print_employee.py
index 51af2444661..12c55f6774a 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_employee.py
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_employee.py
@@ -50,8 +50,7 @@ class analytical_timesheet_employee(osv.osv_memory):
 
     def print_report(self, cr, uid, ids, context=None):
         data = self.read(cr, uid, ids, context=context)[0]
-        if isinstance(data['employee_id'], tuple):
-            data['employee_id'] = data['employee_id'][0]
+        data['employee_id'] = data['employee_id'][0]
         datas = {
              'ids': [],
              'model': 'hr.employee',
diff --git a/addons/point_of_sale/wizard/pos_payment.py b/addons/point_of_sale/wizard/pos_payment.py
index 6f9c2126a6d..d23ed8d0221 100644
--- a/addons/point_of_sale/wizard/pos_payment.py
+++ b/addons/point_of_sale/wizard/pos_payment.py
@@ -149,8 +149,7 @@ class pos_make_payment(osv.osv_memory):
         amount = order.amount_total - order.amount_paid
         data =  self.read(cr, uid, ids, context=context)[0]
         for m2o_field in ['product_id','pricelist_id','partner_id']:
-            if data[m2o_field] and isinstance(data[m2o_field], (list,tuple)):
-               data[m2o_field] = data[m2o_field][0]
+            data[m2o_field] = data[m2o_field][0]
         if data['is_acc']:
             amount = self.pool.get('product.product').browse(cr, uid, data['product_id'], context=context).list_price
 
diff --git a/addons/product/wizard/product_price.py b/addons/product/wizard/product_price.py
index c797efae937..bf5f4674b27 100644
--- a/addons/product/wizard/product_price.py
+++ b/addons/product/wizard/product_price.py
@@ -53,8 +53,7 @@ class product_price_list(osv.osv_memory):
         datas = {'ids': context.get('active_ids', [])}
         res = self.read(cr, uid, ids, ['price_list','qty1', 'qty2','qty3','qty4','qty5'], context=context)
         res = res and res[0] or {}
-        if isinstance(res['price_list'], (tuple,list)):
-            res['price_list'] = res['price_list'][0]
+        res['price_list'] = res['price_list'][0]
         datas['form'] = res
         return {
             'type': 'ir.actions.report.xml',
diff --git a/addons/project/wizard/project_task_delegate.py b/addons/project/wizard/project_task_delegate.py
index c7a64b0431c..ebe6fcb468f 100644
--- a/addons/project/wizard/project_task_delegate.py
+++ b/addons/project/wizard/project_task_delegate.py
@@ -105,8 +105,7 @@ class project_task_delegate(osv.osv_memory):
         task_id = context.get('active_id', False)
         task_pool = self.pool.get('project.task')
         delegate_data = self.read(cr, uid, ids, context=context)[0]
-        if isinstance(delegate_data['user_id'], tuple):
-            delegate_data['user_id'] = delegate_data['user_id'][0]
+        delegate_data['user_id'] = delegate_data['user_id'][0]
         delegate_data['name'] = tools.ustr(delegate_data['name'])
         task_pool.do_delegate(cr, uid, task_id, delegate_data, context=context)
         return {}
diff --git a/addons/project_scrum/wizard/project_scrum_backlog_create_task.py b/addons/project_scrum/wizard/project_scrum_backlog_create_task.py
index 3a13b43ae19..4b6b4d4ce31 100644
--- a/addons/project_scrum/wizard/project_scrum_backlog_create_task.py
+++ b/addons/project_scrum/wizard/project_scrum_backlog_create_task.py
@@ -35,8 +35,7 @@ class backlog_create_task(osv.osv_memory):
         ids_task = []
 
         data = self.read(cr, uid, ids, [], context=context)[0]
-        if isinstance(data['user_id'], tuple):
-            data['user_id'] = data['user_id'][0]
+        data['user_id'] = data['user_id'][0]
 
         backlogs = backlog_id.browse(cr, uid, context['active_ids'], context=context)
         result = mod_obj._get_id(cr, uid, 'project', 'view_task_search_form')