From 87ff4b3c97b2d363228e0495c6f1bab2058930d9 Mon Sep 17 00:00:00 2001
From: "rha@tinyerp.com" <>
Date: Fri, 4 Feb 2011 18:28:09 +0530
Subject: [PATCH 01/13] [IMP] account: Improve osv memory wizards

bzr revid: rha@tinyerp.com-20110204125809-yuiqwhpoy0j1cyfb
---
 addons/account/report/account_balance.py                | 2 ++
 addons/account/wizard/account_move_journal.py           | 2 +-
 addons/account/wizard/account_open_closed_fiscalyear.py | 2 ++
 addons/account/wizard/account_report_balance_sheet.py   | 8 ++++++++
 addons/account/wizard/account_report_common.py          | 5 ++++-
 addons/account/wizard/account_report_common_account.py  | 6 ++++++
 addons/account/wizard/account_report_common_journal.py  | 8 ++++++++
 addons/account/wizard/account_report_common_partner.py  | 6 ++++++
 addons/account/wizard/account_report_general_ledger.py  | 2 +-
 addons/account/wizard/account_report_partner_balance.py | 2 +-
 addons/account/wizard/account_report_partner_ledger.py  | 2 +-
 addons/account/wizard/account_report_profit_loss.py     | 2 +-
 addons/account/wizard/account_validate_account_move.py  | 3 +++
 addons/account/wizard/account_vat.py                    | 3 +++
 addons/auction/wizard/auction_lots_invoice.py           | 4 ++--
 15 files changed, 49 insertions(+), 8 deletions(-)

diff --git a/addons/account/report/account_balance.py b/addons/account/report/account_balance.py
index 8fe9af39e00..e30a6ca3a1f 100644
--- a/addons/account/report/account_balance.py
+++ b/addons/account/report/account_balance.py
@@ -71,6 +71,8 @@ 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_move_journal.py b/addons/account/wizard/account_move_journal.py
index 47b83bb23f1..db179ff00ff 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, [])[0]['target_move']
+        target_move = self.read(cr, uid, ids, [], 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 39c5be00f15..e4562d02ca9 100644
--- a/addons/account/wizard/account_open_closed_fiscalyear.py
+++ b/addons/account/wizard/account_open_closed_fiscalyear.py
@@ -35,6 +35,8 @@ class account_open_closed_fiscalyear(osv.osv_memory):
         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'))
diff --git a/addons/account/wizard/account_report_balance_sheet.py b/addons/account/wizard/account_report_balance_sheet.py
index b69c6d65d71..ef6e02c0d37 100644
--- a/addons/account/wizard/account_report_balance_sheet.py
+++ b/addons/account/wizard/account_report_balance_sheet.py
@@ -66,6 +66,14 @@ class account_bs_report(osv.osv_memory):
         if context is None:
             context = {}
         data['form'].update(self.read(cr, uid, ids, ['display_type','reserve_account_id'])[0])
+
+        for field in data['form'].keys():
+            if isinstance(data['form'][field], tuple):
+                data['form'][field] = data['form'][field][0]
+        for ctx_field in data['form']['used_context'].keys():
+            if isinstance(data['form']['used_context'][ctx_field], tuple):
+                data['form']['used_context'][ctx_field] = data['form']['used_context'][ctx_field][0]
+
         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)
diff --git a/addons/account/wizard/account_report_common.py b/addons/account/wizard/account_report_common.py
index a4f87f55da8..f7d7cac1c77 100644
--- a/addons/account/wizard/account_report_common.py
+++ b/addons/account/wizard/account_report_common.py
@@ -131,7 +131,10 @@ class account_common_report(osv.osv_memory):
         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
diff --git a/addons/account/wizard/account_report_common_account.py b/addons/account/wizard/account_report_common_account.py
index 7205a9e53bf..ac496e9d22e 100644
--- a/addons/account/wizard/account_report_common_account.py
+++ b/addons/account/wizard/account_report_common_account.py
@@ -39,6 +39,12 @@ class account_common_account_report(osv.osv_memory):
         if context is None:
             context = {}
         data['form'].update(self.read(cr, uid, ids, ['display_account'], context=context)[0])
+        for field in data['form'].keys():
+            if isinstance(data['form'][field], tuple):
+                data['form'][field] = data['form'][field][0]
+        for ctx_field in data['form']['used_context'].keys():
+            if isinstance(data['form']['used_context'][ctx_field], tuple):
+                data['form']['used_context'][ctx_field] = data['form']['used_context'][ctx_field][0]
         return data
 
 account_common_account_report()
diff --git a/addons/account/wizard/account_report_common_journal.py b/addons/account/wizard/account_report_common_journal.py
index 8e9db058d31..741b171bfba 100644
--- a/addons/account/wizard/account_report_common_journal.py
+++ b/addons/account/wizard/account_report_common_journal.py
@@ -42,6 +42,14 @@ class account_common_journal_report(osv.osv_memory):
         if context is None:
             context = {}
         data['form'].update(self.read(cr, uid, ids, ['amount_currency'], context=context)[0])
+
+        for field in data['form'].keys():
+            if isinstance(data['form'][field], tuple):
+                data['form'][field] = data['form'][field][0]
+        for ctx_field in data['form']['used_context'].keys():
+            if isinstance(data['form']['used_context'][ctx_field], tuple):
+                data['form']['used_context'][ctx_field] = data['form']['used_context'][ctx_field][0]
+
         fy_ids = data['form']['fiscalyear_id'] and [data['form']['fiscalyear_id']] or self.pool.get('account.fiscalyear').search(cr, uid, [('state', '=', 'draft')], context=context)
         period_list = data['form']['periods'] or self.pool.get('account.period').search(cr, uid, [('fiscalyear_id', 'in', fy_ids)], context=context)
         data['form']['active_ids'] = self.pool.get('account.journal.period').search(cr, uid, [('journal_id', 'in', data['form']['journal_ids']), ('period_id', 'in', period_list)], context=context)
diff --git a/addons/account/wizard/account_report_common_partner.py b/addons/account/wizard/account_report_common_partner.py
index 05003041eeb..1cf3dfa5a35 100644
--- a/addons/account/wizard/account_report_common_partner.py
+++ b/addons/account/wizard/account_report_common_partner.py
@@ -40,6 +40,12 @@ class account_common_partner_report(osv.osv_memory):
         if context is None:
             context = {}
         data['form'].update(self.read(cr, uid, ids, ['result_selection'], context=context)[0])
