diff --git a/addons/event/wizard/event_make_invoice.py b/addons/event/wizard/event_make_invoice.py
index 589818f8077..1e8505a74e9 100644
--- a/addons/event/wizard/event_make_invoice.py
+++ b/addons/event/wizard/event_make_invoice.py
@@ -68,8 +68,11 @@ class event_make_invoice(osv.osv_memory):
                 inv_reject = inv_reject + 1
                 inv_rej_reason += "ID "+str(reg.id)+": Registration doesn't have any partner to invoice. \n"
                 continue
-            partner_address_list = reg.partner_invoice_id and self.pool.get('res.partner').address_get(cr, uid, [reg.partner_invoice_id.id], adr_pref=['invoice'])
-            partner_address_id = partner_address_list['invoice']
+            else:
+                val_invoice = pool_obj.get('account.invoice').onchange_partner_id(cr, uid, [], 'out_invoice', reg.partner_invoice_id.id, False, False)
+                val_invoice['value'].update({'partner_id': reg.partner_invoice_id.id})
+                partner_address_id = val_invoice['value']['address_invoice_id']
+                
             if not partner_address_id:
                 inv_reject = inv_reject + 1
                 inv_rej_reason += "ID "+str(reg.id)+": Registered partner doesn't have an address to make the invoice. \n"
@@ -92,23 +95,14 @@ class event_make_invoice(osv.osv_memory):
             })
             inv_line_ids = obj_event_reg._create_invoice_lines(cr, uid, [reg.id], vals)
 
-            inv = {
-                'name': reg.invoice_label,
+            val_invoice['value'].update({
                 'origin': reg.invoice_label,
-                'type': 'out_invoice',
                 'reference': False,
-                'account_id': reg.partner_invoice_id.property_account_receivable.id,
-                'partner_id': reg.partner_invoice_id.id,
-                'address_invoice_id':partner_address_id,
-                'address_contact_id':partner_address_id,
                 'invoice_line': [(6,0,[inv_line_ids])],
-                'currency_id' :reg.partner_invoice_id.property_product_pricelist.currency_id.id,
                 'comment': "",
-                'payment_term':reg.partner_invoice_id.property_payment_term.id,
-                'fiscal_position': reg.partner_invoice_id.property_account_position.id
-            }
+            })
 
-            inv_id = inv_obj.create(cr, uid, inv)
+            inv_id = inv_obj.create(cr, uid, val_invoice['value'])
             list_inv.append(inv_id)
             obj_event_reg.write(cr, uid, reg.id, {'invoice_id': inv_id, 'state': 'done'})
             obj_event_reg._history(cr, uid, [reg.id], 'Invoiced', history=True)
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 0b2dff7319b..04326f0a9a5 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1753,7 +1753,7 @@ class stock_move(osv.osv):
 
         @ return: Consumed lines
         '''
-        if not context:
+        if context is None:
             context = {}
 
         if quantity <= 0: