From 3e497ea35f27953dcbc4f42f9d7b02031af4caee Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Tue, 5 May 2015 14:29:07 +0200
Subject: [PATCH 01/49] [FIX] registry: recompute `pure_function_fields` after
 every setup

The lazy property `pure_function_fields` was not invalidated upon every setup
of models, and hence could contain old instances of fields.  As every model
setup re-creates instances of fields, the property has to be recomputed.
---
 openerp/modules/registry.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/openerp/modules/registry.py b/openerp/modules/registry.py
index aa75e176a56..09267498d2a 100644
--- a/openerp/modules/registry.py
+++ b/openerp/modules/registry.py
@@ -173,6 +173,8 @@ class Registry(Mapping):
 
             :param partial: ``True`` if all models have not been loaded yet.
         """
+        lazy_property.reset_all(self)
+
         # load custom models
         ir_model = self['ir.model']
         cr.execute('select model from ir_model where state=%s', ('manual',))

From 423720700009f8c99fc49908fbecccd41118bf2f Mon Sep 17 00:00:00 2001
From: Nicolas Lempereur <nle@odoo.com>
Date: Tue, 5 May 2015 10:35:58 +0200
Subject: [PATCH 02/49] [FIX] website_quote: css issue for mobile view

When seen from a mobile, the shortcut menu was over the content of the
quote and hid it.

This fix sets the menu inline in the page when he has no place to be on a
column on its own.

opw-633890
---
 addons/website_quote/static/src/css/website_quotation.css | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/addons/website_quote/static/src/css/website_quotation.css b/addons/website_quote/static/src/css/website_quotation.css
index 28bcf38efc1..a235ec889fe 100644
--- a/addons/website_quote/static/src/css/website_quotation.css
+++ b/addons/website_quote/static/src/css/website_quotation.css
@@ -36,6 +36,11 @@
   font-size: 90%;
 }
 
+@media (max-width: 991px) {
+  .o_website_quote .bs-sidebar {
+    position: static;
+  }
+}
 @media (min-width: 992px) {
   .o_website_quote .bs-sidebar .nav > .active > ul {
     display: block;

From a124988c524553197fe3e1f39e08723de6671ad0 Mon Sep 17 00:00:00 2001
From: Nicolas Lempereur <nle@odoo.com>
Date: Tue, 5 May 2015 10:59:05 +0200
Subject: [PATCH 03/49] [FIX] website_quote: typo for accept button's modal

Correcting typo introduced by commit 0d591ca.
---
 addons/website_quote/views/website_quotation.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_quote/views/website_quotation.xml b/addons/website_quote/views/website_quotation.xml
index 5646bdbc0ce..2d64735d756 100644
--- a/addons/website_quote/views/website_quotation.xml
+++ b/addons/website_quote/views/website_quotation.xml
@@ -156,7 +156,7 @@
 
   <template id="quotation_toolbar">
       <div class="text-center hidden-print" t-if="quotation.state in ('draft', 'sent', 'waiting_date')">
-          <a class="btn btn-success" data-toggle="modal" data-target="#modalaccept"
+          <a class="btn btn-success" data-toggle="modal" data-target="#modelaccept"
             t-if="days_valid &gt;= 0">
               <i class="fa fa-check"></i> Accept
           </a>

From 6b72008c32345e1413f654ba24d0b521dc9bdf33 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Wed, 6 May 2015 14:01:53 +0200
Subject: [PATCH 04/49] [FIX] point_of_sale: products search with ':' in
 products names

This is related to revision bb913d0.

':' in product names are removed, to avoid issues when
searching products with ':' in their name.

JS replace method only replaces the first occurence, if the
needle isn't set as a regex with 'g', e.g. /':'/g

opw-634547
---
 addons/point_of_sale/static/src/js/db.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/point_of_sale/static/src/js/db.js b/addons/point_of_sale/static/src/js/db.js
index 58d458d7560..ed3a72c7e28 100644
--- a/addons/point_of_sale/static/src/js/db.js
+++ b/addons/point_of_sale/static/src/js/db.js
@@ -146,7 +146,7 @@ function openerp_pos_db(instance, module){
             for (var i = 0; i < packagings.length; i++) {
                 str += '|' + packagings[i].ean;
             }
-            str  = product.id + ':' + str.replace(':','') + '\n';
+            str  = product.id + ':' + str.replace(/:/g,'') + '\n';
             return str;
         },
         add_products: function(products){

From 1a535b9d870ced75d9b561bd0bb634c87b1fa999 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 6 May 2015 14:37:56 +0200
Subject: [PATCH 05/49] [IMP] models: in recompute, do not store fields that
 should not be recomputed

Consider a new field that uses the same compute method as another existing
field.  When the field is introduced in database, its value must be computed on
existing records.  In such a case, the existing field should not be written, as
its value is not supposed to have changed.  Not writing on the existing field
can avoid useless recomputations in cascade, which is the reason we introduce
this patch.
---
 openerp/models.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/openerp/models.py b/openerp/models.py
index 6beffe5072f..f584c72ada6 100644
--- a/openerp/models.py
+++ b/openerp/models.py
@@ -5667,7 +5667,11 @@ class BaseModel(object):
         while self.env.has_todo():
             field, recs = self.env.get_todo()
             # evaluate the fields to recompute, and save them to database
-            names = [f.name for f in field.computed_fields if f.store]
+            names = [
+                f.name
+                for f in field.computed_fields
+                if f.store and self.env.field_todo(f)
+            ]
             for rec in recs:
                 try:
                     values = rec._convert_to_write({

From 6553eb37425d8ac9f727971d04509a8130af21f0 Mon Sep 17 00:00:00 2001
From: Nicolas Lempereur <nle@odoo.com>
Date: Tue, 5 May 2015 13:25:54 +0200
Subject: [PATCH 06/49] [FIX] website_quote: use sale description for options
 lines

Use the sale description for suggesteds items.

So when seeing suggesteds items in a quotation, we so the sale description
(if there is one) next to the product name.

It was already done for contained items, but not for the suggested ones.

closes #6565
opw-634507
---
 addons/website_quote/models/order.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/addons/website_quote/models/order.py b/addons/website_quote/models/order.py
index 0e16029ce02..356ad59981b 100644
--- a/addons/website_quote/models/order.py
+++ b/addons/website_quote/models/order.py
@@ -267,6 +267,8 @@ class sale_quote_option(osv.osv):
             'name': product_obj.name,
             'uom_id': product_obj.product_tmpl_id.uom_id.id,
         })
+        if product_obj.description_sale:
+            vals['name'] += '\n'+product_obj.description_sale
         return {'value': vals}
 
 class sale_order_option(osv.osv):
@@ -299,6 +301,8 @@ class sale_order_option(osv.osv):
             'name': product_obj.name,
             'uom_id': product_obj.product_tmpl_id.uom_id.id,
         })
+        if product_obj.description_sale:
+            vals['name'] += '\n'+product_obj.description_sale
         return {'value': vals}
 
 class product_template(osv.Model):

From b7f1b9c01ec108ba06a6eea23dee6815ca7fc48e Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Wed, 6 May 2015 17:25:44 +0200
Subject: [PATCH 07/49] [FIX] models: recompute nested old-style computed field
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The `set` method of the one2many class returns a list
of the fields that require recomputation,
the computing of the function fields being delayed
for performances reasons.

Nevertheless, if the `set` method was called
through another `set` method, in other words,
nested `set` calls, the fields to recompute returned
by the second, nested, call to set were never recomputed,
the result list were simply lost.

e.g.:
```
create/write
│set
└─── create/write with recs.env.recompute set to False
    │set
        └─── create
             with recs.env.recompute set to False
```

To overcome this problem, the list of old api style
compute fields to recompute is stored
within the environment, and this list is cleared
each time the store_set_value has done its job of
recomputing all old api style compute fields.

opw-629650
opw-632624
closes #6053
---
 openerp/api.py    |  8 ++++++++
 openerp/models.py | 15 +++++++++------
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/openerp/api.py b/openerp/api.py
index b377076cf55..62dd2e5f0f3 100644
--- a/openerp/api.py
+++ b/openerp/api.py
@@ -907,6 +907,13 @@ class Environment(object):
         finally:
             self.all.recompute = tmp
 
+    @property
+    def recompute_old(self):
+        return self.all.recompute_old
+
+    def clear_recompute_old(self):
+        del self.all.recompute_old[:]
+
 
 class Environments(object):
     """ A common object for all environments in a request. """
@@ -915,6 +922,7 @@ class Environments(object):
         self.todo = {}                  # recomputations {field: [records]}
         self.mode = False               # flag for draft/onchange
         self.recompute = True
+        self.recompute_old = []        # list of old api compute fields to recompute
 
     def add(self, env):
         """ Add the environment `env`. """
diff --git a/openerp/models.py b/openerp/models.py
index f584c72ada6..858993f94d4 100644
--- a/openerp/models.py
+++ b/openerp/models.py
@@ -3994,10 +3994,10 @@ class BaseModel(object):
                     recs.invalidate_cache(['parent_left', 'parent_right'])
 
         result += self._store_get_values(cr, user, ids, vals.keys(), context)
-        result.sort()
 
         done = {}
-        for order, model_name, ids_to_update, fields_to_recompute in result:
+        recs.env.recompute_old.extend(result)
+        for order, model_name, ids_to_update, fields_to_recompute in sorted(recs.env.recompute_old):
             key = (model_name, tuple(fields_to_recompute))
             done.setdefault(key, {})
             # avoid to do several times the same computation
@@ -4008,6 +4008,7 @@ class BaseModel(object):
                     if id not in deleted_related[model_name]:
                         todo.append(id)
             self.pool[model_name]._store_set_values(cr, user, todo, fields_to_recompute, context)
+        recs.env.clear_recompute_old()
 
         # recompute new-style fields
         if recs.env.recompute and context.get('recompute', True):
@@ -4257,16 +4258,18 @@ class BaseModel(object):
         # check Python constraints
         recs._validate_fields(vals)
 
-        if recs.env.recompute and context.get('recompute', True):
-            result += self._store_get_values(cr, user, [id_new],
+        result += self._store_get_values(cr, user, [id_new],
                 list(set(vals.keys() + self._inherits.values())),
                 context)
-            result.sort()
+        recs.env.recompute_old.extend(result)
+
+        if recs.env.recompute and context.get('recompute', True):
             done = []
-            for order, model_name, ids, fields2 in result:
+            for order, model_name, ids, fields2 in sorted(recs.env.recompute_old):
                 if not (model_name, ids, fields2) in done:
                     self.pool[model_name]._store_set_values(cr, user, ids, fields2, context)
                     done.append((model_name, ids, fields2))
+            recs.env.clear_recompute_old()
             # recompute new-style fields
             recs.recompute()
 

From 576cf26a5368883a829992f7ffb1d08a2ba8bf84 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Wed, 6 May 2015 17:27:17 +0200
Subject: [PATCH 08/49] Revert "[FIX] stock: `product_qty` field is not
 recomputed at record creation."

This reverts commit a1da6c21325ae7121aaba643aa1eea6401649dec.

This revision was a temporary patch to solve function fields
computation issues, solved thanks to the commit b7f1b9c01ec108ba06a6eea23dee6815ca7fc48e
---
 addons/stock/stock.py | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index c7f906f83e3..fc1e636d435 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -24,7 +24,6 @@ from dateutil import relativedelta
 import json
 import time
 
-from openerp import models, fields as new_fields, api
 from openerp.osv import fields, osv
 from openerp.tools.float_utils import float_compare, float_round
 from openerp.tools.translate import _
@@ -1597,7 +1596,7 @@ class stock_production_lot(osv.osv):
 # Move
 # ----------------------------------------------------
 
-class stock_move(models.Model):
+class stock_move(osv.osv):
     _name = "stock.move"
     _description = "Stock Move"
     _order = 'date_expected desc, id'
@@ -1618,11 +1617,12 @@ class stock_move(models.Model):
             res.append((line.id, name))
         return res
 
-    @api.depends('product_id', 'product_uom_qty', 'product_uom', 'product_id.uom_id')
-    def _quantity_normalize(self):
+    def _quantity_normalize(self, cr, uid, ids, name, args, context=None):
         uom_obj = self.pool.get('product.uom')
-        for m in self:
-            m.product_qty = uom_obj._compute_qty_obj(self.env.cr, self.env.uid, m.product_uom, m.product_uom_qty, m.product_id.uom_id, context=self.env.context)
+        res = {}
+        for m in self.browse(cr, uid, ids, context=context):
+            res[m.id] = uom_obj._compute_qty_obj(cr, uid, m.product_uom, m.product_uom_qty, m.product_id.uom_id, context=context)
+        return res
 
     def _get_remaining_qty(self, cr, uid, ids, field_name, args, context=None):
         uom_obj = self.pool.get('product.uom')
@@ -1706,6 +1706,11 @@ class stock_move(models.Model):
             res += [x.id for x in picking.move_lines]
         return res
 
+    def _get_moves_from_prod(self, cr, uid, ids, context=None):
+        if ids:
+            return self.pool.get('stock.move').search(cr, uid, [('product_id', 'in', ids)], context=context)
+        return []
+
     def _set_product_qty(self, cr, uid, id, field, value, arg, context=None):
         """ The meaning of product_qty field changed lately and is now a functional field computing the quantity
             in the default product UoM. This code has been added to raise an error if a write is made given a value
