From f4ec8b95b781d3a7a8f4a8b6163eb9cc83cc66bc Mon Sep 17 00:00:00 2001
From: len-odoo <len@odoo.com>
Date: Thu, 9 Aug 2018 11:00:20 +0200
Subject: [PATCH 1/4] [FIX] mail: only get one mail channel partner per user

When more than one mail.channel.partner have been linked to a given user, he may
be unable to open some discussion channel because of a traceback.
The issue is that we access a channel_partner field while the recordset is not a
singleton.
We limit the search to 1 to ensure that this recordset is a singleton.
---
 addons/mail/models/mail_channel.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/models/mail_channel.py b/addons/mail/models/mail_channel.py
index 8f701194494..1b69bfcfd33 100644
--- a/addons/mail/models/mail_channel.py
+++ b/addons/mail/models/mail_channel.py
@@ -471,7 +471,7 @@ class Channel(models.Model):
             'is_minimized': minimized
         }
         domain = [('partner_id', '=', self.env.user.partner_id.id), ('channel_id.uuid', '=', uuid)]
-        channel_partners = self.env['mail.channel.partner'].search(domain)
+        channel_partners = self.env['mail.channel.partner'].search(domain, limit=1)
         channel_partners.write(values)
         self.env['bus.bus'].sendone((self._cr.dbname, 'res.partner', self.env.user.partner_id.id), channel_partners.channel_id.channel_info()[0])
 

From 1f42cf9f9c504736907d230da661db237d86f10b Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Thu, 9 Aug 2018 11:01:00 +0200
Subject: [PATCH 2/4] [FIX] sale, sale_timesheet: re-introduce default invoice
 policy

Related to f89d4201c779d68d584533e62b209ccf6bd16f84

Since the invoice policy is becoming more and more simple, it is
always nice to add as much logic as possible to make things even more
simple.

For the record, 5 fields are taken into account when it comes to
invoicing policy:
service_policy
service_type
service_tracking
invoice_policy
expense_policy

They are partially linked one with the other, and not all make sense for
a given product type...
---
 addons/sale/views/res_config_settings_views.xml | 2 +-
 addons/sale_timesheet/models/product.py         | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/sale/views/res_config_settings_views.xml b/addons/sale/views/res_config_settings_views.xml
index 534f50e0360..feac0835056 100644
--- a/addons/sale/views/res_config_settings_views.xml
+++ b/addons/sale/views/res_config_settings_views.xml
@@ -347,7 +347,7 @@
                     </div>
                     <h2>Invoicing</h2>
                     <div class="row mt16 o_settings_container">
-                        <div class="col-xs-12 col-md-6 o_setting_box hidden" title="This default value is applied to any new product created. This can be changed in the product detail form.">
+                        <div class="col-xs-12 col-md-6 o_setting_box" title="This default value is applied to any new product created. This can be changed in the product detail form.">
                             <div class="o_setting_right_pane">
                                 <label for="default_invoice_policy"/>
                                 <div class="text-muted">
diff --git a/addons/sale_timesheet/models/product.py b/addons/sale_timesheet/models/product.py
index 88b98d97065..11c3ca36777 100644
--- a/addons/sale_timesheet/models/product.py
+++ b/addons/sale_timesheet/models/product.py
@@ -60,5 +60,6 @@ class ProductTemplate(models.Model):
             self.invoice_policy = 'order'
             self.service_type = 'timesheet'
         elif self.type == 'consu':
-            self.invoice_policy = 'order'
+            if not self.invoice_policy or self.service_policy == 'ordered_timesheet':
+                self.invoice_policy = 'order'
             self.service_type = 'manual'

From 908ddbfeb75a38c29a85c02573d1cef3413754e2 Mon Sep 17 00:00:00 2001
From: len-odoo <len@odoo.com>
Date: Thu, 9 Aug 2018 11:57:07 +0200
Subject: [PATCH 3/4] [FIX] account_asset: do not show deactivated assets in
 the report view

When canceling invoices, Odoo deactivates related assets.
However these assets are not filtered in the pivot view, screwing the report.

opw 1864252
---
 addons/account_asset/report/account_asset_report.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/account_asset/report/account_asset_report.py b/addons/account_asset/report/account_asset_report.py
index 540d7880f3f..8d0551952cd 100644
--- a/addons/account_asset/report/account_asset_report.py
+++ b/addons/account_asset/report/account_asset_report.py
@@ -60,6 +60,7 @@ class AssetAssetReport(models.Model):
                 from account_asset_depreciation_line dl
                     left join account_asset_asset a on (dl.asset_id=a.id)
                     left join (select min(d.id) as id,ac.id as ac_id from account_asset_depreciation_line as d inner join account_asset_asset as ac ON (ac.id=d.asset_id) group by ac_id) as dlmin on dlmin.ac_id=a.id
+                where a.active is true 
                 group by
                     dl.amount,dl.asset_id,dl.depreciation_date,dl.name,
                     a.date, dl.move_check, a.state, a.category_id, a.partner_id, a.company_id,

From a10ea93dbe5bbfcdc53f7ba46fd2b52ef6862a8f Mon Sep 17 00:00:00 2001
From: Goffin Simon <sig@odoo.com>
Date: Thu, 9 Aug 2018 11:07:03 +0200
Subject: [PATCH 4/4] [FIX] account: rounding problem with Payment Matching in
 multi-currency

Steps to reproduce:

- activate the multi-currency option in the Accounting App
- activate the EUR currency (USD being the base currency)
- create a EUR Bank Journal with an EUR account
- on 31/07 ==> rate = 1.1
- on 08/08 ==> rate = 1.2
- create a vendor bill for Asustek on 31/07 for 39794,40 EUR
- create a vendor bill for Asustek on 31/07 for 61668,00 EUR
- create a vendor bill for Asustek on 31/07 for 33487,70 EUR
- create a supplier payment for Asustek for 134950,1 EUR
- use the payment matching smart button
- match the 3 invoices you entered;

Bug:
Odoo says there is an open balance to write-off and prevents you from reconciling

Expected Behavior: the payment total amount in EUR matches the 3 vendor bills total
amount in EUR so I would expect Odoo to consider I have a perfect match between the
payment and the vendor bills and the difference in USD (base currency) should be
automatically reflected through an exchange difference entry.

if you follow the same operation with 3 invoices of 115EUR each and a payment of 345EUR,
it will work as expected.

opw:1872978
---
 .../account/static/src/js/reconciliation/reconciliation_model.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/account/static/src/js/reconciliation/reconciliation_model.js b/addons/account/static/src/js/reconciliation/reconciliation_model.js
index f76304e6908..c6e0bedb8ee 100644
--- a/addons/account/static/src/js/reconciliation/reconciliation_model.js
+++ b/addons/account/static/src/js/reconciliation/reconciliation_model.js
@@ -855,6 +855,7 @@ var StatementModel = BasicModel.extend({
                 }
             });
             total = Math.round(total*1000)/1000 || 0;
+            amount_currency = Math.round(amount_currency);
             line.balance = {
                 amount: total,
                 amount_str: field_utils.format.monetary(Math.abs(total), {}, formatOptions),