From 634c62610efc784b47206a700a796fdbb343ec30 Mon Sep 17 00:00:00 2001
From: Joren Van Onder <jov@odoo.com>
Date: Wed, 27 Jan 2016 12:21:40 +0100
Subject: [PATCH 01/13] [FIX] purchase: only search in requested model

Because otherwise a user who has access to a view displaying
supplier_invoice_count will get an access error if he doesn't also have
access to purchase.order, even if that wouldn't have been displayed.

opw-666935
---
 addons/purchase/partner.py | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/addons/purchase/partner.py b/addons/purchase/partner.py
index bc2255cca03..b86471fafaa 100644
--- a/addons/purchase/partner.py
+++ b/addons/purchase/partner.py
@@ -28,13 +28,17 @@ class res_partner(osv.osv):
     def _purchase_invoice_count(self, cr, uid, ids, field_name, arg, context=None):
         PurchaseOrder = self.pool['purchase.order']
         Invoice = self.pool['account.invoice']
-        return {
-            partner_id: {
-                'purchase_order_count': PurchaseOrder.search_count(cr,uid, [('partner_id', 'child_of', partner_id)], context=context),
-                'supplier_invoice_count': Invoice.search_count(cr,uid, [('partner_id', 'child_of', partner_id), ('type','=','in_invoice')], context=context)
-            }
-            for partner_id in ids
-        }
+        res = {}
+
+        for partner_id in ids:
+            res[partner_id] = {}
+
+            if 'purchase_order_count' in field_name:
+                res[partner_id]['purchase_order_count'] = PurchaseOrder.search_count(cr,uid, [('partner_id', 'child_of', partner_id)], context=context)
+            if 'supplier_invoice_count' in field_name:
+                res[partner_id]['supplier_invoice_count'] = Invoice.search_count(cr,uid, [('partner_id', 'child_of', partner_id), ('type','=','in_invoice')], context=context)
+
+        return res
 
     def _commercial_fields(self, cr, uid, context=None):
         return super(res_partner, self)._commercial_fields(cr, uid, context=context) + ['property_product_pricelist_purchase']

From e2d16ea04a2ae98800086619ff5dc94dfa6eb5d3 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Wed, 27 Jan 2016 16:28:49 +0100
Subject: [PATCH 02/13] [FIX] account_voucher: unreconcile with deleted journal
 items

This is possible to unreconcile and then remove journal
items associated to `account.voucher.line`.

When it's done, the voucher is within a corrupted state,
with debits and credits lines without journal item, which
is required.

Because the journal item of this line is empty,
while required, this is no longer possible to use
the "Unreconcile" button, because the form is invalid.

In order to allow to unreconcile a posted customer/supplier
payments with missing journal items, we set
the journal items as required only when the payment
is within the `draft` stage.

opw-667232
---
 addons/account_voucher/account_voucher.py               | 1 +
 addons/account_voucher/voucher_payment_receipt_view.xml | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index d942225d70b..949239f8124 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -1498,6 +1498,7 @@ class account_voucher_line(osv.osv):
         'amount_unreconciled': fields.function(_compute_balance, multi='dc', type='float', string='Open Balance', store=True, digits_compute=dp.get_precision('Account')),
         'company_id': fields.related('voucher_id','company_id', relation='res.company', type='many2one', string='Company', store=True, readonly=True),
         'currency_id': fields.function(_currency_id, string='Currency', type='many2one', relation='res.currency', readonly=True),
