diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index b5bb1a542f3..9c230451932 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 b9e44ee8f9c..c5d7cfe7117 100644
--- a/addons/account_bank_statement_extensions/account_bank_statement.py
+++ b/addons/account_bank_statement_extensions/account_bank_statement.py
@@ -38,8 +38,7 @@ 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):
-        super(account_bank_statement, self).button_confirm_bank(cr, uid, ids, context=context)
+    def confirm_statement_lines(self, cr, uid, ids, context=None):
         for st in self.browse(cr, uid, ids, context=context):
             if st.line_ids:
                 cr.execute("UPDATE account_bank_statement_line  \
@@ -47,6 +46,16 @@ class account_bank_statement(osv.osv):
                     (tuple([x.id for x in st.line_ids]),))
         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):
         super(account_bank_statement, self).button_cancel(cr, uid, ids, context=context)
         for st in self.browse(cr, uid, ids, context=context):
diff --git a/addons/portal_sale/portal_sale_view.xml b/addons/portal_sale/portal_sale_view.xml
index f27fd003abb..cf6258aa303 100644
--- a/addons/portal_sale/portal_sale_view.xml
+++ b/addons/portal_sale/portal_sale_view.xml
@@ -44,7 +44,8 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">sale.order</field>
             <field name="view_mode">tree,form</field>
-            <field name="context">{"search_default_draft":1}</field>
+            <field name="domain">[('state','in',('draft','sent','cancel'))]</field>
+            <field name="context">{}</field>
             <field name="search_view_id" ref="sale.view_sales_order_filter"/>
             <field name="help">We haven't sent you any quotation.</field>
         </record>
@@ -55,7 +56,8 @@
             <field name="res_model">sale.order</field>
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="sale.view_sales_order_filter"/>
-            <field name="context">{"search_default_sales":1}</field>
+            <field name="domain">[('state', 'not in', ('draft', 'sent', 'cancel'))]</field>
+            <field name="context">{}</field>
             <field name="help">We haven't sent you any sales order.</field>
         </record>