Merge lp:~openerp-commiter/openobject-addons/dev-addons2-rha1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons2

[Rifakat Husen (OpenERP)]

product_margin: group by doesn't work

=== modified file 'account/report/account_balance.py'
--- account/report/account_balance.py	2011-01-24 10:46:10 +0000
+++ account/report/account_balance.py	2011-02-15 10:47:19 +0000
@@ -71,6 +71,8 @@
     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

=== modified file 'account/wizard/account_automatic_reconcile.py'
--- account/wizard/account_automatic_reconcile.py	2011-01-14 00:11:01 +0000
+++ account/wizard/account_automatic_reconcile.py	2011-02-15 10:47:19 +0000
@@ -144,6 +144,9 @@
         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']
@@ -252,4 +255,4 @@
 
 account_automatic_reconcile()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'account/wizard/account_change_currency.py'
--- account/wizard/account_change_currency.py	2011-01-14 00:11:01 +0000
+++ account/wizard/account_change_currency.py	2011-02-15 10:47:19 +0000
@@ -45,8 +45,8 @@
         obj_currency = self.pool.get('res.currency')
         if context is None:
             context = {}
-        data = self.read(cr, uid, ids)[0]
-        new_currency = data['currency_id']
+        data = self.browse(cr, uid, ids)[0]
+        new_currency = data.currency_id.id
 
         invoice = obj_inv.browse(cr, uid, context['active_id'], context=context)
         if invoice.currency_id.id == new_currency:
@@ -76,4 +76,4 @@
 
 account_change_currency()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'account/wizard/account_chart.py'
--- account/wizard/account_chart.py	2011-01-14 00:11:01 +0000
+++ account/wizard/account_chart.py	2011-02-15 10:47:19 +0000
@@ -79,17 +79,17 @@
         fy_obj = self.pool.get('account.fiscalyear')
         if context is None:
             context = {}
-        data = self.read(cr, uid, ids, [], context=context)[0]
+        data = self.browse(cr, uid, ids, context=context)[0]
         result = mod_obj.get_object_reference(cr, uid, 'account', 'action_account_tree')
         id = result and result[1] or False
         result = act_obj.read(cr, uid, [id], context=context)[0]
         result['periods'] = []
-        if data['period_from'] and data['period_to']:
-            result['periods'] = period_obj.build_ctx_periods(cr, uid, data['period_from'], data['period_to'])
-        result['context'] = str({'fiscalyear': data['fiscalyear'], 'periods': result['periods'], \
-                                    'state': data['target_move']})
-        if data['fiscalyear']:
-            result['name'] += ':' + fy_obj.read(cr, uid, [data['fiscalyear']], context=context)[0]['code']
+        if data.period_from and data.period_to:
+            result['periods'] = period_obj.build_ctx_periods(cr, uid, data.period_from.id, data.period_to.id)
+        result['context'] = str({'fiscalyear': data.fiscalyear.id, 'periods': result['periods'], \
+                                    'state': data.target_move})
+        if data.fiscalyear:
+            result['name'] += ':' + fy_obj.read(cr, uid, [data.fiscalyear.id], context=context)[0]['code']
         return result
 
     _defaults = {

=== modified file 'account/wizard/account_fiscalyear_close.py'
--- account/wizard/account_fiscalyear_close.py	2011-01-14 00:11:01 +0000
+++ account/wizard/account_fiscalyear_close.py	2011-02-15 10:47:19 +0000
@@ -56,7 +56,10 @@
         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)
+        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]
 
         if context is None:
             context = {}

=== modified file 'account/wizard/account_fiscalyear_close_state.py'
--- account/wizard/account_fiscalyear_close_state.py	2011-01-14 00:11:01 +0000
+++ account/wizard/account_fiscalyear_close_state.py	2011-02-15 10:47:19 +0000
@@ -40,8 +40,8 @@
         @param ids: List of Account fiscalyear close state’s IDs
 
         """
-        for data in  self.read(cr, uid, ids, context=context):
-            fy_id = data['fy_id']
+        for data in  self.browse(cr, uid, ids, context=context):
+            fy_id = data.fy_id.id
 
             cr.execute('UPDATE account_journal_period ' \
                         'SET state = %s ' \
@@ -61,4 +61,4 @@
 
 account_fiscalyear_close_state()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'account/wizard/account_invoice_refund.py'
--- account/wizard/account_invoice_refund.py	2011-01-14 00:11:01 +0000
+++ account/wizard/account_invoice_refund.py	2011-02-15 10:47:19 +0000
@@ -95,6 +95,8 @@
             description = False
             company = res_users_obj.browse(cr, uid, uid, context=context).company_id
             journal_id = form.get('journal_id', False)
+            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))
@@ -102,6 +104,8 @@
                     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]
                 else:
                     period = inv.period_id and inv.period_id.id or False
 
@@ -217,4 +221,4 @@
 
 account_invoice_refund()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'account/wizard/account_move_bank_reconcile.py'
--- account/wizard/account_move_bank_reconcile.py	2011-01-14 00:11:01 +0000
+++ account/wizard/account_move_bank_reconcile.py	2011-02-15 10:47:19 +0000
@@ -41,15 +41,15 @@
         """
         if context is None:
             context = {}