+        'state': fields.related('voucher_id', 'state', type='char', string='State', readonly=True),
     }
     _defaults = {
         'name': '',
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 073b1efed82..f70f47c54ef 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -163,10 +163,11 @@
                         	<label for="line_dr_ids"/>
                             <field name="line_dr_ids" context="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, currency_id, type, context)">
                                 <tree string="Supplier Invoices and Outstanding transactions" editable="bottom" colors="gray:amount==0">
+                                    <field name="state" invisible="1"/>
                                     <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
                                         on_change="onchange_move_line_id(move_line_id)"
                                         domain="[('account_id.type','=','payable'), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id)]"
-                                        required="1"/>
+                                        attrs="{'required': [('state', 'in', [False, 'draft'])]}"/>
                                     <field name="account_id" groups="base.group_no_one" domain="[('type','=','payable')]"/>
                                     <field name="date_original" readonly="1"/>
                                     <field name="date_due" readonly="1"/>
@@ -179,10 +180,11 @@
                             <label for="line_cr_ids" attrs="{'invisible': [('pre_line','=',False)]}"/>
                             <field name="line_cr_ids" attrs="{'invisible': [('pre_line','=',False)]}" context="{'journal_id':journal_id, 'partner_id':partner_id}" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, currency_id, type, context)">
                                 <tree string="Credits" editable="bottom" colors="gray:amount==0">
+                                    <field name="state" invisible="1"/>
                                     <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
                                         on_change="onchange_move_line_id(move_line_id)"
                                         domain="[('account_id.type','=','payable'), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id)]"
-                                        required="1"/>
+                                        attrs="{'required': [('state', 'in', [False, 'draft'])]}"/>
                                     <field name="account_id" groups="base.group_no_one" domain="[('type','=','payable')]"/>
                                     <field name="date_original" readonly="1"/>
                                     <field name="date_due" readonly="1"/>

From bb2ecb367239f0961e66147eb077b6480bd08ce0 Mon Sep 17 00:00:00 2001
From: Jeremy Kersten <jke@odoo.com>
Date: Wed, 27 Jan 2016 17:55:33 +0100
Subject: [PATCH 03/13] [FIX] website: typo - missing s

Who has eaten the s ?
---
 addons/website/models/website.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website/models/website.py b/addons/website/models/website.py
index 375af2c2fc0..8aee2add5c0 100644
--- a/addons/website/models/website.py
+++ b/addons/website/models/website.py
@@ -347,7 +347,7 @@ class website(osv.osv):
         :rtype: bool
         """
         endpoint = rule.endpoint
-        methods = endpoint.routing.get('method') or ['GET']
+        methods = endpoint.routing.get('methods') or ['GET']
 
         converters = rule._converters.values()
         if not ('GET' in methods

From b493faf5955a905cddbfe10bff0643d975d1b1ea Mon Sep 17 00:00:00 2001
From: Luc De Meyer <luc.demeyer@noviat.com>
Date: Wed, 27 Jan 2016 16:44:23 +0100
Subject: [PATCH 04/13] [FIX] account: pass context as kwargs

context -> context=context in writes within validate.
This is required for super().write with new api.

Closes #10645
---
 addons/account/account.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 87f31daa6d9..18cabe9e169 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -1580,7 +1580,7 @@ class account_move(osv.osv):
 
                 obj_move_line.write(cr, uid, line_draft_ids, {
                     'state': 'valid'
-                }, context, check=False)
+                }, context=context, check=False)
 
                 account = {}
                 account2 = {}
@@ -1599,7 +1599,7 @@ class account_move(osv.osv):
                             obj_move_line.write(cr, uid, [line.id], {
                                 'tax_code_id': code,
                                 'tax_amount': amount
-                            }, context, check=False)
+                            }, context=context, check=False)
             elif journal.centralisation:
                 # If the move is not balanced, it must be centralised...
 
@@ -1614,7 +1614,7 @@ class account_move(osv.osv):
                 self._centralise(cr, uid, move, 'credit', context=context)
                 obj_move_line.write(cr, uid, line_draft_ids, {
                     'state': 'valid'
-                }, context, check=False)
+                }, context=context, check=False)
             else:
                 # We can't validate it (it's unbalanced)
                 # Setting the lines as draft
@@ -1622,7 +1622,7 @@ class account_move(osv.osv):
                 if not_draft_line_ids:
                     obj_move_line.write(cr, uid, not_draft_line_ids, {
                         'state': 'draft'
-                    }, context, check=False)
+                    }, context=context, check=False)
         # Create analytic lines for the valid moves
         for record in valid_moves:
             obj_move_line.create_analytic_lines(cr, uid, [line.id for line in record.line_id], context)

From afd2dbfb7f93f0cdff13e968198d7991e00fd268 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Thu, 28 Jan 2016 15:05:50 +0100
Subject: [PATCH 05/13] [FIX] mrp_repair: quotation report, shipping and
 invoice address

Copy the structure of the sale order report regarding the
partner, invoice and shipping address.

Besides, on a repair order, this is possible
to set a shipping address without setting
an invoice address (if no invoicing is set).

In such a case, the `Invoice address:` must be hidden.

opw-666506
---
 .../mrp_repair/views/report_mrprepairorder.xml   | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/addons/mrp_repair/views/report_mrprepairorder.xml b/addons/mrp_repair/views/report_mrprepairorder.xml
index a6d00ba5b15..7448c674639 100644
--- a/addons/mrp_repair/views/report_mrprepairorder.xml
+++ b/addons/mrp_repair/views/report_mrprepairorder.xml
@@ -10,13 +10,15 @@
 
                     <div class="row">
                         <div class="col-xs-6">
-                            <p t-if="o.address_id == o.partner_invoice_id">Invoice and shipping address:</p>
-                            <p t-if="o.address_id != o.partner_invoice_id">Invoice address: </p>
-                            <div t-field="o.partner_invoice_id" 
-                                t-field-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": true}'/>
-                            <p t-if="o.partner_id.vat">VAT: <span t-field="o.partner_id.vat"/></p>
-                            <div t-if="o.address_id != o.partner_invoice_id">
-                                <p>Shipping address :</p>
+                            <strong t-if="o.address_id == o.partner_invoice_id">Invoice and shipping address:</strong>
+                            <div t-if="o.partner_invoice_id">
+                                <strong t-if="o.address_id != o.partner_invoice_id">Invoice address: </strong>
+                                <div t-field="o.partner_invoice_id"
+                                    t-field-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": true}'/>
+                                <p t-if="o.partner_id.vat">VAT: <span t-field="o.partner_id.vat"/></p>
+                            </div>
+                            <div t-if="o.address_id != o.partner_invoice_id" class="mt8">
+                                <strong>Shipping address :</strong>
                                 <div t-field="o.address_id" 
                                     t-field-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": true}'/>
                                 <p t-if="o.partner_id.vat">VAT: <span t-field="o.partner_id.vat"/></p>

From 995b257a6c09b9dfd89eedac3a84ff36948b095b Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Thu, 28 Jan 2016 15:30:00 +0100
Subject: [PATCH 06/13] [FIX] fields: make `related_sudo` work for draft
 records (2)

Traversing new records in a different cache requires that all new records on
the path are copied across caches.  Make the copy across caches recursive when
the first record on the path is a new record.
---
 .../test_new_api/tests/test_new_fields.py     | 36 ++++++++++++++-----
 openerp/fields.py                             | 14 ++++++--
 2 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/openerp/addons/test_new_api/tests/test_new_fields.py b/openerp/addons/test_new_api/tests/test_new_fields.py
index 59d85b211bf..6ee9a4a664e 100644
--- a/openerp/addons/test_new_api/tests/test_new_fields.py
+++ b/openerp/addons/test_new_api/tests/test_new_fields.py
@@ -393,28 +393,46 @@ class TestNewFields(common.TransactionCase):
 
     @mute_logger('openerp.addons.base.ir.ir_model')
     def test_41_new_related(self):
-        """ test the behavior of related fields on new records. """
-        discussion = self.env.ref('test_new_api.discussion_0')
-        access = self.env.ref('test_new_api.access_discussion')
-
+        """ test the behavior of related fields starting on new records. """
         # make discussions unreadable for demo user
+        access = self.env.ref('test_new_api.access_discussion')
         access.write({'perm_read': False})
 
         # create an environment for demo user
-        demo_env = self.env(user=self.env.ref('base.user_demo'))
-        self.assertEqual(demo_env.user.login, "demo")
+        env = self.env(user=self.env.ref('base.user_demo'))
+        self.assertEqual(env.user.login, "demo")
 
         # create a new message as demo user
-        values = {'discussion': discussion.id}
-        message = demo_env['test_new_api.message'].new(values)
+        discussion = self.env.ref('test_new_api.discussion_0')
+        message = env['test_new_api.message'].new({'discussion': discussion})
         self.assertEqual(message.discussion, discussion)
 
         # read the related field discussion_name
-        self.assertEqual(message.discussion.env, demo_env)
+        self.assertEqual(message.discussion.env, env)
         self.assertEqual(message.discussion_name, discussion.name)
         with self.assertRaises(AccessError):
             message.discussion.name
 
+    @mute_logger('openerp.addons.base.ir.ir_model')
+    def test_42_new_related(self):
+        """ test the behavior of related fields traversing new records. """
+        # make discussions unreadable for demo user
+        access = self.env.ref('test_new_api.access_discussion')
+        access.write({'perm_read': False})
+
+        # create an environment for demo user
+        env = self.env(user=self.env.ref('base.user_demo'))
+        self.assertEqual(env.user.login, "demo")
+
+        # create a new discussion and a new message as demo user
+        discussion = env['test_new_api.discussion'].new({'name': 'Stuff'})
+        message = env['test_new_api.message'].new({'discussion': discussion})
+        self.assertEqual(message.discussion, discussion)
+
+        # read the related field discussion_name
+        self.assertNotEqual(message.sudo().env, message.env)
+        self.assertEqual(message.discussion_name, discussion.name)
+
     def test_50_defaults(self):
         """ test default values. """
         fields = ['discussion', 'body', 'author', 'size']
diff --git a/openerp/fields.py b/openerp/fields.py
index 30e0b97f918..a6775336a1e 100644
--- a/openerp/fields.py
+++ b/openerp/fields.py
@@ -58,6 +58,15 @@ def _check_value(value):
     """ Return ``value``, or call its getter if ``value`` is a :class:`SpecialValue`. """
     return value.get() if isinstance(value, SpecialValue) else value
 
+def copy_cache(records, env):
+    """ Recursively copy the cache of ``records`` to the environment ``env``. """
+    for record, target in zip(records, records.with_env(env)):
+        if not target._cache:
+            for name, value in record._cache.iteritems():
+                target[name] = value
+                if isinstance(value, BaseModel):
+                    copy_cache(value, env)
+
 
 def resolve_all_mro(cls, name, reverse=False):
     """ Return the (successively overridden) values of attribute ``name`` in ``cls``