@@ -1714,9 +1719,6 @@ class stock_move(models.Model):
         """
         raise osv.except_osv(_('Programming Error!'), _('The requested operation cannot be processed because of a programming error setting the `product_qty` field instead of the `product_uom_qty`.'))
 
-    product_qty = new_fields.Float(compute='_quantity_normalize', inverse='_set_product_qty', digits=0, store=True, string='Quantity',
-                                   help='Quantity in the default UoM of the product')
-
     _columns = {
         'name': fields.char('Description', required=True, select=True),
         'priority': fields.selection(procurement.PROCUREMENT_PRIORITIES, 'Priority'),
@@ -1724,6 +1726,8 @@ class stock_move(models.Model):
         'date': fields.datetime('Date', required=True, select=True, help="Move date: scheduled date until move is done, then date of actual move processing", states={'done': [('readonly', True)]}),
         'date_expected': fields.datetime('Expected Date', states={'done': [('readonly', True)]}, required=True, select=True, help="Scheduled date for the processing of this move"),
         'product_id': fields.many2one('product.product', 'Product', required=True, select=True, domain=[('type', '<>', 'service')], states={'done': [('readonly', True)]}),
+        'product_qty': fields.function(_quantity_normalize, fnct_inv=_set_product_qty, type='float', digits=0, store=True, string='Quantity',
+            help='Quantity in the default UoM of the product'),
         'product_uom_qty': fields.float('Quantity', digits_compute=dp.get_precision('Product Unit of Measure'),
             required=True, states={'done': [('readonly', True)]},
             help="This is the quantity of products from an inventory "

From a922d39632f4d51ebed53d488fda6fed67f19659 Mon Sep 17 00:00:00 2001
From: Alexandre Fayolle <alexandre.fayolle@camptocamp.com>
Date: Wed, 6 May 2015 17:29:37 +0200
Subject: [PATCH 09/49] [ADD] sale, delivery: tests for sales prepaid flow

Test uses cases for revision b7f1b9c01ec108ba06a6eea23dee6815ca7fc48e
---
 addons/delivery/__openerp__.py                |  4 +-
 ...ve_values_with_invoice_before_delivery.yml | 83 +++++++++++++++++++
 addons/sale/test/manual_order_policy.yml      |  2 +-
 3 files changed, 87 insertions(+), 2 deletions(-)
 create mode 100644 addons/delivery/test/stock_move_values_with_invoice_before_delivery.yml

diff --git a/addons/delivery/__openerp__.py b/addons/delivery/__openerp__.py
index 1fb2f921d83..8b99e3e186b 100644
--- a/addons/delivery/__openerp__.py
+++ b/addons/delivery/__openerp__.py
@@ -41,7 +41,9 @@ invoices from picking, OpenERP is able to add and compute the shipping line.
         'views/report_shipping.xml',
     ],
     'demo': ['delivery_demo.xml'],
-    'test': ['test/delivery_cost.yml'],
+    'test': ['test/delivery_cost.yml',
+             'test/stock_move_values_with_invoice_before_delivery.yml',
+             ],
     'installable': True,
     'auto_install': False,
 }
diff --git a/addons/delivery/test/stock_move_values_with_invoice_before_delivery.yml b/addons/delivery/test/stock_move_values_with_invoice_before_delivery.yml
new file mode 100644
index 00000000000..1a998f51e22
--- /dev/null
+++ b/addons/delivery/test/stock_move_values_with_invoice_before_delivery.yml
@@ -0,0 +1,83 @@
+-
+  test that the store fields of stock moves are computed with invoice before delivery flow
+-
+  set a weight on ipod 16GB
+-
+  !python {model: product.product, id: product.product_product_11}: |
+    self.write({'weight': 0.25, 'weight_net': 0.2})
+-
+  create a SO with invoice before delivery
+-
+  !record {model: sale.order, id: sale_prepaid}:
+    partner_id: base.res_partner_18
+    partner_invoice_id: base.res_partner_18
+    partner_shipping_id: base.res_partner_18
+    pricelist_id: product.list0
+    order_policy: 'prepaid'
+    order_line:
+      - name: 'Ipod'
+        product_id: product.product_product_11
+        product_uom_qty: 2
+        product_uos_qty: 2
+        product_uom: product.product_uom_unit
+        price_unit: 750.00
+    carrier_id: normal_delivery_carrier
+-
+  I add delivery cost in Sale order.
+-
+  !python {model: sale.order, id: sale_prepaid}: |
+    self.delivery_set()
+-
+  I confirm the SO.
+-
+  !workflow {model: sale.order, action: order_confirm, ref: sale_prepaid}
+-
+  I check that the invoice was created
+-
+  !python {model: sale.order, id: sale_prepaid}: |
+    assert len(self.invoice_ids) == 1, "Invoice not created."
+-
+  I confirm the invoice
+-
+  !python {model: sale.order, id: sale_prepaid}: |
+    invoice = self.invoice_ids[0]
+    invoice.signal_workflow('invoice_open')
+-
+  I pay the invoice.
+-
+  !python {model: sale.order, id: sale_prepaid}: |
+    invoice = self.invoice_ids[0]
+    invoice.signal_workflow('invoice_open')
+    journal = self.env['account.journal'].search([('type', '=', 'cash'),
+                                                  ('company_id', '=', self.company_id.id)],
+                                                  limit=1)
+    invoice.pay_and_reconcile(
+         invoice.amount_total, ref('account.cash'), ref('account.period_8'),
+         journal.id, ref('account.cash'),
+         ref('account.period_8'), journal.id,
+         name='test')
+-
+  Check the SO after paying the invoice
+-
+  !python {model: sale.order, id: sale_prepaid}: |
+     assert self.invoice_exists, 'order not invoiced'
+     assert self.invoiced, 'order is not paid'
+     assert len(self.picking_ids) == 1, 'pickings not generated'
+-
+  check the stock moves
+-
+  !python {model: sale.order, id: sale_prepaid}: |
+     move = self.picking_ids.move_lines
+     assert move.product_qty == 2, 'wrong product_qty'
+     assert move.weight == 0.5, 'wrong move weight'
+     assert move.weight_net == 0.4, 'wrong move weight_net'
+-
+  ship
+-
+  !python {model: sale.order, id: sale_prepaid}: |
+     picking = self.picking_ids.action_done()
+-
+  Check the SO after shipping
+-
+  !python {model: sale.order, id: sale_prepaid}: |
+     assert self.state == 'done'
diff --git a/addons/sale/test/manual_order_policy.yml b/addons/sale/test/manual_order_policy.yml
index d2a1ff0195f..1bb1f1d4415 100644
--- a/addons/sale/test/manual_order_policy.yml
+++ b/addons/sale/test/manual_order_policy.yml
@@ -7,7 +7,7 @@
 -
   !python {model: sale.order}: |
     sale_order = self.browse(cr, uid, ref("sale_order_2"))
-    assert len(sale_order.invoice_ids) == False, "Invoice should not created."
+    assert len(sale_order.invoice_ids) == 0, "Invoice should not created."
 -
   I create advance invoice where type is 'Fixed Price'.
 -

From 7fa432ee118373f1092b3f2b67b75a7418c5e953 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20V=C3=A1zquez=20Acosta?= <mva.led@gmail.com>
Date: Thu, 30 Apr 2015 10:30:10 -0400
Subject: [PATCH 10/49] [CLA] individual signature for mvaled

---
 doc/cla/individual/mvaled.md | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 doc/cla/individual/mvaled.md

diff --git a/doc/cla/individual/mvaled.md b/doc/cla/individual/mvaled.md
new file mode 100644
index 00000000000..e9dd0add952
--- /dev/null
+++ b/doc/cla/individual/mvaled.md
@@ -0,0 +1,11 @@
+La Habana, 2015-04-30
+
+I hereby agree to the terms of the Odoo Individual Contributor License
+Agreement v1.0.
+
+I declare that I am authorized and able to make this agreement and sign this
+declaration.
+
+Signed,
+
+Manuel Vázquez Acosta mva.led@gmail.com https://github.com/mvaled

From 2e3fdf3794f8a2185df1348ec6a3f7edb8e570cf Mon Sep 17 00:00:00 2001
From: Rui Andrada <shingonoide@gmail.com>
Date: Tue, 28 Apr 2015 15:49:59 -0300
Subject: [PATCH 11/49] [CLA] individual signature for shingonoide

---
 doc/cla/individual/shingonoide.md | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 doc/cla/individual/shingonoide.md

diff --git a/doc/cla/individual/shingonoide.md b/doc/cla/individual/shingonoide.md
new file mode 100644
index 00000000000..af4e340188d
--- /dev/null
+++ b/doc/cla/individual/shingonoide.md
@@ -0,0 +1,11 @@
+Brazil, 2015-04-28
+
+I hereby agree to the terms of the Odoo Individual Contributor License
+Agreement v1.0.
+
+I declare that I am authorized and able to make this agreement and sign this
+declaration.
+
+Signed,
+
+Rui Andrada shingonoide@gmail.com https://github.com/shingonoide

From 8aa6aa0c785b006a11b702d6052745d87b058902 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Wed, 6 May 2015 18:17:45 +0200
Subject: [PATCH 12/49] [FIX] account: entries analysis with null values in
 debit/credit

In SQL, the addition/subtraction between NULL and an integer/numeric
returns NULL.

Therefore, if either debit or credit was set to null instead
of 0.0, debit-credit returned null, instead of the actual subtraction

opw-634044
---
 addons/account/report/account_entries_report.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/report/account_entries_report.py b/addons/account/report/account_entries_report.py
index 6dd451599b4..0520a16c64a 100644
--- a/addons/account/report/account_entries_report.py
+++ b/addons/account/report/account_entries_report.py
@@ -145,7 +145,7 @@ class account_entries_report(osv.osv):
                 l.amount_currency as amount_currency,
                 l.debit as debit,
                 l.credit as credit,
-                l.debit-l.credit as balance
+                coalesce(l.debit, 0.0) - coalesce(l.credit, 0.0) as balance
             from
                 account_move_line l
                 left join account_account a on (l.account_id = a.id)

From 4392289745ed4bbf667ed6ac3c0ed3c0a894abc7 Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Tue, 5 May 2015 18:01:30 +0200
Subject: [PATCH 13/49] [FIX] account_invoice: residual of invoices in foreign
 currencies

If a line of the invoice move was in a foreign currency
but its residual amount in this foreign currency was 0,
the `amount_residual` (in company currency) was used,
instead of the `amount_residual_currency`, which
is the residual amount in this foreign currency.

This was due to the fall back with the `and / or` statement.
Using `if / else` instead solves the issue.

This could lead to issues when the residual amount
in the foreign currency was 0, but the residual amount
in the company currency was 0.01, due to the exchange rate
loss.
---
 addons/account/account_invoice.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index 48e6844e67c..4da3e85c6b6 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -131,7 +131,7 @@ class account_invoice(models.Model):
                 continue
             # Get the correct line residual amount
             if line.currency_id == self.currency_id:
-                line_amount = line.currency_id and line.amount_residual_currency or line.amount_residual
+                line_amount = line.amount_residual_currency if line.currency_id else line.amount_residual
             else:
                 from_currency = line.company_id.currency_id.with_context(date=line.date)
                 line_amount = from_currency.compute(line.amount_residual, self.currency_id)

From 9335fed9fecdf411c4e266be58302a5021e14106 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Tue, 5 May 2015 18:06:24 +0200
Subject: [PATCH 14/49] [FIX] account: debit/credit values for move lines in
 foreign currencies

When the target currency is the company currency, there
is no need to re-compute the debit/credit amounts of the move lines,
since these debit/credit values already contains the amount
of the move line within the company currency.

Avoiding the recomputation prevents gain/loss during currencies exchanges

opw-631748
opw-632133
opw-631895
---
 addons/account/account_move_line.py | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 2e5cdce5e84..4ed1219caaa 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -825,12 +825,17 @@ class account_move_line(osv.osv):
                 total_amount_currency_str = rml_parser.formatLang(total_amount, currency_obj=line_currency)
                 ret_line['credit_currency'] = actual_credit
                 ret_line['debit_currency'] = actual_debit
-                ctx = context.copy()
-                if target_date:
-                    ctx.update({'date': target_date})
-                total_amount = currency_obj.compute(cr, uid, line_currency.id, target_currency.id, total_amount, context=ctx)
-                actual_debit = currency_obj.compute(cr, uid, line_currency.id, target_currency.id, actual_debit, context=ctx)
-                actual_credit = currency_obj.compute(cr, uid, line_currency.id, target_currency.id, actual_credit, context=ctx)
+                if target_currency == company_currency:
+                    actual_debit = debit
+                    actual_credit = credit
+                    total_amount = debit or credit
+                else:
+                    ctx = context.copy()
+                    if target_date:
+                        ctx.update({'date': target_date})
+                    total_amount = currency_obj.compute(cr, uid, line_currency.id, target_currency.id, total_amount, context=ctx)
+                    actual_debit = currency_obj.compute(cr, uid, line_currency.id, target_currency.id, actual_debit, context=ctx)
+                    actual_credit = currency_obj.compute(cr, uid, line_currency.id, target_currency.id, actual_credit, context=ctx)
             amount_str = rml_parser.formatLang(actual_debit or actual_credit, currency_obj=target_currency)
             total_amount_str = rml_parser.formatLang(total_amount, currency_obj=target_currency)
 

From dd47b6f5bccfb43ee6fabb81effd16c940a020e0 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Tue, 5 May 2015 18:12:46 +0200
Subject: [PATCH 15/49] [FIX] account: Exchanges rates gain/loss during
 reconciliations

When processing the reconciliation of a bank statement
within the company currency with an invoice in a foreign currency,
avoid to recompute the bank statement debit / credit within
the currency rate at the time of the invoice when the
`amount_currency` of the bank statement line and the `amount_currency`
of the invoice move line are the same
(while having the invoice move line and the
bank statement move line in the same currency,
and having the bank statement currency and
the company currency the same),
to prevent gain/loss exchanges during currencies conversion.

Computing the amount of the statement line
within the currency of the invoice is useful
to compute the difference of amount paid within the company currency
when a change of currency rates occured between the invoice date
and the date of the payment.

Nevertheless, recomputing the amount in the currency of the company
is useless when the payment currency
and the company currency are the same,
and the amount of the invoice and the statement in the foreign currency
are identical, since the amount is already computed, within the
debit/credit field of the invoice move line.

Besides, this prevents gain/loss changes.
opw-631748
opw-632133
opw-631895
closes #6559
---
 addons/account/account_bank_statement.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index b4ccea8ba20..4a9c1127410 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -20,6 +20,7 @@
 ##############################################################################
 
 from openerp.osv import fields, osv
+from openerp.tools import float_is_zero
 from openerp.tools.translate import _
 import openerp.addons.decimal_precision as dp
 from openerp.report import report_sxw
@@ -793,8 +794,13 @@ class account_bank_statement_line(osv.osv):
                 if mv_line_dict.get('counterpart_move_line_id'):
                     #post an account line that use the same currency rate than the counterpart (to balance the account) and post the difference in another line
                     ctx['date'] = mv_line.date
-                    debit_at_old_rate = currency_obj.compute(cr, uid, st_line_currency.id, company_currency.id, mv_line_dict['debit'], context=ctx)
-                    credit_at_old_rate = currency_obj.compute(cr, uid, st_line_currency.id, company_currency.id, mv_line_dict['credit'], context=ctx)
+                    if mv_line.currency_id.id == mv_line_dict['currency_id'] \
+                            and float_is_zero(mv_line.amount_currency - abs(mv_line_dict['amount_currency']), precision_rounding=mv_line.currency_id.rounding):
+                        debit_at_old_rate = mv_line.credit
+                        credit_at_old_rate = mv_line.debit
+                    else:
+                        debit_at_old_rate = currency_obj.compute(cr, uid, st_line_currency.id, company_currency.id, mv_line_dict['debit'], context=ctx)
+                        credit_at_old_rate = currency_obj.compute(cr, uid, st_line_currency.id, company_currency.id, mv_line_dict['credit'], context=ctx)
                     mv_line_dict['credit'] = credit_at_old_rate
                     mv_line_dict['debit'] = debit_at_old_rate
                     if debit_at_old_rate - debit_at_current_rate:

From d65dec9eef900c498a1b86f53ce6dd81aef99793 Mon Sep 17 00:00:00 2001
From: Nicolas Lempereur <nle@odoo.com>
Date: Thu, 7 May 2015 00:20:01 +0200
Subject: [PATCH 16/49] [FIX] mass_mailing: mismastched mailing list view name

opw-634693
---
 addons/mass_mailing/views/mass_mailing.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mass_mailing/views/mass_mailing.xml b/addons/mass_mailing/views/mass_mailing.xml
index f1ed063d221..dff4778fd71 100644
--- a/addons/mass_mailing/views/mass_mailing.xml
+++ b/addons/mass_mailing/views/mass_mailing.xml
@@ -202,7 +202,7 @@
         </record>
 
         <record model="ir.actions.act_window" id="action_view_mass_mailing_lists">
-            <field name="name">Contact Lists</field>
+            <field name="name">Mailing Lists</field>
             <field name="res_model">mail.mass_mailing.list</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>

From f300d648a87a9be76761a97acfe2061a32adcd8f Mon Sep 17 00:00:00 2001
From: Goffin Simon <sig@odoo.com>
Date: Mon, 4 May 2015 12:01:49 +0200
Subject: [PATCH 17/49] [FIX] web: attachment with safari

With Safari, the function content_disposition must return "attachment; filename=\"%s\"" % filename
to avoid that Werkzeug raises an UnicodeDecodeError.

Fixes #6160
opw:634205
---
 addons/web/controllers/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 080025dd737..7d3862c3091 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -527,7 +527,7 @@ def content_disposition(filename, req):
     if browser == 'msie' and version < 9:
         return "attachment; filename=%s" % escaped
     elif browser == 'safari':
-        return "attachment; filename=%s" % filename
+        return "attachment; filename=\"%s\"" % filename
     else:
         return "attachment; filename*=UTF-8''%s" % escaped
 

From 5b6dcbb3a8ce22a1ba7a4a573ff66c42f34ca746 Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Tue, 28 Apr 2015 13:39:45 +0200
Subject: [PATCH 18/49] [FIX] stock_dropshipping: use route with 2 steps for
 crossdock test

---
 addons/stock_dropshipping/test/crossdock.yml | 86 ++++++++++++--------
 1 file changed, 51 insertions(+), 35 deletions(-)

diff --git a/addons/stock_dropshipping/test/crossdock.yml b/addons/stock_dropshipping/test/crossdock.yml
index 5ad1f1db187..2c79a1a3754 100644
--- a/addons/stock_dropshipping/test/crossdock.yml
+++ b/addons/stock_dropshipping/test/crossdock.yml
@@ -1,42 +1,58 @@
-- 
-  Create new product without any routes
-- 
-  !record {model: product.product, id: cross_shop_product}:
-    name: PCE
-    type: product
-    categ_id: product.product_category_1
-    list_price: 100.0
-    standard_price: 70.0
-    seller_ids:
-      - delay: 1
-        name: base.res_partner_2
-        min_qty: 2.0
-        qty: 5.0
-    type: product
-    uom_id: product.product_uom_unit
-    uom_po_id: product.product_uom_unit
-- 
-  Create a sales order with a line of 100 PCE incoming shipment, with route_id crossdock shipping.
-- 
-  !record {model: sale.order, id: sale_order_crossdock_shpng}:
-    partner_id: base.res_partner_4
-    note: Create Sales order
-    order_line:
-      - product_id: cross_shop_product
-        product_uom_qty: 100.00
+-
+    Create a supplier.
+-
+    !record {model: res.partner, id: supplier_crossdock}:
+        name: Crossdocking supplier
+-
+    Use the warehouse created in cancellation_propagated.yml.
+-
+    !python {model: stock.warehouse, id: wh_pps}: |
+        assert self.crossdock_route_id.active, 'Crossdock route is not active'
+-
+    Create new product without any routes.
+-
+    !record {model: product.product, id: cross_shop_product}:
+        name: PCE
+        type: product
+        categ_id: product.product_category_1
+        list_price: 100.0
+        standard_price: 70.0
+        seller_ids:
+            - delay: 1
+              name: supplier_crossdock
+              min_qty: 2.0
+              qty: 5.0
+        type: product
+        uom_id: product.product_uom_unit
+        uom_po_id: product.product_uom_unit
+-
+    Create a sales order with a line of 100 PCE incoming shipment, with route_id crossdock shipping.
+-
+    !record {model: sale.order, id: sale_order_crossdock_shpng}:
+        partner_id: base.res_partner_4
+        warehouse_id: wh_pps
+        note: Create Sales order
+        order_line:
+            - product_id: cross_shop_product
+              product_uom_qty: 100.00
 -
     !python {model: sale.order.line}: |
-        route_warehouse0_crossdock = self.pool.get('stock.warehouse').browse(cr, uid, ref('stock.warehouse0')).crossdock_route_id.id 
+        route_wh_pps_crossdock = self.pool.get('stock.warehouse').browse(cr, uid, ref('stock_dropshipping.wh_pps')).crossdock_route_id.id
         order = self.pool.get('sale.order').browse(cr, uid, ref('sale_order_crossdock_shpng'))
         line_ids = [x.id for x in order.order_line]
-        self.write(cr, uid, line_ids, {'route_id': route_warehouse0_crossdock})
-- 
-  Confirm sales order
-- 
-  !workflow {model: sale.order, action: order_confirm, ref: sale_order_crossdock_shpng}
-- 
-    Check a quotation was created to a certain supplier and confirm so it becomes a confirmed purchase order
+        self.write(cr, uid, line_ids, {'route_id': route_wh_pps_crossdock})
+-
+    Confirm sales order.
+-
+    !workflow {model: sale.order, action: order_confirm, ref: sale_order_crossdock_shpng}
+-
+    Run the scheduler.
+-
+    !python {model: procurement.order}: |
+        self.run_scheduler(cr, uid)
+-
+    Check a quotation was created for the created supplier and confirm it.
 -
     !python {model: purchase.order}: |
-        po_id = self.search(cr, uid, [('partner_id', '=', ref('base.res_partner_2'))])
+        po_id = self.search(cr, uid, [('partner_id', '=', ref('supplier_crossdock')), ('state','=','draft')])
         self.wkf_confirm_order(cr, uid, po_id)

From 610a46109973a2d3be20c853f5210cfa11eac211 Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Wed, 29 Apr 2015 16:36:27 +0200
Subject: [PATCH 19/49] [FIX] purchase: update and cancel of purchase order
 line takes into account existing procurements Update: When an existing
 purchase order line is updated, for example if a new procurement was
 required, we check if the sum of existing running linked procurements is
 larger than the quantity in the purchase order. If it is the case, we update
 the quantity and the unit price accordingly. Without this fix, we
 systematically add the procurement quantity (or the provider minimum
 quantity) to the purchase order line, even if the sum of the procurements is
 smaller than the ordered quantity.

Cancel:
When a procurement is cancelled, we recompute the unit price of the associated purchase order
according to the quantity and make sure the provider minimum quantity is met. If the required
quantity is zero, we cancel and unlink the purchase order line.

opw: 632175 and 632176
---
 addons/purchase/purchase.py | 54 +++++++++++++++++++++++++++++++------
 1 file changed, 46 insertions(+), 8 deletions(-)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 70565e7e94c..076c622d3f3 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -1199,17 +1199,17 @@ class procurement_order(osv.osv):
 
     def propagate_cancel(self, cr, uid, procurement, context=None):
         if procurement.rule_id.action == 'buy' and procurement.purchase_line_id:
-            uom_obj = self.pool.get("product.uom")
             purchase_line_obj = self.pool.get('purchase.order.line')
-            uom = procurement.purchase_line_id.product_uom
-            product_qty = uom_obj._compute_qty_obj(cr, uid, procurement.product_uom, procurement.product_qty, uom, context=context)
             if procurement.purchase_line_id.state not in ('draft', 'cancel'):
                     raise osv.except_osv(_('Error!'),
                         _('Can not cancel this procurement as the related purchase order has been confirmed already.  Please cancel the purchase order first. '))
-            if float_compare(procurement.purchase_line_id.product_qty, product_qty, 0, precision_rounding=uom.rounding) > 0:
-                purchase_line_obj.write(cr, uid, [procurement.purchase_line_id.id], {'product_qty': procurement.purchase_line_id.product_qty - product_qty}, context=context)
-            else:
+
+            new_qty, new_price = self._calc_new_qty_price(cr, uid, procurement, cancel=True, context=context)
+            if new_qty != procurement.purchase_line_id.product_qty:
+                purchase_line_obj.write(cr, uid, [procurement.purchase_line_id.id], {'product_qty': new_qty, 'price_unit': new_price}, context=context)
+            if float_compare(new_qty, 0.0, precision_rounding=procurement.product_uom.rounding) != 1:
                 purchase_line_obj.action_cancel(cr, uid, [procurement.purchase_line_id.id], context=context)
+                purchase_line_obj.unlink(cr, uid, [procurement.purchase_line_id.id], context=context)
         return super(procurement_order, self).propagate_cancel(cr, uid, procurement, context=context)
 
     def _run(self, cr, uid, procurement, context=None):
@@ -1339,6 +1339,41 @@ class procurement_order(osv.osv):
             'taxes_id': [(6, 0, taxes)],
         }
 
+    def _calc_new_qty_price(self, cr, uid, procurement, po_line=None, cancel=False, context=None):
+        if not po_line:
+            po_line = procurement.purchase_line_id
+
+        uom_obj = self.pool.get('product.uom')
+        qty = uom_obj._compute_qty(cr, uid, procurement.product_uom.id, procurement.product_qty,
+            procurement.product_id.uom_po_id.id)
+        if cancel:
+            qty = -qty
+
+        # Make sure we use the minimum quantity of the partner corresponding to the PO
+        if po_line.product_id.seller_id.id == po_line.order_id.partner_id.id:
+            supplierinfo_min_qty = po_line.product_id.seller_qty
+        else:
+            supplierinfo_obj = self.pool.get('product.supplierinfo')
+            supplierinfo_ids = supplierinfo_obj.search(cr, uid, [('name', '=', po_line.order_id.partner_id.id), ('product_tmpl_id', '=', po_line.product_id.product_tmpl_id.id)])
+            supplierinfo_min_qty = supplierinfo_obj.browse(cr, uid, supplierinfo_ids).min_qty
+
+        if supplierinfo_min_qty == 0.0:
+            qty += po_line.product_qty
+        else:
+            # Recompute quantity by adding existing running procurements.
+            for proc in po_line.procurement_ids:
+                qty += uom_obj._compute_qty(cr, uid, proc.product_uom.id, proc.product_qty,
+                    proc.product_id.uom_po_id.id) if proc.state == 'running' else 0.0
+            qty = max(qty, supplierinfo_min_qty) if qty > 0.0 else 0.0
+
+        price = po_line.price_unit
+        if qty != po_line.product_qty:
+            pricelist_obj = self.pool.get('product.pricelist')
+            pricelist_id = po_line.order_id.partner_id.property_product_pricelist_purchase.id
+            price = pricelist_obj.price_get(cr, uid, [pricelist_id], procurement.product_id.id, qty, po_line.order_id.partner_id.id, {'uom': procurement.product_uom.id})[pricelist_id]
+
+        return qty, price
+
     def make_po(self, cr, uid, ids, context=None):
         """ Resolve the purchase from procurement, which may result in a new PO creation, a new PO line creation or a quantity change on existing PO line.
         Note that some operations (as the PO creation) are made as SUPERUSER because the current user may not have rights to do it (mto product launched by a sale for example)
