From cb5d41da3b236611506ad07efb3476b7f88ba36f Mon Sep 17 00:00:00 2001
From: Goffin Simon <sig@odoo.com>
Date: Thu, 14 Apr 2016 16:16:56 +0200
Subject: [PATCH 01/43] [FIX] account_asset: asset_create

When creating assets from invoice lines, the system must check
that assets have not already been created for the related invoice.
If assets already exist then these assets have to be removed.

Used case:

- In the purchase journal, tick "allow canceling entries"
- On a supplier invoice line, set an asset category
- validate the invoice
- cancel the invoice
- set to draft
- validate the invoice

Before the fix: the asset was created twice.
After the fix: A warning is raised if an asset already exists for the invoice.

opw:674674
---
 addons/account_asset/account_asset_invoice.py | 7 +++++++
 addons/account_asset/i18n/account_asset.pot   | 6 ++++++
 2 files changed, 13 insertions(+)

diff --git a/addons/account_asset/account_asset_invoice.py b/addons/account_asset/account_asset_invoice.py
index 38fea23fbe3..9212bc2f73c 100644
--- a/addons/account_asset/account_asset_invoice.py
+++ b/addons/account_asset/account_asset_invoice.py
@@ -19,7 +19,9 @@
 #
 ##############################################################################
 
+from openerp import SUPERUSER_ID
 from openerp.osv import fields, osv
+from openerp.tools.translate import _
 
 class account_invoice(osv.osv):
 
@@ -45,6 +47,11 @@ class account_invoice_line(osv.osv):
     def asset_create(self, cr, uid, lines, context=None):
         context = context or {}
         asset_obj = self.pool.get('account.asset.asset')
