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

[Atik Agewan(OpenERP)]

Purchase:[PS] Purchase order line_ Unit of measure

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

review: Needs Resubmitting

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

 Again..Purchase:[PS] Purchase order line_ Unit of measure

review: Needs Resubmitting

=== modified file 'account/i18n/pt_BR.po'
--- account/i18n/pt_BR.po	2011-02-14 11:45:07 +0000
+++ account/i18n/pt_BR.po	2011-02-15 12:38:08 +0000
@@ -7,14 +7,13 @@
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: [e-mail]\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

=== modified file 'account/report/account_balance.py'
--- account/report/account_balance.py	2011-02-15 12:13:39 +0000
+++ account/report/account_balance.py	2011-02-15 12:38:08 +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_move_journal.py'
--- account/wizard/account_move_journal.py	2011-02-15 12:13:39 +0000
+++ account/wizard/account_move_journal.py	2011-02-15 12:38:08 +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_open_closed_fiscalyear.py'
--- account/wizard/account_open_closed_fiscalyear.py	2011-02-15 12:13:39 +0000
+++ account/wizard/account_open_closed_fiscalyear.py	2011-02-15 12:38:08 +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_report_balance_sheet.py'
--- account/wizard/account_report_balance_sheet.py	2011-02-15 12:13:39 +0000
+++ account/wizard/account_report_balance_sheet.py	2011-02-15 12:38:08 +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-02-15 12:13:39 +0000
+++ account/wizard/account_report_common.py	2011-02-15 12:38:08 +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-02-15 12:13:39 +0000
+++ account/wizard/account_report_general_ledger.py	2011-02-15 12:38:08 +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-02-15 12:13:39 +0000
+++ account/wizard/account_report_partner_balance.py	2011-02-15 12:38:08 +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-02-15 12:13:39 +0000
+++ account/wizard/account_report_partner_ledger.py	2011-02-15 12:38:08 +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-02-15 12:13:39 +0000
+++ account/wizard/account_report_profit_loss.py	2011-02-15 12:38:08 +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_validate_account_move.py'
--- account/wizard/account_validate_account_move.py	2011-02-15 12:13:39 +0000
+++ account/wizard/account_validate_account_move.py	2011-02-15 12:38:08 +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-02-15 12:13:39 +0000
+++ account/wizard/account_vat.py	2011-02-15 12:38:08 +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_invoice_layout/i18n/hu.po'
--- account_invoice_layout/i18n/hu.po	2011-02-11 04:59:58 +0000
+++ account_invoice_layout/i18n/hu.po	2011-02-15 12:38:08 +0000
@@ -7,13 +7,13 @@
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: [e-mail]\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 <[e-mail]>\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 @@
 #: 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

=== modified file 'auction/wizard/auction_pay_sel.py'
--- auction/wizard/auction_pay_sel.py	2011-01-14 00:11:01 +0000
+++ auction/wizard/auction_pay_sel.py	2011-02-15 12:38:08 +0000
@@ -42,14 +42,14 @@
         @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'}

=== modified file 'board/wizard/board_menu_create.py'
--- board/wizard/board_menu_create.py	2011-02-09 07:18:57 +0000
+++ board/wizard/board_menu_create.py	2011-02-15 12:38:08 +0000
@@ -70,10 +70,10 @@
                 })
         obj_menu = self.pool.get('ir.ui.menu')
         #start Loop
-        for data in self.read(cr, uid, ids):
+        for data in self.browse(cr, uid, ids, context=context):
             obj_menu.create(cr, uid, {
-                'name': data.get('menu_name'),
-                'parent_id': data.get('menu_parent_id'),
+                'name': data.menu_name,
+                'parent_id': data.menu_parent_id.id,
                 'icon': 'STOCK_SELECT_COLOR',
                 'action': 'ir.actions.act_window,' + str(action_id)
                 }, context=context)

=== modified file 'email_template/wizard/email_template_send_wizard.py'
--- email_template/wizard/email_template_send_wizard.py	2011-01-14 00:11:01 +0000
+++ email_template/wizard/email_template_send_wizard.py	2011-02-15 12:38:08 +0000
@@ -66,7 +66,7 @@
         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 @@
         '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 @@
         '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 @@
         '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 @@
             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 @@
         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']) + ">",

=== modified file 'hr_timesheet/i18n/pt_BR.po'
--- hr_timesheet/i18n/pt_BR.po	2011-02-11 04:59:58 +0000
+++ hr_timesheet/i18n/pt_BR.po	2011-02-15 12:38:08 +0000
@@ -14,7 +14,7 @@
 "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

=== modified file 'hr_timesheet/wizard/hr_timesheet_print_employee.py'
--- hr_timesheet/wizard/hr_timesheet_print_employee.py	2011-01-14 00:11:01 +0000
+++ hr_timesheet/wizard/hr_timesheet_print_employee.py	2011-02-15 12:38:08 +0000
@@ -31,7 +31,7 @@
                                   '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 @@
 
     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',

=== modified file 'hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py'
--- hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py	2011-01-14 00:11:01 +0000
+++ hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py	2011-02-15 12:38:08 +0000
@@ -59,6 +59,9 @@
         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):