+        for field in data['form'].keys():
+            if isinstance(data['form'][field], tuple):
+                data['form'][field] = data['form'][field][0]
+        for ctx_field in data['form']['used_context'].keys():
+            if isinstance(data['form']['used_context'][ctx_field], tuple):
+                data['form']['used_context'][ctx_field] = data['form']['used_context'][ctx_field][0]
         return data
 
 account_common_partner_report()
diff --git a/addons/account/wizard/account_report_general_ledger.py b/addons/account/wizard/account_report_general_ledger.py
index c08894bfadd..e3ad832e6fb 100644
--- a/addons/account/wizard/account_report_general_ledger.py
+++ b/addons/account/wizard/account_report_general_ledger.py
@@ -50,7 +50,7 @@ class account_report_general_ledger(osv.osv_memory):
         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']:
diff --git a/addons/account/wizard/account_report_partner_balance.py b/addons/account/wizard/account_report_partner_balance.py
index eff9e71cb72..5853824e0ed 100644
--- a/addons/account/wizard/account_report_partner_balance.py
+++ b/addons/account/wizard/account_report_partner_balance.py
@@ -42,7 +42,7 @@ class account_partner_balance(osv.osv_memory):
         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',
diff --git a/addons/account/wizard/account_report_partner_ledger.py b/addons/account/wizard/account_report_partner_ledger.py
index 1a09a6344f4..4211b1db866 100644
--- a/addons/account/wizard/account_report_partner_ledger.py
+++ b/addons/account/wizard/account_report_partner_ledger.py
@@ -47,7 +47,7 @@ class account_partner_ledger(osv.osv_memory):
         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',
diff --git a/addons/account/wizard/account_report_profit_loss.py b/addons/account/wizard/account_report_profit_loss.py
index c526550e789..f84b5db8f1d 100644
--- a/addons/account/wizard/account_report_profit_loss.py
+++ b/addons/account/wizard/account_report_profit_loss.py
@@ -42,7 +42,7 @@ class account_pl_report(osv.osv_memory):
         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',
diff --git a/addons/account/wizard/account_validate_account_move.py b/addons/account/wizard/account_validate_account_move.py
index ddcfa2c5353..c2fcfbfd5ab 100644
--- a/addons/account/wizard/account_validate_account_move.py
+++ b/addons/account/wizard/account_validate_account_move.py
@@ -34,6 +34,9 @@ class validate_account_move(osv.osv_memory):
         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'))
diff --git a/addons/account/wizard/account_vat.py b/addons/account/wizard/account_vat.py
index 863ae055428..3e77979cd3b 100644
--- a/addons/account/wizard/account_vat.py
+++ b/addons/account/wizard/account_vat.py
@@ -47,6 +47,9 @@ class account_vat_declaration(osv.osv_memory):
         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',
diff --git a/addons/auction/wizard/auction_lots_invoice.py b/addons/auction/wizard/auction_lots_invoice.py
index 66bb5e42f2b..d06dcf1db0b 100644
--- a/addons/auction/wizard/auction_lots_invoice.py
+++ b/addons/auction/wizard/auction_lots_invoice.py
@@ -46,7 +46,7 @@ class auction_lots_invoice(osv.osv_memory):
          @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 @@ class auction_lots_invoice(osv.osv_memory):
         @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',[])}

From 1334243f063a441b8a6bafc7fe93fc4b65880538 Mon Sep 17 00:00:00 2001
From: rha <rha@rha-desktop>
Date: Wed, 9 Feb 2011 12:05:43 +0530
Subject: [PATCH 02/13] [IMP] account: improvement in osc memory wizards

bzr revid: rha@rha-desktop-20110209063543-63e1qeizm0cnm1u0
---
 addons/account/wizard/account_report_balance_sheet.py | 11 ++---------
 .../account/wizard/account_report_common_account.py   |  6 ------
 .../account/wizard/account_report_common_journal.py   |  8 --------
 .../account/wizard/account_report_common_partner.py   |  6 ------
 4 files changed, 2 insertions(+), 29 deletions(-)

diff --git a/addons/account/wizard/account_report_balance_sheet.py b/addons/account/wizard/account_report_balance_sheet.py
index ef6e02c0d37..0e234c5cc39 100644
--- a/addons/account/wizard/account_report_balance_sheet.py
+++ b/addons/account/wizard/account_report_balance_sheet.py
@@ -65,15 +65,8 @@ class account_bs_report(osv.osv_memory):
     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])
-
-        for field in data['form'].keys():
-            if isinstance(data['form'][field], tuple):
-                data['form'][field] = data['form'][field][0]
-        for ctx_field in data['form']['used_context'].keys():
-            if isinstance(data['form']['used_context'][ctx_field], tuple):
-                data['form']['used_context'][ctx_field] = data['form']['used_context'][ctx_field][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)
diff --git a/addons/account/wizard/account_report_common_account.py b/addons/account/wizard/account_report_common_account.py
index ac496e9d22e..7205a9e53bf 100644
--- a/addons/account/wizard/account_report_common_account.py
+++ b/addons/account/wizard/account_report_common_account.py
@@ -39,12 +39,6 @@ class account_common_account_report(osv.osv_memory):
         if context is None:
             context = {}
         data['form'].update(self.read(cr, uid, ids, ['display_account'], context=context)[0])
-        for field in data['form'].keys():
-            if isinstance(data['form'][field], tuple):
-                data['form'][field] = data['form'][field][0]
-        for ctx_field in data['form']['used_context'].keys():
-            if isinstance(data['form']['used_context'][ctx_field], tuple):
-                data['form']['used_context'][ctx_field] = data['form']['used_context'][ctx_field][0]
         return data
 
 account_common_account_report()
diff --git a/addons/account/wizard/account_report_common_journal.py b/addons/account/wizard/account_report_common_journal.py
index 741b171bfba..8e9db058d31 100644
--- a/addons/account/wizard/account_report_common_journal.py
+++ b/addons/account/wizard/account_report_common_journal.py
@@ -42,14 +42,6 @@ class account_common_journal_report(osv.osv_memory):
         if context is None:
             context = {}
         data['form'].update(self.read(cr, uid, ids, ['amount_currency'], context=context)[0])
-
-        for field in data['form'].keys():
-            if isinstance(data['form'][field], tuple):
-                data['form'][field] = data['form'][field][0]
-        for ctx_field in data['form']['used_context'].keys():
-            if isinstance(data['form']['used_context'][ctx_field], tuple):
-                data['form']['used_context'][ctx_field] = data['form']['used_context'][ctx_field][0]
-
         fy_ids = data['form']['fiscalyear_id'] and [data['form']['fiscalyear_id']] or self.pool.get('account.fiscalyear').search(cr, uid, [('state', '=', 'draft')], context=context)
         period_list = data['form']['periods'] or self.pool.get('account.period').search(cr, uid, [('fiscalyear_id', 'in', fy_ids)], context=context)
         data['form']['active_ids'] = self.pool.get('account.journal.period').search(cr, uid, [('journal_id', 'in', data['form']['journal_ids']), ('period_id', 'in', period_list)], context=context)
