diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 4dbc8819893..0673fac94c6 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -782,7 +782,7 @@ class account_move_line(osv.osv):
context['journal_id'] = vals['journal_id']
if 'period_id' in vals and 'period_id' not in context:
context['period_id'] = vals['period_id']
- if 'journal_id' not in context and 'move_id' in vals:
+ if ('journal_id' not in context) and ('move_id' in vals) and vals['move_id']:
m = self.pool.get('account.move').browse(cr, uid, vals['move_id'])
context['journal_id'] = m.journal_id.id
context['period_id'] = m.period_id.id
diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index bb4fde85ad6..98e2f3775ea 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -837,7 +837,7 @@ class account_invoice(osv.osv):
'ref':invoice.number,
}
- name = invoice.invoice_line[0].name
+ name = invoice.invoice_line and invoice.invoice_line[0].name or invoice.number
l1['name'] = name
l2['name'] = name
diff --git a/addons/account_payment/payment_view.xml b/addons/account_payment/payment_view.xml
index 4202ca94b6c..4f476339b49 100644
--- a/addons/account_payment/payment_view.xml
+++ b/addons/account_payment/payment_view.xml
@@ -43,7 +43,7 @@
payment.type
form
-