diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 0c8738af972..3be43cd00e9 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -61,7 +61,7 @@
                         <group>
                             <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(product_id, parent.partner_id, parent.type, parent.fiscal_position,account_id)" groups="account.group_account_user"/>
                             <field name="invoice_line_tax_id" context="{'type':parent.get('type')}" domain="[('parent_id','=',False),('company_id', '=', parent.company_id)]" widget="many2many_tags"/>
-                            <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id)], ('state','not in',('close','cancelled'))]" name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
+                            <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('state','not in',('close','cancelled'))]" name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
                             <field name="company_id" groups="base.group_multi_company" readonly="1"/>
                         </group>
                     </group>
diff --git a/addons/account_bank_statement_extensions/account_bank_statement.py b/addons/account_bank_statement_extensions/account_bank_statement.py
index 72c3320be38..78b0a35f4b7 100644
--- a/addons/account_bank_statement_extensions/account_bank_statement.py
+++ b/addons/account_bank_statement_extensions/account_bank_statement.py
@@ -38,9 +38,8 @@ class account_bank_statement(osv.osv):
             res = super(account_bank_statement, self).write(cr, uid, ids, vals, context=context)
         return res
 
-    def button_confirm_bank(self, cr, uid, ids, context=None):
+    def confirm_statement_lines(self, cr, uid, ids, context=None):
         bank_statement_line_obj = self.pool.get('account.bank.statement.line')
-        super(account_bank_statement, self).button_confirm_bank(cr, uid, ids, context=context)
         for st in self.browse(cr, uid, ids, context=context):
             if st.line_ids:
                 line_ids = [l.id for l in st.line_ids]
@@ -50,6 +49,16 @@ class account_bank_statement(osv.osv):
                 bank_statement_line_obj.invalidate_cache(cr, uid, ['state'], line_ids, context=context)
         return True
 
+    def button_confirm_bank(self, cr, uid, ids, context=None):
+        res = super(account_bank_statement, self).button_confirm_bank(cr, uid, ids, context=context)
+        self.confirm_statement_lines(cr, uid, ids, context=context)
+        return res
+
+    def button_confirm_cash(self, cr, uid, ids, context=None):
+        res = super(account_bank_statement, self).button_confirm_cash(cr, uid, ids, context=context)
+        self.confirm_statement_lines(cr, uid, ids, context=context)
+        return res
+
     def button_cancel(self, cr, uid, ids, context=None):
         bank_statement_line_obj = self.pool.get('account.bank.statement.line')
         super(account_bank_statement, self).button_cancel(cr, uid, ids, context=context)