-        data = self.read(cr, uid, ids, context=context)[0]
+        data = self.browse(cr, uid, ids, context=context)[0]
         cr.execute('select default_credit_account_id \
-                        from account_journal where id=%s', (data['journal_id'],))
+                        from account_journal where id=%s', (data.journal_id.id,))
         account_id = cr.fetchone()[0]
         if not account_id:
              raise osv.except_osv(_('Error'), _('You have to define \
 the bank account\nin the journal definition for reconciliation.'))
         return {
-            'domain': "[('journal_id','=',%d), ('account_id','=',%d), ('state','<>','draft')]" % (data['journal_id'], account_id),
+            'domain': "[('journal_id','=',%d), ('account_id','=',%d), ('state','<>','draft')]" % (data.journal_id.id, account_id),
             'name': _('Standard Encoding'),
             'view_type': 'form',
             'view_mode': 'tree,form',
@@ -61,4 +61,4 @@
 
 account_move_bank_reconcile()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'account/wizard/account_move_journal.py'
--- account/wizard/account_move_journal.py	2011-01-17 11:40:49 +0000
+++ account/wizard/account_move_journal.py	2011-02-15 10:47:19 +0000
@@ -148,7 +148,7 @@
 
         journal_id = self._get_journal(cr, uid, context)
         period_id = self._get_period(cr, uid, context)
-        target_move = self.read(cr, uid, ids, [])[0]['target_move']
+        target_move = self.read(cr, uid, ids, [], context=context)[0]['target_move']
 
         name = _("Journal Items")
         if journal_id:

=== modified file 'account/wizard/account_move_line_reconcile_select.py'
--- account/wizard/account_move_line_reconcile_select.py	2011-01-14 00:11:01 +0000
+++ account/wizard/account_move_line_reconcile_select.py	2011-02-15 10:47:19 +0000
@@ -39,9 +39,9 @@
         @return: dictionary of  Open  account move line window for reconcile on given account id
 
          """
-        data = self.read(cr, uid, ids, context=context)[0]
+        data = self.browse(cr, uid, ids, context=context)[0]
         return {
-            'domain': "[('account_id','=',%d),('reconcile_id','=',False),('state','<>','draft')]" % data['account_id'],
+            'domain': "[('account_id','=',%d),('reconcile_id','=',False),('state','<>','draft')]" % data.account_id.id,
             'name': _('Reconciliation'),
             'view_type': 'form',
             'view_mode': 'tree,form',
@@ -52,4 +52,4 @@
 
 account_move_line_reconcile_select()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'account/wizard/account_move_line_unreconcile_select.py'
--- account/wizard/account_move_line_unreconcile_select.py	2011-01-14 00:11:01 +0000
+++ account/wizard/account_move_line_unreconcile_select.py	2011-02-15 10:47:19 +0000
@@ -28,9 +28,9 @@
        'account_id': fields.many2one('account.account','Account',required=True),
     }
     def action_open_window(self, cr, uid, ids, context=None):
-        data = self.read(cr, uid, ids, context=context)[0]
+        data = self.browse(cr, uid, ids, context=context)[0]
         return {
-                'domain': "[('account_id','=',%d),('reconcile_id','<>',False),('state','<>','draft')]" % data['account_id'],
+                'domain': "[('account_id','=',%d),('reconcile_id','<>',False),('state','<>','draft')]" % data.account_id.id,
                 'name': 'Unreconciliation',
                 'view_type': 'form',
                 'view_mode': 'tree,form',
@@ -41,4 +41,4 @@
 
 account_move_line_unreconcile_select()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'account/wizard/account_open_closed_fiscalyear.py'
--- account/wizard/account_open_closed_fiscalyear.py	2011-01-14 00:11:01 +0000
+++ account/wizard/account_open_closed_fiscalyear.py	2011-02-15 10:47:19 +0000
@@ -35,6 +35,8 @@
         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)
         if not data_fyear.end_journal_period_id:
             raise osv.except_osv(_('Error !'), _('No End of year journal defined for the fiscal year'))

=== modified file 'account/wizard/account_reconcile.py'
--- account/wizard/account_reconcile.py	2011-01-14 00:11:01 +0000
+++ account/wizard/account_reconcile.py	2011-02-15 10:47:19 +0000
@@ -152,13 +152,13 @@
         period_obj = self.pool.get('account.period')
         if context is None:
             context = {}
-        data = self.read(cr, uid, ids,context=context)[0]
-        account_id = data['writeoff_acc_id']
-        context['date_p'] = data['date_p']
-        journal_id = data['journal_id']
-        context['comment'] = data['comment']
-        if data['analytic_id']:
-            context['analytic_id'] = data['analytic_id']
+        data = self.browse(cr, uid, ids,context=context)[0]
+        account_id = data.writeoff_acc_id.id
+        context['date_p'] = data.date_p
+        journal_id = data.journal_id.id
+        context['comment'] = data.comment
+        if data.analytic_id:
+            context['analytic_id'] = data.analytic_id.id
         if context['date_p']:
             date = context['date_p']
 
@@ -173,4 +173,4 @@
 
 account_move_line_reconcile_writeoff()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'account/wizard/account_report_balance_sheet.py'
--- account/wizard/account_report_balance_sheet.py	2011-01-14 00:11:01 +0000
+++ account/wizard/account_report_balance_sheet.py	2011-02-15 10:47:19 +0000
@@ -65,7 +65,8 @@
     def _print_report(self, cr, uid, ids, data, context=None):
         if context is None:
             context = {}
-        data['form'].update(self.read(cr, uid, ids, ['display_type','reserve_account_id'])[0])
+        record = self.browse(cr, uid, ids, context=context)[0]
+        data['form'].update({'display_type':record.display_type, 'reserve_account_id':record.reserve_account_id.id})
         if not data['form']['reserve_account_id']:
             raise osv.except_osv(_('Warning'),_('Please define the Reserve and Profit/Loss account for current user company !'))
         data = self.pre_print_report(cr, uid, ids, data, context=context)

=== modified file 'account/wizard/account_report_common.py'
--- account/wizard/account_report_common.py	2011-01-14 00:11:01 +0000
+++ account/wizard/account_report_common.py	2011-02-15 10:47:19 +0000
@@ -131,7 +131,10 @@
         data = {}
         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'])[0]
+        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():
+            if isinstance(data['form'][field], tuple):
+                data['form'][field] = data['form'][field][0]
         used_context = self._build_contexts(cr, uid, ids, data, context=context)
         data['form']['periods'] = used_context.get('periods', False) and used_context['periods'] or []
         data['form']['used_context'] = used_context

=== modified file 'account/wizard/account_report_general_ledger.py'
--- account/wizard/account_report_general_ledger.py	2011-01-14 00:11:01 +0000
+++ account/wizard/account_report_general_ledger.py	2011-02-15 10:47:19 +0000
@@ -50,7 +50,7 @@
         if context is None:
             context = {}
         data = self.pre_print_report(cr, uid, ids, data, context=context)
-        data['form'].update(self.read(cr, uid, ids, ['landscape',  'initial_balance', 'amount_currency', 'sortby'])[0])
+        data['form'].update(self.read(cr, uid, ids, ['landscape',  'initial_balance', 'amount_currency', 'sortby'], context=context)[0])
         if not data['form']['fiscalyear_id']:# GTK client problem onchange does not consider in save record
             data['form'].update({'initial_balance': False})
         if data['form']['landscape']:

=== modified file 'account/wizard/account_report_partner_balance.py'
--- account/wizard/account_report_partner_balance.py	2011-01-14 00:11:01 +0000
+++ account/wizard/account_report_partner_balance.py	2011-02-15 10:47:19 +0000
@@ -42,7 +42,7 @@
         if context is None:
             context = {}
         data = self.pre_print_report(cr, uid, ids, data, context=context)
-        data['form'].update(self.read(cr, uid, ids, ['display_partner'])[0])
+        data['form'].update(self.read(cr, uid, ids, ['display_partner'], context=context)[0])
         return {
             'type': 'ir.actions.report.xml',
             'report_name': 'account.partner.balance',

=== modified file 'account/wizard/account_report_partner_ledger.py'
--- account/wizard/account_report_partner_ledger.py	2011-01-14 00:11:01 +0000
+++ account/wizard/account_report_partner_ledger.py	2011-02-15 10:47:19 +0000
@@ -47,7 +47,7 @@
         if context is None:
             context = {}
         data = self.pre_print_report(cr, uid, ids, data, context=context)
-        data['form'].update(self.read(cr, uid, ids, ['initial_balance', 'reconcil', 'page_split', 'amount_currency'])[0])
+        data['form'].update(self.read(cr, uid, ids, ['initial_balance', 'reconcil', 'page_split', 'amount_currency'], context=context)[0])
         if data['form']['page_split']:
             return {
                 'type': 'ir.actions.report.xml',

=== modified file 'account/wizard/account_report_profit_loss.py'
--- account/wizard/account_report_profit_loss.py	2011-01-14 00:11:01 +0000
+++ account/wizard/account_report_profit_loss.py	2011-02-15 10:47:19 +0000
@@ -42,7 +42,7 @@
         if context is None:
             context = {}
         data = self.pre_print_report(cr, uid, ids, data, context=context)
-        data['form'].update(self.read(cr, uid, ids, ['display_type'])[0])
+        data['form'].update(self.read(cr, uid, ids, ['display_type'], context=context)[0])
         if data['form']['display_type']:
             return {
                 'type': 'ir.actions.report.xml',

=== modified file 'account/wizard/account_tax_chart.py'
--- account/wizard/account_tax_chart.py	2011-01-14 00:11:01 +0000
+++ account/wizard/account_tax_chart.py	2011-02-15 10:47:19 +0000
@@ -54,20 +54,20 @@
         period_obj = self.pool.get('account.period')
         if context is None:
             context = {}
-        data = self.read(cr, uid, ids, [], context=context)[0]
+        data = self.browse(cr, uid, ids, context=context)[0]
         result = mod_obj.get_object_reference(cr, uid, 'account', 'action_tax_code_tree')
         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']], context=context)[0]['fiscalyear_id'][0]
-            result['context'] = str({'period_id': data['period_id'], \
+        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, \
-                                        'state': data['target_move']})
+                                        'state': data.target_move})
         else:
-            result['context'] = str({'state': data['target_move']})
+            result['context'] = str({'state': data.target_move})
 
-        if data['period_id']:
-            period_code = period_obj.read(cr, uid, [data['period_id']], context=context)[0]['code']
+        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
 
@@ -78,4 +78,4 @@
 
 account_tax_chart()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'account/wizard/account_validate_account_move.py'
--- account/wizard/account_validate_account_move.py	2011-01-14 00:11:01 +0000
+++ account/wizard/account_validate_account_move.py	2011-02-15 10:47:19 +0000
@@ -34,6 +34,9 @@
         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'])])
         if not ids_move:
             raise osv.except_osv(_('Warning'), _('Specified Journal does not have any account move entries in draft state for this period'))

=== modified file 'account/wizard/account_vat.py'
--- account/wizard/account_vat.py	2011-01-14 00:11:01 +0000
+++ account/wizard/account_vat.py	2011-02-15 10:47:19 +0000
@@ -47,6 +47,9 @@
         datas = {'ids': context.get('active_ids', [])}
         datas['model'] = 'account.tax.code'
         datas['form'] = self.read(cr, uid, ids)[0]
+        for field in datas['form'].keys():
+            if isinstance(datas['form'][field], tuple):
+                datas['form'][field] = datas['form'][field][0]
         datas['form']['company_id'] = self.pool.get('account.tax.code').browse(cr, uid, [datas['form']['chart_tax_id']], context=context)[0].company_id.id
         return {
             'type': 'ir.actions.report.xml',

=== modified file 'account_analytic_plans/wizard/account_crossovered_analytic.py'
--- account_analytic_plans/wizard/account_crossovered_analytic.py	2011-01-14 00:11:01 +0000
+++ account_analytic_plans/wizard/account_crossovered_analytic.py	2011-02-15 10:47:19 +0000
@@ -45,6 +45,8 @@
         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]
 
         obj_acc = self.pool.get('account.analytic.account').browse(cr, uid, data['ref'], context=context)
         name = obj_acc.name
@@ -72,4 +74,4 @@
 
 account_crossovered_analytic()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'account_coda/wizard/account_coda_import.py'
--- account_coda/wizard/account_coda_import.py	2011-01-14 00:11:01 +0000
+++ account_coda/wizard/account_coda_import.py	2011-02-15 10:47:19 +0000
@@ -69,14 +69,14 @@
         if context is None:
             context = {}
 
-        data = self.read(cr, uid, ids)[0]
+        data = self.browse(cr, uid, ids)[0]
 
-        codafile = data['coda']
-        journal_code = journal_obj.browse(cr, uid, data['journal_id'], context=context).code
+        codafile = data.coda
+        journal_code = journal_obj.browse(cr, uid, data.journal_id.id, context=context).code
 
         period = account_period_obj.find(cr, uid, context=context)[0]
-        def_pay_acc = data['def_payable']
-        def_rec_acc = data['def_receivable']
+        def_pay_acc = data.def_payable.id
+        def_rec_acc = data.def_receivable.id
 
         err_log = "Errors:\n------\n"
         nb_err=0
@@ -96,7 +96,7 @@
                 bank_statement["bank_statement_line"]={}
                 bank_statement_lines = {}
                 bank_statement['date'] = str2date(line[5:11])
-                bank_statement['journal_id']=data['journal_id']
+                bank_statement['journal_id']=data.journal_id.id
                 period_id = account_period_obj.search(cr, uid, [('date_start', '<=', time.strftime('%Y-%m-%d', time.strptime(bank_statement['date'], "%y/%m/%d"))), ('date_stop', '>=', time.strftime('%Y-%m-%d', time.strptime(bank_statement['date'], "%y/%m/%d")))])
                 bank_statement['period_id'] = period_id and period_id[0] or False
                 bank_statement['state']='draft'
@@ -144,7 +144,7 @@
                     bank_statement["bank_statement_line"]=bank_statement_lines
                 elif line[1] == '2':
                     st_line_name = line[2:6]
-                    bank_statement_lines[st_line_name].update({'account_id': data['awaiting_account']})
+                    bank_statement_lines[st_line_name].update({'account_id': data.awaiting_account.id})
 
                 elif line[1] == '3':
                     # movement data record 3.1
@@ -165,7 +165,7 @@
                     else:
                         nb_err += 1
                         err_log += _('The bank account %s is not defined for the partner %s.\n')%(cntry_number, contry_name)
-                        bank_statement_lines[st_line_name].update({'account_id': data['awaiting_account']})
+                        bank_statement_lines[st_line_name].update({'account_id': data.awaiting_account.id})
 
                     bank_statement["bank_statement_line"]=bank_statement_lines
             elif line[0]=='3':
@@ -296,7 +296,7 @@
             'name': codafile,
             'statement_ids': [(6, 0, bkst_list,)],
             'note': str_log1+str_not+std_log+err_log,
-            'journal_id': data['journal_id'],
+            'journal_id': data.journal_id.id,
             'date': time.strftime("%Y-%m-%d"),
             'user_id': uid,
         })
@@ -336,4 +336,4 @@
 
 account_coda_import()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'account_followup/wizard/account_followup_print.py'
--- account_followup/wizard/account_followup_print.py	2011-01-14 00:11:01 +0000
+++ account_followup/wizard/account_followup_print.py	2011-02-15 10:47:19 +0000
@@ -48,10 +48,10 @@
 
         if context is None:
             context = {}
-        data = self.read(cr, uid, ids, [], context=context)[0]
+        data = self.browse(cr, uid, ids, context=context)[0]
         model_data_ids = mod_obj.search(cr, uid, [('model','=','ir.ui.view'),('name','=','view_account_followup_print_all')], context=context)
         resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
-        context.update({'followup_id': data['followup_id'], 'date':data['date']})
+        context.update({'followup_id': data.followup_id.id, 'date':data.date})
         return {
             'name': _('Select Partners'),
             'view_type': 'form',

=== modified file 'account_invoice_layout/report/special_message_invoice.py'
--- account_invoice_layout/report/special_message_invoice.py	2011-01-14 00:11:01 +0000
+++ account_invoice_layout/report/special_message_invoice.py	2011-02-15 10:47:19 +0000
@@ -37,7 +37,10 @@
         self.context = context
 
     def spcl_msg(self, form):
-        account_msg_data = pooler.get_pool(self.cr.dbname).get('notify.message').browse(self.cr, self.uid, form['message'])
+        msg_id = form['message']
+        if isinstance(msg_id, (tuple,list)):
+            msg_id = msg_id[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
 

=== modified file 'auction/wizard/auction_lots_invoice.py'
--- auction/wizard/auction_lots_invoice.py	2011-01-14 00:11:01 +0000
+++ auction/wizard/auction_lots_invoice.py	2011-02-15 10:47:19 +0000
@@ -46,7 +46,7 @@
          @param context: A standard dictionary
          @return: A dictionary which of fields with values.
         """
-        if context is None: 
+        if context is None:
             context = {}
         res = super(auction_lots_invoice, self).default_get(cr, uid, fields, context=context)
         service = netsvc.LocalService("object_proxy")
@@ -103,7 +103,7 @@
         @param ids: List of Auction lots make invoice buyer’s IDs
         @return: dictionary of  account invoice form.
         """
-        if context is None: 
+        if context is None:
             context = {}
         service = netsvc.LocalService("object_proxy")
         datas = {'ids' : context.get('active_ids',[])}

=== modified file 'hr_recruitment/wizard/hr_recruitment_phonecall.py'
--- hr_recruitment/wizard/hr_recruitment_phonecall.py	2011-01-14 00:11:01 +0000
+++ hr_recruitment/wizard/hr_recruitment_phonecall.py	2011-02-15 10:47:19 +0000
@@ -69,7 +69,7 @@
         phonecall_case_obj = self.pool.get('crm.phonecall')
         if context is None:
             context = {}
-        form = self.read(cr, uid, ids, [], context=context)[0]
+        form = self.browse(cr, uid, ids, context=context)[0]
         result = mod_obj._get_id(cr, uid, 'crm', 'view_crm_case_phonecalls_filter')
         res = mod_obj.read(cr, uid, result, ['res_id'], context=context)
         # Select the view
@@ -85,10 +85,10 @@
             #TODO: Take other info from job
             new_phonecall_id = phonecall_case_obj.create(cr, uid, {
                         'name': job.name,
-                        'user_id': form['user_id'],
-                        'categ_id': form['category_id'],
-                        'description': form['note'],
-                        'date': form['deadline'],
+                        'user_id': form.user_id.id,
+                        'categ_id': form.category_id.id,
+                        'description': form.note,
+                        'date': form.deadline,
                         'description': job.description,
                         'partner_id': job.partner_id.id,
                         'partner_address_id': job.partner_address_id.id,

=== modified file 'hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py'
--- hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py	2011-01-14 00:11:01 +0000
+++ hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py	2011-02-15 10:47:19 +0000
@@ -63,13 +63,13 @@
         if context is None:
             context = {}
         result = mod_obj._get_id(cr, uid, 'account', 'view_account_invoice_filter')
-        data = self.read(cr, uid, ids, [], context=context)[0]
+        data = self.browse(cr, uid, ids, context=context)[0]
 
         account_ids = {}
         for line in self.pool.get('account.analytic.line').browse(cr, uid, context['active_ids'], context=context):
             account_ids[line.account_id.id] = True
 
-        account_ids = account_ids.keys() #data['accounts']
+        account_ids = account_ids.keys() #data.accounts
         for account in analytic_account_obj.browse(cr, uid, account_ids, context=context):
             partner = account.partner_id
             if (not partner) or not (account.pricelist_id):
@@ -121,17 +121,17 @@
                 factor_name = ''
                 factor = invoice_factor_obj.browse(cr, uid, factor_id, context2)
 
-                if not data['product']:
+                if not data.product:
                     if factor.customer_name:
                         factor_name = product.name+' - '+factor.customer_name
                     else:
                         factor_name = product.name
                 else:
-                    factor_name = product_obj.name_get(cr, uid, [data['product']], context=context)[0][1]
+                    factor_name = product_obj.name_get(cr, uid, [data.product.id], context=context)[0][1]
 
                 if account.pricelist_id:
                     pl = account.pricelist_id.id
-                    price = pro_price_obj.price_get(cr,uid,[pl], data['product'] or product_id, qty or 1.0, account.partner_id.id)[pl]
+                    price = pro_price_obj.price_get(cr,uid,[pl], data.product.id or product_id, qty or 1.0, account.partner_id.id)[pl]
                 else:
                     price = 0.0
 
@@ -145,7 +145,7 @@
                     'invoice_line_tax_id': [(6,0,tax )],
                     'invoice_id': last_invoice,
                     'name': factor_name,
-                    'product_id': data['product'] or product_id,
+                    'product_id': data.product.id or product_id,
                     'invoice_line_tax_id': [(6,0,tax)],
                     'uos_id': product.uom_id.id,
                     'account_id': account_id,
@@ -162,14 +162,14 @@
                 for line in line_ids:
                     # set invoice_line_note
                     details = []
-                    if data['date']:
+                    if data.date:
                         details.append(line['date'])
-                    if data['time']:
+                    if data.time:
                         if line['product_uom_id']:
                             details.append("%s %s" % (line['unit_amount'], product_uom_obj.browse(cr, uid, [line['product_uom_id']],context2)[0].name))
                         else:
                             details.append("%s" % (line['unit_amount'], ))
-                    if data['name']:
+                    if data.name:
                         details.append(line['name'])
                     note.append(u' - '.join(map(lambda x: unicode(x) or '',details)))
 

=== modified file 'lunch/wizard/lunch_order_confirm.py'
--- lunch/wizard/lunch_order_confirm.py	2011-01-14 00:11:01 +0000
+++ lunch/wizard/lunch_order_confirm.py	2011-02-15 10:47:19 +0000
@@ -46,8 +46,8 @@
         data = context and context.get('active_ids', []) or []
         order_ref = self.pool.get('lunch.order')
 
-        for confirm_obj in self.read(cr, uid, ids):
-            order_ref.confirm(cr, uid, data, confirm_obj['confirm_cashbox'], context)
+        for confirm_obj in self.browse(cr, uid, ids):
+            order_ref.confirm(cr, uid, data, confirm_obj.confirm_cashbox.id, context)
             return {'type': 'ir.actions.act_window_close'}
 
 lunch_order_confirm()

=== modified file 'point_of_sale/wizard/pos_payment.py'
--- point_of_sale/wizard/pos_payment.py	2011-01-24 16:13:46 +0000
+++ point_of_sale/wizard/pos_payment.py	2011-02-15 10:47:19 +0000
@@ -148,6 +148,9 @@
         order = order_obj.browse(cr, uid, active_id, context=context)
         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]
         if data['is_acc']:
             amount = self.pool.get('product.product').browse(cr, uid, data['product_id'], context=context).list_price
 

=== modified file 'point_of_sale/wizard/pos_return.py'
--- point_of_sale/wizard/pos_return.py	2011-01-14 00:11:01 +0000
+++ point_of_sale/wizard/pos_return.py	2011-02-15 10:47:19 +0000
@@ -353,8 +353,8 @@
             data = return_boj.read(cr,uid,return_id,[])[0]
 
         wf_service = netsvc.LocalService("workflow")
-        self_data = self.read(cr, uid, ids)[0]
-        order_obj.add_product(cr, uid, active_ids[0], self_data['product_id'], self_data['quantity'], context=context)
+        self_data = self.browse(cr, uid, ids)[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):
             prop_ids =property_obj.search(cr, uid, [('name', '=', 'property_stock_customer')])

=== modified file 'product/wizard/product_price.py'
--- product/wizard/product_price.py	2011-01-14 00:11:01 +0000
+++ product/wizard/product_price.py	2011-02-15 10:47:19 +0000
@@ -53,6 +53,8 @@
         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]
         datas['form'] = res
         return {
             'type': 'ir.actions.report.xml',

=== modified file 'product_margin/product_margin_view.xml'
--- product_margin/product_margin_view.xml	2011-01-14 00:11:01 +0000
+++ product_margin/product_margin_view.xml	2011-02-15 10:47:19 +0000
@@ -80,6 +80,9 @@
                     <field name="expected_margin"/>
                     <field name="total_margin_rate"  widget="progressbar"/>
                     <field name="expected_margin_rate" widget="progressbar"/>
+                    <field name="categ_id" invisible="1"/>
+                    <field name="uom_id" invisible="1"/>
+                    <field name="type" invisible="1"/>
             </tree>
             </field>
         </record>

=== modified file 'project/wizard/project_task_delegate.py'
--- project/wizard/project_task_delegate.py	2011-01-14 00:11:01 +0000
+++ project/wizard/project_task_delegate.py	2011-02-15 10:47:19 +0000
@@ -105,6 +105,8 @@
         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['name'] = tools.ustr(delegate_data['name'])
         task_pool.do_delegate(cr, uid, task_id, delegate_data, context=context)
         return {}

=== modified file 'project_gtd/wizard/project_gtd_fill.py'
--- project_gtd/wizard/project_gtd_fill.py	2011-01-14 00:11:01 +0000
+++ project_gtd/wizard/project_gtd_fill.py	2011-02-15 10:47:19 +0000
@@ -50,10 +50,10 @@
     def process(self, cr, uid, ids, context=None):
         if not ids:
             return {}
-        data = self.read(cr, uid, ids, [], context=context)
-        if not data[0]['task_ids']:
+        data = self.browse(cr, uid, ids, context=context)
+        if not data[0].task_ids:
             return {}
-        self.pool.get('project.task').write(cr, uid, data[0]['task_ids'], {'timebox_id':data[0]['timebox_to_id']})
+        self.pool.get('project.task').write(cr, uid, [x.id for x in data[0].task_ids], {'timebox_id':data[0].timebox_to_id.id})
         return {'type': 'ir.actions.act_window_close'}
 
 project_timebox_fill()

=== modified file 'project_long_term/wizard/project_compute_phases.py'
--- project_long_term/wizard/project_compute_phases.py	2011-01-14 00:11:01 +0000
+++ project_long_term/wizard/project_compute_phases.py	2011-02-15 10:47:19 +0000
@@ -45,12 +45,12 @@
         Compute the phases for scheduling.
         """
         project_pool = self.pool.get('project.project')
-        data = self.read(cr, uid, ids, [], context=context)[0]
-        if not data['project_id'] and data['target_project'] == 'one':
+        data = self.browse(cr, uid, ids, context=context)[0]
+        if not data.project_id and data.target_project == 'one':
             raise osv.except_osv(_('Error!'), _('Please Specify Project to be schedule'))
 
-        if data['project_id']:        # If project mentioned find its phases
-            project_ids = [data['project_id']]
+        if data.project_id:        # If project mentioned find its phases
+            project_ids = [data.project_id.id]
         else:                        # Else take all the draft,open,pending states phases
             project_ids = project_pool.search(cr, uid, [], context=context)
 
@@ -69,7 +69,7 @@
         id = mod_obj.read(cr, uid, [result], ['res_id'])[0]['res_id']
         result = act_obj.read(cr, uid, [id], context=context)[0]
         result['target'] = 'current'
-        result['context'] = {"search_default_project_id":data['project_id'], "default_project_id":data['project_id'], "search_default_responsible_id":uid, "search_default_current": 1}
+        result['context'] = {"search_default_project_id":data.project_id.id or False, "default_project_id":data.project_id.id or False, "search_default_responsible_id":uid, "search_default_current": 1}
         return result
 
 project_compute_phases()

=== modified file 'project_long_term/wizard/project_compute_tasks.py'
--- project_long_term/wizard/project_compute_tasks.py	2011-01-14 00:11:01 +0000
+++ project_long_term/wizard/project_compute_tasks.py	2011-02-15 10:47:19 +0000
@@ -37,8 +37,8 @@
         if context is None:
             context = {}
         context['compute_by'] = 'project'
-        data = self.read(cr, uid, ids, [])[0]
-        project_id = data['project_id']
+        data = self.browse(cr, uid, ids)[0]
+        project_id = data.project_id.id
         project_pool.schedule_tasks(cr, uid, [project_id], context=context)
         return self._open_task_list(cr, uid, data, context=context)
 

=== modified file 'stock/wizard/stock_move.py'
--- stock/wizard/stock_move.py	2011-02-09 07:18:57 +0000
+++ stock/wizard/stock_move.py	2011-02-15 10:47:19 +0000
@@ -98,9 +98,9 @@
             context = {}
         move_obj = self.pool.get('stock.move')
         move_ids = context['active_ids']
-        for data in self.read(cr, uid, ids):
+        for data in self.browse(cr, uid, ids):
             move_obj.action_consume(cr, uid, move_ids,
-                             data['product_qty'], data['location_id'],
+                             data.product_qty, data.location_id.id,
                              context=context)
         return {'type': 'ir.actions.act_window_close'}
 
@@ -159,9 +159,9 @@
             context = {}
         move_obj = self.pool.get('stock.move')
         move_ids = context['active_ids']
-        for data in self.read(cr, uid, ids):
+        for data in self.browse(cr, uid, ids):
             move_obj.action_scrap(cr, uid, move_ids,
-                             data['product_qty'], data['location_id'],
+                             data.product_qty, data.location_id.id,
                              context=context)
         return {'type': 'ir.actions.act_window_close'}