From 0977bd97981efa49821c693dd51b809b39697d01 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Mon, 21 Mar 2016 15:25:21 +0100
Subject: [PATCH 1/7] [FIX] account: bank statement fiscal year sequence

When using sequences per fiscal year,
the sequence used to build the bank
statement name must be the according fiscal
year sequence.

opw-671937
Closes #11185
---
 addons/account/account_bank_statement.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 001085233c3..f0f31296551 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -32,7 +32,7 @@ class account_bank_statement(osv.osv):
     def create(self, cr, uid, vals, context=None):
         if vals.get('name', '/') == '/':
             journal_id = vals.get('journal_id', self._default_journal_id(cr, uid, context=context))
-            vals['name'] = self._compute_default_statement_name(cr, uid, journal_id, context=context)
+            vals['name'] = self._compute_default_statement_name(cr, uid, journal_id, context=dict(context, period_id=vals.get('period_id')))
         if 'line_ids' in vals:
             for idx, line in enumerate(vals['line_ids']):
                 line[2]['sequence'] = idx + 1
@@ -75,7 +75,7 @@ class account_bank_statement(osv.osv):
     def _compute_default_statement_name(self, cr, uid, journal_id, context=None):
         context = dict(context or {})
         obj_seq = self.pool.get('ir.sequence')
-        period = self.pool.get('account.period').browse(cr, uid, self._get_period(cr, uid, context=context), context=context)
+        period = self.pool.get('account.period').browse(cr, uid, context.get('period_id') or self._get_period(cr, uid, context=context), context=context)
         context['fiscalyear_id'] = period.fiscalyear_id.id
         journal = self.pool.get('account.journal').browse(cr, uid, journal_id, None)
         return obj_seq.next_by_id(cr, uid, journal.sequence_id.id, context=context)

From ec21006d98e8cb076181a9ffb480471b4dc5f076 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Mon, 21 Mar 2016 16:41:33 +0100
Subject: [PATCH 2/7] [FIX] account: check context before using it.

This is related to 0977bd97981efa49821c693dd51b809b39697d01
---
 addons/account/account_bank_statement.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index f0f31296551..8ed9c1c41ef 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -30,6 +30,8 @@ import time
 
 class account_bank_statement(osv.osv):
     def create(self, cr, uid, vals, context=None):
+        if not context:
+            context = {}
         if vals.get('name', '/') == '/':
             journal_id = vals.get('journal_id', self._default_journal_id(cr, uid, context=context))
             vals['name'] = self._compute_default_statement_name(cr, uid, journal_id, context=dict(context, period_id=vals.get('period_id')))

From 43445db7e432c46252339d2aed4f284fb7b30746 Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Tue, 22 Mar 2016 11:27:01 +0100
Subject: [PATCH 3/7] [FIX] point_of_sale: fiscal position on invoice

In v8.0 and saas-6, the PoS does not support the concept of fiscal
position. Therefore, the invoice generated should not use it, otherwise
there might be an inconsistency between the PoS order and the invoice.

FORWARDPORT TO SAAS-6 ONLY!

Fixes #11299
opw-671743
---
 addons/point_of_sale/point_of_sale.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index f665a5b1d32..46c84849bf6 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -1029,6 +1029,8 @@ class pos_order(osv.osv):
                 'currency_id': order.pricelist_id.currency_id.id, # considering partner's sale pricelist's currency
             }
             inv.update(inv_ref.onchange_partner_id(cr, uid, [], 'out_invoice', order.partner_id.id)['value'])
+            # FORWARDPORT TO SAAS-6 ONLY!
+            inv.update({'fiscal_position': False})
             if not inv.get('account_id', None):
                 inv['account_id'] = acc
             inv_id = inv_ref.create(cr, uid, inv, context=context)
