From 7d72a72905ce9e13b7be4239aa67eece9140dcb8 Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Fri, 8 Sep 2017 14:21:18 +0200
Subject: [PATCH 01/18] [FIX] calendar, web_calendar: change date

- Change the date of an event through the form view
  => a mail is sent to the attendees.
- Change the date of an event thanks to the drag and drop of an event
  => the mail is not sent.

It is necessary to introduce a context key in the write call so we can
make the distinction between the write triggered from the drag and drop
and the write triggered by a recomputation of fields. Indeed, when the
form view is used to change the date, `write` is called several times.
We should avoid sending the same email each time.

opw-766295
---
 addons/calendar/models/calendar.py                | 3 ++-
 addons/web_calendar/static/src/js/web_calendar.js | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/calendar/models/calendar.py b/addons/calendar/models/calendar.py
index 145614fc045..fa22382b328 100644
--- a/addons/calendar/models/calendar.py
+++ b/addons/calendar/models/calendar.py
@@ -1406,7 +1406,8 @@ class Meeting(models.Model):
                         partners_to_notify.append(event_attendees_changes['removed_partners'].ids)
                     self.env['calendar.alarm_manager'].notify_next_alarm(partners_to_notify)
 
-            if (values.get('start_date') or values.get('start_datetime')) and values.get('active', True):
+            if (values.get('start_date') or values.get('start_datetime') or
+                    (values.get('start') and self.env.context.get('from_ui'))) and values.get('active', True):
                 for current_meeting in all_meetings:
                     if attendees_create:
                         attendees_create = attendees_create[current_meeting.id]