+        for line in lines:
+            if line.invoice_id.number:
+                if asset_obj.search(cr, SUPERUSER_ID, [('code', '=', line.invoice_id.number)], context=context):
+                    raise osv.except_osv(_('Warning!'), _('You already have assets with the reference %s.\nPlease delete these assets before creating new ones for this invoice.') % (line.invoice_id.number))
+
         for line in lines:
             if line.asset_category_id:
                 vals = {
diff --git a/addons/account_asset/i18n/account_asset.pot b/addons/account_asset/i18n/account_asset.pot
index 8b7e9405ed5..56b547ebcdf 100644
--- a/addons/account_asset/i18n/account_asset.pot
+++ b/addons/account_asset/i18n/account_asset.pot
@@ -782,6 +782,12 @@ msgstr ""
 msgid "Year"
 msgstr ""
 
+#. module: account_asset
+#: code:addons/account_asset/account_asset_invoice.py:53
+#, python-format
+msgid "You already have assets with the reference %s.\nPlease delete these assets before creating new ones for this invoice."
+msgstr ""
+
 #. module: account_asset
 #: code:addons/account_asset/account_asset.py:81
 #, python-format

From e18660c3308e7fb17590e72e6b5e9aadc8ca0517 Mon Sep 17 00:00:00 2001
From: Joren Van Onder <jov@odoo.com>
Date: Fri, 8 Apr 2016 13:46:27 +0200
Subject: [PATCH 02/43] [FIX] web: fix iOS file downloading

e8a00bc50da435d3859118ca127d20a2eb9a0cab moved the get_file function
from web.session to web.ajax. The issue is that get_file uses
session.url() for iOS devices. Also, in order to prevent an infinite
spinner options.complete() is called before actually opening up the new
window. Although this resolves the issue it still requires the user to
configure Safari to allow pop-ups, otherwise they are silently ignored.

opw-672882
---
 addons/web/static/src/js/framework/ajax.js    | 4 +++-
 addons/web/static/src/js/framework/session.js | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/framework/ajax.js b/addons/web/static/src/js/framework/ajax.js
index 869e0214ad9..87fd08c7786 100644
--- a/addons/web/static/src/js/framework/ajax.js
+++ b/addons/web/static/src/js/framework/ajax.js
@@ -203,7 +203,9 @@ function get_file(options) {
     // opening a new window seems the best way to workaround
     if (navigator.userAgent.match(/(iPod|iPhone|iPad)/)) {
         var params = _.extend({}, options.data || {}, {token: token});
-        var url = this.url(options.url, params);
+        var url = options.session.url(options.url, params);
+        if (options.complete) { options.complete(); }
+
         return window.open(url);
     }
 
diff --git a/addons/web/static/src/js/framework/session.js b/addons/web/static/src/js/framework/session.js
index 7eae8b20a65..e16b3767e64 100644
--- a/addons/web/static/src/js/framework/session.js
+++ b/addons/web/static/src/js/framework/session.js
@@ -271,6 +271,7 @@ var Session = core.Class.extend(mixins.EventDispatcherMixin, {
         if (this.override_session){
             options.data.session_id = this.session_id;
         }
+        options.session = this;
         ajax.get_file(options);
     },
     synchronized_mode: function(to_execute) {

From 1df72cb01b9c6de0e417bdafb60b46d0276b7888 Mon Sep 17 00:00:00 2001
From: qdp-odoo <qdp@odoo.com>
Date: Tue, 19 Apr 2016 11:35:45 +0200
Subject: [PATCH 03/43] [FIX] account: fixed query_get() when a domain is
 passed as argument (safe_eval must receive a string)

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

diff --git a/addons/account/models/account_move.py b/addons/account/models/account_move.py
index 01a3bcf0c1e..4490302194c 100644
--- a/addons/account/models/account_move.py
+++ b/addons/account/models/account_move.py
@@ -1147,7 +1147,7 @@ class AccountMoveLine(models.Model):
     @api.model
     def _query_get(self, domain=None):
         context = dict(self._context or {})
-        domain = domain and safe_eval(domain) or []
+        domain = domain and safe_eval(str(domain)) or []
 
         date_field = 'date'
         if context.get('aged_balance'):

From 7bde7b90161466fc8e6f451bc1fff3ec7b4153d3 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Tue, 19 Apr 2016 15:02:08 +0200
Subject: [PATCH 04/43] [FIX] mail: `message_post` requires record write access

By default, users are supposed to be able to write messages
in threads only if they have the write access on the record.

This behavior is the behavior defined in Odoo 8.0.

This behavior can be changed by defining
`_mail_post_access` on the model,
to allow the creation of new messages
if the user has only the read access, for instance.

This is the case on `project.issue`, for instance.

Since 9.0, @ revision 88b8cd058713bfad2942f7e7434c34b6c1a6e7da,
this behavior was broken: Any users having the read
access on the record was allowed to write messages in the thread,
while this should not be the case, except if
`_mail_post_access = 'read'`
has been defined on the model.

This is because the SQL query which is performed in order
to know the thread messages the user has been notified of
was expected to return only the ids of the notified message,
while it actually always returned all the message ids of the thread,
because of the LEFT JOINS, e.g.

```
LEFT JOIN "mail_message_res_partner_rel" partner_rel
ON partner_rel.mail_message_id = m.id AND partner_rel.res_partner_id = (%%s)
```

Instead of just checking the ids of the messages returned by this
query, it must check that one of the two columns
`partner_rel.res_partner_id` or `channel_partner.partner_id`
is filled, meaning the partner has been notified of the message or
is a member of the channel the message has been posted to.

opw-668589
---
 addons/mail/models/mail_message.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/mail/models/mail_message.py b/addons/mail/models/mail_message.py
index 05224add86a..fe7d6d88448 100644
--- a/addons/mail/models/mail_message.py
+++ b/addons/mail/models/mail_message.py
@@ -762,7 +762,7 @@ class Message(models.Model):
             # TDE: probably clean me
             parent_ids = [message.get('parent_id') for mid, message in message_values.iteritems()
                           if message.get('parent_id')]
-            self._cr.execute("""SELECT DISTINCT m.id FROM "%s" m
+            self._cr.execute("""SELECT DISTINCT m.id, partner_rel.res_partner_id, channel_partner.partner_id FROM "%s" m
                 LEFT JOIN "mail_message_res_partner_rel" partner_rel
                 ON partner_rel.mail_message_id = m.id AND partner_rel.res_partner_id = (%%s)
                 LEFT JOIN "mail_message_mail_channel_rel" channel_rel
@@ -772,7 +772,7 @@ class Message(models.Model):
                 LEFT JOIN "mail_channel_partner" channel_partner
                 ON channel_partner.channel_id = channel.id AND channel_partner.partner_id = (%%s)
                 WHERE m.id = ANY (%%s)""" % self._table, (self.env.user.partner_id.id, self.env.user.partner_id.id, parent_ids,))
-            not_parent_ids = [mid[0] for mid in self._cr.fetchall()]
+            not_parent_ids = [mid[0] for mid in self._cr.fetchall() if any([mid[1], mid[2]])]
             notified_ids += [mid for mid, message in message_values.iteritems()
                              if message.get('parent_id') in not_parent_ids]
 

From 04765d491750457ff571a7ede79fdc00d59b6fb3 Mon Sep 17 00:00:00 2001
From: Stefan Rijnhart <stefan@opener.am>
Date: Thu, 24 Mar 2016 10:23:04 +0100
Subject: [PATCH 05/43] [FIX] hw_escpos: RBG images do not necessarily have an
 alpha channel

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

diff --git a/addons/hw_escpos/escpos/escpos.py b/addons/hw_escpos/escpos/escpos.py
index 5087b392922..4051e65066c 100644
--- a/addons/hw_escpos/escpos/escpos.py
+++ b/addons/hw_escpos/escpos/escpos.py
@@ -445,7 +445,7 @@ class Escpos:
             img_rgba = Image.open(f)
             img = Image.new('RGB', img_rgba.size, (255,255,255))
             channels = img_rgba.split()
-            if len(channels) > 1:
+            if len(channels) > 3:
                 # use alpha channel as mask
                 img.paste(img_rgba, mask=channels[3])
             else:

From 17d0117edc01c3c28f6c035f95b1975804f164a5 Mon Sep 17 00:00:00 2001
From: fossoult <thomas.fossoul@noviat.com>
Date: Tue, 5 Apr 2016 11:16:55 +0200
Subject: [PATCH 06/43] [FIX] web: expose list view Column widget

The list view Column widget should be exposed, so it can be extended.
This is required to allow the creation of other kind of list widgets.
The _format method is not extendable if we don't add this line.

(comment from ged) The file list_view.js should be split in two, and
reorganized, but this should not be done in 9.0.
---
 addons/web/static/src/js/views/list_view.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/web/static/src/js/views/list_view.js b/addons/web/static/src/js/views/list_view.js
index cb6daf093ce..229ecb86d83 100644
--- a/addons/web/static/src/js/views/list_view.js
+++ b/addons/web/static/src/js/views/list_view.js
@@ -1901,6 +1901,7 @@ var Column = Class.extend({
             row_data[this.id].value, this, options.value_if_empty));
     }
 });
+ListView.Column = Column;
 
 var MetaColumn = Column.extend({
     meta: true,

From cd13ea99351f8eebf49ec811a5435ff103eb34e9 Mon Sep 17 00:00:00 2001
From: Richard Mathot <rim@odoo.com>
Date: Tue, 19 Apr 2016 15:51:25 +0200
Subject: [PATCH 07/43] [FIX] mail: race condition in mail composer

When an user sends an email from the chatter then quickly switch to
another record, it may happen that this.composer is already destroyed.

We prevent to display a traceback with this fix.
---
 addons/mail/static/src/js/chatter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/static/src/js/chatter.js b/addons/mail/static/src/js/chatter.js
index d57deed0802..2690d6c2444 100644
--- a/addons/mail/static/src/js/chatter.js
+++ b/addons/mail/static/src/js/chatter.js
@@ -919,7 +919,7 @@ var Chatter = form_common.AbstractField.extend({
         this.mute_new_message_button(true);
     },
     close_composer: function (force) {
-        if (this.composer.is_empty() || force) {
+        if (this.composer && (this.composer.is_empty() || force)) {
             this.composer.do_hide();
             this.composer.$input.val('');
             this.mute_new_message_button(false);

From 7f6bd2dc666ca93c09df3131da2866ae2e4b13fa Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 19 Apr 2016 17:26:38 +0200
Subject: [PATCH 08/43] [FIX] web: fix layout issue in Chrome 50 (again)

Makes the fix in f992c8ee192c075b38bf14dd5dcfb10fba7dd2ef
specific to the view manager of the main oe_application
container, in order to avoid disrupting other view manager
occurrences (such as the ones in modal windows or x2many
list views).

Fixes #11629 (again)

Note: Hopefully the Blink team will fix Chrome so we can
get rid of this hack in the future:
  https://bugs.chromium.org/p/chromium/issues/detail?id=603507
---
 addons/web/static/src/css/chrome50.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/css/chrome50.css b/addons/web/static/src/css/chrome50.css
index cfcf6d84033..5279f10bfa4 100644
--- a/addons/web/static/src/css/chrome50.css
+++ b/addons/web/static/src/css/chrome50.css
@@ -3,6 +3,6 @@
   display: table-cell;
 }
 
-.oe_view_manager > .oe_view_manager_wrapper > div {
+.openerp .oe_application > div > .oe_view_manager > .oe_view_manager_wrapper > div {
   display: table-cell;
 }

From 999b2c7e329296b81b5e5f277d1bdb9b5d90f9f1 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Tue, 19 Apr 2016 18:12:31 +0200
Subject: [PATCH 09/43] [FIX] mrp: expected date of the manufactured product
 move

This revision is related to eafebcb308a6214330479359ee00f460387df7d1

According to the `stock.move` fields definition:
`date` is the "scheduled date until move is done, then date of actual move processing"
`date_expected` is the "Scheduled date for the processing of this move"

The scheduled date of the product being produced in a
manufacturing order is the same scheduled date than written
on the manufacturing order.

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

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index fdf1b92c468..b94428f91fe 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -1124,6 +1124,7 @@ class mrp_production(osv.osv):
         data = {
             'name': production.name,
             'date': production.date_planned,
+            'date_expected': production.date_planned,
             'product_id': production.product_id.id,
             'product_uom': production.product_uom.id,
             'product_uom_qty': production.product_qty,

From 2a40c72ac1351d9768c29cfaf9467f018d6324da Mon Sep 17 00:00:00 2001
From: Yenthe <yenthevg@gmail.com>
Date: Mon, 11 Apr 2016 09:17:34 +0200
Subject: [PATCH 10/43] [CLA] signature for Van Roey corporate agreement

This is the corporate agreement for Van Roey.

Closes #11653
---
 doc/cla/corporate/VanRoey.md | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 doc/cla/corporate/VanRoey.md

diff --git a/doc/cla/corporate/VanRoey.md b/doc/cla/corporate/VanRoey.md
new file mode 100644
index 00000000000..956d6bb43a4
--- /dev/null
+++ b/doc/cla/corporate/VanRoey.md
@@ -0,0 +1,18 @@
+Belgium 2016-04-11
+
+Van Roey agrees to the terms of the Odoo Corporate
+Contributor License Agreement v1.0.
+
+I declare that I am authorized and able to make this agreement and sign this
+declaration.
+
+Signed,
+
+Yenthe Van Ginneken  yenthe.vanginneken@vanroey.be https://github.com/Yenthe666
+
+List of contributors:
+
+Yenthe Van Ginneken  yenthe.vanginneken@vanroey.be https://github.com/Yenthe666
+Maarten Wijnants maarten.wijnants@vanroey.be https://github.com/weilant
+Vincent Adriaensen vincent.adriaensen@vanroey.be https://github.com/vincentadriaensen
+Pieter Paulussen pieter.paulussen@vanroey.be https://github.com/PieterPaulussen

From ae594be59458d62e74a940fc7f485e48c8c89779 Mon Sep 17 00:00:00 2001
From: Cody K <ckitterm@gmail.com>
Date: Tue, 19 Apr 2016 09:12:03 -0400
Subject: [PATCH 11/43] [CLA] individual signature for tesserb

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

diff --git a/doc/cla/individual/tesserb.md b/doc/cla/individual/tesserb.md
new file mode 100644
index 00000000000..ba4e41e2e42
--- /dev/null
+++ b/doc/cla/individual/tesserb.md
@@ -0,0 +1,11 @@
+United States, 2016-04-19
+
+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,
+
+Cody Kitterman ckitterm@gmail.com https://github.com/tesserb
\ No newline at end of file

From 1bb237174651c6a4f78f5719e0ef342d4157dc94 Mon Sep 17 00:00:00 2001
From: Cyril Gaudin <cyril.gaudin@camptocamp.com>
Date: Fri, 15 Apr 2016 09:52:01 +0200
Subject: [PATCH 12/43] [CLA] add cyrilgdn to camptocamp signature

Closes #11711
---
 doc/cla/corporate/camptocamp.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/cla/corporate/camptocamp.md b/doc/cla/corporate/camptocamp.md
index bb68262d95f..6e6d131fc2c 100644
--- a/doc/cla/corporate/camptocamp.md
+++ b/doc/cla/corporate/camptocamp.md
@@ -27,4 +27,5 @@ Romain Deheele romain.deheele@camptocamp.com https://github.com/rdeheele
 Maxime Wiot maxime.wiot@camptocamp.com https://github.com/maxime-c2c
 Ferdinand Gassauer ferdinand.gassauer@camptocamp.com https://github.com/ferdiga
 Jean-Baptiste Aubort jean-baptiste.aubort@camptocamp.com
+Cyril Gaudin cyril.gaudin@camptocamp.com https://github.com/cyrilgdn
 

From c225c78a3a032f6756e44a4d29bc1dd25fbbfa2e Mon Sep 17 00:00:00 2001
From: javcasas <javcasas@gmail.com>
Date: Mon, 14 Mar 2016 15:15:06 -0500
Subject: [PATCH 13/43] [CLA] signature for Javier Casas

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

diff --git a/doc/cla/individual/javcasas.md b/doc/cla/individual/javcasas.md
new file mode 100644
index 00000000000..0458f7754b1
--- /dev/null
+++ b/doc/cla/individual/javcasas.md
@@ -0,0 +1,11 @@
+Ecuador, 14th of March, 2016
+
+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,
+
+Javier Casas javcasas@gmail.com https://github.com/javcasas

From bdfc75e613b45afcc5e9ada58f2d6c3d42b7732a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rub=C3=A9n?= <rcabrera@bisnesmart.com>
Date: Fri, 11 Mar 2016 23:07:12 +0100
Subject: [PATCH 14/43] [CLA] coprorate signature by bisneSmart

Closes #11312
---
 doc/cla/corporate/bisneSmart.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 doc/cla/corporate/bisneSmart.md

diff --git a/doc/cla/corporate/bisneSmart.md b/doc/cla/corporate/bisneSmart.md
new file mode 100644
index 00000000000..229c626f5c5
--- /dev/null
+++ b/doc/cla/corporate/bisneSmart.md
@@ -0,0 +1,16 @@
+Spain, March 11, 2016
+
+bisneSmart S.C. agrees to the terms of the Odoo Corporate Contributor License
+Agreement v1.0.
+
+I declare that I am authorized and able to make this agreement and sign this
+declaration.
+
+Signed,
+
+bisneSmart S.C. hola@bisnesmart.com https://github.com/bisnesmart
+
+List of contributors:
+
+Gonzalo Borrás Beta gborras@bisnesmart.com https://github.com/gonxi
+Rubén Cabrera Martínez rcabrera@bisnesmart.com https://github.com/rubencabrera

From 364e80f718869bc00ac22d22099bcb7c3d7ace7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eduardo=20Rodr=C3=ADguez=20Crespo?= <erocre@gmail.com>
Date: Fri, 8 Apr 2016 13:44:11 +0200
Subject: [PATCH 15/43] [CLA] signature for erocre

Closes #11639
---
 doc/cla/individual/erocre.md | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 doc/cla/individual/erocre.md

diff --git a/doc/cla/individual/erocre.md b/doc/cla/individual/erocre.md
new file mode 100644
index 00000000000..a7a2aca53b0
--- /dev/null
+++ b/doc/cla/individual/erocre.md
@@ -0,0 +1,9 @@
+Spain, 2016-04-08
+
+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,
+
+Eduardo Rodriguez erocre@gmail.com https://github.com/erocre

From 58d99909ec95577651a686162860040365181c09 Mon Sep 17 00:00:00 2001
From: Stephen Medina <stephenm@lsm.org>
Date: Wed, 20 Apr 2016 09:12:50 +0200
Subject: [PATCH 16/43] [CLA] signature for stephen144

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

diff --git a/doc/cla/individual/stephen144.md b/doc/cla/individual/stephen144.md
new file mode 100644
index 00000000000..5462fe58f1f
--- /dev/null
+++ b/doc/cla/individual/stephen144.md
@@ -0,0 +1,11 @@
+United States of America, 2016-04-07
+
+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,
+
+Stephen Medina stephenm@lsm.org https://github.com/stephen144

From 92f1cbeb6f46a957a1f733d7ae8239dc35da57d4 Mon Sep 17 00:00:00 2001
From: Stephen Medina <stephenm@lsm.org>
Date: Wed, 23 Mar 2016 13:57:39 -0700
Subject: [PATCH 17/43] [FIX] server: support psutils >= 4.0

In version 3, process.memory_info() returns only rss and vms
In version 4, it now returns rss, vms, shared, text, lib, data and dirty
Automatic unpacking is no longer possible in 4.0

Fixes #11052, Closes #11459
---
 openerp/service/server.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/openerp/service/server.py b/openerp/service/server.py
index 50a7f7f2ee5..46c5c15fe1a 100644
--- a/openerp/service/server.py
+++ b/openerp/service/server.py
@@ -47,7 +47,8 @@ SLEEP_INTERVAL = 60     # 1 min
 def memory_info(process):
     """ psutil < 2.0 does not have memory_info, >= 3.0 does not have
     get_memory_info """
-    return (getattr(process, 'memory_info', None) or process.get_memory_info)()
+    pmem = (getattr(process, 'memory_info', None) or process.get_memory_info)()
+    return (pmem.rss, pmem.vms)
 
 #----------------------------------------------------------
 # Werkzeug WSGI servers patched

From 21ccf2fe1c9ed2f6e16ded5f0e5751eebfc082e2 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Wed, 20 Apr 2016 10:05:09 +0200
Subject: [PATCH 18/43] [FIX] stock: remove spaces surrounding the `/` in
 locations complete name

The location name get is computed as:
`parent.name + '/' + child.name`

While, the complete was computed as:
`parent.name + ' / ' + child.name`

This leaded to an obvious inconsistency.

Besides, this prevented to use the `location`
filter in the search of the products list to
know the quantity available of products for
a specifc location, as the domain used
to retrieve the locations is set as
`[('complete_name','ilike',context['location'])]`

`context['location']` containing the content of the `name_get`
(No spaces surrounding `/`)
and
`complete_name` surrounding `/` with spaces.

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

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 96937d3463d..dab4f6a3c16 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -61,7 +61,7 @@ class stock_location(osv.osv):
             res[m.id] = m.name
             parent = m.location_id
             while parent:
-                res[m.id] = parent.name + ' / ' + res[m.id]
+                res[m.id] = parent.name + '/' + res[m.id]
                 parent = parent.location_id
         return res
 

From 5c476513068813e676ab9e2a63c55ee9a45b67e1 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Wed, 20 Apr 2016 11:00:35 +0200
Subject: [PATCH 19/43] [FIX] sale: allow to import quotations without lines
 description

When importing a quotation,
if the lines `name`, `price_unit`, `product_uom` or `tax_id`
are not specified, but the product is,
retrieve them from the product `on_change`

This was the case in Odoo 8.0,
it was done as well in the override `create` method
of `sale.order.line`

opw-675434
---
 addons/sale/sale.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index c64676331f4..c9cdc6a5507 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -601,6 +601,13 @@ class SaleOrderLine(models.Model):
 
     @api.model
     def create(self, values):
+        onchange_fields = ['name', 'price_unit', 'product_uom', 'tax_id']
+        if values.get('order_id') and values.get('product_id') and any(f not in values for f in onchange_fields):
+            line = self.new(values)
+            line.product_id_change()
+            for field in onchange_fields:
+                if field not in values:
+                    values[field] = line._fields[field].convert_to_write(line[field])
         line = super(SaleOrderLine, self).create(values)
         if line.state == 'sale':
             if (not line.order_id.project_id and

From d043fd03ceca9935d910fb6e8393025a11984b1b Mon Sep 17 00:00:00 2001
From: Joren Van Onder <jov@odoo.com>
Date: Wed, 20 Apr 2016 10:04:06 +0200
Subject: [PATCH 20/43] [FIX] point_of_sale: display correct uom on weighable
 products

Everything's displayed fine on orderlines with weighable products, this
only affected the small blue labels on the products.

opw-674264
---
 addons/point_of_sale/static/src/xml/pos.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/point_of_sale/static/src/xml/pos.xml b/addons/point_of_sale/static/src/xml/pos.xml
index 196495dd624..a7d96b71d1b 100644
--- a/addons/point_of_sale/static/src/xml/pos.xml
+++ b/addons/point_of_sale/static/src/xml/pos.xml
@@ -751,7 +751,7 @@
                 </t>
                 <t t-if="product.to_weight">
                     <span class="price-tag">
-                        <t t-esc="widget.format_currency(product.price,'Product Price')+'/Kg'"/>
+                        <t t-esc="widget.format_currency(product.price,'Product Price')+'/'+widget.pos.units_by_id[product.uom_id[0]].name"/>
                     </span>
                 </t>
             </div>

From fc2aa7360691a7b6075337a4ee9cda762a98b433 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 20 Apr 2016 11:37:39 +0200
Subject: [PATCH 21/43] [FIX] web: fix db manager layout in Chrome 50

Complement of f992c8ee192c075b38bf14dd5dcfb10fba7dd2ef,
to be reverted in saas-6+ and in 8.0 when Chrome's
fix reaches the stable Chrome channel.

Fixes #11629

See https://bugs.chromium.org/p/chromium/issues/detail?id=603507
---
 addons/web/views/database_manager.html | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/addons/web/views/database_manager.html b/addons/web/views/database_manager.html
index 280fa81d901..924e9b9eb65 100644
--- a/addons/web/views/database_manager.html
+++ b/addons/web/views/database_manager.html
@@ -65,6 +65,14 @@
         <link href="/base/static/src/css/modules.css" rel="stylesheet"/>
         <script type="text/javascript">
             $(function() {
+                /* Do not forward port this block! */
+                if ($.browser.chrome) {
+                    var chrome_version = $.browser.version.split('.')[0];
+                    if (parseInt(chrome_version, 10) >= 50) {
+                        openerp.loadCSS('/web/static/src/css/chrome50.css');
+                    }
+                }
+
                 var s = new openerp.init({{ modules|safe }});
                 var wc = new s.web.WebClient(null, { action: 'database_manager' });
                 wc.setElement($(document.body));

From b8e73c248edda77d8de7b46600287cc393f8cb2f Mon Sep 17 00:00:00 2001
From: Goffin Simon <sig@odoo.com>
Date: Wed, 20 Apr 2016 10:48:12 +0200
Subject: [PATCH 22/43] [FIX] l10n_generic_coa:

The Cost of Good Sold should be of type "Direct Costs

opw:674632
---
 addons/l10n_generic_coa/data/configurable_account_chart.xml | 2 +-
 addons/l10n_th/account_data.xml                             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/l10n_generic_coa/data/configurable_account_chart.xml b/addons/l10n_generic_coa/data/configurable_account_chart.xml
index bb07fb10c09..6fc9fbd4e2f 100644
--- a/addons/l10n_generic_coa/data/configurable_account_chart.xml
+++ b/addons/l10n_generic_coa/data/configurable_account_chart.xml
@@ -157,7 +157,7 @@
         <record id="conf_cog" model="account.account.template">
             <field name="code">210</field>
             <field name="name">Cost of Goods Sold</field>
-            <field name="user_type_id" ref="account.data_account_type_expenses"/>
+            <field name="user_type_id" ref="account.data_account_type_direct_costs"/>
             <field name="chart_template_id" ref="configurable_chart_template"/>
             <field name="tag_ids" eval="[(6,0,[ref('account.account_tag_operating')])]"/>
         </record>
diff --git a/addons/l10n_th/account_data.xml b/addons/l10n_th/account_data.xml
index a4571518a36..527a7888a40 100644
--- a/addons/l10n_th/account_data.xml
+++ b/addons/l10n_th/account_data.xml
@@ -193,7 +193,7 @@
 <record id="a_exp_cogs" model="account.account.template">
     <field name="code">5100</field>
     <field name="name">Cost of goods sold</field>
-    <field name="user_type_id" ref="account.data_account_type_expenses"/>
+    <field name="user_type_id" ref="account.data_account_type_direct_costs"/>
     <field name="chart_template_id" ref="chart"/>
 </record>
 

From 6f5acf6001d1c99e9eb1f2eef349149ff40656a0 Mon Sep 17 00:00:00 2001
From: Goffin Simon <sig@odoo.com>
Date: Wed, 20 Apr 2016 10:49:10 +0200
Subject: [PATCH 23/43] =?UTF-8?q?[FIX]=C2=A0account,=20l10n=5Fgeneric=5Fco?=
 =?UTF-8?q?a,=20l10n=5Fth:=20U.S.=20CoA=20Misconfigured?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Translation.

opw:674632
---
 addons/account/data/data_account_type.xml             |  2 +-
 addons/account/i18n/account.pot                       | 11 +++++++++++
 addons/account/views/account_view.xml                 |  3 +--
 .../data/configurable_account_chart.xml               |  3 ++-
 addons/l10n_th/account_data.xml                       |  2 +-
 5 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/addons/account/data/data_account_type.xml b/addons/account/data/data_account_type.xml
index 495b648e1d9..d55114a1033 100644
--- a/addons/account/data/data_account_type.xml
+++ b/addons/account/data/data_account_type.xml
@@ -72,7 +72,7 @@
           <field name="type">other</field>
         </record>
         <record model="account.account.type" id="data_account_type_direct_costs">
-          <field name="name">Direct Costs</field>
+          <field name="name">Cost of Revenue</field>
           <field name="type">other</field>
         </record>
     </data>
diff --git a/addons/account/i18n/account.pot b/addons/account/i18n/account.pot
index 75326f9b110..2031a086405 100644
--- a/addons/account/i18n/account.pot
+++ b/addons/account/i18n/account.pot
@@ -2571,6 +2571,12 @@ msgstr ""
 msgid "Control-Access"
 msgstr ""
 
+#. module: account
+#: model:account.account.type,name:account.data_account_type_direct_costs
+#: model:ir.ui.view,arch_db:account.view_account_form
+msgid "Cost of Revenue"
+msgstr ""
+
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_move_line_counterpart
 msgid "Counterpart"
@@ -5016,6 +5022,11 @@ msgstr ""
 msgid "Less Cost of Sales"
 msgstr ""
 
+#. module: account
+#: model:ir.ui.view,arch_db:account.view_account_form
+msgid "Less Cost of Revenue"
+msgstr ""
+
 #. module: account
 #: model:ir.ui.view,arch_db:account.view_account_form
 msgid "Less Current Liabilities"
diff --git a/addons/account/views/account_view.xml b/addons/account/views/account_view.xml
index 05df1ca0be7..76ac76adf1b 100644
--- a/addons/account/views/account_view.xml
+++ b/addons/account/views/account_view.xml
@@ -36,8 +36,7 @@
                                            <div class="oe_account_help">
                                                 <p class="oe_account_font_help text-center">Profit &amp; Loss</p>
                                                 <p class="oe_account_font_help oe_account_font_title">Income</p>
-                                                <p class="oe_account_font_help oe_account_font_title">Less Cost of Sales</p>
-                                                <p class="oe_account_font_help oe_account_font_content">Direct Costs</p>
+                                                <p class="oe_account_font_help oe_account_font_title">Less Cost of Revenue</p>
                                                 <p class="oe_account_font_help" style="color: grey;border-top: 2px solid;border-bottom: 2px solid;">GROSS PROFIT</p>
                                                 <p class="oe_account_font_help oe_account_font_title">Plus Other Income</p>
                                                 <p class="oe_account_font_help oe_account_font_title">Less Expenses</p>
diff --git a/addons/l10n_generic_coa/data/configurable_account_chart.xml b/addons/l10n_generic_coa/data/configurable_account_chart.xml
index 6fc9fbd4e2f..f14fc818049 100644
--- a/addons/l10n_generic_coa/data/configurable_account_chart.xml
+++ b/addons/l10n_generic_coa/data/configurable_account_chart.xml
@@ -156,7 +156,8 @@
 
         <record id="conf_cog" model="account.account.template">
             <field name="code">210</field>
-            <field name="name">Cost of Goods Sold</field>
+            <field name="name">Cost of Revenue</field>
+            <!-- FORWARDPORT UP TO SAAS-10 -->
             <field name="user_type_id" ref="account.data_account_type_direct_costs"/>
             <field name="chart_template_id" ref="configurable_chart_template"/>
             <field name="tag_ids" eval="[(6,0,[ref('account.account_tag_operating')])]"/>
diff --git a/addons/l10n_th/account_data.xml b/addons/l10n_th/account_data.xml
index 527a7888a40..6462d346d0e 100644
--- a/addons/l10n_th/account_data.xml
+++ b/addons/l10n_th/account_data.xml
@@ -192,7 +192,7 @@
 
 <record id="a_exp_cogs" model="account.account.template">
     <field name="code">5100</field>
-    <field name="name">Cost of goods sold</field>
+    <field name="name">Cost of Revenue</field>
     <field name="user_type_id" ref="account.data_account_type_direct_costs"/>
     <field name="chart_template_id" ref="chart"/>
 </record>

From 85fd9721494311fc07c5856fe368d81345ce65cf Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Tue, 19 Apr 2016 18:20:57 +0200
Subject: [PATCH 24/43] [FIX] stock_landed_costs: use correct UoM

Use the normalized quantity, otherwise the amount per unit is wrongly
calculated.
---
 addons/stock_landed_costs/stock_landed_costs.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock_landed_costs/stock_landed_costs.py b/addons/stock_landed_costs/stock_landed_costs.py
index 38aee976d15..85aff2b21ac 100644
--- a/addons/stock_landed_costs/stock_landed_costs.py
+++ b/addons/stock_landed_costs/stock_landed_costs.py
@@ -70,7 +70,7 @@ class stock_landed_cost(osv.osv):
                 volume = move.product_id and move.product_id.volume * move.product_qty
                 for quant in move.quant_ids:
                     total_cost += quant.cost * quant.qty
-                vals = dict(product_id=move.product_id.id, move_id=move.id, quantity=move.product_uom_qty, former_cost=total_cost, weight=weight, volume=volume)
+                vals = dict(product_id=move.product_id.id, move_id=move.id, quantity=move.product_qty, former_cost=total_cost, weight=weight, volume=volume)
                 lines.append(vals)
         if not lines:
             raise osv.except_osv(_('Error!'), _('The selected picking does not contain any move that would be impacted by landed costs. Landed costs are only possible for products configured in real time valuation with real price costing method. Please make sure it is the case, or you selected the correct picking'))

From bd025cda6a114de1293b583ef0a9fac88ff145b9 Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Wed, 20 Apr 2016 10:54:08 +0200
Subject: [PATCH 25/43] [FIX] stock_landed_costs: former_cost_per_unit
 precision

The precision of `former_cost_per_unit` should not be set. Indeed, a
stock move can contain several quants with different unit prices.
Therefore, we should not round the field when stored, otherwise the
difference per unit will not be calculated correctly.

This is a workaround since we cannot change the DB structure in stable.

opw-675222
---
 addons/stock_landed_costs/stock_landed_costs.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/stock_landed_costs/stock_landed_costs.py b/addons/stock_landed_costs/stock_landed_costs.py
index 85aff2b21ac..0401cbcb83f 100644
--- a/addons/stock_landed_costs/stock_landed_costs.py
+++ b/addons/stock_landed_costs/stock_landed_costs.py
@@ -230,7 +230,8 @@ class stock_landed_cost(osv.osv):
                 if not line.move_id:
                     continue
                 per_unit = line.final_cost / line.quantity
-                diff = per_unit - line.former_cost_per_unit
+                # FORWARDPORT UP TO SAAS-10
+                diff = per_unit - (line.former_cost / line.quantity if line.quantity else 1.0)
                 quants = [quant for quant in line.move_id.quant_ids]
                 quant_dict = {}
                 for quant in quants:

From 262d98bb6988a4b52ae9eabbe553244ead304d9a Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Tue, 19 Apr 2016 18:22:27 +0200
Subject: [PATCH 26/43] [FIX] stock_account: account/valuation inconsistencies
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When the product price is divided per product unit, inconsistencies
may arise between the real stock valuation and the stock valuation
account. This is likely to happen when a product is bought in a UoM
different from the standard UoM of the product.

A numerical example is the following: a box of 13 is bought for 15.00.
An amount of 15.00 is recorded when the products enter the stock. If the
product leave the stock one at a time, 13 entries of 1.15 are recorded
(15.00/13 = 1.153846... ≈ 1.15), which is then equal to
13 * 1.15 = 14.95. In this case, All the products have left the stock
(stock valuation is zero), but 5 cents remain on the account.

This is of course even worse the higher the ratio is. For example, a
box of 4.00 split into 1000 units sold piece by piece will never be
recorded when a product leaves the stock.

The fix is to record the rounding difference on a specific quant. In the
previous example, instead of adding 1.153846... on the unit cost of the
13 units, we do the following:
- 12 units to which we add 1.15 on unit cost
- 1 unit to which we add 1.20 on unit cost

opw-675222
---
 addons/stock_account/stock_account.py | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/addons/stock_account/stock_account.py b/addons/stock_account/stock_account.py
index 41aae4a84fb..bee410ae3ca 100644
--- a/addons/stock_account/stock_account.py
+++ b/addons/stock_account/stock_account.py
@@ -20,6 +20,7 @@
 ##############################################################################
 
 from openerp.osv import fields, osv
+from openerp.tools import float_compare, float_round
 from openerp.tools.translate import _
 from openerp import SUPERUSER_ID, api
 import logging
@@ -152,9 +153,33 @@ class stock_quant(osv.osv):
                 self._create_account_move_line(cr, uid, quants, move, acc_valuation, acc_dest, journal_id, context=ctx)
 
     def _quant_create(self, cr, uid, qty, move, lot_id=False, owner_id=False, src_package_id=False, dest_package_id=False, force_location_from=False, force_location_to=False, context=None):
+        quant_obj = self.pool.get('stock.quant')
         quant = super(stock_quant, self)._quant_create(cr, uid, qty, move, lot_id=lot_id, owner_id=owner_id, src_package_id=src_package_id, dest_package_id=dest_package_id, force_location_from=force_location_from, force_location_to=force_location_to, context=context)
         if move.product_id.valuation == 'real_time':
             self._account_entry_move(cr, uid, [quant], move, context)
+
+            # If the precision required for the variable quant cost is larger than the accounting
+            # precision, inconsistencies between the stock valuation and the accounting entries
+            # may arise.
+            # For example, a box of 13 units is bought 15.00. If the products leave the
+            # stock one unit at a time, the amount related to the cost will correspond to
+            # round(15/13, 2)*13 = 14.95. To avoid this case, we split the quant in 12 + 1, then
+            # record the difference on the new quant.
+            # We need to make sure to able to extract at least one unit of the product. There is
+            # an arbitrary minimum quantity set to 2.0 from which we consider we can extract a
+            # unit and adapt the cost.
+            curr_rounding = move.company_id.currency_id.rounding
+            cost_rounded = float_round(quant.cost, precision_rounding=curr_rounding)
+            cost_correct = cost_rounded
+            if float_compare(quant.product_id.uom_id.rounding, 1.0, precision_digits=1) == 0\
+                    and float_compare(quant.qty * quant.cost, quant.qty * cost_rounded, precision_rounding=curr_rounding) != 0\
+                    and float_compare(quant.qty, 2.0, precision_rounding=quant.product_id.uom_id.rounding) >= 0:
+                qty = quant.qty
+                cost = quant.cost
+                quant_correct = quant_obj._quant_split(cr, uid, quant, quant.qty - 1.0, context=context)
+                cost_correct += (qty * cost) - (qty * cost_rounded)
+                quant_obj.write(cr, SUPERUSER_ID, [quant.id], {'cost': cost_rounded}, context=context)
+                quant_obj.write(cr, SUPERUSER_ID, [quant_correct.id], {'cost': cost_correct}, context=context)
         return quant
 
     def move_quants_write(self, cr, uid, quants, move, location_dest_id, dest_package_id, context=None):

From eb26694e0f30445419e58e88eabae3db1aa18865 Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Wed, 20 Apr 2016 10:54:18 +0200
Subject: [PATCH 27/43] [FIX] stock_landed_costs: account/valuation
 inconsistencies
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When stock landed costs are divided per product unit, inconsistencies
may arise between the real stock valuation and the stock valuation
account. This is likely to happen when several products are bought, but
these products leave the stock one at a time.

A numerical example is the following: a landed cost of 15.00 is applied
to a purchase of 13 units. An amount of 15.00 is recorded when the
products enter the stock. If the product leave the stock one at a time,
13 entries of 1.15 are recorded (15.00/13 = 1.153846... ≈ 1.15), which
is then equal to 13 * 1.15 = 14.95. In this case, All the products have
left the stock (stock valuation is zero), but 5 cents remain on the
account.

This is of course even worse the higher the ratio is. For example, a
landed cost of 4.00 split into 1000 units sold piece by piece will never
be recorded when a product leaves the stock.

The fix is to record the rounding difference on a specific quant. In the
previous example, instead of adding 1.153846... on the unit cost of the
13 units, we do the following:
- 12 units to which we add 1.15 on unit cost
- 1 unit to which we add 1.20 on unit cost

opw-675222
---
 addons/stock_landed_costs/__openerp__.py      |   3 +-
 .../stock_landed_costs/stock_landed_costs.py  |  38 +++-
 .../test/stock_landed_costs_rounding.yml      | 175 ++++++++++++++++++
 3 files changed, 210 insertions(+), 6 deletions(-)
 create mode 100644 addons/stock_landed_costs/test/stock_landed_costs_rounding.yml

diff --git a/addons/stock_landed_costs/__openerp__.py b/addons/stock_landed_costs/__openerp__.py
index 8429d2ed097..9d98b3cf917 100644
--- a/addons/stock_landed_costs/__openerp__.py
+++ b/addons/stock_landed_costs/__openerp__.py
@@ -43,7 +43,8 @@ This module allows you to easily add extra costs on pickings and decide the spli
         'stock_landed_costs_data.xml',
     ],
     'test': [
-        'test/stock_landed_costs.yml'
+        'test/stock_landed_costs.yml',
+        'test/stock_landed_costs_rounding.yml',
     ],
     'installable': True,
     'auto_install': False,
diff --git a/addons/stock_landed_costs/stock_landed_costs.py b/addons/stock_landed_costs/stock_landed_costs.py
index 0401cbcb83f..f6f5a621218 100644
--- a/addons/stock_landed_costs/stock_landed_costs.py
+++ b/addons/stock_landed_costs/stock_landed_costs.py
@@ -232,13 +232,41 @@ class stock_landed_cost(osv.osv):
                 per_unit = line.final_cost / line.quantity
                 # FORWARDPORT UP TO SAAS-10
                 diff = per_unit - (line.former_cost / line.quantity if line.quantity else 1.0)
-                quants = [quant for quant in line.move_id.quant_ids]
+
+                # If the precision required for the variable diff is larger than the accounting
+                # precision, inconsistencies between the stock valuation and the accounting entries
+                # may arise.
+                # For example, a landed cost of 15 divided in 13 units. If the products leave the
+                # stock one unit at a time, the amount related to the landed cost will correspond to
+                # round(15/13, 2)*13 = 14.95. To avoid this case, we split the quant in 12 + 1, then
+                # record the difference on the new quant.
+                # We need to make sure to able to extract at least one unit of the product. There is
+                # an arbitrary minimum quantity set to 2.0 from which we consider we can extract a
+                # unit and adapt the cost.
+                curr_rounding = line.move_id.company_id.currency_id.rounding
+                diff_rounded = float_round(diff, precision_rounding=curr_rounding)
+                diff_correct = diff_rounded
+                quants = line.move_id.quant_ids.sorted(key=lambda r: r.qty, reverse=True)
+                quant_correct = False
+                if quants\
+                        and float_compare(quants[0].product_id.uom_id.rounding, 1.0, precision_digits=1) == 0\
+                        and float_compare(line.quantity * diff, line.quantity * diff_rounded, precision_rounding=curr_rounding) != 0\
+                        and float_compare(quants[0].qty, 2.0, precision_rounding=quants[0].product_id.uom_id.rounding) >= 0:
+                    # Search for existing quant of quantity = 1.0 to avoid creating a new one
+                    quant_correct = quants.filtered(lambda r: float_compare(r.qty, 1.0, precision_rounding=quants[0].product_id.uom_id.rounding) == 0)
+                    if not quant_correct:
+                        quant_correct = quant_obj._quant_split(cr, uid, quants[0], quants[0].qty - 1.0, context=context)
+                    else:
+                        quant_correct = quant_correct[0]
+                        quants = quants - quant_correct
+                    diff_correct += (line.quantity * diff) - (line.quantity * diff_rounded)
+                    diff = diff_rounded
+
                 quant_dict = {}
                 for quant in quants:
-                    if quant.id not in quant_dict:
-                        quant_dict[quant.id] = quant.cost + diff
-                    else:
-                        quant_dict[quant.id] += diff
+                    quant_dict[quant.id] = quant.cost + diff
+                if quant_correct:
+                    quant_dict[quant_correct.id] = quant_correct.cost + diff_correct
                 for key, value in quant_dict.items():
                     quant_obj.write(cr, SUPERUSER_ID, key, {'cost': value}, context=context)
                 qty_out = 0
diff --git a/addons/stock_landed_costs/test/stock_landed_costs_rounding.yml b/addons/stock_landed_costs/test/stock_landed_costs_rounding.yml
new file mode 100644
index 00000000000..d0dd1ca9eb3
--- /dev/null
+++ b/addons/stock_landed_costs/test/stock_landed_costs_rounding.yml
@@ -0,0 +1,175 @@
+-
+  In order to test the rounding in landed costs feature of stock, I create 2 landed cost
+-
+  Define undivisible units
+-
+  !record {model: product.uom, id: product_uom_unit_round_1}:
+    category_id: product.product_uom_categ_unit
+    name: Undivisible Unit(s)
+    factor: 1.0
+    rounding: 1.0
+-
+  I create 2 products with different cost prices and configure them for real_time valuation and real price costing method
+-
+  !record {model: product.product, id: product_landed_cost_3}:
+    name: "LC product 3"
+    cost_method: real
+    uom_id: product_uom_unit_round_1
+    valuation: real_time
+    property_stock_account_input: account.o_expense
+    property_stock_account_output: account.o_income
+-
+  !record {model: product.product, id: product_landed_cost_4}:
+    name: "LC product 4"
+    cost_method: real
+    uom_id: product_uom_unit_round_1
+    valuation: real_time
+    property_stock_account_input: account.o_expense
+    property_stock_account_output: account.o_income
+-
+  I create 2 pickings moving those products
+-
+  !record {model: stock.picking, id: picking_landed_cost_3}:
+    name: 'LC_pick_3'
+    picking_type_id: stock.picking_type_in
+    move_lines:
+      - name: move 3
+        product_id: product_landed_cost_3
+        product_uom_qty: 13
+        product_uom: product_uom_unit_round_1
+        product_uos_qty: 13
+        product_uos: product_uom_unit_round_1
+        location_id: stock.stock_location_customers
+        location_dest_id: stock.stock_location_stock
+-
+  !record {model: stock.picking, id: picking_landed_cost_4}:
+    name: 'LC_pick_4'
+    picking_type_id: stock.picking_type_in
+    move_lines:
+      - name: move 4
+        product_id: product_landed_cost_4
+        product_uom_qty: 1
+        product_uom: product.product_uom_dozen
+        product_uos_qty: 1
+        product_uos: product.product_uom_dozen
+        location_id: stock.stock_location_customers
+        location_dest_id: stock.stock_location_stock
+        price_unit: !eval 17.00/12.00
+-
+  We perform all the tests for LC_pick_3
+-
+  I receive picking LC_pick_3, and check how many quants are created
+-
+  !python {model: stock.picking}: |
+    self.action_confirm(cr, uid, [ref("picking_landed_cost_3")], context=context)
+    self.action_assign(cr, uid, [ref("picking_landed_cost_3")], context=context)
+    self.action_done(cr, uid, [ref("picking_landed_cost_3")], context=context)
+
+    pick = self.browse(cr, uid, [ref("picking_landed_cost_3")], context=context)
+    quants = pick.move_lines.quant_ids
+    assert len(quants) == 1
+    assert quants.qty == 13
+    assert quants.cost == 0.0
+-
+  I create a landed cost for picking 3
+-
+  !record {model: stock.landed.cost, id: stock_landed_cost_2}:
+    picking_ids: [picking_landed_cost_3]
+    account_journal_id: account.expenses_journal
+    cost_lines:
+      - name: 'equal split'
+        split_method: 'equal'
+        price_unit: 15
+        product_id: product.product_product_1
+    valuation_adjustment_lines: []
+-
+  I compute the landed cost using Compute button
+-
+  !python {model: stock.landed.cost}: |
+    self.compute_landed_cost(cr, uid, [ref("stock_landed_cost_2")])
+-
+  I check the valuation adjustment lines
+-
+  !python {model: stock.landed.cost}: |
+    landed_cost = self.browse(cr, uid, ref("stock_landed_cost_2"))
+    for valuation in landed_cost.valuation_adjustment_lines:
+        assert valuation.additional_landed_cost == 15
+-
+  I confirm the landed cost
+-
+  !python {model: stock.landed.cost}: |
+    self.button_validate(cr, uid, [ref("stock_landed_cost_2")])
+-
+  I check that the landed cost is now "Closed" and that it has an accounting entry
+-
+  !assert {model: stock.landed.cost, id: stock_landed_cost_2}:
+    - state == 'done'
+    - account_move_id
+-
+  I check the quants quantity and cost
+-
+  !python {model: stock.landed.cost}: |
+    landed_cost = self.browse(cr, uid, ref("stock_landed_cost_2"))
+    for valuation in landed_cost.valuation_adjustment_lines:
+        quants = valuation.move_id.quant_ids
+        assert quants.mapped('qty') == [12.0, 1.0]
+        assert quants.mapped('cost') == [1.15, 1.2]
+-
+  We perform all the tests for LC_pick_4
+-
+  I receive picking LC_pick_4, and check how many quants are created
+-
+  !python {model: stock.picking}: |
+    self.action_confirm(cr, uid, [ref("picking_landed_cost_4")], context=context)
+    self.action_assign(cr, uid, [ref("picking_landed_cost_4")], context=context)
+    self.action_done(cr, uid, [ref("picking_landed_cost_4")], context=context)
+
+    pick = self.browse(cr, uid, [ref("picking_landed_cost_4")], context=context)
+    quants = pick.move_lines.quant_ids
+    assert len(quants) == 2
+    assert quants.mapped('qty') == [11.0, 1.0]
+    assert [round(c, 2) for c in quants.mapped('cost')] == [1.42, 1.38]
+-
+  I create a landed cost for picking 4
+-
+  !record {model: stock.landed.cost, id: stock_landed_cost_3}:
+    picking_ids: [picking_landed_cost_4]
+    account_journal_id: account.expenses_journal
+    cost_lines:
+      - name: 'equal split'
+        split_method: 'equal'
+        price_unit: 11
+        product_id: product.product_product_1
+    valuation_adjustment_lines: []
+-
+  I compute the landed cost using Compute button
+-
+  !python {model: stock.landed.cost}: |
+    self.compute_landed_cost(cr, uid, [ref("stock_landed_cost_3")])
+-
+  I check the valuation adjustment lines
+-
+  !python {model: stock.landed.cost}: |
+    landed_cost = self.browse(cr, uid, ref("stock_landed_cost_3"))
+    for valuation in landed_cost.valuation_adjustment_lines:
+        assert valuation.additional_landed_cost == 11
+-
+  I confirm the landed cost
+-
+  !python {model: stock.landed.cost}: |
+    self.button_validate(cr, uid, [ref("stock_landed_cost_3")])
+-
+  I check that the landed cost is now "Closed" and that it has an accounting entry
+-
+  !assert {model: stock.landed.cost, id: stock_landed_cost_3}:
+    - state == 'done'
+    - account_move_id
+-
+  I check the quants quantity and cost
+-
+  !python {model: stock.landed.cost}: |
+    landed_cost = self.browse(cr, uid, ref("stock_landed_cost_3"))
+    for valuation in landed_cost.valuation_adjustment_lines:
+        quants = valuation.move_id.quant_ids
+        assert quants.mapped('qty') == [11.0, 1.0]
+        assert [round(c, 2) for c in quants.mapped('cost')] == [2.34, 2.26]

From b112631befff320a0c8ea93ecbca02d551c88147 Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Wed, 20 Apr 2016 14:05:32 +0200
Subject: [PATCH 28/43] [FIX] stock_landed_costs: precision

Oversight of commit bd025cda.
I'm an idiot, I should have checked that another solution was applied
from 9.0 with accounting refactoring. We apply it here as well.
---
 addons/stock_landed_costs/stock_landed_costs.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/addons/stock_landed_costs/stock_landed_costs.py b/addons/stock_landed_costs/stock_landed_costs.py
index f6f5a621218..4d8d32fd335 100644
--- a/addons/stock_landed_costs/stock_landed_costs.py
+++ b/addons/stock_landed_costs/stock_landed_costs.py
@@ -230,8 +230,7 @@ class stock_landed_cost(osv.osv):
                 if not line.move_id:
                     continue
                 per_unit = line.final_cost / line.quantity
-                # FORWARDPORT UP TO SAAS-10
-                diff = per_unit - (line.former_cost / line.quantity if line.quantity else 1.0)
+                diff = per_unit - line.former_cost_per_unit
 
                 # If the precision required for the variable diff is larger than the accounting
                 # precision, inconsistencies between the stock valuation and the accounting entries
@@ -411,9 +410,9 @@ class stock_valuation_adjustment_lines(osv.osv):
         'weight': fields.float('Weight', digits_compute=dp.get_precision('Product Unit of Measure')),
         'volume': fields.float('Volume', digits_compute=dp.get_precision('Product Unit of Measure')),
         'former_cost': fields.float('Former Cost', digits_compute=dp.get_precision('Product Price')),
-        'former_cost_per_unit': fields.function(_amount_final, multi='cost', string='Former Cost(Per Unit)', type='float', digits_compute=dp.get_precision('Account'), store=True),
+        'former_cost_per_unit': fields.function(_amount_final, multi='cost', string='Former Cost(Per Unit)', type='float', store=True, digits=0),
         'additional_landed_cost': fields.float('Additional Landed Cost', digits_compute=dp.get_precision('Product Price')),
-        'final_cost': fields.function(_amount_final, multi='cost', string='Final Cost', type='float', digits_compute=dp.get_precision('Account'), store=True),
+        'final_cost': fields.function(_amount_final, multi='cost', string='Final Cost', type='float', store=True, digits=0),
     }
 
     _defaults = {

From d57623023bce13aa97fc465415d8deacdd68e9ec Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Wed, 20 Apr 2016 16:18:14 +0200
Subject: [PATCH 29/43] [FIX] website_form: handle date & datetime

Adding date & datetime inputs in the website
form builder couldn't work, because
the posted values for these input
types were not treated at all,
and they were not in the format
the date/datetime were stored in database.

opw-672674
---
 addons/website_form/controllers/main.py | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/addons/website_form/controllers/main.py b/addons/website_form/controllers/main.py
index e5cb84823d0..e6ebeaef4b2 100644
--- a/addons/website_form/controllers/main.py
+++ b/addons/website_form/controllers/main.py
@@ -2,9 +2,12 @@
 import base64
 
 import json
+import pytz
+from datetime import datetime
 from psycopg2 import IntegrityError
 from openerp import http, SUPERUSER_ID
 from openerp.http import request
+from openerp.tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT
 from openerp.tools.translate import _
 from openerp.exceptions import ValidationError
 from openerp.addons.base.ir.ir_qweb import nl2br
@@ -60,6 +63,17 @@ class WebsiteForm(http.Controller):
     def boolean(self, field_label, field_input):
         return bool(field_input)
 
+    def date(self, field_label, field_input):
+        lang = request.env['ir.qweb.field'].user_lang()
+        return datetime.strptime(field_input, lang.date_format).strftime(DEFAULT_SERVER_DATE_FORMAT)
+
+    def datetime(self, field_label, field_input):
+        lang = request.env['ir.qweb.field'].user_lang()
+        strftime_format = (u"%s %s" % (lang.date_format, lang.time_format))
+        user_tz = pytz.timezone(request.context.get('tz') or request.env.user.tz or 'UTC')
+        dt = user_tz.localize(datetime.strptime(field_input, strftime_format)).astimezone(pytz.utc)
+        return dt.strftime(DEFAULT_SERVER_DATETIME_FORMAT)
+
     def binary(self, field_label, field_input):
         return base64.b64encode(field_input.read())
 
@@ -73,7 +87,8 @@ class WebsiteForm(http.Controller):
         'char': identity,
         'text': identity,
         'html': identity,
-        'datetime': identity,
+        'date': date,
+        'datetime': datetime,
         'many2one': integer,
         'one2many': one2many,
         'many2many':many2many,

From b893342007ed8d3795ff50b75d840ef5195356b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9ry=20Debongnie?= <ged@odoo.com>
Date: Wed, 20 Apr 2016 15:18:20 +0200
Subject: [PATCH 30/43] [REV] web_kanban: reverts 9b54b04 and 6859c8da

These 2 commits in kanban view fixed 1 bug by introducing a few other
severe bugs. The tradeoff is not worth it, especially when it is
balanced again deleting some contacts in your database.
---
 .../static/src/js/kanban_relational.js        | 17 +--------
 .../web_kanban/static/src/js/kanban_view.js   | 35 ++++++++-----------
 2 files changed, 16 insertions(+), 36 deletions(-)

diff --git a/addons/web_kanban/static/src/js/kanban_relational.js b/addons/web_kanban/static/src/js/kanban_relational.js
index 16b076d7af1..d717cbf9660 100644
--- a/addons/web_kanban/static/src/js/kanban_relational.js
+++ b/addons/web_kanban/static/src/js/kanban_relational.js
@@ -15,22 +15,6 @@ var X2ManyKanbanView = KanbanView.extend({
         });
         this._super($node, options);
     },
-    load_records: function (offset, dataset) {
-        var options = {
-            'limit': this.limit,
-            'offset': offset,
-        };
-        dataset = dataset || this.dataset;
-        return dataset
-            .read_slice(this.fields_keys.concat(['__last_update']), options)
-            .then(function(records) {
-                return {
-                    records: records,
-                    is_empty: !records.length,
-                    grouped: false,
-                };
-            });
-    },    
 });
 
 var One2ManyKanbanView = X2ManyKanbanView.extend({
@@ -102,3 +86,4 @@ core.view_registry.add('one2many_kanban', One2ManyKanbanView);
 core.view_registry.add('many2many_kanban', Many2ManyKanbanView);
 
 });
+
diff --git a/addons/web_kanban/static/src/js/kanban_view.js b/addons/web_kanban/static/src/js/kanban_view.js
index e8c6d806fe4..e35976a1fa6 100644
--- a/addons/web_kanban/static/src/js/kanban_view.js
+++ b/addons/web_kanban/static/src/js/kanban_view.js
@@ -130,17 +130,13 @@ var KanbanView = View.extend({
         return this.search_orderer
             .add(options.grouped ? this.load_groups(options) : this.load_records())
             .then(function (data) {
-                var new_ids;
                 _.extend(self, options);
                 if (options.grouped) {
-                    new_ids = _.union.apply(null, _.map(data.groups, function (group) {
+                    var new_ids = _.union.apply(null, _.map(data.groups, function (group) {
                         return group.dataset.ids;
                     }));
-                } else {
-                    new_ids = _.pluck(data.records, 'id');
-                    self.dataset._length = data.count;
+                    self.dataset.alter_ids(new_ids);
                 }
-                self.dataset.alter_ids(new_ids);
                 self.data = data;
             })
             .then(this.proxy('render'))
@@ -157,20 +153,19 @@ var KanbanView = View.extend({
     },
 
     load_records: function (offset, dataset) {
-        dataset = dataset || this.dataset;        
-        var query = dataset._model.query(this.fields_keys.concat(['__last_update']))
-                .limit(this.limit || false)
-                .offset(offset || 0);
-        return query.all()
-            .then(function (records) {
-                return query.count().then(function(count) {
-                    return {
-                        records: records,
-                        is_empty: !records.length,
-                        grouped: false,
-                        count: count,
-                    };
-                })
+        var options = {
+            'limit': this.limit,
+            'offset': offset,
+        };
+        dataset = dataset || this.dataset;
+        return dataset
+            .read_slice(this.fields_keys.concat(['__last_update']), options)
+            .then(function(records) {
+                return {
+                    records: records,
+                    is_empty: !records.length,
+                    grouped: false,
+                };
             });
     },
 

From ab8a93c85268a4d7fc0bef10c0f39fb25d1530c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9ry=20Debongnie?= <ged@odoo.com>
Date: Wed, 20 Apr 2016 15:25:15 +0200
Subject: [PATCH 31/43] [FIX] web: fix dataset to avoid race conditions

The read_slice method in dataset is problematic, because it alters the
dataset ids.  So, if 2 consecutive read_slice are started, but the first
one ends after the second one, we don't have the correct ids in the
dataset.

This commit just make sure that previous read_slice do not alter the ids
of the next read_slice.
---
 addons/web/static/src/js/framework/data.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/framework/data.js b/addons/web/static/src/js/framework/data.js
index a1b8e1602e9..3e9396a4e96 100644
--- a/addons/web/static/src/js/framework/data.js
+++ b/addons/web/static/src/js/framework/data.js
@@ -320,6 +320,7 @@ var DataSet =  Class.extend(mixins.PropertiesMixin, {
         this.index = null;
         this._sort = [];
         this._model = new Model(model, context);
+        this.orderer = new utils.DropMisordered();
     },
     previous: function () {
         this.index -= 1;
@@ -408,10 +409,11 @@ var DataSet =  Class.extend(mixins.PropertiesMixin, {
     read_slice: function (fields, options) {
         var self = this;
         options = options || {};
-        return this._model.query(fields)
+        var query = this._model.query(fields)
                 .limit(options.limit || false)
                 .offset(options.offset || 0)
-                .all().done(function (records) {
+                .all();
+        return this.orderer.add(query).done(function (records) {
             self.ids = _(records).pluck('id');
         });
     },

From 6339bae8759526bef94fd024a6bbf645406a2c6d Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@odoo.com>
Date: Wed, 20 Apr 2016 18:54:49 +0200
Subject: [PATCH 32/43] [FIX] stock_landed_costs: correct rounding tests

Previous forward-port (17b6191a027b84d9e7d879053a4880e6fff62ba6) includes
new tests (added by eb26694e0f30445419e58e88eabae3db1aa18865) which are
now broken because quants with a cost of zero are forbidden.

Force a standard_price on created product to avoid this situation.
Adapt quants cost values.

Also change references of accounts and journals on records.
---
 .../test/stock_landed_costs_rounding.yml      | 30 +++++++++----------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/addons/stock_landed_costs/test/stock_landed_costs_rounding.yml b/addons/stock_landed_costs/test/stock_landed_costs_rounding.yml
index d0dd1ca9eb3..fd2ff25e297 100644
--- a/addons/stock_landed_costs/test/stock_landed_costs_rounding.yml
+++ b/addons/stock_landed_costs/test/stock_landed_costs_rounding.yml
@@ -13,19 +13,21 @@
 -
   !record {model: product.product, id: product_landed_cost_3}:
     name: "LC product 3"
+    standard_price: 10
     cost_method: real
     uom_id: product_uom_unit_round_1
     valuation: real_time
-    property_stock_account_input: account.o_expense
-    property_stock_account_output: account.o_income
+    property_stock_account_input: o_expense
+    property_stock_account_output: o_income
 -
   !record {model: product.product, id: product_landed_cost_4}:
     name: "LC product 4"
+    standard_price: 8
     cost_method: real
     uom_id: product_uom_unit_round_1
     valuation: real_time
-    property_stock_account_input: account.o_expense
-    property_stock_account_output: account.o_income
+    property_stock_account_input: o_expense
+    property_stock_account_output: o_income
 -
   I create 2 pickings moving those products
 -
@@ -37,8 +39,6 @@
         product_id: product_landed_cost_3
         product_uom_qty: 13
         product_uom: product_uom_unit_round_1
-        product_uos_qty: 13
-        product_uos: product_uom_unit_round_1
         location_id: stock.stock_location_customers
         location_dest_id: stock.stock_location_stock
 -
@@ -50,8 +50,6 @@
         product_id: product_landed_cost_4
         product_uom_qty: 1
         product_uom: product.product_uom_dozen
-        product_uos_qty: 1
-        product_uos: product.product_uom_dozen
         location_id: stock.stock_location_customers
         location_dest_id: stock.stock_location_stock
         price_unit: !eval 17.00/12.00
@@ -69,13 +67,13 @@
     quants = pick.move_lines.quant_ids
     assert len(quants) == 1
     assert quants.qty == 13
-    assert quants.cost == 0.0
+    assert quants.cost == 10.0
 -
   I create a landed cost for picking 3
 -
   !record {model: stock.landed.cost, id: stock_landed_cost_2}:
     picking_ids: [picking_landed_cost_3]
-    account_journal_id: account.expenses_journal
+    account_journal_id: expenses_journal
     cost_lines:
       - name: 'equal split'
         split_method: 'equal'
@@ -113,7 +111,7 @@
     for valuation in landed_cost.valuation_adjustment_lines:
         quants = valuation.move_id.quant_ids
         assert quants.mapped('qty') == [12.0, 1.0]
-        assert quants.mapped('cost') == [1.15, 1.2]
+        assert quants.mapped('cost') == [11.15, 11.2]
 -
   We perform all the tests for LC_pick_4
 -
@@ -126,15 +124,15 @@
 
     pick = self.browse(cr, uid, [ref("picking_landed_cost_4")], context=context)
     quants = pick.move_lines.quant_ids
-    assert len(quants) == 2
-    assert quants.mapped('qty') == [11.0, 1.0]
-    assert [round(c, 2) for c in quants.mapped('cost')] == [1.42, 1.38]
+    assert len(quants) == 1
+    assert quants.mapped('qty') == [12.0]
+    assert [round(c, 2) for c in quants.mapped('cost')] == [8.0]
 -
   I create a landed cost for picking 4
 -
   !record {model: stock.landed.cost, id: stock_landed_cost_3}:
     picking_ids: [picking_landed_cost_4]
-    account_journal_id: account.expenses_journal
+    account_journal_id: expenses_journal
     cost_lines:
       - name: 'equal split'
         split_method: 'equal'
@@ -172,4 +170,4 @@
     for valuation in landed_cost.valuation_adjustment_lines:
         quants = valuation.move_id.quant_ids
         assert quants.mapped('qty') == [11.0, 1.0]
-        assert [round(c, 2) for c in quants.mapped('cost')] == [2.34, 2.26]
+        assert [round(c, 2) for c in quants.mapped('cost')] == [8.92, 8.88]

From 6a473e4565130d274d7064d03c4b70f901dcc1b0 Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Wed, 20 Apr 2016 19:59:30 +0200
Subject: [PATCH 33/43] [FIX] stock_landed_costs: fix the fix of the tests

Commit 6339bae87 fixes the tests, but now the tests are not testing
what should be tested ;-)
---
 .../test/stock_landed_costs_rounding.yml      | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/addons/stock_landed_costs/test/stock_landed_costs_rounding.yml b/addons/stock_landed_costs/test/stock_landed_costs_rounding.yml
index fd2ff25e297..2f237e6751a 100644
--- a/addons/stock_landed_costs/test/stock_landed_costs_rounding.yml
+++ b/addons/stock_landed_costs/test/stock_landed_costs_rounding.yml
@@ -13,7 +13,6 @@
 -
   !record {model: product.product, id: product_landed_cost_3}:
     name: "LC product 3"
-    standard_price: 10
     cost_method: real
     uom_id: product_uom_unit_round_1
     valuation: real_time
@@ -22,7 +21,6 @@
 -
   !record {model: product.product, id: product_landed_cost_4}:
     name: "LC product 4"
-    standard_price: 8
     cost_method: real
     uom_id: product_uom_unit_round_1
     valuation: real_time
@@ -59,15 +57,17 @@
   I receive picking LC_pick_3, and check how many quants are created
 -
   !python {model: stock.picking}: |
+    pick = self.browse(cr, uid, [ref("picking_landed_cost_3")], context=context)
+    pick.move_lines.price_unit = 1.0
+
     self.action_confirm(cr, uid, [ref("picking_landed_cost_3")], context=context)
     self.action_assign(cr, uid, [ref("picking_landed_cost_3")], context=context)
     self.action_done(cr, uid, [ref("picking_landed_cost_3")], context=context)
 
-    pick = self.browse(cr, uid, [ref("picking_landed_cost_3")], context=context)
     quants = pick.move_lines.quant_ids
     assert len(quants) == 1
     assert quants.qty == 13
-    assert quants.cost == 10.0
+    assert quants.cost == 1.0
 -
   I create a landed cost for picking 3
 -
@@ -111,22 +111,24 @@
     for valuation in landed_cost.valuation_adjustment_lines:
         quants = valuation.move_id.quant_ids
         assert quants.mapped('qty') == [12.0, 1.0]
-        assert quants.mapped('cost') == [11.15, 11.2]
+        assert quants.mapped('cost') == [2.15, 2.2]
 -
   We perform all the tests for LC_pick_4
 -
   I receive picking LC_pick_4, and check how many quants are created
 -
   !python {model: stock.picking}: |
+    pick = self.browse(cr, uid, [ref("picking_landed_cost_4")], context=context)
+    pick.move_lines.price_unit = 17.0/12.0
+
     self.action_confirm(cr, uid, [ref("picking_landed_cost_4")], context=context)
     self.action_assign(cr, uid, [ref("picking_landed_cost_4")], context=context)
     self.action_done(cr, uid, [ref("picking_landed_cost_4")], context=context)
 
-    pick = self.browse(cr, uid, [ref("picking_landed_cost_4")], context=context)
     quants = pick.move_lines.quant_ids
-    assert len(quants) == 1
-    assert quants.mapped('qty') == [12.0]
-    assert [round(c, 2) for c in quants.mapped('cost')] == [8.0]
+    assert len(quants) == 2
+    assert quants.mapped('qty') == [11.0, 1.0]
+    assert [round(c, 2) for c in quants.mapped('cost')] == [1.42, 1.38]
 -
   I create a landed cost for picking 4
 -
@@ -170,4 +172,4 @@
     for valuation in landed_cost.valuation_adjustment_lines:
         quants = valuation.move_id.quant_ids
         assert quants.mapped('qty') == [11.0, 1.0]
-        assert [round(c, 2) for c in quants.mapped('cost')] == [8.92, 8.88]
+        assert [round(c, 2) for c in quants.mapped('cost')] == [2.34, 2.26]

From c486d9973dcd3ea327ca286fad75ca01f670827b Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Wed, 20 Apr 2016 15:08:41 +0200
Subject: [PATCH 34/43] [FIX] account: partner in compute_all

The method `compute_all` in new api expects a browse record, not an id.

opw-675428
---
 addons/account/models/account_move.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/account/models/account_move.py b/addons/account/models/account_move.py
index 4490302194c..28722d53e0b 100644
--- a/addons/account/models/account_move.py
+++ b/addons/account/models/account_move.py
@@ -986,8 +986,9 @@ class AccountMoveLine(models.Model):
             # Since create() receives ids instead of recordset, let's just use the old-api bridge
             taxes = self.env['account.tax'].browse(tax_ids)
             currency = self.env['res.currency'].browse(vals.get('currency_id'))
+            partner = self.env['res.partner'].browse(vals.get('partner_id'))
             res = taxes.compute_all(amount,
-                currency, 1, vals.get('product_id'), vals.get('partner_id'))
+                currency, 1, vals.get('product_id'), partner)
             # Adjust line amount if any tax is price_include
             if abs(res['total_excluded']) < abs(amount):
                 if vals['debit'] != 0.0: vals['debit'] = res['total_excluded']

From 8388b12b1e53e641887347630cf0c009dfd1e93b Mon Sep 17 00:00:00 2001
From: Nicolas Lempereur <nle@odoo.com>
Date: Thu, 21 Apr 2016 09:16:23 +0200
Subject: [PATCH 35/43] [FIX] l10n_fr_fec: fix unwanted NULL values

An account.move.line could be not linked to a partner.

opw-675586
---
 addons/l10n_fr_fec/wizard/fec.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/addons/l10n_fr_fec/wizard/fec.py b/addons/l10n_fr_fec/wizard/fec.py
index 5aa6b177415..6ab15ccbd12 100644
--- a/addons/l10n_fr_fec/wizard/fec.py
+++ b/addons/l10n_fr_fec/wizard/fec.py
@@ -125,11 +125,11 @@ class AccountFrFec(models.TransientModel):
             aa.code AS CompteNum,
             replace(aa.name, '|', '/') AS CompteLib,
             CASE WHEN rp.ref IS null OR rp.ref = ''
-            THEN 'ID ' || rp.id
+            THEN COALESCE('ID ' || rp.id, '')
             ELSE rp.ref
             END
             AS CompAuxNum,
-            replace(rp.name, '|', '/') AS CompAuxLib,
+            COALESCE(replace(rp.name, '|', '/'), '') AS CompAuxLib,
             CASE WHEN am.ref IS null OR am.ref = ''
             THEN '-'
             ELSE replace(am.ref, '|', '/')
@@ -142,7 +142,10 @@ class AccountFrFec(models.TransientModel):
             CASE WHEN rec.name IS NULL THEN '' ELSE rec.name END AS EcritureLet,
             CASE WHEN aml.full_reconcile_id IS NULL THEN '' ELSE TO_CHAR(rec.create_date, 'YYYYMMDD') END AS DateLet,
             TO_CHAR(am.date, 'YYYYMMDD') AS ValidDate,
-            replace(CASE WHEN aml.amount_currency = 0 THEN '' ELSE to_char(aml.amount_currency, '999999999999999D99') END, '.', ',') AS Montantdevise,
+            CASE
+                WHEN aml.amount_currency IS NULL OR aml.amount_currency = 0 THEN ''
+                ELSE replace(to_char(aml.amount_currency, '999999999999999D99'), '.', ',')
+            END AS Montantdevise,
             CASE WHEN aml.currency_id IS NULL THEN '' ELSE rc.name END AS Idevise
         FROM
             account_move_line aml

From 0287c1e1b34a14300dcf7ef9ffddf160b61631ee Mon Sep 17 00:00:00 2001
From: Goffin Simon <sig@odoo.com>
Date: Thu, 21 Apr 2016 09:50:10 +0200
Subject: [PATCH 36/43] [FIX] account_asset: deferred_revenue_category_id and
 asset_category_id

When creating an customer invoice with a product linked to a deferred revenue
category, the account used in the invoice line must be the account_asset_id.

When creating an vendor bill with a product linked to an asset
category, the account used in the invoice line must be the account_depreciation_id.

opw:22157
---
 addons/account_asset/account_asset_invoice.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/addons/account_asset/account_asset_invoice.py b/addons/account_asset/account_asset_invoice.py
index 45c95af7fca..88027ca8125 100644
--- a/addons/account_asset/account_asset_invoice.py
+++ b/addons/account_asset/account_asset_invoice.py
@@ -90,3 +90,13 @@ class ProductTemplate(models.Model):
     _inherit = 'product.template'
     asset_category_id = fields.Many2one('account.asset.category', string='Asset Type', ondelete="restrict")
     deferred_revenue_category_id = fields.Many2one('account.asset.category', string='Deferred Revenue Type', ondelete="restrict")
+
+    @api.onchange('deferred_revenue_category_id')
+    def onchange_deferred_revenue(self):
+        if self.deferred_revenue_category_id:
+            self.property_account_income_id = self.deferred_revenue_category_id.account_asset_id
+
+    @api.onchange('asset_category_id')
+    def onchange_asset(self):
+        if self.asset_category_id:
+            self.property_account_expense_id = self.asset_category_id.account_asset_id

From a3a8bfb06003d25de62eefd4a2dd5a9e887fcdaa Mon Sep 17 00:00:00 2001
From: pvy <pvy@odoo.com>
Date: Thu, 21 Apr 2016 10:39:11 +0200
Subject: [PATCH 37/43] [ADD] l10n_fr: added tags to differentiate Salaires
 from Charges Sociales

---
 addons/l10n_fr/plan_comptable_general.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/addons/l10n_fr/plan_comptable_general.xml b/addons/l10n_fr/plan_comptable_general.xml
index d4f29e5d626..d16acb998d9 100644
--- a/addons/l10n_fr/plan_comptable_general.xml
+++ b/addons/l10n_fr/plan_comptable_general.xml
@@ -1,6 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <odoo>
 
+    <record id="account_fr_tag_salaires" model="account.account.tag">
+        <field name="name">Salaires</field>
+        <field name="applicability">accounts</field>
+    </record>
+
+      <record id="account_fr_tag_charges_sociales" model="account.account.tag">
+        <field name="name">Charges Sociales</field>
+        <field name="applicability">accounts</field>
+    </record>
+
     <menuitem id="account_reports_fr_statements_menu" name="French Statements" parent="account.menu_finance_reports" sequence="3" groups="account.group_account_user"/>
 
     <!--

From 9dd373d1323d35c13b3c259f5aa037623ba9ae33 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Thu, 21 Apr 2016 11:01:05 +0200
Subject: [PATCH 38/43] [FIX] calendar: Partial revert of
 b7e393a71a964afab7c30d11f5312d617947f275

The above revision allow to edit an event with a start date
greater than the stop date.

This issue was solved by the revision
6c78541978336ae8ad4dc43f7051c19bf1ad4f7d
that the above revision reverts.

The reason why the constraint on
`event.start` and `event.stop` was replaced
by a constraint on
`event.start_datetime` and `event.stop_datetime`
and
`event.start_date` and `event.stop_date` are explained
in 6c78541978336ae8ad4dc43f7051c19bf1ad4f7d:
Basically, `start` and `stop` are computed fields,
that are not recomputed in time, before the constraint is checked.

Besides, the revision b7e393a71a964afab7c30d11f5312d617947f275
re-set the constraint on `start` and `stop`, but forget
to replace the fields in the constraint definition:
```
(_check_closing_date, 'Error ! End date cannot be set before start date.',
['start_datetime', 'stop_datetime', 'start_date', 'stop_date'])
```

opw-673297
---
 addons/calendar/calendar.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/calendar/calendar.py b/addons/calendar/calendar.py
index 00c575f7ef4..1079e16bd87 100644
--- a/addons/calendar/calendar.py
+++ b/addons/calendar/calendar.py
@@ -961,7 +961,9 @@ class calendar_event(osv.Model):
 
     def _check_closing_date(self, cr, uid, ids, context=None):
         for event in self.browse(cr, uid, ids, context=context):
-            if event.stop < event.start:
+            if event.start_datetime and event.stop_datetime < event.start_datetime:
+                return False
+            if event.start_date and event.stop_date < event.start_date:
                 return False
         return True
 

From 70494d894e2ee1296fb81c16ce6beaf1f1a33620 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Thu, 21 Apr 2016 15:25:33 +0200
Subject: [PATCH 39/43] [FIX] account: Dashboard invoices refunds link

When clicking on the "Refunds" link of a
Sale / Purchase invoices journal,
creating a new invoice did not create
a new refund invoice, but a normal invoice.

opw-675408
---
 addons/account/models/account_journal_dashboard.py | 14 ++++++++------
 .../views/account_journal_dashboard_view.xml       |  2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/addons/account/models/account_journal_dashboard.py b/addons/account/models/account_journal_dashboard.py
index 1ebc3f77b0c..56298bebbba 100644
--- a/addons/account/models/account_journal_dashboard.py
+++ b/addons/account/models/account_journal_dashboard.py
@@ -281,13 +281,15 @@ class account_journal(models.Model):
                 action_name = 'action_move_journal_line'
 
         _journal_invoice_type_map = {
-            'sale': 'out_invoice',
-            'purchase': 'in_invoice',
-            'bank': 'bank',
-            'cash': 'cash',
-            'general': 'general',
+            ('sale', None): 'out_invoice',
+            ('purchase', None): 'in_invoice',
+            ('sale', 'refund'): 'out_refund',
+            ('purchase', 'refund'): 'in_refund',
+            ('bank', None): 'bank',
+            ('cash', None): 'cash',
+            ('general', None): 'general',
         }
-        invoice_type = _journal_invoice_type_map[self.type]
+        invoice_type = _journal_invoice_type_map[(self.type, self._context.get('invoice_type'))]
 
         ctx = self._context.copy()
         ctx.update({
diff --git a/addons/account/views/account_journal_dashboard_view.xml b/addons/account/views/account_journal_dashboard_view.xml
index 9594e78a65c..ad4f5a1c96c 100644
--- a/addons/account/views/account_journal_dashboard_view.xml
+++ b/addons/account/views/account_journal_dashboard_view.xml
@@ -117,7 +117,7 @@
                                     </a>
                                 </div>
                                 <div>
-                                    <a type="object" name="open_action" context="{'use_domain': [('type','in',('out_refund','in_refund'))]}">
+                                    <a type="object" name="open_action" context="{'use_domain': [('type','in',('out_refund','in_refund'))], 'invoice_type': 'refund'}">
                                         <span t-if="journal_type == 'sale'">Refunds</span>
                                         <span t-if="journal_type == 'purchase'">Refunds</span>
                                     </a>

From 3b19fa426b3a277c3a6e489f3ee22d20f2933d94 Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Thu, 21 Apr 2016 14:52:29 +0200
Subject: [PATCH 40/43] [FIX] web_kanban: long names un header

When the stage name is too long, the column header is messed up: the
'Settings' and the 'Quick Add' icons are located outside of the column.

The fix is to truncate stage names when they are too long.

opw-672710
---
 addons/web_kanban/static/src/less/kanban_view.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web_kanban/static/src/less/kanban_view.less b/addons/web_kanban/static/src/less/kanban_view.less
index 61ce72975d6..4d2e19a2a88 100644
--- a/addons/web_kanban/static/src/less/kanban_view.less
+++ b/addons/web_kanban/static/src/less/kanban_view.less
@@ -383,7 +383,7 @@
                 font-size: 18px;
                 font-weight: 300;
                 .o-flex(1, 1, auto);
-                white-space: nowrap;
+                .o-text-overflow();
                 padding-top: 5px;
             }
             .o_kanban_quick_add i {

From 9fba75bd542138aee0e297e019ee0e6f99980921 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 15 Apr 2016 10:10:30 +0200
Subject: [PATCH 41/43] [FIX] web_editor: save translation values as HTML or
 XML fragment

The translation value is given as an HTML fragment.  It is converted to a valid
XML fragment if the translation's field requires it.
---
 addons/web_editor/models/ir_translation.py    | 20 +++++++++++++++++++
 addons/web_editor/static/src/js/translator.js |  4 ++--
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/addons/web_editor/models/ir_translation.py b/addons/web_editor/models/ir_translation.py
index 1dedb26d1bf..19627b58c57 100644
--- a/addons/web_editor/models/ir_translation.py
+++ b/addons/web_editor/models/ir_translation.py
@@ -1,7 +1,10 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
+from lxml import etree
+
 from openerp import models, api
+from openerp.tools.translate import encode, xml_translate
 
 def edit_translation_mapping(data):
     data = dict(data, model=data['name'].partition(',')[0])
@@ -16,3 +19,20 @@ class ir_translation(models.Model):
             self.insert_missing(field, records)
             return edit_translation_mapping
         return super(ir_translation, self)._get_terms_mapping(field, records)
+
+    @api.multi
+    def save_html(self, value):
+        """ Convert the HTML fragment ``value`` to XML if necessary, and write
+        it as the value of translation ``self``.
+        """
+        assert len(self) == 1 and self.type == 'model'
+        mname, fname = self.name.split(',')
+        field = self.env[mname]._fields[fname]
+        if field.translate == xml_translate:
+            # wrap value inside a div and parse it as HTML
+            div = "<div>%s</div>" % encode(value)
+            root = etree.fromstring(div, etree.HTMLParser(encoding='utf-8'))
+            # root is html > body > div
+            # serialize div as XML and discard surrounding tags
+            value = etree.tostring(root[0][0], encoding='utf-8')[5:-6]
+        return self.write({'value': value})
diff --git a/addons/web_editor/static/src/js/translator.js b/addons/web_editor/static/src/js/translator.js
index 39efbe1db2f..f243a878d2c 100644
--- a/addons/web_editor/static/src/js/translator.js
+++ b/addons/web_editor/static/src/js/translator.js
@@ -47,10 +47,10 @@ var RTE_Translate = rte.Class.extend({
 
             return ajax.jsonRpc('/web/dataset/call', 'call', {
                 model: 'ir.translation',
-                method: 'write',
+                method: 'save_html',
                 args: [
                     [+$el.data('oe-translation-id')],
-                    {'value': translation_content, 'state': 'translated'},
+                    translation_content,
                     context || base.get_context()
                 ],
             });

From 3f43d3056b3a64b5d4afe49ca9eb598dab196fe2 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Thu, 21 Apr 2016 15:34:43 +0200
Subject: [PATCH 42/43] [FIX] hr_expense: expenses paid by the company should
 be posted on bank journal

opw-674409
---
 addons/hr_expense/models/hr_expense.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/hr_expense/models/hr_expense.py b/addons/hr_expense/models/hr_expense.py
index 5fd8ab6ec29..9e49b312146 100644
--- a/addons/hr_expense/models/hr_expense.py
+++ b/addons/hr_expense/models/hr_expense.py
@@ -212,9 +212,9 @@ class HrExpense(models.Model):
         for expense in self:
             if expense.date > maxdate:
                 maxdate = expense.date
-            if expense.journal_id not in journal_dict:
-                journal_dict[expense.journal_id] = []
-            journal_dict[expense.journal_id].append(expense)
+            jrn = expense.bank_journal_id if expense.payment_mode == 'company_account' else expense.journal_id
+            journal_dict.setdefault(jrn, [])
+            journal_dict[jrn].append(expense)
 
         for journal, expense_list in journal_dict.items():
             #create the move that will contain the accounting entries

From 74d8cbc190d1a93ef699ee254b1efbc88d2a1e26 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 21 Apr 2016 13:26:16 +0200
Subject: [PATCH 43/43] [FIX] mail: fix bounce email addressing

- The "From" should not be the administrator user but
  the postmaster/system, and should be an address that
  ignores double-bounces. Using the default bounce
  email accomplishes both.

- The "To" recipient should be the "envelope from"
  sender when available, usually as provided by
  the "Return-Path" header set by the upstream MTA.
  If not present, fall back to the "From" of
  the original email.

- adapt tests to verify the behavior wrt Return-Path
---
 addons/mail/models/mail_thread.py      | 11 ++++++++---
 addons/mail/tests/test_mail_gateway.py |  4 ++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/addons/mail/models/mail_thread.py b/addons/mail/models/mail_thread.py
index 717d37c0500..feea6292e8f 100644
--- a/addons/mail/models/mail_thread.py
+++ b/addons/mail/models/mail_thread.py
@@ -798,15 +798,20 @@ class MailThread(models.AbstractModel):
         record_set = None
 
         def _create_bounce_email():
-            self.env['mail.mail'].create({
+            bounce_to = decode_header(message, 'Return-Path') or email_from
+            bounce_mail_values = {
                 'body_html': '<div><p>Hello,</p>'
                              '<p>The following email sent to %s cannot be accepted because this is '
                              'a private email address. Only allowed people can contact us at this address.</p></div>'
                              '<blockquote>%s</blockquote>' % (message.get('to'), message_dict.get('body')),
                 'subject': 'Re: %s' % message.get('subject'),
-                'email_to': message.get('from'),
+                'email_to': bounce_to,
                 'auto_delete': True,
-            }).send()
+            }
+            bounce_from = self.env['ir.mail_server']._get_default_bounce_address()
+            if bounce_from:
+                bounce_mail_values['email_from'] = 'MAILER-DAEMON <%s>' % bounce_from
+            self.env['mail.mail'].create(bounce_mail_values).send()
 
         def _warn(message):
             _logger.info('Routing mail with Message-Id %s: route %s: %s',
diff --git a/addons/mail/tests/test_mail_gateway.py b/addons/mail/tests/test_mail_gateway.py
index 11b9bb3b9a7..9c1bc2216da 100644
--- a/addons/mail/tests/test_mail_gateway.py
+++ b/addons/mail/tests/test_mail_gateway.py
@@ -313,8 +313,8 @@ class TestMailgateway(TestMail):
                          'message_process: incoming email on Partners alias should send a bounce email')
         self.assertIn('New Frogs', self._mails[0].get('subject'),
                       'message_process: bounce email on Partners alias should contain the original subject')
-        self.assertIn(formataddr(('Sylvie Lelitre', 'test.sylvie.lelitre@agrolait.com')), self._mails[0].get('email_to'),
-                      'message_process: bounce email on Partners alias should have original email sender as recipient')
+        self.assertIn('whatever-2a840@postmaster.twitter.com', self._mails[0].get('email_to'),
+                      'message_process: bounce email on Partners alias should go to Return-Path address')
 
     @mute_logger('openerp.addons.mail.models.mail_thread', 'openerp.models', 'openerp.addons.mail.models.mail_mail')
     def test_message_process_alias_followers_bounce(self):