@@ -1376,9 +1411,12 @@ class procurement_order(osv.osv):
                     available_po_line_ids = po_line_obj.search(cr, uid, [('order_id', '=', po_id), ('product_id', '=', line_vals['product_id']), ('product_uom', '=', line_vals['product_uom'])], context=context)
                     if available_po_line_ids:
                         po_line = po_line_obj.browse(cr, uid, available_po_line_ids[0], context=context)
-                        po_line_obj.write(cr, SUPERUSER_ID, po_line.id, {'product_qty': po_line.product_qty + line_vals['product_qty']}, context=context)
                         po_line_id = po_line.id
-                        sum_po_line_ids.append(procurement.id)
+                        new_qty, new_price = self._calc_new_qty_price(cr, uid, procurement, po_line=po_line, context=context)
+
+                        if new_qty > po_line.product_qty:
+                            po_line_obj.write(cr, SUPERUSER_ID, po_line.id, {'product_qty': new_qty, 'price_unit': new_price}, context=context)
+                            sum_po_line_ids.append(procurement.id)
                     else:
                         line_vals.update(order_id=po_id)
                         po_line_id = po_line_obj.create(cr, SUPERUSER_ID, line_vals, context=context)

From 81dbbd8d87d737c75e10103edc030a4a7164f0a1 Mon Sep 17 00:00:00 2001
From: Levent Karakas <leventk@eskayazilim.com.tr>
Date: Wed, 6 May 2015 20:18:56 +0300
Subject: [PATCH 20/49] [FIX] sale_layout: access rights 0 instead of O