@@ -538,10 +547,9 @@ class Field(object):
         # when related_sudo, bypass access rights checks when reading values
         others = records.sudo() if self.related_sudo else records
         for record, other in zip(records, others):
-            if not record.id:
+            if not record.id and record.env != other.env:
                 # draft records: copy record's cache to other's cache first
-                for name, value in record._cache.iteritems():
-                    other[name] = value
+                copy_cache(record, other.env)
             # traverse the intermediate fields; follow the first record at each step
             for name in self.related[:-1]:
                 other = other[name][:1]

From fd038801c0942ee76912742f1fc18feb33d0cedc Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Thu, 28 Jan 2016 16:44:35 +0100
Subject: [PATCH 07/13] [FIX] im_livechat: Strict MIME type.

Backport of revisions
 - 100d604cb0ebd6aa3f57c9809c6771b0b4b72a07
 - ddd3e08fbcb54e971537f9f20668c00dbe36ab37
opw-667814
---
 addons/im_livechat/im_livechat.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/im_livechat/im_livechat.py b/addons/im_livechat/im_livechat.py
index 26f08761ed2..42edb671370 100644
--- a/addons/im_livechat/im_livechat.py
+++ b/addons/im_livechat/im_livechat.py
@@ -231,7 +231,7 @@ class LiveChatController(http.Controller):
         info["dbname"] = dbname
         info["channel"] = channel_id
         info["username"] = kwargs.get("username", "Visitor")
-        return request.render('im_livechat.loader', info)
+        return request.render('im_livechat.loader', info, headers=[('Content-Type', 'application/javascript')])
 
     @http.route('/im_livechat/get_session', type="json", auth="none")
     def get_session(self, channel_id, anonymous_name, **kwargs):

