Merge lp:~openerp-commiter/openobject-addons/dev-addons2-acu-sus1 into lp:~openerp/openobject-addons/trunk-fix-osvmem-read

[Sunny Sheth(OpenERP)]

Done changes in :
->email_template/wizard/email_template_send_wizard.py,
->auction/wizard/auction_pay_sel.py

=== modified file 'account/report/account_balance.py'
--- account/report/account_balance.py	2011-02-07 13:29:42 +0000
+++ account/report/account_balance.py	2011-02-08 13:16:18 +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-01-17 11:40:49 +0000
+++ account/wizard/account_move_journal.py	2011-02-08 13:16:18 +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-01-14 00:11:01 +0000
+++ account/wizard/account_open_closed_fiscalyear.py	2011-02-08 13:16:18 +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-01-14 00:11:01 +0000
+++ account/wizard/account_report_balance_sheet.py	2011-02-08 13:16:18 +0000
@@ -66,6 +66,14 @@
         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)

=== modified file 'account/wizard/account_report_common.py'
--- account/wizard/account_report_common.py	2011-01-14 00:11:01 +0000
+++ account/wizard/account_report_common.py	2011-02-08 13:16:18 +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_common_account.py'
--- account/wizard/account_report_common_account.py	2011-01-14 00:11:01 +0000
+++ account/wizard/account_report_common_account.py	2011-02-08 13:16:18 +0000
@@ -39,6 +39,12 @@
         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()

=== modified file 'account/wizard/account_report_common_journal.py'
--- account/wizard/account_report_common_journal.py	2011-01-14 00:11:01 +0000
+++ account/wizard/account_report_common_journal.py	2011-02-08 13:16:18 +0000
@@ -42,6 +42,14 @@
         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)

=== modified file 'account/wizard/account_report_common_partner.py'
--- account/wizard/account_report_common_partner.py	2011-01-14 00:11:01 +0000
+++ account/wizard/account_report_common_partner.py	2011-02-08 13:16:18 +0000
@@ -40,6 +40,12 @@
         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()

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

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

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

=== modified file 'account/wizard/account_report_profit_loss.py'
--- account/wizard/account_report_profit_loss.py	2011-01-14 00:11:01 +0000
+++ account/wizard/account_report_profit_loss.py	2011-02-08 13:16:18 +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-01-14 00:11:01 +0000
+++ account/wizard/account_validate_account_move.py	2011-02-08 13:16:18 +0000
@@ -34,6 +34,9 @@
         if context is None:
             context = {}
         data = self.read(cr, uid, ids, context=context)[0]
+        for field in data.keys():
+            if isinstance(data[field], tuple):
+                data[field] = data[field][0]
         ids_move = obj_move.search(cr, uid, [('state','=','draft'),('journal_id','=',data['journal_id']),('period_id','=',data['period_id'])])
         if not ids_move:
             raise osv.except_osv(_('Warning'), _('Specified Journal does not have any account move entries in draft state for this period'))

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

=== modified file '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-08 13:16:18 +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 '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-08 13:16:18 +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 'mrp/mrp.py'
--- mrp/mrp.py	2011-02-07 13:29:42 +0000
+++ mrp/mrp.py	2011-02-08 13:16:18 +0000
@@ -573,6 +573,7 @@
         """
         results = []
         bom_obj = self.pool.get('mrp.bom')
+        uom_obj = self.pool.get('product.uom')
         prod_line_obj = self.pool.get('mrp.production.product.line')
         workcenter_line_obj = self.pool.get('mrp.production.workcenter.line')
         for production in self.browse(cr, uid, ids):
@@ -590,7 +591,7 @@
             if not bom_id:
                 raise osv.except_osv(_('Error'), _("Couldn't find bill of material for product"))
 
-            factor = production.product_qty * production.product_uom.factor / bom_point.product_uom.factor
+            factor = uom_obj._compute_qty(cr, uid, production.product_uom.id, production.product_qty, bom_point.product_uom.id)
             res = bom_obj._bom_explode(cr, uid, bom_point, factor / bom_point.product_qty, properties)
             results = res[0]
             results2 = res[1]

=== modified file 'product/pricelist.py'
--- product/pricelist.py	2011-02-07 13:29:42 +0000
+++ product/pricelist.py	2011-02-08 13:16:18 +0000
@@ -264,7 +264,7 @@
                                     product_obj.price_get(cr, uid, [product_id],
                                         price_type.field)[product_id], round=False, context=context)
 
-                        if price:
+                        if price or price == 0.0:
                             price_limit = price
 
                             price = price * (1.0+(res['price_discount'] or 0.0))

=== modified file 'stock/stock.py'
--- stock/stock.py	2011-02-07 13:29:42 +0000
+++ stock/stock.py	2011-02-08 13:16:18 +0000
@@ -1886,6 +1886,14 @@
         @return: True
         """
         self.write(cr, uid, ids, {'state': 'confirmed'})
+
+        # fix for bug lp:707031
+        # called write of related picking because changing move availability does
+        # not trigger workflow of picking in order to change the state of picking
+        wf_service = netsvc.LocalService('workflow')
+        for move in self.browse(cr, uid, ids, context):
+            if move.picking_id:
+                wf_service.trg_write(uid, 'stock.picking', move.picking_id.id, cr)
         return True
 
     #

=== modified file 'stock/wizard/stock_invoice_onshipping.py'
--- stock/wizard/stock_invoice_onshipping.py	2011-02-08 07:23:53 +0000
+++ stock/wizard/stock_invoice_onshipping.py	2011-02-08 13:16:18 +0000
@@ -127,7 +127,7 @@
         res = picking_pool.action_invoice_create(cr, uid, active_ids,
               journal_id = onshipdata_obj[0]['journal_id'],
               group = onshipdata_obj[0]['group'],
-              type = None,
+              type = context.get('inv_type'),
               context=context)
         return res
 

=== modified file 'stock/wizard/stock_move.py'