diff --git a/addons/account/wizard/account_report_common_partner.py b/addons/account/wizard/account_report_common_partner.py
index 1cf3dfa5a35..05003041eeb 100644
--- a/addons/account/wizard/account_report_common_partner.py
+++ b/addons/account/wizard/account_report_common_partner.py
@@ -40,12 +40,6 @@ class account_common_partner_report(osv.osv_memory):
         if context is None:
             context = {}
         data['form'].update(self.read(cr, uid, ids, ['result_selection'], context=context)[0])
-        for field in data['form'].keys():
-            if isinstance(data['form'][field], tuple):
-                data['form'][field] = data['form'][field][0]
-        for ctx_field in data['form']['used_context'].keys():
-            if isinstance(data['form']['used_context'][ctx_field], tuple):
-                data['form']['used_context'][ctx_field] = data['form']['used_context'][ctx_field][0]
         return data
 
 account_common_partner_report()

From a03052d81739c71902a97d04d4481b71180ec33c Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Thu, 10 Feb 2011 12:46:28 +0530
Subject: [PATCH 03/13] [Fix] mrp: BOM allows self reference recursion error

lp bug: https://launchpad.net/bugs/713221 fixed

bzr revid: rha@tinyerp.com-20110210071628-hnybpta0k5k0x8jo
---
 addons/mrp/mrp.py | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 3ba8d4bde47..ac392f6565b 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -240,10 +240,28 @@ class mrp_bom(osv.osv):
                 return False
             level -= 1
         return True
-    _constraints = [
-        (_check_recursion, 'Error ! You can not create recursive BoM.', ['parent_id'])
-    ]
 