From 29be9ae80bd16c828962b239df8bd5c46fa3ebe8 Mon Sep 17 00:00:00 2001
From: Nicolas Lempereur <nle@odoo.com>
Date: Wed, 27 Jan 2016 11:36:38 +0100
Subject: [PATCH 08/13] [FIX] web: conserve /id for saved export list

With 003d85b instead of getting the name of the relation
field_relation we get field_relation/id which will get us an xmlid
instead.

But the data about related fields are not gotten all at once when
opening the export modal. They are gotten by clicking on the arrow of
the related record.

It is in this data that the /id will be appended for the field, but when
getting a saved export list, this data may not be available.

This commit immediately add the `/id` when a field is put in "Fields to
export" column, so this inconsistency is no more.

closes #10640
fixes #10327
opw-665994
---
 addons/web/static/src/js/data_export.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/web/static/src/js/data_export.js b/addons/web/static/src/js/data_export.js
index 7a2b902f5c0..4e50d1f780a 100644
--- a/addons/web/static/src/js/data_export.js
+++ b/addons/web/static/src/js/data_export.js
@@ -368,6 +368,7 @@ instance.web.DataExport = instance.web.Dialog.extend({
     },
     add_field: function(field_id, string) {
         var field_list = this.$el.find('#fields_list');
+        field_id = this.records[field_id] || field_id;
         if (this.$el.find("#fields_list option[value='" + field_id + "']")
                 && !this.$el.find("#fields_list option[value='" + field_id + "']").length) {
             field_list.append(new Option(string, field_id));

From 6f4e7867f0a005b7588e16160765e23036ce7abc Mon Sep 17 00:00:00 2001
From: Joren Van Onder <jov@odoo.com>
Date: Thu, 28 Jan 2016 15:42:11 +0100
Subject: [PATCH 09/13] [IMP] hw_escpos: add the MAC address to the ticket
 printed at startup

Usually when setting up a POSBox you want it to have a static IP. The
best way to do that is by configuring whatever DHCP server is
used (usually just on the router) to always assign the same IP to a
certain MAC address (naming depends on what is being used, sometimes
it's called static DHCP but it's also known as DHCP reservations and a
bunch of other names).

The process of setting this up is complicated for a non-technical user,
and this attempts to make it a little bit easier to do by immediately
giving them the correct MAC address they should use. To avoid confusion
this only prints the MAC addresses for interfaces which have an IP
address.
---
 addons/hw_escpos/controllers/main.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/hw_escpos/controllers/main.py b/addons/hw_escpos/controllers/main.py
index c91d17364ce..0b91dc0d37e 100644
--- a/addons/hw_escpos/controllers/main.py
+++ b/addons/hw_escpos/controllers/main.py
@@ -195,6 +195,7 @@ class EscposDriver(Thread):
         localips = ['0.0.0.0','127.0.0.1','127.0.1.1']
         hosting_ap = os.system('pgrep hostapd') == 0
         ssid = subprocess.check_output('iwconfig 2>&1 | grep \'ESSID:"\' | sed \'s/.*"\\(.*\\)"/\\1/\'', shell=True).rstrip()
+        mac = subprocess.check_output('ifconfig | grep -B 1 \'inet addr\' | grep -o \'HWaddr .*\' | sed \'s/HWaddr //\'', shell=True).rstrip()
         ips =  [ c.split(':')[1].split(' ')[0] for c in commands.getoutput("/sbin/ifconfig").split('\n') if 'inet addr' in c ]
         ips =  [ ip for ip in ips if ip not in localips ] 
         eprint.text('\n\n')
@@ -218,6 +219,7 @@ class EscposDriver(Thread):
                 eprint.text(ip+'\n')
 
         if len(ips) >= 1:
+            eprint.text('\nMAC Address:\n' + mac + '\n')
             eprint.text('\nHomepage:\nhttp://'+ips[0]+':8069\n')
 
         eprint.text('\n\n')

From f0646cb51b236a3afd5e7289f5cd5986c88da8f6 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 27 Jan 2016 18:00:48 +0100
Subject: [PATCH 10/13] [IMP] fields: use a "lazy" cursor to compute attribute
 `digits`

Borrowing a cursor each time you access `field.digits` may be costly, because
of the connection reset.  Moreover, in most cases, the cursor is not used at
all, since the decimal precision are kept in cache.

For the installation of module `product` with its demo data, the number of
cursor allocations was reduced from ~1500 to about 50!
---
 openerp/fields.py     |  5 +++--
 openerp/osv/fields.py | 15 ++++++---------
 openerp/sql_db.py     | 34 ++++++++++++++++++++++++++++++++++
 3 files changed, 43 insertions(+), 11 deletions(-)

diff --git a/openerp/fields.py b/openerp/fields.py
index a6775336a1e..b46e4e3cda7 100644
--- a/openerp/fields.py
+++ b/openerp/fields.py
@@ -30,6 +30,7 @@ import logging
 import pytz
 import xmlrpclib
 
+from openerp.sql_db import LazyCursor
 from openerp.tools import float_round, frozendict, html_sanitize, ustr, OrderedSet
 from openerp.tools import DEFAULT_SERVER_DATE_FORMAT as DATE_FORMAT
 from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT as DATETIME_FORMAT
@@ -1070,7 +1071,7 @@ class Float(Field):
     @property
     def digits(self):
         if callable(self._digits):
-            with fields._get_cursor() as cr:
+            with LazyCursor() as cr:
                 return self._digits(cr)
         else:
             return self._digits
@@ -1882,7 +1883,7 @@ class Id(Field):
         raise TypeError("field 'id' cannot be assigned")
 
 # imported here to avoid dependency cycle issues
-from openerp import SUPERUSER_ID, registry
+from openerp import SUPERUSER_ID
 from .exceptions import Warning, AccessError, MissingError
 from .models import BaseModel, MAGIC_COLUMNS
 from .osv import fields
diff --git a/openerp/osv/fields.py b/openerp/osv/fields.py
index 38b034dded1..54b39418b9c 100644
--- a/openerp/osv/fields.py
+++ b/openerp/osv/fields.py
@@ -43,21 +43,18 @@ import pytz
 import re
 import xmlrpclib
 from operator import itemgetter
-from contextlib import contextmanager
 from psycopg2 import Binary
 
 import openerp
 import openerp.tools as tools
+from openerp.sql_db import LazyCursor
 from openerp.tools.translate import _
 from openerp.tools import float_repr, float_round, frozendict, html_sanitize
 import simplejson
-from openerp import SUPERUSER_ID, registry
+from openerp import SUPERUSER_ID
 
-@contextmanager
-def _get_cursor():
-    # yield a valid cursor from any environment or create a new one if none found
-    with registry().cursor() as cr:
-        yield cr
+# deprecated; kept for backward compatibility only
+_get_cursor = LazyCursor
 
 EMPTY_DICT = frozendict()
 
@@ -396,7 +393,7 @@ class float(_column):
     @property
     def digits(self):
         if self._digits_compute:
-            with _get_cursor() as cr:
+            with LazyCursor() as cr:
                 return self._digits_compute(cr)
         else:
             return self._digits
@@ -1323,7 +1320,7 @@ class function(_column):
     @property
     def digits(self):
         if self._digits_compute:
-            with _get_cursor() as cr:
+            with LazyCursor() as cr:
                 return self._digits_compute(cr)
         else:
             return self._digits
diff --git a/openerp/sql_db.py b/openerp/sql_db.py
index f389a847548..a3af4be677a 100644
--- a/openerp/sql_db.py
+++ b/openerp/sql_db.py
@@ -443,6 +443,40 @@ class TestCursor(Cursor):
         self.execute("ROLLBACK TO SAVEPOINT test_cursor")
         self.execute("SAVEPOINT test_cursor")
 
+class LazyCursor(object):
+    """ A proxy object to a cursor. The cursor itself is allocated only if it is
+        needed. This class is useful for cached methods, that use the cursor
+        only in the case of a cache miss.
+    """
+    def __init__(self, dbname=None):
+        self._dbname = dbname
+        self._cursor = None
+        self._depth = 0
+
+    @property
+    def dbname(self):
+        return self._dbname or threading.currentThread().dbname
+
+    def __getattr__(self, name):
+        cr = self._cursor
+        if cr is None:
+            from openerp import registry
+            cr = self._cursor = registry(self.dbname).cursor()
+            for _ in xrange(self._depth):
+                cr.__enter__()
+        return getattr(cr, name)
+
+    def __enter__(self):
+        self._depth += 1
+        if self._cursor is not None:
+            self._cursor.__enter__()
+        return self
+
+    def __exit__(self, exc_type, exc_value, traceback):
+        self._depth -= 1
+        if self._cursor is not None:
+            self._cursor.__exit__(exc_type, exc_value, traceback)
+
 class PsycoConnection(psycopg2.extensions.connection):
     pass
 

From 812332855a22d5a0f41f579d949aba87213230b9 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Thu, 28 Jan 2016 16:36:24 +0100
Subject: [PATCH 11/13] [IMP] fields: speedup `Float.convert_to_cache` by not
 rounding the value

---
 openerp/fields.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/openerp/fields.py b/openerp/fields.py
index b46e4e3cda7..ba3bc259282 100644
--- a/openerp/fields.py
+++ b/openerp/fields.py
@@ -1096,6 +1096,8 @@ class Float(Field):
     def convert_to_cache(self, value, record, validate=True):
         # apply rounding here, otherwise value in cache may be wrong!
         value = float(value or 0.0)
+        if not validate:
+            return value
         digits = self.digits
         return float_round(value, precision_digits=digits[1]) if digits else value
 

From ca7983a40fdadf4f28760a879ffcee342850d112 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Thu, 28 Jan 2016 16:44:05 +0100
Subject: [PATCH 12/13] [FIX] account_budget: in test, use `float_compare` to
 compare amounts

---
 .../tests/test_theoreticalamount.py           | 28 +++++++++++--------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/addons/account_budget/tests/test_theoreticalamount.py b/addons/account_budget/tests/test_theoreticalamount.py
index a1e090e2184..ab1c4dabf7c 100644
--- a/addons/account_budget/tests/test_theoreticalamount.py
+++ b/addons/account_budget/tests/test_theoreticalamount.py
@@ -3,7 +3,7 @@ from datetime import datetime
 from mock import patch
 
 from openerp.tests.common import TransactionCase
-from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT
+from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT, float_compare
 
 
 # ---------------------------------------------------------
@@ -32,65 +32,71 @@ class TestTheoreticalAmount(TransactionCase):
         self.patcher = patch('openerp.addons.account_budget.account_budget.datetime', wraps=datetime)
         self.mock_datetime = self.patcher.start()
 
+    def assertFloatEqual(self, value1, value2, *args, **kwargs):
+        """ Compare two values of the field theoritical_amount """
+        digits = type(self.line).theoritical_amount.digits
+        result = float_compare(value1, value2, precision_digits=digits[1])
+        return self.assertFalse(result, *args, **kwargs)
+
     def test_01(self):
         """Start"""
         date = datetime.strptime('2014-01-01 00:00:00', DEFAULT_SERVER_DATETIME_FORMAT)
         self.mock_datetime.now.return_value = date
-        self.assertEqual(self.line.theoritical_amount, 0)
+        self.assertFloatEqual(self.line.theoritical_amount, 0)
 
     def test_02(self):
         """After 24 hours"""
         date = datetime.strptime('2014-01-02 00:00:00', DEFAULT_SERVER_DATETIME_FORMAT)
         self.mock_datetime.now.return_value = date
-        self.assertEqual(self.line.theoritical_amount, -1)
+        self.assertFloatEqual(self.line.theoritical_amount, -1)
 
     def test_03(self):
         """After 36 hours"""
         date = datetime.strptime('2014-01-02 12:00:00', DEFAULT_SERVER_DATETIME_FORMAT)
         self.mock_datetime.now.return_value = date
-        self.assertEqual(self.line.theoritical_amount, -1.5)
+        self.assertFloatEqual(self.line.theoritical_amount, -1.5)
 
     def test_04(self):
         """After 48 hours"""
         date = datetime.strptime('2014-01-03 00:00:00', DEFAULT_SERVER_DATETIME_FORMAT)
         self.mock_datetime.now.return_value = date
-        self.assertEqual(self.line.theoritical_amount, -2)
+        self.assertFloatEqual(self.line.theoritical_amount, -2)
 
     def test_05(self):
         """After 10 days"""
         date = datetime.strptime('2014-01-11 00:00:00', DEFAULT_SERVER_DATETIME_FORMAT)
         self.mock_datetime.now.return_value = date
-        self.assertEqual(self.line.theoritical_amount, -10)
+        self.assertFloatEqual(self.line.theoritical_amount, -10)
 
     def test_06(self):
         """After 50 days"""
         date = datetime.strptime('2014-02-20 00:00:00', DEFAULT_SERVER_DATETIME_FORMAT)
         self.mock_datetime.now.return_value = date
-        self.assertEqual(self.line.theoritical_amount, -50)
+        self.assertFloatEqual(self.line.theoritical_amount, -50)
 
     def test_07(self):
         """After 182 days, exactly half of the budget line"""
         date = datetime.strptime('2014-07-02 00:00:00', DEFAULT_SERVER_DATETIME_FORMAT)
         self.mock_datetime.now.return_value = date
-        self.assertEqual(self.line.theoritical_amount, -182)
+        self.assertFloatEqual(self.line.theoritical_amount, -182)
 
     def test_08(self):
         """After 308 days at noon"""
         date = datetime.strptime('2014-11-05 12:00:00', DEFAULT_SERVER_DATETIME_FORMAT)  # remember, remember
         self.mock_datetime.now.return_value = date
-        self.assertEqual(self.line.theoritical_amount, -308.5)
+        self.assertFloatEqual(self.line.theoritical_amount, -308.5)
 
     def test_09(self):
         """One day before"""
         date = datetime.strptime('2014-12-30 00:00:00', DEFAULT_SERVER_DATETIME_FORMAT)
         self.mock_datetime.now.return_value = date
-        self.assertEqual(self.line.theoritical_amount, -363)
+        self.assertFloatEqual(self.line.theoritical_amount, -363)
 
     def test_10(self):
         """At last"""
         date = datetime.strptime('2014-12-31 00:00:00', DEFAULT_SERVER_DATETIME_FORMAT)
         self.mock_datetime.now.return_value = date
-        self.assertEqual(self.line.theoritical_amount, -364)
+        self.assertFloatEqual(self.line.theoritical_amount, -364)
 
     def tearDown(self):
         self.patcher.stop()

From edeb5a8c0fb5c837364f1d92db731f89824bb28a Mon Sep 17 00:00:00 2001
From: xmo-odoo <xmo-odoo@users.noreply.github.com>
Date: Fri, 29 Jan 2016 10:20:08 +0100
Subject: [PATCH 13/13] [FIX] module finder path parameter should be optional

According to PEP302, the signature of `Finder.find_module` should be
`find_module(fullname, path=None)`.

Ever since it was introduced in 64ec5f36df the addons import hook
defines the second parameter as mandatory, which is an issue for
systems relying on the specified behaviour (and not needing to
provide a path) like the stdlib's `pkgutil.find_loader`.

fixes #10670
---
 openerp/modules/module.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/modules/module.py b/openerp/modules/module.py
index b9f19293fee..8a72fd6f954 100644
--- a/openerp/modules/module.py
+++ b/openerp/modules/module.py
@@ -65,7 +65,7 @@ class AddonsImportHook(object):
     thus `import openerp.addons.module`.
     """
 
-    def find_module(self, module_name, package_path):
+    def find_module(self, module_name, package_path=None):
         module_parts = module_name.split('.')
         if len(module_parts) == 3 and module_name.startswith('openerp.addons.'):
             return self # We act as a loader too.