From f26df86ea9e36c5d82a944b1500d4df2cb798f3e Mon Sep 17 00:00:00 2001
From: Commandant Custo <sve@odoo.com>
Date: Fri, 28 Aug 2015 10:36:25 +0200
Subject: [PATCH 1/3] [FIX] portal_sale: fix default domains

Quotations/Sales orders menu in the portal must copy the behavior
of the menus in the regular back-end.
Backport of e5c5b1cc23f3f95af9b2dd056f21ab0dfbd63fd8

closes #8271
opw:648186
---
 addons/portal_sale/portal_sale_view.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/portal_sale/portal_sale_view.xml b/addons/portal_sale/portal_sale_view.xml
index 80dff872377..be4cf460a6b 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>
 

From 0fb00808b2dcd4504a0aa533319274a7bd7faa84 Mon Sep 17 00:00:00 2001
From: Thomas Rehn <thomas.rehn@initos.com>
Date: Wed, 12 Nov 2014 14:30:11 +0100
Subject: [PATCH 2/3] [FIX] account_bank_statement_extensions: lines
 confirmation

Confirm lines of account cash statement on closing

The `account_bank_statement_extensions` adds
a state field to account.bank.statement.line
and sets the status to 'confirm'
when a bank statement is closed.

When a cash statement is closed,
the lines remained in draft.

Closes #3584
---
 .../account_bank_statement.py                       | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/addons/account_bank_statement_extensions/account_bank_statement.py b/addons/account_bank_statement_extensions/account_bank_statement.py
index 60dcc6dfa25..27518ac756c 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):

From 1cfe1910db8b110e1293ed2ca396d27769287f81 Mon Sep 17 00:00:00 2001
From: Matthieu Dietrich <matthieu.dietrich@camptocamp.com>
Date: Tue, 18 Nov 2014 11:11:21 +0100
Subject: [PATCH 3/3] [FIX] account: Remove superfluous bracket for analytic
 account domain

With the bracket in place,
the domain does not consider the last part,
"('state','not in',('close','cancelled'))".

Closes #3714
---
 addons/account/account_invoice_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index ab6c921c6ca..fb3a49dc9de 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>