+    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']),
+    ]
 
     def onchange_product_id(self, cr, uid, ids, product_id, name, context=None):
         """ Changes UoM and name if product_id changes.

From 9be8ea59955ed7960112aa3ae429ea26082d1926 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Fri, 11 Feb 2011 16:55:20 +0530
Subject: [PATCH 04/13] [FIX]mrp_operation:cancelling MO given - given
 arguments wrong

lp bug: https://launchpad.net/bugs/709065 fixed

bzr revid: ron@tinyerp.com-20110211112520-c79ulbypasq38stt
---
 addons/mrp_operations/mrp_operations.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/mrp_operations/mrp_operations.py b/addons/mrp_operations/mrp_operations.py
index df5456baa4a..a01d22717b6 100644
--- a/addons/mrp_operations/mrp_operations.py
+++ b/addons/mrp_operations/mrp_operations.py
@@ -244,10 +244,12 @@ class mrp_production(osv.osv):
             wf_service.trg_validate(uid, 'mrp.production.workcenter.line', workcenter_line.id, 'button_start_working', cr)
         return super(mrp_production,self).action_in_production(cr, uid, ids)
     
-    def action_cancel(self, cr, uid, ids):
+    def action_cancel(self, cr, uid, ids, context=None):
         """ Cancels work order if production order is canceled.
         @return: Super method
         """
+        if context is None:
+            context = {}
         obj = self.browse(cr, uid, ids)[0]
         wf_service = netsvc.LocalService("workflow")
         for workcenter_line in obj.workcenter_lines:

From f394ec23578fd359fec475c78fafcbce65331d92 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Fri, 11 Feb 2011 18:29:20 +0530
Subject: [PATCH 05/13] [FIX] Purchase:[PS] Purchase order line_ Unit of
 measure

lp bug: https://launchpad.net/bugs/716117 fixed

bzr revid: aag@tinyerp.co.in-20110211125920-iarez31rjra2bep8
---
 addons/purchase/purchase.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 2527d0d6a7e..2b4ffb69f1f 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -662,7 +662,6 @@ class purchase_order_line(osv.osv):
                 'notes': notes or'', 'product_uom' : uom or False}, 'domain':{'product_uom':[]}}
         res = {}
         prod= self.pool.get('product.product').browse(cr, uid, product)
-
         product_uom_pool = self.pool.get('product.uom')
         lang=False
         if partner_id:
@@ -678,6 +677,11 @@ class purchase_order_line(osv.osv):
             date_order = time.strftime('%Y-%m-%d')
         qty = qty or 1.0
         seller_delay = 0
+        if uom:
+            uom1_cat = prod.uom_id.category_id.id
+            uom2_cat = product_uom_pool.browse(cr, uid, uom).category_id.id
+            if uom1_cat != uom2_cat:
+                uom = False
 
         prod_name = self.pool.get('product.product').name_get(cr, uid, [prod.id], context=context)[0][1]
         res = {}
@@ -704,14 +708,13 @@ class purchase_order_line(osv.osv):
             'taxes_id':map(lambda x: x.id, prod.supplier_taxes_id),
             'date_planned': date_planned or dt,'notes': notes or prod.description_purchase,
             'product_qty': qty,
-            'product_uom': uom}})
+            'product_uom': prod.uom_id.id}})
         domain = {}
 
         taxes = self.pool.get('account.tax').browse(cr, uid,map(lambda x: x.id, prod.supplier_taxes_id))
         fpos = fiscal_position and self.pool.get('account.fiscal.position').browse(cr, uid, fiscal_position) or False
         res['value']['taxes_id'] = self.pool.get('account.fiscal.position').map_tax(cr, uid, fpos, taxes)
-
-        res2 = self.pool.get('product.uom').read(cr, uid, [uom], ['category_id'])
+        res2 = self.pool.get('product.uom').read(cr, uid, [prod.uom_id.id], ['category_id'])
         res3 = prod.uom_id.category_id.id
         domain = {'product_uom':[('category_id','=',res2[0]['category_id'][0])]}
         if res2[0]['category_id'][0] != res3:

From bf880017ea3b22845b3c26bcb0c25b137f2da64f Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Fri, 11 Feb 2011 18:32:00 +0530
Subject: [PATCH 06/13] [FIX]product:Product UoM conversion error needs
 definition

lp bug: https://launchpad.net/bugs/716705 fixed

bzr revid: ron@tinyerp.com-20110211130200-hsc3iaasjizn5ipn
---
 addons/product/product.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/product/product.py b/addons/product/product.py
index 801e647e3f2..c1588c2295b 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -139,7 +139,7 @@ class product_uom(osv.osv):
             context = {}
         if from_unit.category_id.id <> to_unit.category_id.id:
             if context.get('raise-exception', True):
-                raise osv.except_osv(_('Error !'), _('Conversion from Product UoM m to Default UoM PCE is not possible as they both belong to different Category!.'))
+                raise osv.except_osv(_('Error !'), _('Conversion from Product UoM %s to Default UoM %s is not possible as they both belong to different Category!.') % (from_unit.name,to_unit.name,))
             else:
                 return qty
         amount = qty / from_unit.factor

From b9fb0a7ff9ced4e3e59892ba865eeafa6a68dab6 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Mon, 14 Feb 2011 12:24:13 +0530
Subject: [PATCH 07/13] [IMP] STOCK: Improvement in OSV wiz , Remove
 stock_move_track wiz

bzr revid: aag@tinyerp.co.in-20110214065413-jd4ow4sx80qaqgmc
---
 addons/stock/i18n/stock.pot             |  5 -----
 addons/stock/wizard/stock_move.py       | 29 -------------------------
 addons/stock/wizard/stock_move_view.xml | 28 ------------------------
 3 files changed, 62 deletions(-)

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 8cfdc648349..1ce2889abb3 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">

From 0e219e879fd6f015969ce2b015f8d8eee6200bba Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Mon, 14 Feb 2011 15:38:09 +0530
Subject: [PATCH 08/13] [MERGE]: Merge with lp:trunk-fix-osvmem-read

bzr revid: aag@tinyerp.co.in-20110214100809-plgvq13mbh3s5hm2
---
 addons/account/i18n/pt_BR.po                  |  5 ++---
 addons/account/report/account_balance.py      |  2 ++
 addons/account/wizard/account_move_journal.py |  2 +-
 .../wizard/account_open_closed_fiscalyear.py  |  2 ++
 .../wizard/account_report_balance_sheet.py    |  3 ++-
 .../account/wizard/account_report_common.py   |  5 ++++-
 .../wizard/account_report_general_ledger.py   |  2 +-
 .../wizard/account_report_partner_balance.py  |  2 +-
 .../wizard/account_report_partner_ledger.py   |  2 +-
 .../wizard/account_report_profit_loss.py      |  2 +-
 .../wizard/account_validate_account_move.py   |  3 +++
 addons/account/wizard/account_vat.py          |  3 +++
 addons/account_invoice_layout/i18n/hu.po      |  6 +++---
 addons/auction/wizard/auction_pay_sel.py      | 10 +++++-----
 addons/board/wizard/board_menu_create.py      |  4 +++-
 .../wizard/email_template_send_wizard.py      | 20 +++++++++----------
 addons/hr_timesheet/i18n/pt_BR.po             |  2 +-
 .../wizard/hr_timesheet_print_employee.py     |  4 +++-
 .../hr_timesheet_final_invoice_create.py      |  3 +++
 addons/mrp/i18n/es_AR.po                      |  5 ++---
 addons/mrp/wizard/mrp_product_produce.py      |  4 ++--
 addons/pad/__openerp__.py                     |  2 +-
 addons/point_of_sale/i18n/pt_BR.po            |  2 +-
 .../project_scrum_backlog_create_task.py      |  6 ++++--
 .../wizard/project_scrum_backlog_sprint.py    |  3 +++
 .../wizard/purchase_requisition_partner.py    |  9 ++++-----
 addons/stock/wizard/stock_split_move.py       |  2 +-
 addons/survey/wizard/survey_browse_answer.py  |  4 +++-
 addons/survey/wizard/survey_print.py          |  4 ++--
 addons/survey/wizard/survey_print_answer.py   |  2 +-
 .../survey/wizard/survey_print_statistics.py  |  2 +-
 addons/survey/wizard/survey_selection.py      |  4 ++--
 .../survey/wizard/survey_send_invitation.py   |  2 +-
 33 files changed, 79 insertions(+), 54 deletions(-)

diff --git a/addons/account/i18n/pt_BR.po b/addons/account/i18n/pt_BR.po
index 635c1071f25..165fda38df8 100644
--- a/addons/account/i18n/pt_BR.po
+++ b/addons/account/i18n/pt_BR.po
@@ -7,14 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-02-11 22:50+0000\n"
+"PO-Revision-Date: 2011-02-10 00:58+0000\n"
 "Last-Translator: Emerson <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-12 05:00+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-02-10 04:35+0000\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
diff --git a/addons/account/report/account_balance.py b/addons/account/report/account_balance.py
index 5d9cfac5699..45e642cd59e 100644
--- a/addons/account/report/account_balance.py
+++ b/addons/account/report/account_balance.py
@@ -71,6 +71,8 @@ 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_move_journal.py b/addons/account/wizard/account_move_journal.py
index 47b83bb23f1..db179ff00ff 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, [])[0]['target_move']
+        target_move = self.read(cr, uid, ids, [], 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 39c5be00f15..e4562d02ca9 100644
--- a/addons/account/wizard/account_open_closed_fiscalyear.py
+++ b/addons/account/wizard/account_open_closed_fiscalyear.py
@@ -35,6 +35,8 @@ class account_open_closed_fiscalyear(osv.osv_memory):
         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'))
diff --git a/addons/account/wizard/account_report_balance_sheet.py b/addons/account/wizard/account_report_balance_sheet.py
index b69c6d65d71..0e234c5cc39 100644
--- a/addons/account/wizard/account_report_balance_sheet.py
+++ b/addons/account/wizard/account_report_balance_sheet.py
@@ -65,7 +65,8 @@ class account_bs_report(osv.osv_memory):
     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)
diff --git a/addons/account/wizard/account_report_common.py b/addons/account/wizard/account_report_common.py
index a4f87f55da8..f7d7cac1c77 100644
--- a/addons/account/wizard/account_report_common.py
+++ b/addons/account/wizard/account_report_common.py
@@ -131,7 +131,10 @@ class account_common_report(osv.osv_memory):
         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
diff --git a/addons/account/wizard/account_report_general_ledger.py b/addons/account/wizard/account_report_general_ledger.py
index c08894bfadd..e3ad832e6fb 100644
--- a/addons/account/wizard/account_report_general_ledger.py
+++ b/addons/account/wizard/account_report_general_ledger.py
@@ -50,7 +50,7 @@ class account_report_general_ledger(osv.osv_memory):
         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']:
diff --git a/addons/account/wizard/account_report_partner_balance.py b/addons/account/wizard/account_report_partner_balance.py
index eff9e71cb72..5853824e0ed 100644
--- a/addons/account/wizard/account_report_partner_balance.py
+++ b/addons/account/wizard/account_report_partner_balance.py
@@ -42,7 +42,7 @@ class account_partner_balance(osv.osv_memory):
         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',
diff --git a/addons/account/wizard/account_report_partner_ledger.py b/addons/account/wizard/account_report_partner_ledger.py
index 1a09a6344f4..4211b1db866 100644
--- a/addons/account/wizard/account_report_partner_ledger.py
+++ b/addons/account/wizard/account_report_partner_ledger.py
@@ -47,7 +47,7 @@ class account_partner_ledger(osv.osv_memory):
         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',
diff --git a/addons/account/wizard/account_report_profit_loss.py b/addons/account/wizard/account_report_profit_loss.py
index c526550e789..f84b5db8f1d 100644
--- a/addons/account/wizard/account_report_profit_loss.py
+++ b/addons/account/wizard/account_report_profit_loss.py
@@ -42,7 +42,7 @@ class account_pl_report(osv.osv_memory):
         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',
diff --git a/addons/account/wizard/account_validate_account_move.py b/addons/account/wizard/account_validate_account_move.py
index ddcfa2c5353..c2fcfbfd5ab 100644
--- a/addons/account/wizard/account_validate_account_move.py
+++ b/addons/account/wizard/account_validate_account_move.py
@@ -34,6 +34,9 @@ class validate_account_move(osv.osv_memory):
         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'))
diff --git a/addons/account/wizard/account_vat.py b/addons/account/wizard/account_vat.py
index 863ae055428..3e77979cd3b 100644
--- a/addons/account/wizard/account_vat.py
+++ b/addons/account/wizard/account_vat.py
@@ -47,6 +47,9 @@ class account_vat_declaration(osv.osv_memory):
         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',
diff --git a/addons/account_invoice_layout/i18n/hu.po b/addons/account_invoice_layout/i18n/hu.po
index a94ea6f48ff..34093670df8 100644
--- a/addons/account_invoice_layout/i18n/hu.po
+++ b/addons/account_invoice_layout/i18n/hu.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-02-10 13:27+0000\n"
+"PO-Revision-Date: 2011-02-09 12:16+0000\n"
 "Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-11 04:59+0000\n"
+"X-Launchpad-Export-Date: 2011-02-10 04:35+0000\n"
 "X-Generator: Launchpad (build 12177)\n"
 
 #. module: account_invoice_layout
@@ -160,7 +160,7 @@ msgstr "Megadja a számlasorok listázási sorrendjét."
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Price"
-msgstr "Nettó érték"
+msgstr "Érték"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
diff --git a/addons/auction/wizard/auction_pay_sel.py b/addons/auction/wizard/auction_pay_sel.py
index 77484bbe988..7a3194b1967 100644
--- a/addons/auction/wizard/auction_pay_sel.py
+++ b/addons/auction/wizard/auction_pay_sel.py
@@ -42,14 +42,14 @@ class auction_pay_sel(osv.osv_memory):
         @param context: A standard dictionary
         @return:
         """