=== modified file 'mrp/i18n/es_AR.po'
--- mrp/i18n/es_AR.po	2011-02-12 05:00:59 +0000
+++ mrp/i18n/es_AR.po	2011-02-15 12:38:08 +0000
@@ -7,14 +7,13 @@
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: [e-mail]\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

=== modified file 'mrp/wizard/mrp_product_produce.py'
--- mrp/wizard/mrp_product_produce.py	2011-01-14 00:11:01 +0000
+++ mrp/wizard/mrp_product_produce.py	2011-02-15 12:38:08 +0000
@@ -70,10 +70,10 @@
             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()

=== modified file 'pad/__openerp__.py'
--- pad/__openerp__.py	2011-02-10 16:10:42 +0000
+++ pad/__openerp__.py	2011-02-15 12:38:08 +0000
@@ -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

=== modified file 'point_of_sale/i18n/pt_BR.po'
--- point_of_sale/i18n/pt_BR.po	2011-02-11 04:59:58 +0000
+++ point_of_sale/i18n/pt_BR.po	2011-02-15 12:38:08 +0000
@@ -13,7 +13,7 @@
 "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

=== modified file 'project_scrum/wizard/project_scrum_backlog_create_task.py'
--- project_scrum/wizard/project_scrum_backlog_create_task.py	2011-01-14 00:11:01 +0000
+++ project_scrum/wizard/project_scrum_backlog_create_task.py	2011-02-15 12:38:08 +0000
@@ -34,7 +34,9 @@
         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 @@
                 '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,

=== modified file 'project_scrum/wizard/project_scrum_backlog_sprint.py'
--- project_scrum/wizard/project_scrum_backlog_sprint.py	2011-01-14 00:11:01 +0000
+++ project_scrum/wizard/project_scrum_backlog_sprint.py	2011-02-15 12:38:08 +0000
@@ -42,6 +42,9 @@
         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']:

=== modified file 'purchase/purchase.py'
--- purchase/purchase.py	2011-02-15 05:48:34 +0000
+++ purchase/purchase.py	2011-02-15 12:38:08 +0000
@@ -665,7 +665,6 @@
                 '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:
@@ -681,6 +680,11 @@
             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 = {}
@@ -707,14 +711,13 @@
             '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:

=== modified file 'purchase_requisition/wizard/purchase_requisition_partner.py'
--- purchase_requisition/wizard/purchase_requisition_partner.py	2011-01-14 00:11:01 +0000
+++ purchase_requisition/wizard/purchase_requisition_partner.py	2011-02-15 12:38:08 +0000
@@ -67,19 +67,18 @@
             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=[]

=== modified file 'stock/i18n/stock.pot'
--- stock/i18n/stock.pot	2011-01-14 00:11:01 +0000
+++ stock/i18n/stock.pot	2011-02-15 12:38:08 +0000
@@ -1114,7 +1114,6 @@
 #: 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 @@
 msgstr ""
 
 #. module: stock
-#: field:stock.move.track,quantity:0
 msgid "Quantity per lot"
 msgstr ""
 
@@ -1920,7 +1918,6 @@
 
 #. 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 @@
 msgstr ""
 
 #. module: stock
-#: field:stock.move.track,tracking_prefix:0
 msgid "Tracking prefix"
 msgstr ""
 
@@ -2901,7 +2897,6 @@
 #: 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 ""

=== modified file 'stock/wizard/stock_move.py'
--- stock/wizard/stock_move.py	2011-02-15 12:13:39 +0000
+++ stock/wizard/stock_move.py	2011-02-15 12:38:08 +0000
@@ -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"

=== modified file 'stock/wizard/stock_move_view.xml'
--- stock/wizard/stock_move_view.xml	2011-01-14 00:11:01 +0000
+++ stock/wizard/stock_move_view.xml	2011-02-15 12:38:08 +0000
@@ -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">

=== modified file 'stock/wizard/stock_split_move.py'
--- stock/wizard/stock_split_move.py	2011-02-09 07:18:57 +0000
+++ stock/wizard/stock_split_move.py	2011-02-15 12:38:08 +0000
@@ -107,7 +107,7 @@
         record_id = context and context.get('active_id', False) or False
         pick_obj = self.pool.get('stock.picking')
         pick = pick_obj.browse(cr, uid, record_id, context=context)
-        data = self.read(cr, uid, ids[0])
+        data = self.read(cr, uid, ids[0], context=context)
         for move in pick.move_lines:
             quantity = data['move%s' % move.id]
             if 0 < quantity < move.product_qty:

=== modified file 'survey/wizard/survey_browse_answer.py'
--- survey/wizard/survey_browse_answer.py	2011-02-09 07:18:57 +0000
+++ survey/wizard/survey_browse_answer.py	2011-02-15 12:38:08 +0000
@@ -61,14 +61,13 @@
         @return : Dictionary value for Open the browse answer wizard.
         """
         if context is None: context = {}
-        record = self.read(cr, uid, ids, [])
-        record = record and record[0] or {} 
-        if record['response_id']:
-            res_id = [(record['response_id'])]
-        else:
-            sur_response_obj = self.pool.get('survey.response')
-            res_id = sur_response_obj.search(cr, uid, [('survey_id', '=',int(record['survey_id']))])
-        context.update({'active' : True,'survey_id' : record['survey_id'], 'response_id' : res_id, 'response_no' : 0})
+        sur_response_obj = self.pool.get('survey.response')
+        for record in self.browse(cr, uid, ids,context=context):
+            if record.response_id.id:
+                res_id = record.response_id.id
+            else:
+                res_id = sur_response_obj.search(cr, uid, [('survey_id', '=',record.survey_id)])[0]
+        context.update({'active' : True,'survey_id' : record.survey_id, 'response_id' : [res_id], 'response_no' : 0})
         search_obj = self.pool.get('ir.ui.view')
         search_id = search_obj.search(cr,uid,[('model','=','survey.question.wiz'),('name','=','Survey Search')])
         return {

=== modified file 'survey/wizard/survey_print.py'
--- survey/wizard/survey_print.py	2011-02-09 07:18:57 +0000
+++ survey/wizard/survey_print.py	2011-02-15 12:38:08 +0000
@@ -55,10 +55,9 @@
         @param context: A standard dictionary for contextual values
         @return : Dictionary value for print survey form.
         """
-
-        datas = {'ids' : self.read(cr, uid, ids, [], context)[0]['survey_ids']}
+        datas = {'ids' : self.read(cr, uid, ids, ['survey_ids'], context=context)[0]['survey_ids']}
         res = self.read(cr, uid, ids, ['survey_title', 'orientation', 'paper_size',\
-                             'page_number', 'without_pagebreak'], context)
+                             'page_number', 'without_pagebreak'], context=context)
         res = res and res[0] or {}
         datas['form'] = res
         datas['model'] = 'survey.print'

=== modified file 'survey/wizard/survey_print_answer.py'
--- survey/wizard/survey_print_answer.py	2011-02-09 07:18:57 +0000
+++ survey/wizard/survey_print_answer.py	2011-02-15 12:38:08 +0000
@@ -59,7 +59,7 @@
             context = {}
         datas = {'ids': context.get('active_ids', [])}
         res = self.read(cr, uid, ids, ['response_ids', 'orientation', 'paper_size',\
-                             'page_number', 'without_pagebreak'], context)
+                             'page_number', 'without_pagebreak'], context=context)
         res = res and res[0] or {}
         datas['form'] = res
         datas['model'] = 'survey.print.answer'

=== modified file 'survey/wizard/survey_print_statistics.py'
--- survey/wizard/survey_print_statistics.py	2011-02-09 07:18:57 +0000
+++ survey/wizard/survey_print_statistics.py	2011-02-15 12:38:08 +0000
@@ -44,7 +44,7 @@
         if context is None:
             context = {}
         datas = {'ids': context.get('active_ids', [])}
-        res = self.read(cr, uid, ids, ['survey_ids'], context)
+        res = self.read(cr, uid, ids, ['survey_ids'], context=context)
         res = res and res[0] or {}
         datas['form'] = res
         datas['model'] = 'survey.print.statistics'

=== modified file 'survey/wizard/survey_selection.py'
--- survey/wizard/survey_selection.py	2011-02-09 07:18:57 +0000
+++ survey/wizard/survey_selection.py	2011-02-15 12:38:08 +0000
@@ -122,7 +122,7 @@
         search_obj = self.pool.get('ir.ui.view')
         if context is None: context = {}
 
-        sur_id = self.read(cr, uid, ids, [])[0]
+        sur_id = self.read(cr, uid, ids, ['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 @@
         if user_limit and res >= user_limit:
             raise osv.except_osv(_('Warning !'),_("You can not give response for this survey more than %s times") % (user_limit))
 
-        sur_rec = survey_obj.read(cr,uid,self.read(cr,uid,ids)[0]['survey_id'])
-        if sur_rec['max_response_limit'] and sur_rec['max_response_limit'] <= sur_rec['tot_start_survey']:
+        sur_rec = survey_obj.browse(cr,uid,ids,context=context)[0]
+        if sur_rec.max_response_limit and sur_rec.max_response_limit <= sur_rec.tot_start_survey:
             raise osv.except_osv(_('Warning !'),_("You can not give more response. Please contact the author of this survey for further assistance."))
 
         search_id = search_obj.search(cr,uid,[('model','=','survey.question.wiz'),('name','=','Survey Search')])

=== modified file 'survey/wizard/survey_send_invitation.py'
--- survey/wizard/survey_send_invitation.py	2011-02-09 07:18:57 +0000
+++ survey/wizard/survey_send_invitation.py	2011-02-15 12:38:08 +0000
@@ -96,7 +96,7 @@
     def action_send(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
-        record = self.read(cr, uid, ids, [])
+        record = self.read(cr, uid, ids, [],context=context)
         survey_ids =  context.get('active_ids', [])
         record = record and record[0]
         partner_ids = record['partner_ids']