Typo in ir.model.access with a letter instead of a number. 'O' will be
considered as True instead of '0' considered as False.
---
 addons/sale_layout/security/ir.model.access.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale_layout/security/ir.model.access.csv b/addons/sale_layout/security/ir.model.access.csv
index 119fce977d1..d0b78bab1be 100644
--- a/addons/sale_layout/security/ir.model.access.csv
+++ b/addons/sale_layout/security/ir.model.access.csv
@@ -1,5 +1,5 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 report_layout_category_1,report_layout_category_1,model_sale_layout_category,base.group_sale_manager,1,1,1,1
 report_layout_category_2,report_layout_category_2,model_sale_layout_category,account.group_account_manager,1,1,1,1
-report_layout_category_3,report_layout_category_3,model_sale_layout_category,base.group_sale_salesman,1,1,1,O
+report_layout_category_3,report_layout_category_3,model_sale_layout_category,base.group_sale_salesman,1,1,1,0
 report_layout_category_4,report_layout_category_4,model_sale_layout_category,base.group_sale_salesman_all_leads,1,1,1,0

From 0e5e8d2873b6741701cfc1932111f441cc7716fe Mon Sep 17 00:00:00 2001
From: Jeffery Chen Fan <jeffery9@gmail.com>
Date: Sat, 25 Apr 2015 23:30:27 +0800
Subject: [PATCH 21/49] [CLA] signqture for jeffery9

---
 doc/cla/individual/jeffery.md | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 doc/cla/individual/jeffery.md

diff --git a/doc/cla/individual/jeffery.md b/doc/cla/individual/jeffery.md
new file mode 100644
index 00000000000..5063b81c4df
--- /dev/null
+++ b/doc/cla/individual/jeffery.md
@@ -0,0 +1,11 @@
+China, 2015-04-25
+
+I hereby agree to the terms of the Odoo Individual Contributor License
+Agreement v1.0.
+
+I declare that I am authorized and able to make this agreement and sign this
+declaration.
+
+Signed,
+
+Jeffery Chen Fan  jeffery9@gmail.com  https://github.com/jeffery9

From f9d25973d08c2bf27049d606efaee955cf7386ed Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Thu, 7 May 2015 13:52:21 +0200
Subject: [PATCH 22/49] [FIX] account: create statement from invoice line uses
 statement date instead of today's date Using statement date is necessary in
 order to select the appropriate currency rate.

opw-634297
---
 addons/account_voucher/wizard/account_statement_from_invoice.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account_voucher/wizard/account_statement_from_invoice.py b/addons/account_voucher/wizard/account_statement_from_invoice.py
index 362cb516e7c..ba5243e420e 100644
--- a/addons/account_voucher/wizard/account_statement_from_invoice.py
+++ b/addons/account_voucher/wizard/account_statement_from_invoice.py
@@ -51,8 +51,8 @@ class account_statement_from_invoice_lines(osv.osv_memory):
         currency_obj = self.pool.get('res.currency')
         voucher_obj = self.pool.get('account.voucher')
         voucher_line_obj = self.pool.get('account.voucher.line')
-        line_date = time.strftime('%Y-%m-%d')
         statement = statement_obj.browse(cr, uid, statement_id, context=context)
+        line_date = statement.date
 
         # for each selected move lines
         for line in line_obj.browse(cr, uid, line_ids, context=context):

From 561346db9ed820f09540382b012baa583f2df951 Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Tue, 5 May 2015 14:26:17 +0200
Subject: [PATCH 23/49] [FIX] stock: forbids possibility to make inventory of
 all products when a given product is chosen opw-634388 Fixes #6512

---
 addons/stock/stock.py           | 12 ++++++++++++
 addons/stock/stock_view.xml     |  2 +-
 addons/stock/test/inventory.yml |  2 ++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index fc1e636d435..76e87a72763 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2744,6 +2744,18 @@ class stock_inventory(osv.osv):
             vals.append(product_line)
         return vals
 
+    def _check_filter_product(self, cr, uid, ids, context=None):
+        for inventory in self.browse(cr, uid, ids, context=context):
+            if inventory.filter not in ('product', 'product_owner') and inventory.product_id:
+                return False
+        return True
+
+    def onchange_filter(self, cr, uid, ids, filter):
+        return {'value': {'product_id': False} if filter not in ('product', 'product_owner') else {}}
+
+    _constraints = [
+        (_check_filter_product, 'A specific product is chosen while the filter "One product only" is not selected', ['product_id', 'filter']),
+    ]
 
 class stock_inventory_line(osv.osv):
     _name = "stock.inventory.line"
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 44352125727..828a63c53f8 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -102,7 +102,7 @@
                     <group>
                         <group>
                             <field name="location_id" domain="[('usage','not in', ['supplier','production'])]"/>
-                            <field name="filter" string="Inventory of" widget='radio' attrs="{'readonly': [('state', '!=', 'draft')]}"/>
+                            <field name="filter" string="Inventory of" widget='radio' attrs="{'readonly': [('state', '!=', 'draft')]}" on_change="onchange_filter(filter)"/>
                         </group>
                         <group>
                             <field name="date"/>
diff --git a/addons/stock/test/inventory.yml b/addons/stock/test/inventory.yml
index a0b0f58512b..4bfc70d3dd1 100644
--- a/addons/stock/test/inventory.yml
+++ b/addons/stock/test/inventory.yml
@@ -9,6 +9,7 @@
 -
   !record {model: stock.inventory, id: inventory_test0}:
     name: Test
+    filter: product
     product_id: inventory_product
 -
   I confirm the inventory and check that my inventory has no line, as the product is a new one.
@@ -60,6 +61,7 @@
 -
   !record {model: stock.inventory, id: inventory_test1}:
     name: second test inventory 
+    filter: product
     product_id: inventory_product
 -
   I confirm the inventory and check that my inventory has one line, with a quantity of 10.

From 547204b7f4a81b6915c9f84754080dd3195950e9 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Thu, 7 May 2015 15:07:04 +0200
Subject: [PATCH 24/49] [IMP] logging: store logs in database in multi
 databases env.

The server parameter `log-db` gives the possibility
to store the logs of a server in a specific database,
in the ir.logging model.

Unfortunately, it wasn't possible to store these logs within
the database from which the logs came from in a multi databases
environment (e.g. the SAAS).

This revision gives the possibility to store the logs
within the database where the logs come from,
using --log-db=%d (inspired from the --db-filter arg)

We also added the possibility to change the level of logs to store in
the database, with the --log-db-level argument, which is set
by default to `warning`.
---
 openerp/netsvc.py       | 11 +++++++++--
 openerp/tools/config.py |  3 ++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/openerp/netsvc.py b/openerp/netsvc.py
index 307ffaf24d3..368e704b22f 100644
--- a/openerp/netsvc.py
+++ b/openerp/netsvc.py
@@ -78,7 +78,7 @@ class PostgreSQLHandler(logging.Handler):
     def emit(self, record):
         ct = threading.current_thread()
         ct_db = getattr(ct, 'dbname', None)
-        dbname = tools.config['log_db'] or ct_db
+        dbname = tools.config['log_db'] if tools.config['log_db'] and tools.config['log_db'] != '%d' else ct_db
         if not dbname:
             return
         with tools.ignore(Exception), tools.mute_logger('openerp.sql_db'), sql_db.db_connect(dbname, allow_uri=True).cursor() as cr:
@@ -187,8 +187,15 @@ def init_logger():
     logging.getLogger().addHandler(handler)
 
     if tools.config['log_db']:
+        db_levels = {
+            'debug': logging.DEBUG,
+            'info': logging.INFO,
+            'warning': logging.WARNING,
+            'error': logging.ERROR,
+            'critical': logging.CRITICAL,
+        }
         postgresqlHandler = PostgreSQLHandler()
-        postgresqlHandler.setLevel(25)
+        postgresqlHandler.setLevel(int(db_levels.get(tools.config['log_db_level'], tools.config['log_db_level'])))
         logging.getLogger().addHandler(postgresqlHandler)
 
     # Configure loggers levels
diff --git a/openerp/tools/config.py b/openerp/tools/config.py
index 21b15132fa3..2a96ed764bb 100644
--- a/openerp/tools/config.py
+++ b/openerp/tools/config.py
@@ -209,6 +209,7 @@ class configmanager(object):
         group.add_option('--log-web', action="append_const", dest="log_handler", const="openerp.http:DEBUG", help='shortcut for --log-handler=openerp.http:DEBUG')
         group.add_option('--log-sql', action="append_const", dest="log_handler", const="openerp.sql_db:DEBUG", help='shortcut for --log-handler=openerp.sql_db:DEBUG')
         group.add_option('--log-db', dest='log_db', help="Logging database", my_default=False)
+        group.add_option('--log-db-level', dest='log_db_level', my_default='warning', help="Logging database level")
         # For backward-compatibility, map the old log levels to something
         # quite close.
         levels = [
@@ -417,7 +418,7 @@ class configmanager(object):
                 'xmlrpc', 'syslog', 'without_demo', 'timezone',
                 'xmlrpcs_interface', 'xmlrpcs_port', 'xmlrpcs',
                 'secure_cert_file', 'secure_pkey_file', 'dbfilter', 'log_level', 'log_db',
-                'geoip_database',
+                'log_db_level', 'geoip_database',
         ]
 
         for arg in keys:

From 4a9deb8be3c863607a54ca82fc5580e319df9b9c Mon Sep 17 00:00:00 2001
From: Goffin Simon <sig@odoo.com>
Date: Thu, 30 Apr 2015 15:31:31 +0200
Subject: [PATCH 25/49] [FIX] im_chat: translate placeholder

The placeholder "Search Users..." must be translatable.

opw:633746
---
 addons/im_chat/static/src/xml/im_chat.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/im_chat/static/src/xml/im_chat.xml b/addons/im_chat/static/src/xml/im_chat.xml
index 0ca4fe307d2..a62d5d5d998 100644
--- a/addons/im_chat/static/src/xml/im_chat.xml
+++ b/addons/im_chat/static/src/xml/im_chat.xml
@@ -76,7 +76,7 @@
     <div class="oe_im">
         <div class="oe_im_frame_header">
             <span class="oe_e oe_im_search_icon">ô</span>
