diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index e4e12f63490..43a7803fb5c 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -572,7 +572,7 @@
                                     <field name="ref"/>
                                     <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
                                     <field name="type" on_change="onchange_type(partner_id, type)"/>
-                                    <field domain="[('journal_id','=',parent.journal_id)]" name="account_id"/>
+                                    <field domain="[('journal_id','=',parent.journal_id), ('company_id', '=', parent.company_id)]" name="account_id"/>
                                     <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('company_id', '=', parent.company_id), ('type', '&lt;&gt;', 'view')]"/>
                                     <field name="amount"/>
                                 </tree>
@@ -582,7 +582,7 @@
                                     <field name="ref"/>
                                     <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
                                     <field name="type" on_change="onchange_type(partner_id, type)"/>
-                                    <field domain="[('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id"/>
+                                    <field domain="[('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view'), ('company_id', '=', parent.company_id)]" name="account_id"/>
                                     <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('company_id', '=', parent.company_id), ('type', '&lt;&gt;', 'view')]"/>
                                     <field name="amount"/>
                                     <field name="sequence" readonly="0"/>
@@ -1013,7 +1013,7 @@
                     <field name="invoice"/>
                     <field name="name"/>
                     <field name="partner_id" on_change="onchange_partner_id(move_id, partner_id, account_id, debit, credit, date, journal_id)"/>
-                    <field name="account_id" domain="[('journal_id','=',journal_id)]"/>
+                    <field name="account_id" domain="[('journal_id','=',journal_id), ('company_id', '=', company_id)]"/>
                     <field name="journal_id"/>
                     <field name="debit" sum="Total debit"/>
                     <field name="credit" sum="Total credit"/>
@@ -1048,7 +1048,7 @@
                         <page string="Information">
                             <group col="2" colspan="2">
                                 <separator colspan="2" string="Amount"/>
-                                <field name="account_id" select="1" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                                <field name="account_id" select="1" domain="[('company_id', '=', company_id), ('type','&lt;&gt;','view'), ('type','&lt;&gt;','consolidation')]"/>
                                 <field name="debit"/>
                                 <field name="credit"/>
                                 <field name="quantity"/>
@@ -1122,7 +1122,7 @@
                             <field name="date"/>
                             <field name="journal_id" readonly="False" select="1"/>
                             <field name="period_id" readonly="False"/>
-                            <field name="account_id" select="1" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                            <field name="account_id" select="1" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation'),('company_id', '=', company_id)]"/>
                             <field name="partner_id" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,date)"/>
                             <newline/>
                             <field name="debit"/>
@@ -1343,7 +1343,7 @@
                                         <page string="Information">
                                             <group col="2" colspan="2">
                                                 <separator colspan="2" string="Amount"/>
-                                                <field name="account_id" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                                                <field name="account_id" domain="[('company_id', '=', parent.company_id), ('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                                                 <field name="debit"/>
                                                 <field name="credit"/>
                                                 <field name="quantity"/>
@@ -1405,7 +1405,7 @@
                                     <field name="invoice"/>
                                     <field name="name"/>
                                     <field name="partner_id" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,parent.date,parent.journal_id)"/>
-                                    <field name="account_id" domain="[('journal_id','=',parent.journal_id)]"/>
+                                    <field name="account_id" domain="[('journal_id','=',parent.journal_id),('company_id', '=', parent.company_id)]"/>
                                     <field name="date_maturity"/>
                                     <field name="debit" sum="Total Debit"/>
                                     <field name="credit" sum="Total Credit"/>
@@ -2576,7 +2576,7 @@ action = self.pool.get('res.config').next(cr, uid, [], context)
                                     <field name="ref"/>
                                     <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
                                     <field name="type" on_change="onchange_type(partner_id, type)"/>
-                                    <field domain="[('journal_id','=',parent.journal_id)]" name="account_id"/>
+                                    <field domain="[('journal_id','=',parent.journal_id), ('company_id', '=', parent.company_id)]" name="account_id"/>
                                     <field name="analytic_account_id" domain="[('company_id', '=', parent.company_id), ('type', '&lt;&gt;', 'view')]" groups="analytic.group_analytic_accounting" />
                                     <field name="amount"/>
                                 </tree>
@@ -2586,7 +2586,7 @@ action = self.pool.get('res.config').next(cr, uid, [], context)
                                     <field name="ref"/>
                                     <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
                                     <field name="type" on_change="onchange_type(partner_id, type)"/>
-                                    <field domain="[('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id"/>
+                                    <field domain="[('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view'), ('company_id', '=', parent.company_id)]" name="account_id"/>
                                     <field name="analytic_account_id" domain="[('company_id', '=', parent.company_id), ('type', '&lt;&gt;', 'view')]" groups="analytic.group_analytic_accounting" />
                                     <field name="amount"/>
                                     <field name="sequence"/>
diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index f4fde5f24ae..63c4e13e7c7 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -752,15 +752,16 @@ class account_voucher(osv.osv):
             if not currency_pool.is_zero(cr, uid, inv.currency_id, line_total):
                 diff = line_total
                 account_id = False
+                write_off_name = ''
                 if inv.payment_option == 'with_writeoff':
                     account_id = inv.writeoff_acc_id.id
-                    name = inv.comment
+                    write_off_name = inv.comment
                 elif inv.type in ('sale', 'receipt'):
                     account_id = inv.partner_id.property_account_receivable.id
                 else:
                     account_id = inv.partner_id.property_account_payable.id
                 move_line = {
-                    'name': name,
+                    'name': write_off_name or name,
                     'account_id': account_id,
                     'move_id': move_id,
                     'partner_id': inv.partner_id.id,