@@ -1045,8 +1047,7 @@ class pos_order(osv.osv):
                 inv_line.update(inv_line_ref.product_id_change(cr, uid, [],
                                                                line.product_id.id,
                                                                line.product_id.uom_id.id,
-                                                               line.qty, partner_id = order.partner_id.id,
-                                                               fposition_id=order.partner_id.property_account_position.id)['value'])
+                                                               line.qty, partner_id = order.partner_id.id)['value'])
                 if not inv_line.get('account_analytic_id', False):
                     inv_line['account_analytic_id'] = \
                         self._prepare_analytic_account(cr, uid, line,

From d6c88b8809db5eec83bf3818391386d687f42340 Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Mon, 21 Mar 2016 16:27:06 +0100
Subject: [PATCH 4/7] [FIX] account: filter out special periods

Commit 7b7f3fa filters out the special periods. However, the filtering
should be done only for the display in the form view, nto for the
reporting which is actually correct.

opw-672531
---
 addons/account/account.py               | 2 +-
 addons/account/account_invoice_view.xml | 3 ++-
 addons/account/account_view.xml         | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 306bb18fef9..da19fcf7197 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -314,7 +314,7 @@ class account_account(osv.osv):
         res = {}
         null_result = dict((fn, 0.0) for fn in field_names)
         if children_and_consolidated:
-            aml_query = self.pool.get('account.move.line')._query_get(cr, uid, context=dict(context or {}, periods_special=False))
+            aml_query = self.pool.get('account.move.line')._query_get(cr, uid, context=context)
 
             wheres = [""]
             if query.strip():
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 3be43cd00e9..71b6779178f 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -336,7 +336,8 @@
                                 on_change="onchange_journal_id(journal_id)" options="{'no_create': True}"
                                 attrs="{'readonly':[('internal_number','!=',False)]}"/>
                             <field domain="[('company_id', '=', company_id),('type','=', 'receivable')]"
-                                name="account_id" groups="account.group_account_user"/>
+                                name="account_id" groups="account.group_account_user"
+                                context="{'periods_special': False}"/>
 
                             <label for="currency_id" groups="base.group_multi_currency"/>
                             <div groups="base.group_multi_currency">
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 0ef81a94c80..5faf26e67e0 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -247,6 +247,7 @@
             <field name="view_mode">tree,form,graph</field>
             <field name="search_view_id" ref="view_account_search"/>
             <field name="view_id" ref="view_account_list"/>
+            <field name="context">{'periods_special': False}</field>
             <field name="help" type="html">
               <p class="oe_view_nocontent_create">
                 Click to add an account.

From e94be1856c0a156000ba226d547ba6c18bd1caea Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Tue, 22 Mar 2016 15:45:15 +0100
Subject: [PATCH 5/7] [FIX] website_sale: non-blocking order confirmation fail

When validating a payment transaction,
if the cart (order) cannot be confirmed or
the email cannot be sent for any reason
(instance, the email template is broken),
the transaction must continue, so the payment
transaction can be set to `done` or `pending`.

In other words, not sending the confirmation
email or not confirming the sale order must
not be blocking to mark the payment
transaction as done.

opw-672486
---
 addons/website_sale/models/payment.py | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/addons/website_sale/models/payment.py b/addons/website_sale/models/payment.py
index a76bba4bca8..6129de092aa 100644
--- a/addons/website_sale/models/payment.py
+++ b/addons/website_sale/models/payment.py
@@ -1,8 +1,11 @@
 # -*- coding: utf-8 -*-
+import logging
 
 from openerp import SUPERUSER_ID
 from openerp.osv import orm, fields
 
+_logger = logging.getLogger(__name__)
+
 
 class PaymentTransaction(orm.Model):
     _inherit = 'payment.transaction'
@@ -19,12 +22,15 @@ class PaymentTransaction(orm.Model):
         res = super(PaymentTransaction, self).form_feedback(cr, uid, data, acquirer_name, context=context)
 
         # fetch the tx, check its state, confirm the potential SO
-        tx_find_method_name = '_%s_form_get_tx_from_data' % acquirer_name
-        if hasattr(self, tx_find_method_name):
-            tx = getattr(self, tx_find_method_name)(cr, uid, data, context=context)
-        if tx and tx.state == 'done' and tx.sale_order_id and tx.sale_order_id.state in ['draft', 'sent']:
-            self.pool['sale.order'].action_button_confirm(cr, SUPERUSER_ID, [tx.sale_order_id.id], context=dict(context, send_email=True))
-        elif tx and tx.state not in ['cancel'] and tx.sale_order_id and tx.sale_order_id.state in ['draft']:
-            self.pool['sale.order'].force_quotation_send(cr, SUPERUSER_ID, [tx.sale_order_id.id], context=context)
+        try:
+            tx_find_method_name = '_%s_form_get_tx_from_data' % acquirer_name
+            if hasattr(self, tx_find_method_name):
+                tx = getattr(self, tx_find_method_name)(cr, uid, data, context=context)
+            if tx and tx.state == 'done' and tx.sale_order_id and tx.sale_order_id.state in ['draft', 'sent']:
+                self.pool['sale.order'].action_button_confirm(cr, SUPERUSER_ID, [tx.sale_order_id.id], context=dict(context, send_email=True))
+            elif tx and tx.state not in ['cancel'] and tx.sale_order_id and tx.sale_order_id.state in ['draft']:
+                self.pool['sale.order'].force_quotation_send(cr, SUPERUSER_ID, [tx.sale_order_id.id], context=context)
+        except Exception:
+            _logger.exception('Fail to confirm the order or send the confirmation email%s', tx and ' for the transaction %s' % tx.reference or '')
 
         return res

From 9e624671d2fea68d6693a1276cad8ce716389320 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Tue, 22 Mar 2016 17:06:53 +0100
Subject: [PATCH 6/7] [FIX] account: bank statement lines order on write

When adding new lines to an existing statement,
the order of the lines was not kept,
due to the re-sequencing operation done in the
override of `write` in `account.bank.statement`:

```
for statement in self.browse(cr, uid, ids, context):
    for idx, line in enumerate(statement.line_ids):
        account_bank_statement_line_obj.write(cr, uid, [line.id], {'sequence': idx + 1}, context=context)
```
as the lines order was based on `statement_id desc, sequence`,
which is the same for all lines added,
(except if the order is forced in the web client,
using the handle widget)
and, therefore, the order
of the lines returned by `statement.line_ids` was
not determinist.

Adding the `id` to the lines order
(as it's done in `sale.order`, for instance),
solves the issue, as the lines will then be fetched
in the order they were created.

opw-667541
---
 addons/account/account_bank_statement.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 8ed9c1c41ef..849326d1068 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -924,7 +924,7 @@ class account_bank_statement_line(osv.osv):
         user = self.pool.get("res.users").browse(cr, uid, uid)
         return ['|', ('company_id', '=', False), ('company_id', 'child_of', [user.company_id.id]), ('journal_entry_id', '=', False), ('account_id', '=', False)]
 
-    _order = "statement_id desc, sequence"
+    _order = "statement_id desc, sequence, id"
     _name = "account.bank.statement.line"
     _description = "Bank Statement Line"
     _inherit = ['ir.needaction_mixin']

From d39d191cec76a69cf63b9834e1a99aa87f8be9c4 Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Tue, 22 Mar 2016 15:32:14 +0100
Subject: [PATCH 7/7] [FIX] stock: reserve if move not assigned

Commit 4a0b6f6 slightly improves the performances of `action_assign` by
skipping moves which already have pack operations. However, if the move
is not completely assigned, it prevents the possibility to search for
new quants to assign to the given move.

opw-672069
---
 addons/stock/stock.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index ea8cf25beb6..f13a208e58c 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2347,8 +2347,6 @@ class stock_move(osv.osv):
                         quants = quant_obj.quants_get_prefered_domain(cr, uid, ops.location_id, move.product_id, qty, domain=domain, prefered_domain_list=[], restrict_lot_id=move.restrict_lot_id.id, restrict_partner_id=move.restrict_partner_id.id, context=context)
                         quant_obj.quants_reserve(cr, uid, quants, move, record, context=context)
         for move in todo_moves:
-            if move.linked_move_operation_ids:
-                continue
             #then if the move isn't totally assigned, try to find quants without any specific domain
             if move.state != 'assigned':
                 qty_already_assigned = move.reserved_availability