From e3ae3650dec7164200550c00d1f6f0f226948028 Mon Sep 17 00:00:00 2001
From: Goffin Simon <sig@odoo.com>
Date: Tue, 17 Mar 2015 09:56:52 +0100
Subject: [PATCH 01/16] [FIX] website_quote: Accept button displayed in an
 expired quotation The accept button must be hidden if the quotation is
 expired.

opw:630342
---
 addons/website_quote/views/website_quotation.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/website_quote/views/website_quotation.xml b/addons/website_quote/views/website_quotation.xml
index 022258a9044..5059d0915e8 100644
--- a/addons/website_quote/views/website_quotation.xml
+++ b/addons/website_quote/views/website_quotation.xml
@@ -156,7 +156,8 @@
 
   <template id="quotation_toolbar">
       <div class="text-center hidden-print" t-if="quotation.state in ('draft', 'sent', 'waiting_date')">
-          <a class="btn btn-success fa fa-check" data-toggle="modal" data-target="#modelaccept">
+          <a class="btn btn-success fa fa-check" data-toggle="modal" data-target="#modelaccept"
+            t-if="days_valid">
               Accept
           </a>
           <a class="btn btn-info fa fa-comment" type="submit" href="#discussion">

From aaf9badbceaf683603b4667dd3d29e2784e78e6f Mon Sep 17 00:00:00 2001
From: Nicolas Lempereur <nle@odoo.com>
Date: Thu, 12 Mar 2015 13:12:55 +0100
Subject: [PATCH 02/16] [FIX] account: context/domain in move line tree

On a line write in a account.move.line tree view, the on_write return all the
sibling move lines of the written move line. The lines are then displayed even
if they do not match the current search domain.

This fix adds the context on the given on_write callback request, and in
on_create_write use a on_write_domain in this context to filter the returned ids.

fixes #3161, closes #5727

opw-630093
---
 addons/account/account_move_line.py            | 3 ++-
 addons/web/static/src/js/view_list_editable.js | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 8f6618d50ae..e79fde1df8f 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -306,7 +306,8 @@ class account_move_line(osv.osv):
         if not id:
             return []
         ml = self.browse(cr, uid, id, context=context)
-        return map(lambda x: x.id, ml.move_id.line_id)
+        domain = (context or {}).get('on_write_domain', [])
+        return self.pool.get('account.move.line').search(cr, uid, domain + [['id', 'in', [l.id for l in ml.move_id.line_id]]], context=context)
 
     def _balance(self, cr, uid, ids, name, arg, context=None):
         if context is None:
diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js
index 98585fd6757..d1d70068964 100644
--- a/addons/web/static/src/js/view_list_editable.js
+++ b/addons/web/static/src/js/view_list_editable.js
@@ -430,7 +430,8 @@ openerp.web.list_editable = function (instance) {
             var self = this;
             var on_write_callback = self.fields_view.arch.attrs.on_write;
             if (!on_write_callback) { return $.when(); }
-            return this.dataset.call(on_write_callback, [source_record.get('id')])
+            var context = new instance.web.CompoundContext(self.dataset.get_context(), {'on_write_domain': self.dataset.domain}).eval();
+            return this.dataset.call(on_write_callback, [source_record.get('id'), context])
                 .then(function (ids) {
                     return $.when.apply(
                         null, _(ids).map(

From 8e48eb625dcedb333137e4af59c4d5332ae5f4a3 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Thu, 26 Mar 2015 09:51:43 +0100
Subject: [PATCH 03/16] [FIX] mrp: ability to search BOM on BOM lines
 containing ...

In BOM, when performing an advanced search
on "BOM Lines" contains "a name"
all lines were returned, whatever the lines content.

This was due to the simple fact no field 'name'
was set on the mrp.bom.line model.

We set "product_id" as _rec_name, it seems the more
logical choice.

opw-631335
---
 addons/mrp/mrp.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 3ca55e3efb0..fabeeca0fe3 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -367,6 +367,7 @@ class mrp_bom(osv.osv):
 class mrp_bom_line(osv.osv):
     _name = 'mrp.bom.line'
     _order = "sequence"
+    _rec_name = "product_id"
 
     def _get_child_bom_lines(self, cr, uid, ids, field_name, arg, context=None):
         """If the BOM line refers to a BOM, return the ids of the child BOM lines"""

From 2faf4b7747310a58b93eea5d3d2d7ab0bf06ca33 Mon Sep 17 00:00:00 2001
From: Laurent Mignon <laurent.mignon@acsone.eu>
Date: Mon, 23 Mar 2015 13:36:42 +0100
Subject: [PATCH 04/16] [IMP] Display the line note in the details When
 reconciling, it's sometimes useful to have access to the note since the note
 can be filled with some information by the parser.

---
 .../static/src/xml/account_bank_statement_reconciliation.xml     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/account/static/src/xml/account_bank_statement_reconciliation.xml b/addons/account/static/src/xml/account_bank_statement_reconciliation.xml
index 72d5afde377..68813e9a8e6 100644
--- a/addons/account/static/src/xml/account_bank_statement_reconciliation.xml
+++ b/addons/account/static/src/xml/account_bank_statement_reconciliation.xml
@@ -137,6 +137,7 @@
             <tr><td>Description</td><td><t t-esc="line.name"/></td></tr>
             <tr><td>Amount</td><td><t t-esc="line.amount_str"/><t t-if="line.amount_currency_str"> (<t t-esc="line.amount_currency_str"/>)</t></td></tr>
             <tr><td>Account</td><td><t t-esc="line.account_code"/> <t t-esc="line.account_name"/></td></tr>
+            <tr t-if="line.note"><td>Note</td><td><t t-esc="line.note"/></td></tr>
         </table>
     </t>
 

From 6ef068a8115be8c9ab2c0ed69ece127ce81f3504 Mon Sep 17 00:00:00 2001
From: Richard Mathot <rim@odoo.com>
Date: Fri, 20 Mar 2015 08:45:35 +0100
Subject: [PATCH 05/16] [FIX] doc: exception for date/datetime in kanban views

---
 doc/reference/views.rst | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/reference/views.rst b/doc/reference/views.rst
index 7f67bfbc092..3efdcb55545 100644
--- a/doc/reference/views.rst
+++ b/doc/reference/views.rst
@@ -851,7 +851,9 @@ Possible children of the view element are:
     an object with all the requested fields as its attributes. Each field has
     two attributes ``value`` and ``raw_value``, the former is formatted
     according to current user parameters, the latter is the direct value from
-    a :meth:`~openerp.models.Model.read`
+    a :meth:`~openerp.models.Model.read` (except for date and datetime fields
+    that are `formatted according to user's locale
+    <https://github.com/odoo/odoo/blob/8.0/addons/web_kanban/static/src/js/kanban.js#L900>`_)
   ``read_only_mode``
     self-explanatory
 

From b9adcc759897f48acaf7e9b05cc6eaf5e68fc416 Mon Sep 17 00:00:00 2001
From: Jeremy Kersten <jke@odoo.com>
Date: Thu, 26 Mar 2015 10:09:31 +0100
Subject: [PATCH 06/16] [IMP] base_import: match column names withtout check
 the case

If you try to import a file with a header 'Parent_id/id'
_match_header will not match Parent_id with parent_id
because it was comparing with case sensitive.

It's not a bug, but in most cases this new behaviour (non
sensitive case search) is what the end user was expected.

Hate Excel and the auto correct capitalization !
---
 addons/base_import/models.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/base_import/models.py b/addons/base_import/models.py
index ab2ec8b72ce..9157b9b5920 100644
--- a/addons/base_import/models.py
+++ b/addons/base_import/models.py
@@ -157,7 +157,7 @@ class ir_import(orm.TransientModel):
         for field in fields:
             # FIXME: should match all translations & original
             # TODO: use string distance (levenshtein? hamming?)
-            if header == field['name'] \
+            if header.lower() == field['name'].lower() \
               or header.lower() == field['string'].lower():
                 return [field]
 

From d79a1622bb99338438ab0378643065988b9d6c65 Mon Sep 17 00:00:00 2001
From: Goffin Simon <sig@odoo.com>
Date: Thu, 26 Mar 2015 11:20:54 +0100
Subject: [PATCH 07/16] [FIX] base: ir_filters: filters not in the language of
 the user

the context of the user must be used in get_filters to take into account
the language of the user.

opw:630057
---
 openerp/addons/base/ir/ir_filters.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/openerp/addons/base/ir/ir_filters.py b/openerp/addons/base/ir/ir_filters.py
index dacacfd3d16..261403b7820 100644
--- a/openerp/addons/base/ir/ir_filters.py
+++ b/openerp/addons/base/ir/ir_filters.py
@@ -44,10 +44,11 @@ class ir_filters(osv.osv):
             ``context`` of the matching ``ir.filters``.
         """
         # available filters: private filters (user_id=uid) and public filters (uid=NULL) 
+        context = self.pool['res.users'].context_get(cr, uid)
         filter_ids = self.search(cr, uid,
             [('model_id','=',model),('user_id','in',[uid, False])])
         my_filters = self.read(cr, uid, filter_ids,
-            ['name', 'is_default', 'domain', 'context', 'user_id'])
+            ['name', 'is_default', 'domain', 'context', 'user_id'], context=context)
         return my_filters
 
     def _check_global_default(self, cr, uid, vals, matching_filters, context=None):

From 8b2c8dc0d1242203dd4c5002b2e5ca4bf86539f7 Mon Sep 17 00:00:00 2001
From: "Adrien Peiffer (ACSONE)" <adrien.peiffer@acsone.eu>
Date: Thu, 26 Mar 2015 12:07:54 +0100
Subject: [PATCH 08/16] [IMP] account_payment: display amount of transaction on
 payment line

Was changed on the form view at ab640d2, applying the same to tre view
---
 addons/account_payment/account_payment_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml
index 2d2748ec17d..ab020d9614b 100644
--- a/addons/account_payment/account_payment_view.xml
+++ b/addons/account_payment/account_payment_view.xml
@@ -136,8 +136,8 @@
                             <field name="bank_id" domain="[('partner_id', '=', partner_id)]"/>
                             <field name="ml_maturity_date"/>
                             <field name="date"/>
-                            <field name="amount_currency" string="Amount" groups="base.group_multi_currency"/>
-                            <field name="currency" groups="base.group_multi_currency"/>
+                            <field name="amount_currency" string="Amount"/>
+                            <field name="currency"/>
                             <field name="name"/>
                             <field name="amount" sum="Total in Company Currency" invisible="1"/>
                         </tree>

From f89c4cd78def1ea3f0b3ab4f44dc3308cd30a5a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9rome=20Maes?= <jem@openerp.com>
Date: Wed, 7 Jan 2015 12:01:54 +0100
Subject: [PATCH 09/16] [FIX] document : keep order during the search of
 ir.attachment

Backport of 16fa24d52258245af4ee9100666bae6ebe664046
---
 addons/document/document.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/document/document.py b/addons/document/document.py
index 5384ee0fb18..df12431df7a 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -104,10 +104,13 @@ class document_file(osv.osv):
         visible_parent_ids = self.pool.get('document.directory').search(cr, uid, [('id', 'in', list(parent_ids))])
 
         # null parents means allowed
+        orig_ids = ids # save the ids, to keep order
         ids = parents.get(None,[])
         for parent_id in visible_parent_ids:
             ids.extend(parents[parent_id])
 
+        # sort result according to the original sort ordering
+        ids = [id for id in orig_ids if id in ids]
         return len(ids) if count else ids
 
     def copy(self, cr, uid, id, default=None, context=None):

From 3eda25119fa2de39a07f073269a42f317dc0d61b Mon Sep 17 00:00:00 2001
From: Goffin Simon <sig@odoo.com>
Date: Wed, 25 Mar 2015 16:31:21 +0100
Subject: [PATCH 10/16] [FIX] account: Invoiced doesn't take into account
 cancelled invoices

"Invoiced" stat button on the res.partner form view must not include cancelled and draft invoices.
The button triggered an action which shows a tree view with invoices where:
type in ['out_invoice'] and all states.
Now the button triggers a tree view with invoices where: type in ['out_invoice' , 'out_refund']
and state not in ['draft', 'cancel'].

opw:472318
---
 addons/account/account_invoice_view.xml | 12 ++++++++++++
 addons/account/partner.py               |  2 +-
 addons/account/partner_view.xml         |  2 +-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 4e2e041efea..b692f4e55c2 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -133,6 +133,7 @@
                     <field name="amount_untaxed" sum="Untaxed Amount"/>
                     <field name="amount_total" sum="Total Amount"/>
                     <field name="state"/>
+                    <field name="type" invisible="context.get('type',True)"/>
                 </tree>
             </field>
         </record>
@@ -496,6 +497,17 @@
             <field name="search_view_id" ref="view_account_invoice_filter"/>
         </record>
 
+        <record id="action_invoice_refund_out_tree" model="ir.actions.act_window">
+            <field name="name">Invoices</field>
+            <field name="res_model">account.invoice</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form,calendar,graph</field>
+            <field name="view_id" ref="invoice_tree"/>
+            <field name="domain">[('type','in', ['out_invoice', 'out_refund']), ('state', 'not in', ['draft', 'cancel'])]</field>
+            <field name="context">{'type':False}</field>
+            <field name="search_view_id" ref="view_account_invoice_filter"/>
+        </record>
+
         <record id="action_invoice_tree_pending_invoice" model="ir.actions.act_window">
             <field name="name">Pending Invoice</field>
             <field name="res_model">account.invoice</field>
diff --git a/addons/account/partner.py b/addons/account/partner.py
index 416ecf5fbbf..3df24382164 100644
--- a/addons/account/partner.py
+++ b/addons/account/partner.py
@@ -242,7 +242,7 @@ class res_partner(osv.osv):
         result = {}
         account_invoice_report = self.pool.get('account.invoice.report')
         for partner in self.browse(cr, uid, ids, context=context):
-            domain = [('partner_id', 'child_of', partner.id)]
+            domain = [('partner_id', 'child_of', partner.id), ('state', 'not in', ['draft', 'cancel'])]
             invoice_ids = account_invoice_report.search(cr, uid, domain, context=context)
             invoices = account_invoice_report.browse(cr, uid, invoice_ids, context=context)
             result[partner.id] = sum(inv.user_currency_price_total for inv in invoices)
diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index ebc485c5f76..a85b27882c4 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -77,7 +77,7 @@
                         class="oe_stat_button"
                         id="invoice_button"
                         icon="fa-pencil-square-o"
-                        name="%(account.action_invoice_tree)d" 
+                        name="%(account.action_invoice_refund_out_tree)d"
                         attrs="{'invisible': [('customer', '=', False)]}" 
                         context="{'search_default_partner_id': active_id,'default_partner_id': active_id}">
                         <div><strong><field name="total_invoiced" widget="monetary"/></strong><br/>Invoiced</div>

From 0beb14f0d23c9cfecb4aeb329869716bee8f8c8a Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Thu, 26 Mar 2015 14:38:32 +0100
Subject: [PATCH 11/16] [FIX] ormcache: fix calls to `ormcache` with unexpected
 context parameter

The implementation of `ormcache` does not work on methods that take a `context`
parameter.  Because of the decorator `decorator`, the arguments of the call are
passed positionally to the method `ormcache.lookup`, and positional arguments
are used in the cache key.

The fix consists in removing the `context` parameter from the faulty methods,
either directly, or by caching a private method called by the public method.
---
 addons/website/models/website.py        | 4 ++--
 openerp/addons/base/ir/ir_attachment.py | 2 +-
 openerp/addons/base/ir/ir_model.py      | 7 +++++--
 openerp/addons/base/res/res_users.py    | 9 ++++++---
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/addons/website/models/website.py b/addons/website/models/website.py
index 006e6c4a10f..826a77022da 100644
--- a/addons/website/models/website.py
+++ b/addons/website/models/website.py
@@ -228,12 +228,12 @@ class website(osv.osv):
             return False
 
     @openerp.tools.ormcache(skiparg=3)
-    def _get_languages(self, cr, uid, id, context=None):
+    def _get_languages(self, cr, uid, id):
         website = self.browse(cr, uid, id)
         return [(lg.code, lg.name) for lg in website.language_ids]
 
     def get_languages(self, cr, uid, ids, context=None):
-        return self._get_languages(cr, uid, ids[0], context=context)
+        return self._get_languages(cr, uid, ids[0])
 
     def get_alternate_languages(self, cr, uid, ids, req=None, context=None):
         langs = []
diff --git a/openerp/addons/base/ir/ir_attachment.py b/openerp/addons/base/ir/ir_attachment.py
index 77e4190f552..e3cd3aa6db3 100644
--- a/openerp/addons/base/ir/ir_attachment.py
+++ b/openerp/addons/base/ir/ir_attachment.py
@@ -72,7 +72,7 @@ class ir_attachment(osv.osv):
         return self.pool['ir.config_parameter'].get_param(cr, SUPERUSER_ID, 'ir_attachment.location', 'file')
 
     @tools.ormcache(skiparg=3)
-    def _filestore(self, cr, uid, context=None):
+    def _filestore(self, cr, uid):
         return tools.config.filestore(cr.dbname)
 
     def force_storage(self, cr, uid, context=None):
diff --git a/openerp/addons/base/ir/ir_model.py b/openerp/addons/base/ir/ir_model.py
index e488515b09a..98baa1255fe 100644
--- a/openerp/addons/base/ir/ir_model.py
+++ b/openerp/addons/base/ir/ir_model.py
@@ -732,7 +732,7 @@ class ir_model_access(osv.osv):
         return [('%s/%s' % x) if x[0] else x[1] for x in cr.fetchall()]
 
     @tools.ormcache()
-    def check(self, cr, uid, model, mode='read', raise_exception=True, context=None):
+    def _check(self, cr, uid, model, mode='read', raise_exception=True):
         if uid==1:
             # User root have all accesses
             # TODO: exclude xml-rpc requests
@@ -796,6 +796,9 @@ class ir_model_access(osv.osv):
             raise openerp.exceptions.AccessError(msg % msg_params)
         return bool(r)
 
+    def check(self, cr, uid, model, mode='read', raise_exception=True, context=None):
+        return self._check(cr, uid, model, mode, raise_exception)
+
     __cache_clearing_methods = []
 
     def register_cache_clearing_method(self, model, method):
@@ -810,7 +813,7 @@ class ir_model_access(osv.osv):
 
     def call_cache_clearing_methods(self, cr):
         self.invalidate_cache(cr, SUPERUSER_ID)
-        self.check.clear_cache(self)    # clear the cache of check function
+        self._check.clear_cache(self)   # clear the cache of check function
         for model, method in self.__cache_clearing_methods:
             if model in self.pool:
                 getattr(self.pool[model], method)()
diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index 6ef7e0b4792..0ce5b6fa242 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -338,7 +338,7 @@ class res_users(osv.osv):
             for id in ids:
                 if id in self._uid_cache[db]:
                     del self._uid_cache[db][id]
-        self.context_get.clear_cache(self)
+        self._context_get.clear_cache(self)
         self.has_group.clear_cache(self)
         return res
 
@@ -374,8 +374,8 @@ class res_users(osv.osv):
         return super(res_users, self).copy(cr, uid, id, default, context)
 
     @tools.ormcache(skiparg=2)
-    def context_get(self, cr, uid, context=None):
-        user = self.browse(cr, SUPERUSER_ID, uid, context)
+    def _context_get(self, cr, uid):
+        user = self.browse(cr, SUPERUSER_ID, uid)
         result = {}
         for k in self._fields:
             if k.startswith('context_'):
@@ -391,6 +391,9 @@ class res_users(osv.osv):
                 result[context_key] = res or False
         return result
 
+    def context_get(self, cr, uid, context=None):
+        return self._context_get(cr, uid)
+
     def action_get(self, cr, uid, context=None):
         dataobj = self.pool['ir.model.data']
         data_id = dataobj._get_id(cr, SUPERUSER_ID, 'base', 'action_res_users_my')

From cec7a02fdda1f0ccf856b99841a209c1f15e9c83 Mon Sep 17 00:00:00 2001
From: han-odoo <han@openerp.com>
Date: Fri, 7 Nov 2014 15:38:19 +0530
Subject: [PATCH 12/16] [FIX] POS: invoices taxes according to fiscal position

Fix the issue of taxes not being mapped
according to fiscal postion

opw-615167
---
 addons/point_of_sale/point_of_sale.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index 304f7d71061..4ba175868f2 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -989,7 +989,7 @@ class pos_order(osv.osv):
                 inv_line['price_unit'] = line.price_unit
                 inv_line['discount'] = line.discount
                 inv_line['name'] = inv_name
-                inv_line['invoice_line_tax_id'] = [(6, 0, [x.id for x in line.product_id.taxes_id] )]
+                inv_line['invoice_line_tax_id'] = [(6, 0, inv_line['invoice_line_tax_id'])]
                 inv_line_ref.create(cr, uid, inv_line, context=context)
             inv_ref.button_reset_taxes(cr, uid, [inv_id], context=context)
             self.signal_workflow(cr, uid, [order.id], 'invoice')

From c58121e8f151b8a90d69a7c99e15ccc6a43b06ab Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Thu, 26 Mar 2015 17:01:27 +0100
Subject: [PATCH 13/16] [FIX] method `ir_model.check` now decorated with
 `ormcache_context`

The method needs the `context` parameter to translate the error message in case
the access is denied and an exception is raised.
---
 openerp/addons/base/ir/ir_model.py | 13 +++++++------
 openerp/tools/cache.py             |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/openerp/addons/base/ir/ir_model.py b/openerp/addons/base/ir/ir_model.py
index 98baa1255fe..7e13a9fa9fb 100644
--- a/openerp/addons/base/ir/ir_model.py
+++ b/openerp/addons/base/ir/ir_model.py
@@ -731,8 +731,12 @@ class ir_model_access(osv.osv):
                         a.perm_''' + access_mode, (model_name,))
         return [('%s/%s' % x) if x[0] else x[1] for x in cr.fetchall()]
 
-    @tools.ormcache()
-    def _check(self, cr, uid, model, mode='read', raise_exception=True):
+    # The context parameter is useful when the method translates error messages.
+    # But as the method raises an exception in that case,  the key 'lang' might
+    # not be really necessary as a cache key, unless the `ormcache_context`
+    # decorator catches the exception (it does not at the moment.)
+    @tools.ormcache_context(accepted_keys=('lang',))
+    def check(self, cr, uid, model, mode='read', raise_exception=True, context=None):
         if uid==1:
             # User root have all accesses
             # TODO: exclude xml-rpc requests
@@ -796,9 +800,6 @@ class ir_model_access(osv.osv):
             raise openerp.exceptions.AccessError(msg % msg_params)
         return bool(r)
 
-    def check(self, cr, uid, model, mode='read', raise_exception=True, context=None):
-        return self._check(cr, uid, model, mode, raise_exception)
-
     __cache_clearing_methods = []
 
     def register_cache_clearing_method(self, model, method):
@@ -813,7 +814,7 @@ class ir_model_access(osv.osv):
 
     def call_cache_clearing_methods(self, cr):
         self.invalidate_cache(cr, SUPERUSER_ID)
-        self._check.clear_cache(self)   # clear the cache of check function
+        self.check.clear_cache(self)    # clear the cache of check function
         for model, method in self.__cache_clearing_methods:
             if model in self.pool:
                 getattr(self.pool[model], method)()
diff --git a/openerp/tools/cache.py b/openerp/tools/cache.py
index 7f40421e13a..91773dd8702 100644
--- a/openerp/tools/cache.py
+++ b/openerp/tools/cache.py
@@ -105,7 +105,7 @@ class ormcache_context(ormcache):
         # arguments, and pass them positionally to lookup(). This is why context
         # is not passed through kwargs!
         if self.context_pos < len(args):
-            context = args[self.context_pos]
+            context = args[self.context_pos] or {}
         else:
             context = kwargs.get('context') or {}
         ckey = [(k, context[k]) for k in self.accepted_keys if k in context]

From 2a0c018043ddcc40074bb46e63bce46f191d459d Mon Sep 17 00:00:00 2001
From: Nicolas Lempereur <nle@odoo.com>
Date: Thu, 19 Mar 2015 14:15:33 +0100
Subject: [PATCH 14/16] [FIX] kanban: search more when DataSetStatic

When showing a kanban, there is differences between dataset of types:

* DataSetStatic: self.view.dataset===self.dataset, their ids attributes are the entire ids list,
* DataSet and DataSetSearch: self.view.dataset.ids are the already in the view ids, self.dataset.ids are the last gotten ids.

Hence with DataSetStatic dataset, when self.view.dataset.ids.splice(0) is done
self.dataset.ids is also emptied. And in the read_slice function, the slice is
done on that (now empty) array.

This fix removes the splicing of this ids array (which doesn't change a thing
since the array is overwritten latter), a _.difference is used to remove
eventual duplicates since in the DataSetStatic case, the same array is being
concatenated to itself

opw-630654 opw-617090 opw-619563
---
 addons/web_kanban/static/src/js/kanban.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index bdc0d539d25..60e7f1e6585 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -649,12 +649,12 @@ instance.web_kanban.KanbanGroup = instance.web.Widget.extend({
     },
     do_show_more: function(evt) {
         var self = this;
-        var ids = self.view.dataset.ids.splice(0);
+        var ids = self.view.dataset.ids.slice(0);
         return this.dataset.read_slice(this.view.fields_keys.concat(['__last_update']), {
             'limit': self.view.limit,
             'offset': self.dataset_offset += self.view.limit
         }).then(function(records) {
-            self.view.dataset.ids = ids.concat(self.dataset.ids);
+            self.view.dataset.ids = ids.concat(_.difference(self.dataset.ids, ids));
             self.do_add_records(records);
             self.compute_cards_auto_height();
             self.view.postprocess_m2m_tags();

From 95b921d0f7cffd3b2546db8949f3c30b2b120335 Mon Sep 17 00:00:00 2001
From: FalcoBolger <vta@openerp.com>
Date: Thu, 26 Mar 2015 11:44:01 +0100
Subject: [PATCH 15/16] [FIX] website: move support for ir.attachment resources
 to web module

Commit 540b753bf84f118b6863bac699f52c2c418a7f30 introduced
support for resources stored as ir.attachment records in
asset bundles too.
This is specifically useful for customizations.

However the HTTP route for reaching those resources
when they are *not* in a bundle was originally created
in the `website` module (as a special handling for
404 requests)

This means that these dynamic resources would only
be partially supported when `website` is not installed,
causing various problems:
 - missing resources in debug mode where bundles are skipped
 - errors when trying to define new client-side Qweb templates
   via XML resources - which are loaded with a direct request
 - ...

This commit moves back the supporting code to the web module.

The `mimetype` column is not present in ir.attachment without
the `website` module, but sniffing it based on the attachment
name works fine at serving time too.

Closes #6002
---
 addons/website/models/ir_http.py  | 35 +---------------------------
 openerp/addons/base/ir/ir_http.py | 38 +++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 34 deletions(-)

diff --git a/addons/website/models/ir_http.py b/addons/website/models/ir_http.py
index 7da212998c8..c45a203f4da 100644
--- a/addons/website/models/ir_http.py
+++ b/addons/website/models/ir_http.py
@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-import datetime
-import hashlib
 import logging
 import os
 import re
@@ -76,7 +74,7 @@ class ir_http(orm.AbstractModel):
             if self.geo_ip_resolver and request.httprequest.remote_addr:
                 record = self.geo_ip_resolver.record_by_addr(request.httprequest.remote_addr) or {}
             request.session['geoip'] = record
-            
+
         if request.website_enabled:
             try:
                 if func:
@@ -163,38 +161,7 @@ class ir_http(orm.AbstractModel):
                     path += '?' + request.httprequest.query_string
                 return werkzeug.utils.redirect(path, code=301)
 
-    def _serve_attachment(self):
-        domain = [('type', '=', 'binary'), ('url', '=', request.httprequest.path)]
-        attach = self.pool['ir.attachment'].search_read(request.cr, openerp.SUPERUSER_ID, domain, ['__last_update', 'datas', 'mimetype'], context=request.context)
-        if attach:
-            wdate = attach[0]['__last_update']
-            datas = attach[0]['datas']
-            response = werkzeug.wrappers.Response()
-            server_format = openerp.tools.misc.DEFAULT_SERVER_DATETIME_FORMAT
-            try:
-                response.last_modified = datetime.datetime.strptime(wdate, server_format + '.%f')
-            except ValueError:
-                # just in case we have a timestamp without microseconds
-                response.last_modified = datetime.datetime.strptime(wdate, server_format)
-
-            response.set_etag(hashlib.sha1(datas).hexdigest())
-            response.make_conditional(request.httprequest)
-
-            if response.status_code == 304:
-                return response
-
-            response.mimetype = attach[0]['mimetype'] or 'application/octet-stream'
-            response.data = datas.decode('base64')
-            return response
-
     def _handle_exception(self, exception, code=500):
-        # This is done first as the attachment path may
-        # not match any HTTP controller, so the request
-        # may not be website-enabled.
-        attach = self._serve_attachment()
-        if attach:
-            return attach
-
         is_website_request = bool(getattr(request, 'website_enabled', False) and request.website)
         if not is_website_request:
             # Don't touch non website requests exception handling
diff --git a/openerp/addons/base/ir/ir_http.py b/openerp/addons/base/ir/ir_http.py
index 8c4f8bed82b..0c82d4f1cfd 100644
--- a/openerp/addons/base/ir/ir_http.py
+++ b/openerp/addons/base/ir/ir_http.py
@@ -1,10 +1,14 @@
 #----------------------------------------------------------
 # ir_http modular http routing
 #----------------------------------------------------------
+import datetime
+import hashlib
 import logging
+import mimetypes
 import re
 import sys
 
+import werkzeug
 import werkzeug.exceptions
 import werkzeug.routing
 import werkzeug.urls
@@ -94,7 +98,41 @@ class ir_http(osv.AbstractModel):
             raise openerp.exceptions.AccessDenied()
         return auth_method
 
+    def _serve_attachment(self):
+        domain = [('type', '=', 'binary'), ('url', '=', request.httprequest.path)]
+        attach = self.pool['ir.attachment'].search_read(
+            request.cr, openerp.SUPERUSER_ID, domain,
+            ['__last_update', 'datas', 'datas_fname'],
+            context=request.context)
+        if attach:
+            wdate = attach[0]['__last_update']
+            datas = attach[0]['datas']
+            response = werkzeug.wrappers.Response()
+            server_format = openerp.tools.misc.DEFAULT_SERVER_DATETIME_FORMAT
+            try:
+                response.last_modified = datetime.datetime.strptime(wdate, server_format + '.%f')
+            except ValueError:
+                # just in case we have a timestamp without microseconds
+                response.last_modified = datetime.datetime.strptime(wdate, server_format)
+
+            response.set_etag(hashlib.sha1(datas).hexdigest())
+            response.make_conditional(request.httprequest)
+
+            if response.status_code == 304:
+                return response
+
+            response.mimetype = (mimetypes.guess_type(attach[0]['datas_fname'])[0] or
+                                    'application/octet-stream')
+            response.data = datas.decode('base64')
+            return response
+
     def _handle_exception(self, exception):
+        # This is done first as the attachment path may
+        # not match any HTTP controller.
+        attach = self._serve_attachment()
+        if attach:
+            return attach
+
         # If handle_exception returns something different than None, it will be used as a response
         try:
             return request._handle_exception(exception)

From 12416eb35f66f4924743f5b4098e281d499375ba Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@odoo.com>
Date: Thu, 26 Mar 2015 17:47:21 +0100
Subject: [PATCH 16/16] [FIX] google_*: set a timeout when contacting google
 servers

---
 addons/google_account/__init__.py               |  3 +--
 addons/google_account/google_account.py         |  5 +++--
 addons/google_drive/google_drive.py             | 13 +++++++------
 addons/google_spreadsheet/google_spreadsheet.py |  4 ++--
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/addons/google_account/__init__.py b/addons/google_account/__init__.py
index 640a9747f2d..24a68d8ba78 100644
--- a/addons/google_account/__init__.py
+++ b/addons/google_account/__init__.py
@@ -21,5 +21,4 @@
 import google_account
 import controllers
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
+from .google_account import TIMEOUT     # noqa
diff --git a/addons/google_account/google_account.py b/addons/google_account/google_account.py
index db137b087e6..2cc56d0cba4 100644
--- a/addons/google_account/google_account.py
+++ b/addons/google_account/google_account.py
@@ -15,6 +15,7 @@ import simplejson
 import logging
 _logger = logging.getLogger(__name__)
 
+TIMEOUT = 20
 
 class google_service(osv.osv_memory):
     _name = 'google.service'
@@ -31,7 +32,7 @@ class google_service(osv.osv_memory):
         data = werkzeug.url_encode(data)
         try:
             req = urllib2.Request("https://accounts.google.com/o/oauth2/token", data, headers)
-            content = urllib2.urlopen(req).read()
+            content = urllib2.urlopen(req, timeout=TIMEOUT).read()
         except urllib2.HTTPError:
             error_msg = "Something went wrong during your token generation. Maybe your Authorization Code is invalid or already expired"
             raise self.pool.get('res.config.settings').get_config_warning(cr, _(error_msg), context=context)
@@ -148,7 +149,7 @@ class google_service(osv.osv_memory):
                 raise ('Method not supported [%s] not in [GET, POST, PUT, PATCH or DELETE]!' % (type))
             req.get_method = lambda: type.upper()
 
-            request = urllib2.urlopen(req)
+            request = urllib2.urlopen(req, timeout=TIMEOUT)
             status = request.getcode()
 
             if int(status) in (204, 404):  # Page not found, no response
diff --git a/addons/google_drive/google_drive.py b/addons/google_drive/google_drive.py
index 1a95a5ec1ee..789b5527e31 100644
--- a/addons/google_drive/google_drive.py
+++ b/addons/google_drive/google_drive.py
@@ -20,6 +20,7 @@
 import logging
 
 from openerp import SUPERUSER_ID
+from openerp.addons.google_account import TIMEOUT
 from openerp.osv import fields, osv
 from openerp.tools.translate import _
 
@@ -81,7 +82,7 @@ class config(osv.Model):
         headers = {"Content-type": "application/x-www-form-urlencoded", "Accept-Encoding": "gzip, deflate"}
         try:
             req = urllib2.Request('https://accounts.google.com/o/oauth2/token', data, headers)
-            content = urllib2.urlopen(req).read()
+            content = urllib2.urlopen(req, timeout=TIMEOUT).read()
         except urllib2.HTTPError:
             if user_is_admin:
                 model, action_id = self.pool['ir.model.data'].get_object_reference(cr, uid, 'base_setup', 'action_general_configuration')
@@ -101,7 +102,7 @@ class config(osv.Model):
         headers = {"Content-type": "application/x-www-form-urlencoded", "Accept-Encoding": "gzip, deflate"}
         try:
             req = urllib2.Request(request_url, None, headers)
-            parents = urllib2.urlopen(req).read()
+            parents = urllib2.urlopen(req, timeout=TIMEOUT).read()
         except urllib2.HTTPError:
             raise osv.except_osv(_('Warning!'), _("The Google Template cannot be found. Maybe it has been deleted."))
         parents_dict = json.loads(parents)
@@ -113,7 +114,7 @@ class config(osv.Model):
         data_json = json.dumps(data)
         # resp, content = Http().request(request_url, "POST", data_json, headers)
         req = urllib2.Request(request_url, data_json, headers)
-        content = urllib2.urlopen(req).read()
+        content = urllib2.urlopen(req, timeout=TIMEOUT).read()
         content = json.loads(content)
         res = {}
         if content.get('alternateLink'):
@@ -128,7 +129,7 @@ class config(osv.Model):
             data = {'role': 'writer', 'type': 'anyone', 'value': '', 'withLink': True}
             try:
                 req = urllib2.Request(request_url, json.dumps(data), headers)
-                urllib2.urlopen(req)
+                urllib2.urlopen(req, timeout=TIMEOUT)
             except urllib2.HTTPError:
                 raise self.pool.get('res.config.settings').get_config_warning(cr, _("The permission 'reader' for 'anyone with the link' has not been written on the document"), context=context)
             user = self.pool['res.users'].browse(cr, uid, uid, context=context)
@@ -136,10 +137,10 @@ class config(osv.Model):
                 data = {'role': 'writer', 'type': 'user', 'value': user.email}
                 try:
                     req = urllib2.Request(request_url, json.dumps(data), headers)
-                    urllib2.urlopen(req)
+                    urllib2.urlopen(req, timeout=TIMEOUT)
                 except urllib2.HTTPError:
                     pass
-        return res 
+        return res
 
     def get_google_drive_config(self, cr, uid, res_model, res_id, context=None):
         '''
diff --git a/addons/google_spreadsheet/google_spreadsheet.py b/addons/google_spreadsheet/google_spreadsheet.py
index df63ac5f632..2d062c9a9d2 100644
--- a/addons/google_spreadsheet/google_spreadsheet.py
+++ b/addons/google_spreadsheet/google_spreadsheet.py
@@ -27,7 +27,7 @@ import werkzeug.urls
 import urllib2
 
 from openerp.osv import osv
-from openerp import SUPERUSER_ID
+from openerp.addons.google_account import TIMEOUT
 
 _logger = logging.getLogger(__name__)
 
@@ -92,7 +92,7 @@ class config(osv.osv):
                 'https://spreadsheets.google.com/feeds/cells/%s/od6/private/full/batch?%s' % (spreadsheet_key, werkzeug.url_encode({'v': 3, 'access_token': access_token})),
                 data=request,
                 headers={'content-type': 'application/atom+xml', 'If-Match': '*'})
-            urllib2.urlopen(req)
+            urllib2.urlopen(req, timeout=TIMEOUT)
         except (urllib2.HTTPError, urllib2.URLError):
             _logger.warning("An error occured while writting the formula on the Google Spreadsheet.")