-        if context is None: 
+        if context is None:
             context = {}
         lot = self.pool.get('auction.lots').browse(cr, uid, context['active_id'], context=context)
         invoice_obj = self.pool.get('account.invoice')
-        for datas in self.read(cr, uid, ids, context=context):
-            account_id = datas.get('writeoff_acc_id', False)
-            period_id = datas.get('period_id', False)
-            journal_id = datas.get('journal_id', False)
+        for datas in self.browse(cr, uid, ids, context=context):
+            account_id = datas.dest_account_id and datas.dest_account_id.id or False
+            period_id = datas.period_id and datas.period_id.id or False
+            journal_id = datas.journal_id and datas.journal_id.id or False
             if lot.sel_inv_id:
                 p = invoice_obj.pay_and_reconcile(['lot.sel_inv_id.id'], datas['amount'], datas['dest_account_id'], journal_id, account_id, period_id, journal_id, context)
             return {'type': 'ir.actions.act_window_close'}
diff --git a/addons/board/wizard/board_menu_create.py b/addons/board/wizard/board_menu_create.py
index 10d4d80a7f3..73a8337bdb7 100644
--- a/addons/board/wizard/board_menu_create.py
+++ b/addons/board/wizard/board_menu_create.py
@@ -70,7 +70,9 @@ class board_menu_create(osv.osv_memory):
                 })
         obj_menu = self.pool.get('ir.ui.menu')
         #start Loop