-            <input class="oe_im_searchbox" t-att-placeholder="_t('Search users...')"/>
+            <input class="oe_im_searchbox" placeholder="Search users..."/>
             <span class="oe_e oe_im_search_clear">[</span>
         </div>
         <div class="oe_im_users"></div>

From ac8b663d12770dba91ddce8b3e7bd9e3a21aa26f Mon Sep 17 00:00:00 2001
From: Goffin Simon <sig@odoo.com>
Date: Sun, 3 May 2015 11:37:52 +0200
Subject: [PATCH 26/49] [FIX] im_livechat: date in website_livechat

The lang of the date used in website_livechat must be
the lang of the user as in "Instant Messaging".

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

diff --git a/addons/im_livechat/views/im_livechat.xml b/addons/im_livechat/views/im_livechat.xml
index 33ee2e0b906..f6676024c3b 100644
--- a/addons/im_livechat/views/im_livechat.xml
+++ b/addons/im_livechat/views/im_livechat.xml
@@ -108,7 +108,8 @@
         <!-- Bundle of Librairies of the Bus, Chat, Livechat -->
         <template id="internal_lib" name="Librairies of the Livechat">
             <!-- Datejs -->
-            <script type="text/javascript" src="/web/static/lib/datejs/globalization/en-US.js"></script>
+            <script type="text/javascript" t-att-src="'/web/static/lib/datejs/globalization/%s.js'
+                % (request.session.context.get('lang').replace('_','-'))"></script>
             <script type="text/javascript" src="/web/static/lib/datejs/core.js"></script>
             <script type="text/javascript" src="/web/static/lib/datejs/parser.js"></script>
             <script type="text/javascript" src="/web/static/lib/datejs/sugarpak.js"></script>

From 5efac22043adc735d9502fb9f6f7466b85916573 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Thu, 7 May 2015 16:46:48 +0200
Subject: [PATCH 27/49] [FIX] fields: when determining `digits()`, make sure to
 use a valid cursor

---
 openerp/fields.py     |  5 +----
 openerp/osv/fields.py | 18 ++++++++++--------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/openerp/fields.py b/openerp/fields.py
index 1613b69cf98..d780bf5adb3 100644
--- a/openerp/fields.py
+++ b/openerp/fields.py
@@ -1054,10 +1054,7 @@ class Float(Field):
     @property
     def digits(self):
         if callable(self._digits):
-            # retrieve a cursor from any environment
-            from openerp.api import Environment
-            cr = next(iter(Environment.envs)).cr
-            return self._digits(cr)
+            return self._digits(fields.get_cursor())
         else:
             return self._digits
 
diff --git a/openerp/osv/fields.py b/openerp/osv/fields.py
index 7bcb8606e64..02d24fdf47b 100644
--- a/openerp/osv/fields.py
+++ b/openerp/osv/fields.py
@@ -52,6 +52,14 @@ from openerp.tools import float_repr, float_round, frozendict, html_sanitize
 import simplejson
 from openerp import SUPERUSER_ID, registry
 
+def get_cursor():
+    # retrieve a valid cursor from any environment
+    from openerp.api import Environment
+    for env in Environment.envs:
+        if not env.cr.closed:
+            return env.cr
+    raise RuntimeError("No valid cursor found")
+
 EMPTY_DICT = frozendict()
 
 _logger = logging.getLogger(__name__)
@@ -388,10 +396,7 @@ class float(_column):
     @property
     def digits(self):
         if self._digits_compute:
-            # retrieve a cursor from any environment
-            from openerp.api import Environment
-            cr = next(iter(Environment.envs)).cr
-            return self._digits_compute(cr)
+            return self._digits_compute(get_cursor())
         else:
             return self._digits
 
@@ -1311,10 +1316,7 @@ class function(_column):
     @property
     def digits(self):
         if self._digits_compute:
-            # retrieve a cursor from any environment
-            from openerp.api import Environment
-            cr = next(iter(Environment.envs)).cr
-            return self._digits_compute(cr)
+            return self._digits_compute(get_cursor())
         else:
             return self._digits
 

From 612b44648ee79c5f8bb10e16efdee3cc81abaa08 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Thu, 7 May 2015 18:16:28 +0200
Subject: [PATCH 28/49] [FIX] crm: hide mark won/lost buttons when opportunity
 is won

When an opportunity has a 100% probability, it is regarded
as won. When the opportunity is regarded as done,
there is no more use to show the mark won/lost button.

opw-634420
---
 addons/crm/crm_lead_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 95e020bc35d..11b2d7d08cc 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -372,8 +372,8 @@
             <field name="arch" type="xml">
                 <form string="Opportunities">
                     <header>
-                        <button name="case_mark_won" string="Mark Won" type="object" class="oe_highlight"/>
-                        <button name="case_mark_lost" string="Mark Lost" type="object" class="oe_highlight"/>
+                        <button name="case_mark_won" string="Mark Won" attrs="{'invisible': [('probability', '=', 100)]}" type="object" class="oe_highlight"/>
+                        <button name="case_mark_lost" string="Mark Lost" attrs="{'invisible': [('probability', '=', 100)]}" type="object" class="oe_highlight"/>
                         <field name="stage_id" widget="statusbar" clickable="True"
                             options="{'fold_field': 'fold'}"
                             domain="['&amp;', ('section_ids', '=', section_id), '|', ('type', '=', type), ('type', '=', 'both')]"/>

From 44fecec0585bae1bffc6baf49e5e066b3d22d63f Mon Sep 17 00:00:00 2001
From: Goffin Simon <sig@odoo.com>
Date: Tue, 5 May 2015 10:27:50 +0200
Subject: [PATCH 29/49] [FIX] mrp: Manufacture Order Sequence

The name of the manufacture order created must include the sequence linked
to the company of the salesperson.

opw:632600
---
 addons/mrp/mrp.py         | 2 +-
 addons/mrp/procurement.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 9d2a7fc38d4..fa28986a05e 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -594,7 +594,7 @@ class mrp_production(osv.osv):
         'date_planned': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
         'product_qty': lambda *a: 1.0,
         'user_id': lambda self, cr, uid, c: uid,
-        'name': lambda x, y, z, c: x.pool.get('ir.sequence').get(y, z, 'mrp.production') or '/',
+        'name': lambda self, cr, uid, context: self.pool['ir.sequence'].get(cr, uid, 'mrp.production', context=context) or '/',
         'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'mrp.production', context=c),
         'location_src_id': _src_id_default,
         'location_dest_id': _dest_id_default
diff --git a/addons/mrp/procurement.py b/addons/mrp/procurement.py
index 71aae2be711..dd14cd89c93 100644
--- a/addons/mrp/procurement.py
+++ b/addons/mrp/procurement.py
@@ -116,7 +116,7 @@ class procurement_order(osv.osv):
             if self.check_bom_exists(cr, uid, [procurement.id], context=context):
                 #create the MO as SUPERUSER because the current user may not have the rights to do it (mto product launched by a sale for example)
                 vals = self._prepare_mo_vals(cr, uid, procurement, context=context)
-                produce_id = production_obj.create(cr, SUPERUSER_ID, vals, context=context)
+                produce_id = production_obj.create(cr, SUPERUSER_ID, vals, context=dict(context, force_company=procurement.company_id.id))
                 res[procurement.id] = produce_id
                 self.write(cr, uid, [procurement.id], {'production_id': produce_id})
                 self.production_order_create_note(cr, uid, procurement, context=context)

From 6e23b2a8073b5ac1b7c74bf6bb98893d3983cea7 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Fri, 8 May 2015 10:17:44 +0200
Subject: [PATCH 30/49] [FIX] ir.model.data._update: create/modify XML IDs as
 super-user

When importing a CSV file with an "id" column containing
external IDs (XML IDs), the system automatically creates
or updates the corresponding ir.model.data entries.
This would fail for regular users who do not have
create/write access on this internal model.
---
 openerp/addons/base/ir/ir_model.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/openerp/addons/base/ir/ir_model.py b/openerp/addons/base/ir/ir_model.py
index fb8e1db2fd5..69fd4db6380 100644
--- a/openerp/addons/base/ir/ir_model.py
+++ b/openerp/addons/base/ir/ir_model.py
@@ -954,13 +954,13 @@ class ir_model_data(osv.osv):
 
         if action_id and res_id:
             model_obj.write(cr, uid, [res_id], values, context=context)
-            self.write(cr, uid, [action_id], {
+            self.write(cr, SUPERUSER_ID, [action_id], {
                 'date_update': time.strftime('%Y-%m-%d %H:%M:%S'),
                 },context=context)
         elif res_id:
             model_obj.write(cr, uid, [res_id], values, context=context)
             if xml_id:
-                self.create(cr, uid, {
+                self.create(cr, SUPERUSER_ID, {
                     'name': xml_id,
                     'model': model,
                     'module':module,
@@ -971,7 +971,7 @@ class ir_model_data(osv.osv):
                     for table in model_obj._inherits:
                         inherit_id = model_obj.browse(cr, uid,
                                 res_id,context=context)[model_obj._inherits[table]]
-                        self.create(cr, uid, {
+                        self.create(cr, SUPERUSER_ID, {
                             'name': xml_id + '_' + table.replace('.', '_'),
                             'model': table,
                             'module': module,
@@ -982,7 +982,7 @@ class ir_model_data(osv.osv):
             if mode=='init' or (mode=='update' and xml_id):
                 res_id = model_obj.create(cr, uid, values, context=context)
                 if xml_id:
-                    self.create(cr, uid, {
+                    self.create(cr, SUPERUSER_ID, {
                         'name': xml_id,
                         'model': model,
                         'module': module,
@@ -993,7 +993,7 @@ class ir_model_data(osv.osv):
                         for table in model_obj._inherits:
                             inherit_id = model_obj.browse(cr, uid,
                                     res_id,context=context)[model_obj._inherits[table]]
-                            self.create(cr, uid, {
+                            self.create(cr, SUPERUSER_ID, {
                                 'name': xml_id + '_' + table.replace('.', '_'),
                                 'model': table,
                                 'module': module,

From 68599dcd437921848ace6524a06fe346260859a4 Mon Sep 17 00:00:00 2001
From: Daniel-CA <danielcampos@avanzosc.es>
Date: Thu, 23 Apr 2015 16:40:21 +0200
Subject: [PATCH 31/49] [FIX] mrp: avoid float representation error

Avoid ZeroDivisionError if a move is confirmed with quantity of 0 (when stored
in database where the rounding is done by the precision defined on product_qty
field.
Fixes #6439
---
 addons/mrp/mrp.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index fa28986a05e..854349f110b 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -24,7 +24,7 @@ import openerp.addons.decimal_precision as dp
 from collections import OrderedDict
 from openerp.osv import fields, osv, orm
 from openerp.tools import DEFAULT_SERVER_DATE_FORMAT
-from openerp.tools import float_compare
+from openerp.tools import float_compare, float_is_zero
 from openerp.tools.translate import _
 from openerp import tools, SUPERUSER_ID
 from openerp.addons.product import _common
@@ -931,6 +931,7 @@ class mrp_production(osv.osv):
         uom_obj = self.pool.get("product.uom")
         production = self.browse(cr, uid, production_id, context=context)
         production_qty_uom = uom_obj._compute_qty(cr, uid, production.product_uom.id, production_qty, production.product_id.uom_id.id)
+        precision = self.pool['decimal.precision'].precision_get(cr, uid, 'Product Unit of Measure')
 
         main_production_move = False
         if production_mode == 'consume_produce':
@@ -952,7 +953,8 @@ class mrp_production(osv.osv):
                                                          location_id=produce_product.location_id.id, restrict_lot_id=lot_id, context=context)
                 stock_mov_obj.write(cr, uid, new_moves, {'production_id': production_id}, context=context)
                 remaining_qty = subproduct_factor * production_qty_uom - qty
-                if remaining_qty: # In case you need to make more than planned
+                if not float_is_zero(remaining_qty, precision_rounding=precision):
+                    # In case you need to make more than planned
                     #consumed more in wizard than previously planned
                     extra_move_id = stock_mov_obj.copy(cr, uid, produce_product.id, default={'product_uom_qty': remaining_qty,
                                                                                              'production_id': production_id}, context=context)
@@ -982,7 +984,7 @@ class mrp_production(osv.osv):
                     stock_mov_obj.action_consume(cr, uid, [raw_material_line.id], consumed_qty, raw_material_line.location_id.id,
                                                  restrict_lot_id=consume['lot_id'], consumed_for=main_production_move, context=context)
                     remaining_qty -= consumed_qty
-                if remaining_qty:
+                if not float_is_zero(remaining_qty, precision_rounding=precision):
                     #consumed more in wizard than previously planned
                     product = self.pool.get('product.product').browse(cr, uid, consume['product_id'], context=context)
                     extra_move_id = self._make_consume_line_from_data(cr, uid, production, product, product.uom_id.id, remaining_qty, False, 0, context=context)

From 5804246e0fcabc1b44e4de13722e227f47e2d462 Mon Sep 17 00:00:00 2001
From: Nicolas Lempereur <nle@odoo.com>
Date: Thu, 7 May 2015 13:51:25 +0200
Subject: [PATCH 32/49] [FIX] website_membership: perf, pagination

This fixes :
 * pagination only on /members and sometimes with bad page count,
 * free members could not be searched (were always all displayed),
 * all elements are displayed even if there is a pagination,
 * for members without country, errors happened in some use case,
 * when too much locations were on a map (>2000) it failed,
 * numbers of members by countries was not displayed for guest.

And also as performance improvemnts:
 * only query all partners when the map is enabled (customize > left
   world map),
 * limit partners put on the map to 2000 (even then it's a lot for
   google maps),
 * don't browse all membership_line to get res_partner but use a query.

opw-634653
---
 addons/website_membership/controllers/main.py | 51 +++++++++++++++----
 addons/website_membership/models/__init__.py  |  1 +
 .../website_membership/models/membership.py   | 35 +++++++++++++
 3 files changed, 76 insertions(+), 11 deletions(-)
 create mode 100644 addons/website_membership/models/membership.py

diff --git a/addons/website_membership/controllers/main.py b/addons/website_membership/controllers/main.py
index beedd50a04f..1df80c36c71 100644
--- a/addons/website_membership/controllers/main.py
+++ b/addons/website_membership/controllers/main.py
@@ -27,7 +27,7 @@ class WebsiteMembership(http.Controller):
         '/members/association/<membership_id>/country/<country_name>-<int:country_id>/page/<int:page>',
         '/members/association/<membership_id>/country/<int:country_id>/page/<int:page>',
     ], type='http', auth="public", website=True)
-    def members(self, membership_id=None, country_name=None, country_id=0, page=0, **post):
+    def members(self, membership_id=None, country_name=None, country_id=0, page=1, **post):
         cr, uid, context = request.cr, request.uid, request.context
         product_obj = request.registry['product.product']
         country_obj = request.registry['res.country']
@@ -56,7 +56,7 @@ class WebsiteMembership(http.Controller):
             membership_line_ids = []
             country_domain = ('free_member', '=', True)
         countries = partner_obj.read_group(
-            cr, uid, [country_domain, ("website_published", "=", True)], ["id", "country_id"],
+            cr, SUPERUSER_ID, [country_domain, ("website_published", "=", True)], ["id", "country_id"],
             groupby="country_id", orderby="country_id", context=request.context)
         countries_total = sum(country_dict['country_id_count'] for country_dict in countries)
 
@@ -64,11 +64,12 @@ class WebsiteMembership(http.Controller):
         if country_id:
             line_domain.append(('partner.country_id', '=', country_id))
             current_country = country_obj.read(cr, uid, country_id, ['id', 'name'], context)
-            if not any(x['country_id'][0] == country_id for x in countries):
+            if not any(x['country_id'][0] == country_id for x in countries if x['country_id']):
                 countries.append({
                     'country_id_count': 0,
                     'country_id': (country_id, current_country["name"])
                 })
+                countries = filter(lambda d:d['country_id'], countries)
                 countries.sort(key=lambda d: d['country_id'][1])
 
         countries.insert(0, {
@@ -82,15 +83,32 @@ class WebsiteMembership(http.Controller):
         # make sure we don't access to lines with unpublished membershipts
         line_domain.append(('membership_id', 'in', membership_ids))
 
-        # displayed membership lines
+        limit = self._references_per_page
+        offset = limit * (page - 1)
+
+        count_members = 0
+        membership_line_ids = []
+        # displayed non-free membership lines
         if membership_id != 'free':
-            membership_line_ids = membership_line_obj.search(cr, SUPERUSER_ID, line_domain, context=context)
+            count_members = membership_line_obj.search_count(cr, SUPERUSER_ID, line_domain, context=context)
+            if offset <= count_members:
+                membership_line_ids = tuple(membership_line_obj.search(cr, SUPERUSER_ID, line_domain, offset, limit, context=context))
         membership_lines = membership_line_obj.browse(cr, uid, membership_line_ids, context=context)
         # TODO: Following line can be deleted in master. Kept for retrocompatibility.
         membership_lines = sorted(membership_lines, key=lambda x: x.membership_id.website_sequence)
-        partner_ids = [m.partner.id for m in membership_lines]
-        free_partner_ids = partner_obj.search(cr, SUPERUSER_ID, [('free_member', '=', True), ('website_published', '=', True)], context=context)
-        google_map_partner_ids = ",".join(map(str, partner_ids))
+        page_partner_ids = set(m.partner.id for m in membership_lines)
+
+        google_map_partner_ids = []
+        if request.env.ref('website_membership.opt_index_google_map').customize_show:
+            membership_lines_ids = membership_line_obj.search(cr, uid, line_domain, context=context)
+            google_map_partner_ids = membership_line_obj.get_published_companies(cr, uid, membership_line_ids, limit=2000, context=context)
+
+        search_domain = [('free_member', '=', True), ('website_published', '=', True)]
+        if post_name:
+            search_domain += ['|', ('name', 'ilike', post_name), ('website_description', 'ilike', post_name)]
+        if country_id:
+            search_domain += [('country_id', '=', country_id)]
+        free_partner_ids = partner_obj.search(cr, SUPERUSER_ID, search_domain, context=context)
         memberships_data = []
         for membership_record in memberships:
             memberships_data.append({'id': membership_record.id, 'name': membership_record.name})
@@ -100,12 +118,23 @@ class WebsiteMembership(http.Controller):
         if free_partner_ids:
             memberships_data.append({'id': 'free', 'name': _('Free Members')})
             if not membership_id or membership_id == 'free':
-                memberships_partner_ids['free'] = free_partner_ids
+                if count_members < offset + limit:
+                    free_start = max(offset - count_members, 0)
+                    free_end = max(offset + limit - count_members, 0)
+                    memberships_partner_ids['free'] = free_partner_ids[free_start:free_end]
+                    page_partner_ids |= set(memberships_partner_ids['free'])
+                google_map_partner_ids += free_partner_ids[:2000-len(google_map_partner_ids)]
+                count_members += len(free_partner_ids)
 
-        partners = dict((p.id, p) for p in partner_obj.browse(request.cr, SUPERUSER_ID, list(set(partner_ids + free_partner_ids)), request.context))
+        google_map_partner_ids = ",".join(map(str, google_map_partner_ids))
+
+        partners = { p.id: p for p in partner_obj.browse(request.cr, SUPERUSER_ID, list(page_partner_ids), request.context)}
+
+        base_url = '/members%s%s' % ('/association/%s' % membership_id if membership_id else '',
+                                     '/country/%s' % country_id if country_id else '')
 
         # request pager for lines
-        pager = request.website.pager(url="/members", total=len(membership_line_ids), page=page, step=self._references_per_page, scope=7, url_args=post)
+        pager = request.website.pager(url=base_url, total=count_members, page=page, step=limit, scope=7, url_args=post)
 
         values = {
             'partners': partners,
diff --git a/addons/website_membership/models/__init__.py b/addons/website_membership/models/__init__.py
index 926e5cf4638..7fe5021ec83 100644
--- a/addons/website_membership/models/__init__.py
+++ b/addons/website_membership/models/__init__.py
@@ -1 +1,2 @@
 import product
+import membership
diff --git a/addons/website_membership/models/membership.py b/addons/website_membership/models/membership.py
new file mode 100644
index 00000000000..feba5ce6ea6
--- /dev/null
+++ b/addons/website_membership/models/membership.py
@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013-Today OpenERP SA (<http://www.openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.osv import osv, fields
+
+class membership_membership_line(osv.Model):
+    _inherit = 'membership.membership_line'
+
+    def get_published_companies(self, cr, uid, ids, limit=None, context=None):
+        if not ids:
+            return []
+        limit_clause = '' if limit is None else ' LIMIT %d' % limit
+        cr.execute('SELECT DISTINCT p.id \
+                    FROM res_partner p INNER JOIN membership_membership_line m \
+                    ON  p.id = m.partner \
+                    WHERE website_published AND is_company AND m.id IN %s ' + limit_clause, (tuple(ids),))
+        return [partner_id[0] for partner_id in cr.fetchall()]

From 5275c10e7047d5ae9c59dfb9eb8bc0fbbab4f298 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Fri, 8 May 2015 12:39:32 +0200
Subject: [PATCH 33/49] [FIX] hw_proxy: routes shadowed by same method name

---
 addons/hw_proxy/controllers/main.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hw_proxy/controllers/main.py b/addons/hw_proxy/controllers/main.py
index 88a569d366c..eced1d65b94 100644
--- a/addons/hw_proxy/controllers/main.py
+++ b/addons/hw_proxy/controllers/main.py
@@ -192,12 +192,12 @@ class Proxy(http.Controller):
         print 'print_receipt' + str(receipt)
 
     @http.route('/hw_proxy/is_scanner_connected', type='json', auth='none', cors='*')
-    def print_receipt(self, receipt):
+    def is_scanner_connected(self, receipt):
         print 'is_scanner_connected?' 
         return False
 
     @http.route('/hw_proxy/scanner', type='json', auth='none', cors='*')
-    def print_receipt(self, receipt):
+    def scanner(self, receipt):
         print 'scanner' 
         time.sleep(10)
         return ''

From 5b19ae8a5965fa3234725709b946b9bfb6930254 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Fri, 8 May 2015 12:49:19 +0200
Subject: [PATCH 34/49] [FIX] hw_*: enforce Python dependencies + disable if
 missing dependency

Prevents installing the hw_* modules at all when the python
dependencies are missing. If they were already installed
do not start the hardware threads to avoid wasting resources
and logging errors
---
 addons/hw_scale/__openerp__.py        |  1 +
 addons/hw_scale/controllers/main.py   | 20 +++++++++++++-------
 addons/hw_scanner/__openerp__.py      |  1 +
 addons/hw_scanner/controllers/main.py | 15 ++++++---------
 4 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/addons/hw_scale/__openerp__.py b/addons/hw_scale/__openerp__.py
index 98085771452..63542fa88d0 100644
--- a/addons/hw_scale/__openerp__.py
+++ b/addons/hw_scale/__openerp__.py
@@ -37,6 +37,7 @@ such as the Mettler Toledo Ariva.
 """,
     'author': 'OpenERP SA',
     'depends': ['hw_proxy'],
+    'external_dependencies': {'python': ['serial']},
     'test': [
     ],
     'installable': True,
diff --git a/addons/hw_scale/controllers/main.py b/addons/hw_scale/controllers/main.py
index fcfa6ede536..0c39ffcde9d 100644
--- a/addons/hw_scale/controllers/main.py
+++ b/addons/hw_scale/controllers/main.py
@@ -178,28 +178,34 @@ class Scale(Thread):
                 if not self.device:
                     time.sleep(5)
 
-s = Scale()
-
-hw_proxy.drivers['scale'] = s
+scale_thread = None
+if serial:
+    scale_thread = Scale()
+    hw_proxy.drivers['scale'] = scale_thread
 
 class ScaleDriver(hw_proxy.Proxy):
     @http.route('/hw_proxy/scale_read/', type='json', auth='none', cors='*')
     def scale_read(self):
-        return {'weight':s.get_weight(), 'unit':'kg', 'info':s.get_weight_info()}
+        if scale_thread:
+            return {'weight': scale_thread.get_weight(), 'unit':'kg', 'info': scale_thread.get_weight_info()}
+        return None
 
     @http.route('/hw_proxy/scale_zero/', type='json', auth='none', cors='*')
     def scale_zero(self):
-        s.set_zero()
+        if scale_thread:
+            scale_thread.set_zero()
         return True
 
     @http.route('/hw_proxy/scale_tare/', type='json', auth='none', cors='*')
     def scale_tare(self):
-        s.set_tare()
+        if scale_thread:
+            scale_thread.set_tare()
         return True
 
     @http.route('/hw_proxy/scale_clear_tare/', type='json', auth='none', cors='*')
     def scale_clear_tare(self):
-        s.clear_tare()
+        if scale_thread:
+            scale_thread.clear_tare()
         return True
         
         
diff --git a/addons/hw_scanner/__openerp__.py b/addons/hw_scanner/__openerp__.py
index fa8bb9daccb..b24532c4a3f 100644
--- a/addons/hw_scanner/__openerp__.py
+++ b/addons/hw_scanner/__openerp__.py
@@ -38,6 +38,7 @@ point of sale module.
 """,
     'author': 'OpenERP SA',
     'depends': ['hw_proxy'],
+    'external_dependencies': {'python': ['evdev']},
     'test': [
     ],
     'installable': True,
diff --git a/addons/hw_scanner/controllers/main.py b/addons/hw_scanner/controllers/main.py
index 057674c1ca1..0ae08d7d36b 100644
--- a/addons/hw_scanner/controllers/main.py
+++ b/addons/hw_scanner/controllers/main.py
@@ -111,8 +111,6 @@ class Scanner(Thread):
 
     def get_device(self):
         try:
-            if not evdev:
-                return None
             devices   = [ device for device in listdir(self.input_dir)]
             keyboards = [ device for device in devices if ('kbd' in device) and ('keyboard' not in device.lower())]
             scanners  = [ device for device in devices if ('barcode' in device.lower()) or ('scanner' in device.lower())]
@@ -135,7 +133,6 @@ class Scanner(Thread):
             been returned before. This is necessary to catch barcodes scanned while the POS is
             busy reading another barcode
         """
-
         self.lockedstart()
 
         while True:
@@ -204,12 +201,12 @@ class Scanner(Thread):
             except Exception as e:
                 self.set_status('error',str(e))
 
-s = Scanner()
-
-hw_proxy.drivers['scanner'] = s
+scanner_thread = None
+if evdev:
+    scanner_thread = Scanner()
+    hw_proxy.drivers['scanner'] = scanner_thread
 
 class ScannerDriver(hw_proxy.Proxy):
     @http.route('/hw_proxy/scanner', type='json', auth='none', cors='*')
-    def scanner(self):
-        return s.get_barcode()
-
+    def scanner_thread(self):
+        return scanner_thread.get_barcode() if scanner_thread else None

From 63db719151b34d3d8b22bbf84607cdda7eb0828d Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Fri, 8 May 2015 16:12:37 +0200
Subject: [PATCH 35/49] [FIX] account: Exchanges rates gain/loss during
 supplier reconciliations

This revision is related to dd47b6f5bccfb43ee6fabb81effd16c940a020e0.

The above revision was allmost correct, except that, in a supplier
invoices, the `amount_currency` of the invoice is negative,
and the one of the bank statement is possitive.

To check that both are equal, we should subtract one to each other,
and check that the diff is 0, but both part need to be the
absolute value.

opw-634263
closes #6533
---
 addons/account/account_bank_statement.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 4a9c1127410..a6f2c6d6eb0 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -795,7 +795,7 @@ class account_bank_statement_line(osv.osv):
                     #post an account line that use the same currency rate than the counterpart (to balance the account) and post the difference in another line
                     ctx['date'] = mv_line.date
                     if mv_line.currency_id.id == mv_line_dict['currency_id'] \
-                            and float_is_zero(mv_line.amount_currency - abs(mv_line_dict['amount_currency']), precision_rounding=mv_line.currency_id.rounding):
+                            and float_is_zero(abs(mv_line.amount_currency) - abs(mv_line_dict['amount_currency']), precision_rounding=mv_line.currency_id.rounding):
                         debit_at_old_rate = mv_line.credit
                         credit_at_old_rate = mv_line.debit
                     else:

From 4e015bd96e69f072d84f2a13633754090ac64bd7 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Fri, 8 May 2015 16:41:20 +0200
Subject: [PATCH 36/49] [FIX] payment_adyen: live Adyen payment acquirer URL

The production payment page of Adyen is not
`https://prod.adyen.com/hpp/pay.shtml`
but
`https://live.adyen.com/hpp/pay.shtml`

opw-634894
---
 addons/payment_adyen/models/adyen.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/payment_adyen/models/adyen.py b/addons/payment_adyen/models/adyen.py
index 672faed9d63..1ab2f1839f2 100644
--- a/addons/payment_adyen/models/adyen.py
+++ b/addons/payment_adyen/models/adyen.py
@@ -27,7 +27,7 @@ class AcquirerAdyen(osv.Model):
          - yhpp: hosted payment page: pay.shtml for single, select.shtml for multiple
         """
         return {
-            'adyen_form_url': 'https://%s.adyen.com/hpp/pay.shtml' % environment,
+            'adyen_form_url': 'https://%s.adyen.com/hpp/pay.shtml' % 'live' if environment == 'prod' else environment,
         }
 
     def _get_providers(self, cr, uid, context=None):

From 1b5576af4658b979b97976e23030a03c167d3bc8 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@odoo.com>
Date: Fri, 8 May 2015 16:38:46 +0200
Subject: [PATCH 37/49] [FIX] sql_db: add `closed` property on `Cursor`.

---
 openerp/sql_db.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/openerp/sql_db.py b/openerp/sql_db.py
index d1009113a02..2ed408e61e5 100644
--- a/openerp/sql_db.py
+++ b/openerp/sql_db.py
@@ -402,6 +402,12 @@ class Cursor(object):
     def __getattr__(self, name):
         return getattr(self._obj, name)
 
+    @property
+    def closed(self):
+        # NOTE: we cannot use `__getattr__` delegation as we
+        #       should not `check` that the cursor is closed
+        return self._obj.closed
+
 class TestCursor(Cursor):
     """ A cursor to be used for tests. It keeps the transaction open across
         several requests, and simulates committing, rolling back, and closing.

From 61a5bbfb210859e3c795d8c7d25c941f6091b4dd Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Fri, 8 May 2015 11:18:44 +0200
Subject: [PATCH 38/49] [FIX] stock_account: add taxes to invoice when creating
 an invoice from delivery Generating an invoice from a delivery now add the
 taxes to the invoice. This impacts a returned purchase for which the invoice
 is created from the delivery, and a sale order which is set to create invoice
 on delivery. opw-634565

---
 addons/stock_account/stock.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/addons/stock_account/stock.py b/addons/stock_account/stock.py
index b59d7144250..d7dcdd5443f 100644
--- a/addons/stock_account/stock.py
+++ b/addons/stock_account/stock.py
@@ -151,6 +151,13 @@ class stock_move(osv.osv):
         if move.product_uos:
             uos_id = move.product_uos.id
             quantity = move.product_uos_qty
+
+        taxes_ids = []
+        if move.origin_returned_move_id.purchase_line_id.taxes_id:
+            taxes_ids = [tax.id for tax in move.origin_returned_move_id.purchase_line_id.taxes_id]
+        elif move.procurement_id.sale_line_id.tax_id:
+            taxes_ids = [tax.id for tax in move.procurement_id.sale_line_id.tax_id]
+
         return {
             'name': move.name,
             'account_id': account_id,
@@ -158,6 +165,7 @@ class stock_move(osv.osv):
             'uos_id': uos_id,
             'quantity': quantity,
             'price_unit': self._get_price_unit_invoice(cr, uid, move, inv_type),
+            'invoice_line_tax_id': [(6, 0, taxes_ids)],
             'discount': 0.0,
             'account_analytic_id': False,
         }

From b8779f0c536560ba8362f83ab5ce6d6817fcf750 Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Thu, 7 May 2015 16:54:18 +0200
Subject: [PATCH 39/49] [FIX] stock: keep inventory options consistent Make
 sure that appropriate fields are emptied when switching to in between
 inventory filters. This prevents incoherent results due to hidden fields
 which were filled in a previous selection.

opw-634388
Fixes #6512
---
 addons/stock/stock.py                         | 24 ++++++++++++++++---
 .../stock/wizard/stock_change_product_qty.py  |  7 ++++++
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 76e87a72763..a4c7324dafd 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2746,15 +2746,33 @@ class stock_inventory(osv.osv):
 
     def _check_filter_product(self, cr, uid, ids, context=None):
         for inventory in self.browse(cr, uid, ids, context=context):
+            if inventory.filter == 'none' and inventory.product_id and inventory.location_id and inventory.lot_id:
+                return True
             if inventory.filter not in ('product', 'product_owner') and inventory.product_id:
                 return False
+            if inventory.filter != 'lot' and inventory.lot_id:
+                return False
+            if inventory.filter not in ('owner', 'product_owner') and inventory.partner_id:
+                return False
+            if inventory.filter != 'pack' and inventory.package_id:
+                return False
         return True
 
-    def onchange_filter(self, cr, uid, ids, filter):
-        return {'value': {'product_id': False} if filter not in ('product', 'product_owner') else {}}
+    def onchange_filter(self, cr, uid, ids, filter, context=None):
+        to_clean = { 'value': {} }
+        if filter not in ('product', 'product_owner'):
+            to_clean['value']['product_id'] = False
+        if filter != 'lot':
+            to_clean['value']['lot_id'] = False
+        if filter not in ('owner', 'product_owner'):
+            to_clean['value']['partner_id'] = False
+        if filter != 'pack':
+            to_clean['value']['package_id'] = False
+        return to_clean
 
     _constraints = [
-        (_check_filter_product, 'A specific product is chosen while the filter "One product only" is not selected', ['product_id', 'filter']),
+        (_check_filter_product, 'The selected inventory options are not coherent.',
+            ['filter', 'product_id', 'lot_id', 'partner_id', 'package_id']),
     ]
 
 class stock_inventory_line(osv.osv):
diff --git a/addons/stock/wizard/stock_change_product_qty.py b/addons/stock/wizard/stock_change_product_qty.py
index 8843581d70a..9c495106a2f 100644
--- a/addons/stock/wizard/stock_change_product_qty.py
+++ b/addons/stock/wizard/stock_change_product_qty.py
@@ -93,8 +93,15 @@ class stock_change_product_qty(osv.osv_memory):
             ctx = context.copy()
             ctx['location'] = data.location_id.id
             ctx['lot_id'] = data.lot_id.id
+            if data.product_id.id and data.lot_id.id:
+                filter = 'none'
+            elif data.product_id.id:
+                filter = 'product'
+            else:
+                filter = 'none'
             inventory_id = inventory_obj.create(cr, uid, {
                 'name': _('INV: %s') % tools.ustr(data.product_id.name),
+                'filter': filter,
                 'product_id': data.product_id.id,
                 'location_id': data.location_id.id,
                 'lot_id': data.lot_id.id}, context=context)

From e7886c6d75b2f95828fc61d8be542c5270a705bb Mon Sep 17 00:00:00 2001
From: Nicolas Seinlet <nse@odoo.com>
Date: Mon, 11 May 2015 09:35:01 +0300
Subject: [PATCH 40/49] [FIX] doc, new API + kanban error

- fix default_group_by in kanban
- use new api in server actions
- missing @api.multi in @compute example

Closes #6640
---
 doc/howtos/backend.rst                             |  1 +
 doc/howtos/backend/exercise-gantt                  |  9 ++++-----
 doc/howtos/backend/exercise-state-workflow-actions | 11 ++++-------
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/doc/howtos/backend.rst b/doc/howtos/backend.rst
index 0ac7ab8060d..10200f66268 100644
--- a/doc/howtos/backend.rst
+++ b/doc/howtos/backend.rst
@@ -764,6 +764,7 @@ method should simply set the value of the field to compute on every record in
 
         name = fields.Char(compute='_compute_name')
 
+        @api.multi
         def _compute_name(self):
             for record in self:
                 record.name = str(random.randint(1, 1e6))
diff --git a/doc/howtos/backend/exercise-gantt b/doc/howtos/backend/exercise-gantt
index dc4033e18de..273854b197d 100644
--- a/doc/howtos/backend/exercise-gantt
+++ b/doc/howtos/backend/exercise-gantt
@@ -35,7 +35,7 @@ Index: addons/openacademy/views/openacademy.xml
 ===================================================================
 --- addons.orig/openacademy/views/openacademy.xml	2014-08-28 14:21:46.543015785 +0200
 +++ addons/openacademy/views/openacademy.xml	2014-08-28 14:21:46.539015785 +0200
-@@ -145,11 +145,24 @@
+@@ -145,11 +145,23 @@
              </field>
          </record>
  
@@ -44,10 +44,9 @@ Index: addons/openacademy/views/openacademy.xml
 +            <field name="model">openacademy.session</field>
 +            <field name="arch" type="xml">
 +                <gantt string="Session Gantt" color="course_id"
-+                       date_start="start_date" date_delay="hours">
-+                    <level object="res.partner" link="instructor_id">
-+                        <field name="name"/>
-+                    </level>
++                       date_start="start_date" date_delay="hours"
++                       default_group_by='instructor_id'>
++                    <field name="name"/>
 +                </gantt>
 +            </field>
 +        </record>
diff --git a/doc/howtos/backend/exercise-state-workflow-actions b/doc/howtos/backend/exercise-state-workflow-actions
index 826ec5ce870..fe9a0c8a796 100644
--- a/doc/howtos/backend/exercise-state-workflow-actions
+++ b/doc/howtos/backend/exercise-state-workflow-actions
@@ -5,7 +5,7 @@ Index: addons/openacademy/views/session_workflow.xml
 ===================================================================
 --- addons.orig/openacademy/views/session_workflow.xml	2014-08-26 17:26:17.339783114 +0200
 +++ addons/openacademy/views/session_workflow.xml	2014-08-26 17:26:17.331783114 +0200
-@@ -6,24 +6,53 @@
+@@ -6,24 +6,50 @@
              <field name="on_create">True</field>
          </record>
  
@@ -13,8 +13,7 @@ Index: addons/openacademy/views/session_workflow.xml
 +            <field name="name">Set session to Draft</field>
 +            <field name="model_id" ref="model_openacademy_session"/>
 +            <field name="code">
-+recs = self.browse(cr, uid, context['active_ids'], context=context)
-+recs.action_draft()
++model.search([('id', 'in', context['active_ids'])]).action_draft()
 +            </field>
 +        </record>
          <record model="workflow.activity" id="draft">
@@ -32,8 +31,7 @@ Index: addons/openacademy/views/session_workflow.xml
 +            <field name="name">Set session to Confirmed</field>
 +            <field name="model_id" ref="model_openacademy_session"/>
 +            <field name="code">
-+recs = self.browse(cr, uid, context['active_ids'], context=context)
-+recs.action_confirm()
++model.search([('id', 'in', context['active_ids'])]).action_confirm()
 +            </field>
          </record>
          <record model="workflow.activity" id="confirmed">
@@ -50,8 +48,7 @@ Index: addons/openacademy/views/session_workflow.xml
 +            <field name="name">Set session to Done</field>
 +            <field name="model_id" ref="model_openacademy_session"/>
 +            <field name="code">
-+recs = self.browse(cr, uid, context['active_ids'], context=context)
-+recs.action_done()
++model.search([('id', 'in', context['active_ids'])]).action_done()
 +            </field>
          </record>
          <record model="workflow.activity" id="done">

From 2e49fc09ff37ad0d1834fcfafa037c629a54a8d6 Mon Sep 17 00:00:00 2001
From: Jeremy Kersten <jke@odoo.com>
Date: Mon, 11 May 2015 10:40:19 +0200
Subject: [PATCH 41/49] [FIX] calendar: set context if none

Avoid traceback if no context in get_recurrent_date_by_event when code do:
    context.get('xx')
---
 addons/calendar/calendar.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/calendar/calendar.py b/addons/calendar/calendar.py
index 28edd84426b..45919e6b024 100644
--- a/addons/calendar/calendar.py
+++ b/addons/calendar/calendar.py
@@ -701,6 +701,9 @@ class calendar_event(osv.Model):
                 val = pytz.UTC.localize(val)
             return val.astimezone(timezone)
 
+        if context is None:
+            context = {}
+
         timezone = pytz.timezone(context.get('tz') or 'UTC')
         startdate = pytz.UTC.localize(datetime.strptime(event.start, DEFAULT_SERVER_DATETIME_FORMAT))  # Add "+hh:mm" timezone
         if not startdate:

From 8ab987d828c44e92760986b9ec839861f87a1399 Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Wed, 6 May 2015 15:29:07 +0200
Subject: [PATCH 42/49] [FIX] stock_account: set the same unit price for extra
 moves than for moves linked to SO When extra moves are created, the unit
 price of the invoice line for these extra moves is now the same than the unit
 price of the moves generated from the SO.

opw-634227
---
 addons/stock_account/stock.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/addons/stock_account/stock.py b/addons/stock_account/stock.py
index d7dcdd5443f..f47a5f8e5f5 100644
--- a/addons/stock_account/stock.py
+++ b/addons/stock_account/stock.py
@@ -300,6 +300,7 @@ class stock_picking(osv.osv):
         move_obj = self.pool.get('stock.move')
         invoices = {}
         is_extra_move, extra_move_tax = move_obj._get_moves_taxes(cr, uid, moves, context=context)
+        product_price_unit = {}
         for move in moves:
             company = move.company_id
             origin = move.picking_id.name
@@ -321,6 +322,10 @@ class stock_picking(osv.osv):
             invoice_line_vals = move_obj._get_invoice_line_vals(cr, uid, move, partner, inv_type, context=context)
             invoice_line_vals['invoice_id'] = invoices[key]
             invoice_line_vals['origin'] = origin
+            if not is_extra_move[move.id]:
+                product_price_unit[invoice_line_vals['product_id']] = invoice_line_vals['price_unit']
+            if is_extra_move[move.id] and invoice_line_vals['product_id'] in product_price_unit:
+                invoice_line_vals['price_unit'] = product_price_unit[invoice_line_vals['product_id']]
             if is_extra_move[move.id] and extra_move_tax[move.picking_id, move.product_id]:
                 invoice_line_vals['invoice_line_tax_id'] = extra_move_tax[move.picking_id, move.product_id]
 

From fdc6ba18206d7ee00118e58e9eb1d75350e1b498 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Mon, 11 May 2015 10:58:23 +0200
Subject: [PATCH 43/49] [FIX] http: make sure to instantiate an environment
 before calling method

This fixes an issue in property `field.digits` that cannot find a valid cursor
to the database.  Forcing the instantiation of an environment makes the cursor
retrievable.
---
 openerp/http.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/openerp/http.py b/openerp/http.py
index d56e2d84649..b972c610329 100644
--- a/openerp/http.py
+++ b/openerp/http.py
@@ -896,7 +896,8 @@ class Model(object):
                 raise Exception("Access denied")
             mod = request.registry[self.model]
             meth = getattr(mod, method)
-            cr = request.cr
+            # make sure to instantiate an environment
+            cr = request.env.cr
             result = meth(cr, request.uid, *args, **kw)
             # reorder read
             if method == "read":

From 9d2dbda8cacbdefecd530e3e43049b5fc55e7a7d Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Mon, 11 May 2015 13:20:06 +0200
Subject: [PATCH 44/49] [FIX] stock_dropshipping: not enough stock warning for
 MTOs

When 'stock_dropshipping' was installed, in a sale order,
choosing a product being stockable + buy + MTOs returned
the "Not Enough Stock" warning, while it shouldn't.

It's because the according method `_check_rounting` was
overriden in this module, with a @api.one, which aggregates, while
the method expects to return a simple boolean even for a list of
multiple ids.
Converting the method to @api.multi solves the issue.

opw-639426
---
 addons/stock_dropshipping/stock_dropshipping.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/addons/stock_dropshipping/stock_dropshipping.py b/addons/stock_dropshipping/stock_dropshipping.py
index cbd079263ca..2fe37ea8565 100644
--- a/addons/stock_dropshipping/stock_dropshipping.py
+++ b/addons/stock_dropshipping/stock_dropshipping.py
@@ -6,16 +6,17 @@ from openerp import models, api
 class sale_order_line(models.Model):
     _inherit = 'sale.order.line'
 
-    @api.one
+    @api.multi
     def _check_routing(self, product, warehouse):
         """ skip stock verification if the route goes from supplier to customer
             As the product never goes in stock, no need to verify it's availibility
         """
         res = super(sale_order_line, self)._check_routing(product, warehouse)
         if not res:
-            for pull_rule in self.route_id.pull_ids:
-                if (pull_rule.picking_type_id.default_location_src_id.usage == 'supplier' and
-                        pull_rule.picking_type_id.default_location_dest_id.usage == 'customer'):
-                    res = True
-                    break
+            for line in self:
+                for pull_rule in line.route_id.pull_ids:
+                    if (pull_rule.picking_type_id.default_location_src_id.usage == 'supplier' and
+                            pull_rule.picking_type_id.default_location_dest_id.usage == 'customer'):
+                        res = True
+                        break
         return res

From 2d260b78d8c9f910719e7537e98e940ee1abefca Mon Sep 17 00:00:00 2001
From: Julien De Coster <jdc@odoo.com>
Date: Mon, 11 May 2015 11:47:00 +0200
Subject: [PATCH 45/49] [FIX] Don't send mail to opt-outed contacts in mass
 mailing

---
 addons/mass_mailing/models/mass_mailing.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mass_mailing/models/mass_mailing.py b/addons/mass_mailing/models/mass_mailing.py
index 8b6bb15ec0b..89df42268c7 100644
--- a/addons/mass_mailing/models/mass_mailing.py
+++ b/addons/mass_mailing/models/mass_mailing.py
@@ -513,7 +513,7 @@ class MassMailing(osv.Model):
                 elif len(item) == 3:
                     mailing_list_ids |= set(item[2])
             if mailing_list_ids:
-                value['mailing_domain'] = "[('list_id', 'in', %s)]" % list(mailing_list_ids)
+                value['mailing_domain'] = "[('list_id', 'in', %s), ('opt_out', '=', False)]" % list(mailing_list_ids)
             else:
                 value['mailing_domain'] = "[('list_id', '=', False)]"
         else:

From 163e7ee5ede991ac6c92fcaeb9cbc858a4847223 Mon Sep 17 00:00:00 2001
From: Goffin Simon <sig@odoo.com>
Date: Tue, 5 May 2015 12:09:25 +0200
Subject: [PATCH 46/49] [FIX] point_of_point: POS sales details

Total of the day must include the invoiced lines.

opw:634098
---
 addons/point_of_sale/report/pos_details.py | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/addons/point_of_sale/report/pos_details.py b/addons/point_of_sale/report/pos_details.py
index 1765a8a066d..a723793e0e2 100644
--- a/addons/point_of_sale/report/pos_details.py
+++ b/addons/point_of_sale/report/pos_details.py
@@ -129,13 +129,7 @@ class pos_details(report_sxw.rml_parse):
             return {}
 
     def _total_of_the_day(self, objects):
-        if self.total:
-             if self.total == self.total_invoiced:
-                 return self.total
-             else:
-                 return ((self.total or 0.00) - (self.total_invoiced or 0.00))
-        else:
-            return False
+            return self.total or 0.00
 
     def _sum_invoice(self, objects):
         return reduce(lambda acc, obj:

From 740efb93497ceb7b511d2707afd28e748cee4e0b Mon Sep 17 00:00:00 2001
From: Goffin Simon <sig@odoo.com>
Date: Mon, 11 May 2015 14:10:12 +0200
Subject: [PATCH 47/49] [FIX] point_of_sale: bad indentation

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

diff --git a/addons/point_of_sale/report/pos_details.py b/addons/point_of_sale/report/pos_details.py
index a723793e0e2..f430029ea2d 100644
--- a/addons/point_of_sale/report/pos_details.py
+++ b/addons/point_of_sale/report/pos_details.py
@@ -129,7 +129,7 @@ class pos_details(report_sxw.rml_parse):
             return {}
 
     def _total_of_the_day(self, objects):
-            return self.total or 0.00
+        return self.total or 0.00
 
     def _sum_invoice(self, objects):
         return reduce(lambda acc, obj:

From af86f029c92b7cf4f4f0d2d7a86003f821adbfb4 Mon Sep 17 00:00:00 2001
From: Goffin Simon <sig@odoo.com>
Date: Sun, 10 May 2015 10:25:05 +0200
Subject: [PATCH 48/49] [FIX] account: Translation of journal name

The journal name showed in the pop over of the reconciliation bank statement wizard
must be in the language of the user.

opw:634378
---
 addons/account/account_bank_statement.py        | 2 +-
 addons/account/static/src/js/account_widgets.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index a6f2c6d6eb0..72a907876b9 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -588,7 +588,7 @@ class account_bank_statement_line(osv.osv):
             domain += [(amount_field, '<', 0), (amount_field, '>', (sign * amount))]
         else:
             domain += [(amount_field, '>', 0), (amount_field, '<', (sign * amount))]
-        mv_lines = self.get_move_lines_for_reconciliation(cr, uid, st_line, excluded_ids=excluded_ids, limit=5, additional_domain=domain)
+        mv_lines = self.get_move_lines_for_reconciliation(cr, uid, st_line, excluded_ids=excluded_ids, limit=5, additional_domain=domain, context=context)
         ret = []
         total = 0
         for line in mv_lines:
diff --git a/addons/account/static/src/js/account_widgets.js b/addons/account/static/src/js/account_widgets.js
index bbef41e98ed..64d7beaf8f3 100644
--- a/addons/account/static/src/js/account_widgets.js
+++ b/addons/account/static/src/js/account_widgets.js
@@ -233,7 +233,7 @@ openerp.account = function (instance) {
     
                 // Display the reconciliations
                 return self.model_bank_statement_line
-                    .call("get_data_for_reconciliations", [reconciliations_to_show])
+                    .call("get_data_for_reconciliations", [reconciliations_to_show], {context:self.session.user_context})
                     .then(function (data) {
                         var child_promises = [];
                         while ((datum = data.shift()) !== undefined)
@@ -1594,7 +1594,7 @@ openerp.account = function (instance) {
             limit += 1; // Let's fetch 1 more item than requested
             if (limit > 0) {
                 return self.model_bank_statement_line
-                    .call("get_move_lines_for_reconciliation_by_statement_line_id", [self.st_line.id, excluded_ids, self.filter, offset, limit])
+                    .call("get_move_lines_for_reconciliation_by_statement_line_id", [self.st_line.id, excluded_ids, self.filter, offset, limit], {context:self.session.user_context})
                     .then(function (lines) {
                         _.each(lines, function(line) { self.decorateMoveLine(line, self.st_line.currency_id) }, self);
                         // If we could fetch 1 more item than what we'll display, that means there are move lines left to be displayed (so we enable the pager)

From bff6dffbb424a9ab458ae8fc2044f0b52490c36b Mon Sep 17 00:00:00 2001
From: Goffin Simon <sig@odoo.com>
Date: Fri, 8 May 2015 12:18:07 +0200
Subject: [PATCH 49/49] [FIX] website_sale: Coupon Code

The pricelist linked to the coupon code is just applied in the cart.
In the shop, the pricelist of the user is applied.

opw:634639
---
 addons/website_sale/controllers/main.py           | 7 +++++--
 addons/website_sale/static/src/js/website_sale.js | 3 ++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index 47a1eae07ee..65155ca3ba8 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -934,11 +934,14 @@ class website_sale(http.Controller):
         return ret
 
     @http.route(['/shop/get_unit_price'], type='json', auth="public", methods=['POST'], website=True)
-    def get_unit_price(self, product_ids, add_qty, **kw):
+    def get_unit_price(self, product_ids, add_qty, use_order_pricelist=False, **kw):
         cr, uid, context, pool = request.cr, request.uid, request.context, request.registry
         products = pool['product.product'].browse(cr, uid, product_ids, context=context)
         partner = pool['res.users'].browse(cr, uid, uid, context=context).partner_id
-        pricelist_id = request.session.get('sale_order_code_pricelist_id') or partner.property_product_pricelist.id
+        if use_order_pricelist:
+            pricelist_id = request.session.get('sale_order_code_pricelist_id') or partner.property_product_pricelist.id
+        else:
+            pricelist_id = partner.property_product_pricelist.id
         prices = pool['product.pricelist'].price_rule_get_multi(cr, uid, [], [(product, add_qty, partner) for product in products], context=context)
         return {product_id: prices[product_id][pricelist_id][0] for product_id in product_ids}
 
diff --git a/addons/website_sale/static/src/js/website_sale.js b/addons/website_sale/static/src/js/website_sale.js
index b9b351b9266..d48accaac58 100644
--- a/addons/website_sale/static/src/js/website_sale.js
+++ b/addons/website_sale/static/src/js/website_sale.js
@@ -56,7 +56,8 @@ $('.oe_website_sale').each(function () {
         if (isNaN(value)) value = 0;
         openerp.jsonRpc("/shop/get_unit_price", 'call', {
             'product_ids': product_ids,
-            'add_qty': value})
+            'add_qty': value,
+            'use_order_pricelist': true})
         .then(function (res) {
             //basic case
             $dom.find('span.oe_currency_value').last().text(res[product_id].toFixed(2));