diff --git a/addons/web_calendar/static/src/js/web_calendar.js b/addons/web_calendar/static/src/js/web_calendar.js
index be6e1743ddc..51827c27e3c 100644
--- a/addons/web_calendar/static/src/js/web_calendar.js
+++ b/addons/web_calendar/static/src/js/web_calendar.js
@@ -892,7 +892,7 @@ var CalendarView = View.extend({
         var index = this.dataset.get_id_index(id);
         if (index !== null) {
             event_id = this.dataset.ids[index];
-            this.dataset.write(event_id, data, {}).always(function() {
+            this.dataset.write(event_id, data, {context: {from_ui: true}}).always(function() {
                 if (is_virtual_id(event_id)) {
                     // this is a virtual ID and so this will create a new event
                     // with an unknown id for us.

From d23667262b3e0c14935f58cae793c0ed7b58bd08 Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Fri, 8 Sep 2017 11:49:54 +0200
Subject: [PATCH 02/18] [FIX] account: future payment

- Create a vendor bill
- Register a payment in the future (e.g. Bank payment)

On the dashboard, this payment in the future is taken into account,
while it shows a graph up to today. Moreover, when clicking on
"Difference", the report is opened at today's date.

opw-768155
---
 addons/account/models/account_journal_dashboard.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/models/account_journal_dashboard.py b/addons/account/models/account_journal_dashboard.py
index 7fc9aa17cf8..3b44fa44eb9 100644
--- a/addons/account/models/account_journal_dashboard.py
+++ b/addons/account/models/account_journal_dashboard.py
@@ -163,8 +163,8 @@ class account_journal(models.Model):
             account_ids = tuple(filter(None, [self.default_debit_account_id.id, self.default_credit_account_id.id]))
             if account_ids:
                 amount_field = 'balance' if not self.currency_id else 'amount_currency'
-                query = """SELECT sum(%s) FROM account_move_line WHERE account_id in %%s;""" % (amount_field,)
-                self.env.cr.execute(query, (account_ids,))
+                query = """SELECT sum(%s) FROM account_move_line WHERE account_id in %%s AND date <= %%s;""" % (amount_field,)
+                self.env.cr.execute(query, (account_ids, fields.Date.today(),))
                 query_results = self.env.cr.dictfetchall()
                 if query_results and query_results[0].get('sum') != None:
                     account_sum = query_results[0].get('sum')

From 2e292a21e6650c2045e12820263216965d5d86d5 Mon Sep 17 00:00:00 2001
From: Goffin Simon <sig@odoo.com>
Date: Mon, 11 Sep 2017 11:42:49 +0200
Subject: [PATCH 03/18] [FIX] mrp: Singleton expected in action_unbuild

In some cases, the consumed quants can be more than one.
In this case the check for the lot must be done just on the first
consumed quant. Courtesy of @jco.

opw:748472
---
 addons/mrp/models/mrp_unbuild.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/mrp/models/mrp_unbuild.py b/addons/mrp/models/mrp_unbuild.py
index d73466ed2bb..4fc4af387c4 100644
--- a/addons/mrp/models/mrp_unbuild.py
+++ b/addons/mrp/models/mrp_unbuild.py
@@ -121,11 +121,11 @@ class MrpUnbuild(models.Model):
         for produce_move in produce_moves:
             if produce_move.has_tracking != 'none':
                 original = original_quants.filtered(lambda quant: quant.product_id == produce_move.product_id)
-                if not original.lot_id:
+                if original and not original[0].lot_id:
                     raise UserError(_("You don't have in the stock the required lot/serial number for %s .") % (produce_move.product_id.name,))
                 self.env['stock.move.lots'].create({
                     'move_id': produce_move.id,
-                    'lot_id': original.lot_id.id,
+                    'lot_id': original[0].lot_id.id,
                     'quantity_done': produce_move.product_uom_qty,
                     'quantity': produce_move.product_uom_qty
                 })

From 0327f3e4671c517e18787e6c282ffcd6f3b45685 Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Mon, 11 Sep 2017 14:02:21 +0200
Subject: [PATCH 04/18] [FIX] report: paper format

Make paper format mandatory on the company. If no paper format is
defined, the PDF created may have an unexpected format.

opw-770173
---
 addons/report/views/base_config_settings_views.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/report/views/base_config_settings_views.xml b/addons/report/views/base_config_settings_views.xml
index 5e2766736f7..2d15525fcf4 100644
--- a/addons/report/views/base_config_settings_views.xml
+++ b/addons/report/views/base_config_settings_views.xml
@@ -9,7 +9,7 @@
                 <group name="report" position="inside">
                     <label for="paperformat_id"/>
                     <div>
-                        <field name="paperformat_id" class="oe_inline"/>
+                        <field name="paperformat_id" class="oe_inline" required="1"/>
                         <button name="%(action_report_internalpreview)d" string="Preview Internal Report" type="action"/>
                         <button name="%(action_report_externalpreview)d" string="Preview External Report" type="action"/>
                         <button name="edit_external_header" string="Edit external header" type="object" class="oe_link"/>

From 280d9986fde4fff9b3eecbd4824785320bc7cebf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Pigeon?= <cedric.pigeon@acsone.eu>
Date: Sat, 2 Sep 2017 11:24:36 +0200
Subject: [PATCH 05/18] [FIX] prevent calling costful methods on empty
 recordset

Some methods are called on empty recordset causing lacking of performance.

opw:769720
---
 addons/stock/models/procurement.py | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/addons/stock/models/procurement.py b/addons/stock/models/procurement.py
index 3c548ebd984..836d72875db 100644
--- a/addons/stock/models/procurement.py
+++ b/addons/stock/models/procurement.py
@@ -196,17 +196,21 @@ class ProcurementOrder(models.Model):
     def run(self, autocommit=False):
         # TDE CLEANME: unused context key procurement_auto_defer remove
         new_self = self.filtered(lambda order: order.state not in ['running', 'done', 'cancel'])
-        res = super(ProcurementOrder, new_self).run(autocommit=autocommit)
+        res = True
+        if new_self:
+            res = super(ProcurementOrder, new_self).run(autocommit=autocommit)
 
-        # after all the procurements are run, check if some created a draft stock move that needs to be confirmed
-        # (we do that in batch because it fasts the picking assignation and the picking state computation)
-        new_self.filtered(lambda order: order.state == 'running' and order.rule_id.action == 'move').mapped('move_ids').filtered(lambda move: move.state == 'draft').action_confirm()
+            # after all the procurements are run, check if some created a draft stock move that needs to be confirmed
+            # (we do that in batch because it fasts the picking assignation and the picking state computation)
+            move_ids = new_self.filtered(lambda order: order.state == 'running' and order.rule_id.action == 'move').mapped('move_ids').filtered(lambda move: move.state == 'draft')
+            if move_ids:
+                move_ids.action_confirm()
 
-        # TDE FIXME: action_confirm in stock_move already call run() ... necessary ??
-        # If procurements created other procurements, run the created in batch
-        new_procurements = self.search([('move_dest_id.procurement_id', 'in', new_self.ids)], order='id')
-        if new_procurements:
-            res = new_procurements.run(autocommit=autocommit)
+            # TDE FIXME: action_confirm in stock_move already call run() ... necessary ??
+            # If procurements created other procurements, run the created in batch
+            new_procurements = self.search([('move_dest_id.procurement_id', 'in', new_self.ids)], order='id')
+            if new_procurements:
+                res = new_procurements.run(autocommit=autocommit)
         return res
 
     @api.multi

From 80ad2a370cb161b205c7fd07a97f577a07fc50b0 Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Mon, 11 Sep 2017 15:40:02 +0200
Subject: [PATCH 06/18] [FIX] account_asset: deferred revenue account

- Associate a product with a "Deferred Revenue Type"
- Create a customer invoice and add the product => the account of the
  deferred revenue is used.
- Create a SO with the same product, and generate the invoice => the
  account of the deferred revenue is NOT used.

opw-769254
---
 addons/account_asset/models/account_invoice.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/account_asset/models/account_invoice.py b/addons/account_asset/models/account_invoice.py
index 4d6e3590037..f3726a798c0 100644
--- a/addons/account_asset/models/account_invoice.py
+++ b/addons/account_asset/models/account_invoice.py
@@ -107,4 +107,5 @@ class AccountInvoiceLine(models.Model):
                 self.asset_category_id = self.product_id.product_tmpl_id.deferred_revenue_category_id.id
             elif invoice.type == 'in_invoice':
                 self.asset_category_id = self.product_id.product_tmpl_id.asset_category_id.id
+            self.onchange_asset_category_id()
         super(AccountInvoiceLine, self)._set_additional_fields(invoice)

From 236a24de964d4fb4cdcab9bc2f43f29b2bbe47fe Mon Sep 17 00:00:00 2001
From: Wolfgang Taferner <wtaferner@users.noreply.github.com>
Date: Sun, 10 Sep 2017 07:28:49 +0200
Subject: [PATCH 07/18] [FIX] account: handling of text domains in _query_get

1df72cb01b9c6de0e417bdafb60b46d0276b7888 added a stringification of
the domain parameter to handle situations where an actual
domain (list/tuple) is being provided rather than a string, however
this causes issues when the string input is text (unicode) containing
non-ascii data as in Python 2 `str()` will then raise a
UnicodeEncodeError.

Rather than stringify the input, bypass safe_eval when the input is
already a proper domain.

Closes #19367
---
 addons/account/models/account_move.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/account/models/account_move.py b/addons/account/models/account_move.py
index 15c69fe3d53..4458152f940 100644
--- a/addons/account/models/account_move.py
+++ b/addons/account/models/account_move.py
@@ -1292,7 +1292,9 @@ class AccountMoveLine(models.Model):
     @api.model
     def _query_get(self, domain=None):
         context = dict(self._context or {})
-        domain = domain and safe_eval(str(domain)) or []
+        domain = domain or []
+        if not isinstance(domain, (list, tuple)):
+            domain = safe_eval(domain)
 
         date_field = 'date'
         if context.get('aged_balance'):

From 7eb7e9fd6e72764f28df19ab8803e1cceff38b4d Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Mon, 11 Sep 2017 15:56:54 +0200
Subject: [PATCH 08/18] [FIX] account_tax_python: empty code

If the user somewhat removes the 'Applicable Code' text, the call to
`safe_eval` will crash.

opw-769267
---
 addons/account_tax_python/account_tax_python.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account_tax_python/account_tax_python.py b/addons/account_tax_python/account_tax_python.py
index 57527de81f8..e670ce88c0e 100644
--- a/addons/account_tax_python/account_tax_python.py
+++ b/addons/account_tax_python/account_tax_python.py
@@ -36,9 +36,9 @@ class AccountTaxPython(models.Model):
 
     @api.v8
     def compute_all(self, price_unit, currency=None, quantity=1.0, product=None, partner=None):
-        taxes = self.env['account.tax']
+        taxes = self.filtered(lambda r: r.amount_type != 'code')
         company = self.env.user.company_id
-        for tax in self:
+        for tax in self.filtered(lambda r: r.amount_type == 'code'):
             localdict = {'price_unit':price_unit, 'quantity': quantity, 'product':product, 'partner':partner, 'company': company}
             safe_eval(tax.python_applicable, localdict, mode="exec", nocopy=True)
             if localdict.get('result', False):

From d20388ba1ae93095b369ffd3519bb06bd1a090f0 Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Tue, 12 Sep 2017 12:25:34 +0200
Subject: [PATCH 09/18] [FIX] purchase: missing data in tax computation

- Create a purchase tax computed with Python code.
- The Python code must use an attribute of the product, e.g.
  `product.price`.
- Create a PO using the created purchase tax.

It crashes, because the product (as well as the partner) is not sent to
the `compute_all` method.

opw-770078
---
 addons/purchase/models/purchase.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/purchase/models/purchase.py b/addons/purchase/models/purchase.py
index ec1d25a8e63..9ff1ee0ebf1 100644
--- a/addons/purchase/models/purchase.py
+++ b/addons/purchase/models/purchase.py
@@ -649,7 +649,9 @@ class PurchaseOrderLine(models.Model):
         order = line.order_id
         price_unit = line.price_unit
         if line.taxes_id:
-            price_unit = line.taxes_id.with_context(round=False).compute_all(price_unit, currency=line.order_id.currency_id, quantity=1.0)['total_excluded']
+            price_unit = line.taxes_id.with_context(round=False).compute_all(
+                price_unit, currency=line.order_id.currency_id, quantity=1.0, product=line.product_id, partner=line.order_id.partner_id
+            )['total_excluded']
         if line.product_uom.id != line.product_id.uom_id.id:
             price_unit *= line.product_uom.factor / line.product_id.uom_id.factor
         if order.currency_id != order.company_id.currency_id:

From 94eb69907d6ac401ce1a55cc36fdd01c9eacce48 Mon Sep 17 00:00:00 2001
From: Goffin Simon <sig@odoo.com>
Date: Tue, 12 Sep 2017 12:14:46 +0200
Subject: [PATCH 10/18] [FIX] crm: columns and tables in upper cases

The module studio gives the abality to name columns or tables with
upper cases. So making the SQL case sensitive avoids problems with studio.

opw:770022
---
 addons/crm/wizard/base_partner_merge.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/wizard/base_partner_merge.py b/addons/crm/wizard/base_partner_merge.py
index 27f3f3e002d..b8b46f2a7dc 100644
--- a/addons/crm/wizard/base_partner_merge.py
+++ b/addons/crm/wizard/base_partner_merge.py
@@ -199,7 +199,7 @@ class MergePartnerAutomatic(models.TransientModel):
                 except psycopg2.Error:
                     # updating fails, most likely due to a violated unique constraint
                     # keeping record with nonexistent partner_id is useless, better delete it
-                    query = 'DELETE FROM %(table)s WHERE %(column)s IN %%s' % query_dic
+                    query = 'DELETE FROM "%(table)s" WHERE "%(column)s" IN %%s' % query_dic
                     self._cr.execute(query, (tuple(src_partners.ids),))
 
     @api.model

From 39964e6cf23438e1f09d1a167fd6afa5dc6eba47 Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Tue, 12 Sep 2017 14:19:31 +0200
Subject: [PATCH 11/18] [FIX] account: mark as reconciled

- Create 2 companies:
- Company A and check VIES VAT Check
- Company B and do not check VIES VAT Check
- Set current company of admin to Company A and do not allow Company B
- Create a demo user on Company B and give him Adviser group in
  Accounting.
- Log in with the demo user.
- Create a Customer A as a company with:
  Country = Spain
  TIN = ES85847955H
- Create a contact on Customer A: "Contact Sample"
- Create a Customer invoice on "Contact Sample" partner
- Through the menu Accounting/Payments, create a new payment on "Contact
  Sample" partner with the total amount of the invoice.
- Open the menu Manual Payments and invoicing matching. The invoice and
  the payment should be proposed for reconciliation. Do CTRL+ENTER.

An error message appears: 'The VAT number [ES85847955H] for partner
[Contact Sample] either failed the VIES VAT validation check or did not
respect the expected format ESA12345674.'

This message should not appear as the current user is on Company B which
doesn't have the flag "VIES VAT Check" checked.

The issue comes from the `sudo` in `mark_as_reconciled`, which will lead
to `self.env.user` to be the admin in the VAT check, and therefore
`self.env.user.company_id` will be Company A.

Closes #19274
opw-770018
---
 addons/account/models/partner.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/addons/account/models/partner.py b/addons/account/models/partner.py
index 253a2e2b680..bfd3dc7d589 100644
--- a/addons/account/models/partner.py
+++ b/addons/account/models/partner.py
@@ -365,7 +365,12 @@ class ResPartner(models.Model):
     @api.multi
     def mark_as_reconciled(self):
         self.env['account.partial.reconcile'].check_access_rights('write')
-        return self.sudo().write({'last_time_entries_checked': time.strftime(DEFAULT_SERVER_DATETIME_FORMAT)})
+        if self.ids:
+            self.env.cr.execute(
+                'UPDATE res_partner SET last_time_entries_checked = %s WHERE id IN %s',
+                (time.strftime(DEFAULT_SERVER_DATETIME_FORMAT), tuple(self.ids),)
+            )
+        return True
 
     @api.one
     def _get_company_currency(self):

From 6318ff667504ead9eeec286f319ea1fc49f34f4e Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Tue, 12 Sep 2017 17:11:14 +0200
Subject: [PATCH 12/18] [FIX] account_voucher: default currency

- Go to Accounting > Configuration > Journals.
- In the form view of a journal, click on Action > Voucher Entries
- Click on Create => traceback

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

diff --git a/addons/account_voucher/models/account_voucher.py b/addons/account_voucher/models/account_voucher.py
index 48b38c90487..467ed1c4533 100644
--- a/addons/account_voucher/models/account_voucher.py
+++ b/addons/account_voucher/models/account_voucher.py
@@ -82,7 +82,7 @@ class AccountVoucher(models.Model):
 
     @api.model
     def _get_currency(self):
-        journal = self.env['account.journal'].browse(self._context.get('journal_id', False))
+        journal = self.env['account.journal'].browse(self.env.context.get('default_journal_id', False))
         if journal.currency_id:
             return journal.currency_id.id
         return self.env.user.company_id.currency_id.id

From 7f356d66538d52ddb650b9d7a485c2062c490d4d Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Tue, 12 Sep 2017 17:59:59 +0200
Subject: [PATCH 13/18] [FIX] account: mark as reconciled

`last_time_entries_checked` is a commercial field, so bypassing the
write won't sync it.

Closes #19274
opw-770018
---
 addons/account/models/partner.py      |  7 +------
 addons/base_vat/models/res_partner.py | 12 ++++++++++--
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/addons/account/models/partner.py b/addons/account/models/partner.py
index bfd3dc7d589..08037dc6225 100644
--- a/addons/account/models/partner.py
+++ b/addons/account/models/partner.py
@@ -365,12 +365,7 @@ class ResPartner(models.Model):
     @api.multi
     def mark_as_reconciled(self):
         self.env['account.partial.reconcile'].check_access_rights('write')
-        if self.ids:
-            self.env.cr.execute(
-                'UPDATE res_partner SET last_time_entries_checked = %s WHERE id IN %s',
-                (time.strftime(DEFAULT_SERVER_DATETIME_FORMAT), tuple(self.ids),)
-            )
-        return True
+        return self.sudo().with_context(company_id=self.env.user.company_id.id).write({'last_time_entries_checked': time.strftime(DEFAULT_SERVER_DATETIME_FORMAT)})
 
     @api.one
     def _get_company_currency(self):
diff --git a/addons/base_vat/models/res_partner.py b/addons/base_vat/models/res_partner.py
index 9e6d86b3aaa..12129945b8c 100644
--- a/addons/base_vat/models/res_partner.py
+++ b/addons/base_vat/models/res_partner.py
@@ -98,7 +98,11 @@ class ResPartner(models.Model):
 
     @api.constrains("vat")
     def check_vat(self):
-        if self.env.user.company_id.vat_check_vies:
+        if self.env.context.get('company_id'):
+            company = self.env['res.company'].browse(self.env.context['company_id'])
+        else:
+            company = self.env.user.company_id
+        if company.vat_check_vies:
             # force full VIES online check
             check_func = self.vies_vat_check
         else:
@@ -126,7 +130,11 @@ class ResPartner(models.Model):
         vat_no = "'CC##' (CC=Country Code, ##=VAT Number)"
         if default_vat_check(vat_country, vat_number):
             vat_no = _ref_vat[vat_country] if vat_country in _ref_vat else vat_no
-            if self.env.user.company_id.vat_check_vies:
+            if self.env.context.get('company_id'):
+                company = self.env['res.company'].browse(self.env.context['company_id'])
+            else:
+                company = self.env.user.company_id
+            if company.vat_check_vies:
                 return '\n' + _('The VAT number [%s] for partner [%s] either failed the VIES VAT validation check or did not respect the expected format %s.') % (self.vat, self.name, vat_no)
         return '\n' + _('The VAT number [%s] for partner [%s] does not seem to be valid. \nNote: the expected format is %s') % (self.vat, self.name, vat_no)
 

From 8fbee7978f154bfd7d1424709cd66796cb3d82f3 Mon Sep 17 00:00:00 2001
From: Goffin Simon <sig@odoo.com>
Date: Tue, 12 Sep 2017 17:13:22 +0200
Subject: [PATCH 14/18] [FIX] purchase: PO state when validated

When nothing has been invoiced and the PO is validated with nothing to invoice
then the state of the PO must be "Nothing to invoice"

opw:769919
---
 addons/purchase/models/purchase.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/purchase/models/purchase.py b/addons/purchase/models/purchase.py
index 9ff1ee0ebf1..7cd1132d89e 100644
--- a/addons/purchase/models/purchase.py
+++ b/addons/purchase/models/purchase.py
@@ -57,7 +57,7 @@ class PurchaseOrder(models.Model):
 
             if any(float_compare(line.qty_invoiced, line.product_qty if line.product_id.purchase_method == 'purchase' else line.qty_received, precision_digits=precision) == -1 for line in order.order_line):
                 order.invoice_status = 'to invoice'
-            elif all(float_compare(line.qty_invoiced, line.product_qty if line.product_id.purchase_method == 'purchase' else line.qty_received, precision_digits=precision) >= 0 for line in order.order_line):
+            elif all(float_compare(line.qty_invoiced, line.product_qty if line.product_id.purchase_method == 'purchase' else line.qty_received, precision_digits=precision) >= 0 for line in order.order_line) and order.invoice_ids:
                 order.invoice_status = 'invoiced'
             else:
                 order.invoice_status = 'no'

From cc955698cef71ac02e1322b2bd71a92a6f79a3b8 Mon Sep 17 00:00:00 2001
From: David Arnold <dar@xoe.solutions>
Date: Tue, 22 Aug 2017 15:58:35 -0500
Subject: [PATCH 15/18] [FIX]sale_stock: copy devolution move without
 decreasing respective SO values

-Make a return picking from a SO, and condigure the items to be refunded on SO(in the wizard)
-Copy the return picking.
-Validate it.

Without this fix, it would just keep decreasing the delivered value on SO.

opw:767429
---
 addons/sale_stock/models/stock.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale_stock/models/stock.py b/addons/sale_stock/models/stock.py
index 41ddb896476..054b070b152 100644
--- a/addons/sale_stock/models/stock.py
+++ b/addons/sale_stock/models/stock.py
@@ -14,7 +14,7 @@ class StockMove(models.Model):
     _inherit = "stock.move"
 
     to_refund_so = fields.Boolean(
-        "To Refund in SO", default=False,
+        "To Refund in SO", copy=False, default=False,
         help='Trigger a decrease of the delivered quantity in the associated Sale Order')
 
     @api.multi

From a52369274a4ac0d7f4a80e7fb0e75e193c05e3f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dan.cermak@cgc-instruments.com>
Date: Tue, 12 Sep 2017 23:40:13 +0200
Subject: [PATCH 16/18] [CLA] signature for D4N

Closes #19425
---
 doc/cla/individual/d4n.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 doc/cla/individual/d4n.md

diff --git a/doc/cla/individual/d4n.md b/doc/cla/individual/d4n.md
new file mode 100644
index 00000000000..080d8ba9789
--- /dev/null
+++ b/doc/cla/individual/d4n.md
@@ -0,0 +1,12 @@
+Germany, 2017-09-12
+
+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,
+
+Dan Čermák dan.cermak@cgc-instruments.com https://github.com/D4N
+Dan Čermák dan.cermak@cgc-instruments.de https://github.com/D4N

From 052bc3880534e45f168f396005e7cfc3edad0490 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@odoo.com>
Date: Wed, 12 Jul 2017 11:33:52 +0200
Subject: [PATCH 17/18] [FIX] google_calendar: do not create an event with an
 invalid id

The id is useful to update existing events but sometimes we are getting some
ids that are not accepted by Google

Getting an error:
odoo.addons.google_account.models.google_service: Bad google request : {
 "error": {
  "errors": [
   {
    "domain": "global",
    "reason": "invalid",
    "message": "Invalid resource id value."
   }
  ],
  "code": 400,
  "message": "Invalid resource id value."
 }
}

Looks like existing events can have a _ in their id but new one, no longer.
It seems that these events are created by outlook calendar when synchronized
with Google Calendar.

opw-749752
opw-751294
opw-751348
---
 addons/google_calendar/models/google_calendar.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/google_calendar/models/google_calendar.py b/addons/google_calendar/models/google_calendar.py
index 8a751c7a45b..b3f29b6d7eb 100644
--- a/addons/google_calendar/models/google_calendar.py
+++ b/addons/google_calendar/models/google_calendar.py
@@ -249,7 +249,8 @@ class GoogleCalendar(models.AbstractModel):
         if not self.get_need_synchro_attendee():
             data.pop("attendees")
         if isCreating:
-            other_google_ids = [other_att.google_internal_event_id for other_att in event.attendee_ids if other_att.google_internal_event_id]
+            other_google_ids = [other_att.google_internal_event_id for other_att in event.attendee_ids
+                                if other_att.google_internal_event_id and not other_att.google_internal_event_id.startswith('_')]
             if other_google_ids:
                 data["id"] = other_google_ids[0]
         return data
@@ -610,7 +611,8 @@ class GoogleCalendar(models.AbstractModel):
             ('event_id.final_date', '>', fields.Datetime.to_string(self.get_minTime())),
         ])
         for att in my_attendees:
-            other_google_ids = [other_att.google_internal_event_id for other_att in att.event_id.attendee_ids if other_att.google_internal_event_id and other_att.id != att.id]
+            other_google_ids = [other_att.google_internal_event_id for other_att in att.event_id.attendee_ids if
+                                other_att.google_internal_event_id and other_att.id != att.id and not other_att.google_internal_event_id.startswith('_')]
             for other_google_id in other_google_ids:
                 if self.get_one_event_synchro(other_google_id):
                     att.write({'google_internal_event_id': other_google_id})

From 5b69f1a333b0ae0b4d12f6281e87cd824daa0c8b Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@odoo.com>
Date: Wed, 13 Sep 2017 17:47:34 +0200
Subject: [PATCH 18/18] [FIX] account_tax_python: correctly forward-port
 7eb7e9fd6e72764f28df19ab8803e1cceff38b4d

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

diff --git a/addons/account_tax_python/models/account_tax.py b/addons/account_tax_python/models/account_tax.py
index a8f3d77752d..17821f22052 100644
--- a/addons/account_tax_python/models/account_tax.py
+++ b/addons/account_tax_python/models/account_tax.py
@@ -37,7 +37,7 @@ class AccountTaxPython(models.Model):
 
     @api.multi
     def compute_all(self, price_unit, currency=None, quantity=1.0, product=None, partner=None):
-        taxes = self.env['account.tax']
+        taxes = self.filtered(lambda r: r.amount_type != 'code')
         company = self.env.user.company_id
         for tax in self.filtered(lambda r: r.amount_type == 'code'):
             localdict = {'price_unit': price_unit, 'quantity': quantity, 'product': product, 'partner': partner, 'company': company}