-        for data in self.read(cr, uid, ids):
+        for data in self.read(cr, uid, ids, context=context):
+            if isinstance(data['menu_parent_id'], tuple):
+                data['menu_parent_id'] = data['menu_parent_id'][0]
             obj_menu.create(cr, uid, {
                 'name': data.get('menu_name'),
                 'parent_id': data.get('menu_parent_id'),
diff --git a/addons/email_template/wizard/email_template_send_wizard.py b/addons/email_template/wizard/email_template_send_wizard.py
index 4f6ab7af381..d66de039941 100644
--- a/addons/email_template/wizard/email_template_send_wizard.py
+++ b/addons/email_template/wizard/email_template_send_wizard.py
@@ -66,7 +66,7 @@ class email_template_send_wizard(osv.osv_memory):
         if not id:
             id = context['src_rec_ids'][0]
         return get_value(cursor, user, id, message, template, context)
-    
+
     def _get_template(self, cr, uid, context=None):
         if context is None:
             context = {}
@@ -116,13 +116,13 @@ class email_template_send_wizard(osv.osv_memory):
         'to':fields.char('To',size=250,required=True),
         'cc':fields.char('CC',size=250,),
         'bcc':fields.char('BCC',size=250,),
-        'reply_to':fields.char('Reply-To', 
-                    size=250, 
+        'reply_to':fields.char('Reply-To',
+                    size=250,
                     help="The address recipients should reply to,"
                          " if different from the From address."
                          " Placeholders can be used here."),
-        'message_id':fields.char('Message-ID', 
-                    size=250, 
+        'message_id':fields.char('Message-ID',
+                    size=250,
                     help="The Message-ID header value, if you need to"
                          "specify it, for example to automatically recognize the replies later."
                         " Placeholders can be used here."),
@@ -133,12 +133,12 @@ class email_template_send_wizard(osv.osv_memory):
         'signature':fields.boolean('Attach my signature to mail'),
         #'filename':fields.text('File Name'),
         'requested':fields.integer('No of requested Mails',readonly=True),
-        'generated':fields.integer('No of generated Mails',readonly=True), 
+        'generated':fields.integer('No of generated Mails',readonly=True),
         'full_success':fields.boolean('Complete Success',readonly=True),
         'attachment_ids': fields.many2many('ir.attachment','send_wizard_attachment_rel', 'wizard_id', 'attachment_id', 'Attachments'),
     }
 
-    #FIXME: probably better by overriding default_get directly 
+    #FIXME: probably better by overriding default_get directly
     _defaults = {
         'state': lambda self,cr,uid,ctx: len(ctx['src_rec_ids']) > 1 and 'multi' or 'single',
         'rel_model': lambda self,cr,uid,ctx: self.pool.get('ir.model').search(cr,uid,[('model','=',ctx['src_model'])],context=ctx)[0],
@@ -156,7 +156,7 @@ class email_template_send_wizard(osv.osv_memory):
         'reply_to': lambda self,cr,uid,ctx: self._get_template_value(cr, uid, 'reply_to', ctx),
         'requested':lambda self,cr,uid,ctx: len(ctx['src_rec_ids']),
         'full_success': False,
-        'attachment_ids': [], 
+        'attachment_ids': [],
     }
 
     def fields_get(self, cr, uid, fields=None, context=None, write_access=True):
@@ -200,7 +200,7 @@ class email_template_send_wizard(osv.osv_memory):
             else:
                 raise osv.except_osv(_("Email Template"),_("Email sending failed for one or more objects."))
         return True
-     
+
     def save_to_mailbox(self, cr, uid, ids, context=None):
         def get_end_value(id, value):
             if len(context['src_rec_ids']) > 1: # Multiple Mail: Gets value from the template
@@ -213,7 +213,7 @@ class email_template_send_wizard(osv.osv_memory):
         mail_ids = []
         template = self._get_template(cr, uid, context)
         for id in context['src_rec_ids']:
-            screen_vals = self.read(cr, uid, ids[0], [],context)
+            screen_vals = self.read(cr, uid, ids[0], [],context=context)
             account = self.pool.get('email_template.account').read(cr, uid, screen_vals['from'], context=context)
             vals = {
                 'email_from': tools.ustr(account['name']) + "<" + tools.ustr(account['email_id']) + ">",
diff --git a/addons/hr_timesheet/i18n/pt_BR.po b/addons/hr_timesheet/i18n/pt_BR.po
index 5beebcce854..7903fad3b8c 100644
--- a/addons/hr_timesheet/i18n/pt_BR.po
+++ b/addons/hr_timesheet/i18n/pt_BR.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-11 04:59+0000\n"
+"X-Launchpad-Export-Date: 2011-02-10 04:35+0000\n"
 "X-Generator: Launchpad (build 12177)\n"
 
 #. module: hr_timesheet
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/i18n/es_AR.po b/addons/mrp/i18n/es_AR.po
index b86befdef02..a8e1c47aa9f 100644
--- a/addons/mrp/i18n/es_AR.po
+++ b/addons/mrp/i18n/es_AR.po
@@ -7,14 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-02-11 22:02+0000\n"
+"PO-Revision-Date: 2011-02-06 16:11+0000\n"
 "Last-Translator: jpdborgna <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-12 05:00+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2011-02-07 05:19+0000\n"
 
 #. module: mrp
 #: field:mrp.production,move_created_ids:0
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/pad/__openerp__.py b/addons/pad/__openerp__.py
index 9ed790ceedc..c7f379050bf 100644
--- a/addons/pad/__openerp__.py
+++ b/addons/pad/__openerp__.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 {
     'name': 'Enhanced support for (Ether)Pad attachments',
-    'version': '1.0.3',
+    'version': '1.0.2',
     'category': 'Generic Modules/Others',
     'description': """
 Adds enhanced support for (Ether)Pad attachments in the web client, lets the
diff --git a/addons/point_of_sale/i18n/pt_BR.po b/addons/point_of_sale/i18n/pt_BR.po
index 609fe7d0b96..89041bfd4c5 100644
--- a/addons/point_of_sale/i18n/pt_BR.po
+++ b/addons/point_of_sale/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-11 04:59+0000\n"
+"X-Launchpad-Export-Date: 2011-02-10 04:35+0000\n"
 "X-Generator: Launchpad (build 12177)\n"
 
 #. module: point_of_sale
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..a4a4722ca1d 100644
--- a/addons/project_scrum/wizard/project_scrum_backlog_create_task.py
+++ b/addons/project_scrum/wizard/project_scrum_backlog_create_task.py
@@ -34,7 +34,9 @@ class backlog_create_task(osv.osv_memory):
         document_pool = self.pool.get('ir.attachment')
         ids_task = []
 
-        data = self.read(cr, uid, ids, [], context=context)[0]
+        record = self.browse(cr, uid, ids, context=context)[0]
+        user = record.user_id and record.user_id.id or False
+
         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'])
@@ -45,7 +47,7 @@ class backlog_create_task(osv.osv_memory):
                 'name': backlog.name,
                 'description': backlog.note,
                 'project_id': backlog.project_id.id,
-                'user_id': data['user_id'] or False,
+                'user_id': user,
                 'planned_hours': backlog.expected_hours,
                 'remaining_hours':backlog.expected_hours,
                 'sequence':backlog.sequence,
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..2626000b468 100644
--- a/addons/purchase_requisition/wizard/purchase_requisition_partner.py
+++ b/addons/purchase_requisition/wizard/purchase_requisition_partner.py
@@ -67,19 +67,18 @@ 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.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')
             partner_obj = self.pool.get('res.partner')
-            tender_line_obj = self.pool.get('purchase.requisition.line')
             pricelist_obj = self.pool.get('product.pricelist')
             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']
-
-            supplier_data = partner_obj.browse(cr, uid, partner_id, context=context)
+            partner_id = data.partner_id and data.partner_id.id or False
+            supplier_data = data.partner_id
 
             address_id = partner_obj.address_get(cr, uid, [partner_id], ['delivery'])['delivery']
             list_line=[]
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..13ff39cc6be 100644
--- a/addons/survey/wizard/survey_browse_answer.py
+++ b/addons/survey/wizard/survey_browse_answer.py
@@ -61,9 +61,11 @@ class survey_browse_answer(osv.osv_memory):
         @return : Dictionary value for Open the browse answer wizard.
         """
         if context is None: context = {}
-        record = self.read(cr, uid, ids, [])
+        record = self.read(cr, uid, ids, [],context=context)
         record = record and record[0] or {} 
         if record['response_id']:
+            if isinstance(record['response_id'], tuple):
+                record['response_id'] = record['response_id'][0]
             res_id = [(record['response_id'])]
         else:
             sur_response_obj = self.pool.get('survey.response')
diff --git a/addons/survey/wizard/survey_print.py b/addons/survey/wizard/survey_print.py
index ed6479885dc..ddaec0a4600 100644
--- a/addons/survey/wizard/survey_print.py
+++ b/addons/survey/wizard/survey_print.py
@@ -56,9 +56,9 @@ class survey_print(osv.osv_memory):
         @return : Dictionary value for print survey form.
         """
 
-        datas = {'ids' : self.read(cr, uid, ids, [], context)[0]['survey_ids']}
+        datas = {'ids' : self.read(cr, uid, ids, [], context=context)[0]['survey_ids']}
         res = self.read(cr, uid, ids, ['survey_title', 'orientation', 'paper_size',\
-                             'page_number', 'without_pagebreak'], context)
+                             'page_number', 'without_pagebreak'], context=context)
         res = res and res[0] or {}
         datas['form'] = res
         datas['model'] = 'survey.print'
diff --git a/addons/survey/wizard/survey_print_answer.py b/addons/survey/wizard/survey_print_answer.py
index 8375868e9db..02db236d233 100644
--- a/addons/survey/wizard/survey_print_answer.py
+++ b/addons/survey/wizard/survey_print_answer.py
@@ -59,7 +59,7 @@ class survey_print_answer(osv.osv_memory):
             context = {}
         datas = {'ids': context.get('active_ids', [])}
         res = self.read(cr, uid, ids, ['response_ids', 'orientation', 'paper_size',\
-                             'page_number', 'without_pagebreak'], context)
+                             'page_number', 'without_pagebreak'], context=context)
         res = res and res[0] or {}
         datas['form'] = res
         datas['model'] = 'survey.print.answer'
diff --git a/addons/survey/wizard/survey_print_statistics.py b/addons/survey/wizard/survey_print_statistics.py
index 9c10d138e0e..10b321fcf45 100644
--- a/addons/survey/wizard/survey_print_statistics.py
+++ b/addons/survey/wizard/survey_print_statistics.py
@@ -44,7 +44,7 @@ class survey_print_statistics(osv.osv_memory):
         if context is None:
             context = {}
         datas = {'ids': context.get('active_ids', [])}
-        res = self.read(cr, uid, ids, ['survey_ids'], context)
+        res = self.read(cr, uid, ids, ['survey_ids'], context=context)
         res = res and res[0] or {}
         datas['form'] = res
         datas['model'] = 'survey.print.statistics'
diff --git a/addons/survey/wizard/survey_selection.py b/addons/survey/wizard/survey_selection.py
index 04b829077f3..4d246c2b0c3 100644
--- a/addons/survey/wizard/survey_selection.py
+++ b/addons/survey/wizard/survey_selection.py
@@ -122,7 +122,7 @@ class survey_name_wiz(osv.osv_memory):
         search_obj = self.pool.get('ir.ui.view')
         if context is None: context = {}
 
-        sur_id = self.read(cr, uid, ids, [])[0]
+        sur_id = self.read(cr, uid, ids, [], context=context)[0]
         survey_id = sur_id['survey_id']
         context.update({'survey_id': survey_id, 'sur_name_id': sur_id['id']})
         cr.execute('select count(id) from survey_history where user_id=%s\
@@ -133,7 +133,7 @@ class survey_name_wiz(osv.osv_memory):
         if user_limit and res >= user_limit:
             raise osv.except_osv(_('Warning !'),_("You can not give response for this survey more than %s times") % (user_limit))
 
-        sur_rec = survey_obj.read(cr,uid,self.read(cr,uid,ids)[0]['survey_id'])
+        sur_rec = survey_obj.read(cr,uid,self.read(cr,uid,ids, context=context)[0]['survey_id'])
         if sur_rec['max_response_limit'] and sur_rec['max_response_limit'] <= sur_rec['tot_start_survey']:
             raise osv.except_osv(_('Warning !'),_("You can not give more response. Please contact the author of this survey for further assistance."))
 
diff --git a/addons/survey/wizard/survey_send_invitation.py b/addons/survey/wizard/survey_send_invitation.py
index 361f7388f6f..f091653c499 100644
--- a/addons/survey/wizard/survey_send_invitation.py
+++ b/addons/survey/wizard/survey_send_invitation.py
@@ -97,7 +97,7 @@ class survey_send_invitation(osv.osv_memory):
         if context is None:
             context = {}
         record = self.read(cr, uid, ids, [])
-        survey_ids =  context.get('active_ids', [])
+        survey_ids =  context.get('active_ids', [], context=context)
         record = record and record[0]
         partner_ids = record['partner_ids']
         user_ref= self.pool.get('res.users')

From e66dcf25ec033e010af4cf460481a14a27deccbd Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Mon, 14 Feb 2011 17:27:07 +0530
Subject: [PATCH 09/13] [IMP] Survey,Board: USE BROWSE method insted of Read in
 OSV memory wiz

bzr revid: aag@tinyerp.co.in-20110214115707-4l7bl0cfp595q6rc
---
 addons/board/wizard/board_menu_create.py     |  8 +++-----
 addons/survey/wizard/survey_browse_answer.py | 17 +++++++----------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/addons/board/wizard/board_menu_create.py b/addons/board/wizard/board_menu_create.py
index 73a8337bdb7..3c46c7e4092 100644
--- a/addons/board/wizard/board_menu_create.py
+++ b/addons/board/wizard/board_menu_create.py
@@ -70,12 +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, context=context):
-            if isinstance(data['menu_parent_id'], tuple):
-                data['menu_parent_id'] = data['menu_parent_id'][0]
+        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/survey/wizard/survey_browse_answer.py b/addons/survey/wizard/survey_browse_answer.py
index 13ff39cc6be..6b1e3034974 100644
--- a/addons/survey/wizard/survey_browse_answer.py
+++ b/addons/survey/wizard/survey_browse_answer.py
@@ -61,16 +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, [],context=context)
-        record = record and record[0] or {} 
-        if record['response_id']:
-            if isinstance(record['response_id'], tuple):
-                record['response_id'] = record['response_id'][0]
-            res_id = [(record['response_id'])]
-        else:
-            sur_response_obj = self.pool.get('survey.response')
-            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 {

From 8845509da6546c081112c8df73ecda4320af7863 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Mon, 14 Feb 2011 17:43:07 +0530
Subject: [PATCH 10/13] [FIX]mrp_operation:Problem in Manufacturing Operation

lp bug: https://launchpad.net/bugs/711269 fixed

bzr revid: ron@tinyerp.com-20110214121307-0oly4lou3frq59re
---
 addons/mrp_operations/mrp_operations.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/addons/mrp_operations/mrp_operations.py b/addons/mrp_operations/mrp_operations.py
index a01d22717b6..a7b264c781e 100644
--- a/addons/mrp_operations/mrp_operations.py
+++ b/addons/mrp_operations/mrp_operations.py
@@ -119,11 +119,12 @@ class mrp_production_workcenter_line(osv.osv):
         @return: Nothing
         """
         wf_service = netsvc.LocalService("workflow")
+        prod_obj_pool = self.pool.get('mrp.production')
         oper_obj = self.browse(cr, uid, ids)[0]
         prod_obj = oper_obj.production_id
         if action == 'start':
                if prod_obj.state =='confirmed':
-                   self.pool.get('mrp.production').force_production(cr, uid, [prod_obj.id])
+                   prod_obj_pool.force_production(cr, uid, [prod_obj.id])
                    wf_service.trg_validate(uid, 'mrp.production', prod_obj.id, 'button_produce', cr)
                elif prod_obj.state =='ready':
                    wf_service.trg_validate(uid, 'mrp.production', prod_obj.id, 'button_produce', cr)
@@ -139,6 +140,9 @@ class mrp_production_workcenter_line(osv.osv):
                 if line.state != 'done':
                      flag = False
             if flag:
+                for production in prod_obj_pool.browse(cr, uid, [prod_obj.id], context= None):
+                    if production.move_lines or production.move_created_ids:
+                        prod_obj_pool.action_produce(cr,uid, production.id, production.product_qty, 'consume_produce', context = None)
                 wf_service.trg_validate(uid, 'mrp.production', oper_obj.production_id.id, 'button_produce_done', cr)
         return
 

From ea7b07a981a8528581304995c4a2262c48bcb870 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Tue, 15 Feb 2011 11:38:12 +0530
Subject: [PATCH 11/13] [IMP] survey:Last Improvement in OSV wiz ,Realated Read
 method

bzr revid: aag@tinyerp.co.in-20110215060812-q2ai3hxrdhnl5182
---
 addons/survey/wizard/survey_print.py           | 3 +--
 addons/survey/wizard/survey_selection.py       | 6 +++---
 addons/survey/wizard/survey_send_invitation.py | 4 ++--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/addons/survey/wizard/survey_print.py b/addons/survey/wizard/survey_print.py
index ddaec0a4600..87767f34a68 100644
--- a/addons/survey/wizard/survey_print.py
+++ b/addons/survey/wizard/survey_print.py
@@ -55,8 +55,7 @@ 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=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=context)
         res = res and res[0] or {}
diff --git a/addons/survey/wizard/survey_selection.py b/addons/survey/wizard/survey_selection.py
index 4d246c2b0c3..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, [], context=context)[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, context=context)[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 f091653c499..4cf66d28cb3 100644
--- a/addons/survey/wizard/survey_send_invitation.py
+++ b/addons/survey/wizard/survey_send_invitation.py
@@ -96,8 +96,8 @@ 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, [])
-        survey_ids =  context.get('active_ids', [], context=context)
+        record = self.read(cr, uid, ids, [],context=context)
+        survey_ids =  context.get('active_ids', [])
         record = record and record[0]
         partner_ids = record['partner_ids']
         user_ref= self.pool.get('res.users')

From 9935d9b822c05ad2d5fbbffcba526b52b8a234ed Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Tue, 15 Feb 2011 16:06:44 +0530
Subject: [PATCH 12/13] [FIX]: product_margin: group by doesn't work

lp bug: https://launchpad.net/bugs/719223 fixed

bzr revid: rha@tinyerp.com-20110215103644-p4fmhivr48h5n22k
---
 addons/product_margin/product_margin_view.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/product_margin/product_margin_view.xml b/addons/product_margin/product_margin_view.xml
index a6d6eff5238..87022bdc44f 100644
--- a/addons/product_margin/product_margin_view.xml
+++ b/addons/product_margin/product_margin_view.xml
@@ -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>

From 43060a18be53ff8f53dbb3d57dbdd8a58b6a52e4 Mon Sep 17 00:00:00 2001
From: sus <sus@sus-desktop>
Date: Tue, 15 Feb 2011 16:19:00 +0530
Subject: [PATCH 13/13] [ADD] Passes missing context in
 purchase/purchase_view.xml

lp bug: https://launchpad.net/bugs/718616 fixed

bzr revid: sus@sus-desktop-20110215104900-pxu0frix1402tg8f
---
 addons/purchase/purchase_view.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index cb83841f005..d20b9491b39 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -12,7 +12,7 @@
             groups="group_purchase_manager"
             parent="base.menu_purchase_root" sequence="100"/>
 
-        <menuitem 
+        <menuitem
             id="menu_purchase_config_pricelist" name="Pricelists"
             parent="menu_purchase_config_purchase" sequence="50"/>
 
@@ -29,22 +29,22 @@
             parent="menu_purchase_config_pricelist" sequence="2"
             groups="base.group_extended"/>
 
-        <menuitem 
+        <menuitem
             id="menu_product_in_config_purchase" name="Product"
             parent="menu_purchase_config_purchase" sequence="30"/>
 
         <menuitem
             action="product.product_category_action_form" id="menu_product_category_config_purchase"
             parent="purchase.menu_product_in_config_purchase" sequence="10"/>
-          
-        <menuitem 
+
+        <menuitem
             id="menu_purchase_unit_measure_purchase" name="Units of Measure"
             parent="purchase.menu_product_in_config_purchase"  sequence="20"/>
 
         <menuitem
              action="product.product_uom_categ_form_action" id="menu_purchase_uom_categ_form_action"
              parent="menu_purchase_unit_measure_purchase" sequence="30"/>
-             
+
         <menuitem
               action="product.product_uom_form_action" id="menu_purchase_uom_form_action"
               parent="menu_purchase_unit_measure_purchase" sequence="30"/>
@@ -216,7 +216,7 @@
                             <field name="date_approve"/>
                         	<separator string="Invoices" colspan="4"/>
                         	<newline/>
-                        	<field name="invoice_ids" groups="base.group_extended" nolabel="1" colspan="4"/>
+                        	<field name="invoice_ids" groups="base.group_extended" nolabel="1" colspan="4" context="{'type':'in_invoice'}"/>
                         </page>
                         <page string="Notes">
                             <field colspan="4" name="notes" nolabel="1"/>