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 01/27] [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 02/27] [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 9d12f90c239a9d30a47cf5dce0ba15a1417f1438 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Mon, 21 Mar 2016 18:26:59 +0100
Subject: [PATCH 03/27] [FIX] crm: check context before using it

context could be `Nonetype`

opw-672452
---
 addons/crm/crm_lead.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 4c784fcd398..9fcaa4e5f1d 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -320,6 +320,8 @@ class crm_lead(format_address, osv.osv):
     def on_change_user(self, cr, uid, ids, user_id, context=None):
         """ When changing the user, also set a team_id or restrict team id
             to the ones user_id is member of. """
+        if not context:
+            context = {}
         if user_id and context.get('team_id'):
             team = self.pool['crm.team'].browse(cr, uid, context['team_id'], context=context)
             if user_id in team.member_ids.ids:

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 04/27] [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 05/27] [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 06/27] [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 07/27] [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 08/27] [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

From 6207644c00fc9ffe6a17e236b0df351fc456fda3 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Tue, 22 Mar 2016 17:53:25 +0100
Subject: [PATCH 09/27] [FIX] website*: remove technical routes in sitemap

Multiple technical routes were listed in the sitemap,
and it's pointless to list them in the sitemap.

There is currently no way to exclude routes
from the sitemap using a specifc argument
(e.g. sitemap=False on the route).

Therefore, in order to remove them from the sitemap,
we play with the current conditions to exclude
these routes from the sitemap:
 - routes with `auth` other than `none` and  'public`
   are excluded. Technical routes marked as `auth="public"`
   for no reasons are changed to `auth="user" so they
   are excluded from the sitemap
 - routes with required arguments are excluded as well.
   the route `website/image` cannot work without any argument,
   `website/image` has therefore been removed from the possible
   routes for the method `website_image`, so it's no longer
   listed in the sitemap.

For an exhaustive list of the conditions to exclude
a route from the sitemap, check the method
`rule_is_enumerable` in `website/models/website.py`

opw-670865
---
 addons/website/controllers/main.py                | 3 +--
 addons/website_mail/controllers/email_designer.py | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py
index 9ef28bcba77..0443ac03e68 100644
--- a/addons/website/controllers/main.py
+++ b/addons/website/controllers/main.py
@@ -433,7 +433,6 @@ class Website(openerp.addons.web.controllers.main.Home):
         return request.registry['website']._image_placeholder(response)
 
     @http.route([
-        '/website/image',
         '/website/image/<xmlid>',
         '/website/image/<xmlid>/<int:max_width>x<int:max_height>',
         '/website/image/<xmlid>/<field>',
@@ -528,7 +527,7 @@ class Website(openerp.addons.web.controllers.main.Home):
     #------------------------------------------------------
     # Backend html field
     #------------------------------------------------------
-    @http.route('/website/field/html', type='http', auth="public", website=True)
+    @http.route('/website/field/html', type='http', auth="user", website=True)
     def FieldTextHtml(self, model=None, res_id=None, field=None, callback=None, **kwargs):
         record = None
         if model and res_id:
diff --git a/addons/website_mail/controllers/email_designer.py b/addons/website_mail/controllers/email_designer.py
index 16ef40095a5..f7ac12ade0c 100644
--- a/addons/website_mail/controllers/email_designer.py
+++ b/addons/website_mail/controllers/email_designer.py
@@ -82,12 +82,12 @@ class Website(addons.website.controllers.main.Website):
     #------------------------------------------------------
     # Backend email template field
     #------------------------------------------------------
-    @http.route('/website_mail/field/email', type='http', auth="public", website=True)
+    @http.route('/website_mail/field/email', type='http', auth="user", website=True)
     def FieldTextHtmlEmail(self, model=None, res_id=None, field=None, callback=None, **kwargs):
         kwargs['template'] = "website_mail.FieldTextHtmlEmail"
         return self.FieldTextHtml(model, res_id, field, callback, **kwargs)
 
-    @http.route('/website_mail/field/email_template', type='http', auth="public", website=True)
+    @http.route('/website_mail/field/email_template', type='http', auth="user", website=True)
     def FieldTextHtmlEmailTemplate(self, model=None, res_id=None, field=None, callback=None, **kwargs):
         cr, uid, context = request.cr, request.uid, request.context
         kwargs['theme'] = True

From a9c93119ae1c876bd20aa08697a5bcb95b2b4ee5 Mon Sep 17 00:00:00 2001
From: rmu-odoo <rmu@openerp.com>
Date: Tue, 9 Feb 2016 15:23:33 +0530
Subject: [PATCH 10/27] [IMP] l10n_et: Create newly tag assign to taxes

---
 addons/l10n_et/data/account.tax.template.csv |  26 +--
 addons/l10n_et/data/account_account_tag.xml  | 185 ++++++++++++-------
 2 files changed, 130 insertions(+), 81 deletions(-)

diff --git a/addons/l10n_et/data/account.tax.template.csv b/addons/l10n_et/data/account.tax.template.csv
index 19281193cdb..f7e763b23ee 100644
--- a/addons/l10n_et/data/account.tax.template.csv
+++ b/addons/l10n_et/data/account.tax.template.csv
@@ -1,14 +1,14 @@
 id,description,chart_template_id:id,type_tax_use,name,amount,amount_type,tag_ids:id,account_id:id,refund_account_id:id
-id_tax03,tax03,l10n_et,sale,VAT 15% rated sales,15,percent,tax_tax03,l10n_et3007,l10n_et3007
-id_tax04,tax04,l10n_et,sale,VAT 0% rated sales,,percent,tax_tax04,l10n_et3007,l10n_et3007
-id_tax06,tax06,l10n_et,sale,VAT Exempt rated sales,,percent,tax_tax06,l10n_et3007,l10n_et3007
-id_tax11,tax11,l10n_et,sale,VAT Out of Scope rated sales,,percent,tax_tax11,l10n_et3007,l10n_et3007
-id_tax02,tax02,l10n_et,sale,Withholding 2% rated sales,-2,percent,tax_tax02,l10n_et3006,l10n_et3006
-id_tax13,tax13,l10n_et,sale,Withholding 35% rated sales,-35,percent,tax_tax13,l10n_et3006,l10n_et3006
-id_tax14,tax14,l10n_et,sale,Withholding VAT 15% rated sales,-15,percent,tax_tax14,l10n_et3006,l10n_et3006
-id_tax08,tax08,l10n_et,purchase,VAT 15% rated purchases,15,percent,tax_tax08,l10n_et2212,l10n_et2212
-id_tax07,tax07,l10n_et,purchase,VAT 0% rated purchases,,percent,tax_tax07,l10n_et2212,l10n_et2212
-id_tax10,tax10,l10n_et,purchase,VAT Exempt rated purchases,,percent,tax_tax10,l10n_et2212,l10n_et2212
-id_tax09,tax09,l10n_et,purchase,VAT Out of Scope rated purchases,,percent,tax_tax09,l10n_et2212,l10n_et2212
-id_tax05,tax05,l10n_et,purchase,Withholding 2% rated purchases,-2,percent,tax_tax05,l10n_et2213,l10n_et2213
-id_tax12,tax12,l10n_et,purchase,Withholding 35% rated purchases,-35,percent,tax_tax12,l10n_et2213,l10n_et2213
+id_tax03,tax03,l10n_et,sale,VAT 15% rated sales,15,percent,"tag_et_13,tag_et_22",l10n_et3007,l10n_et3007
+id_tax04,tax04,l10n_et,sale,VAT 0% rated sales,,percent,tag_et_12,l10n_et3007,l10n_et3007
+id_tax06,tax06,l10n_et,sale,VAT Exempt rated sales,,percent,tag_et_11,l10n_et3007,l10n_et3007
+id_tax11,tax11,l10n_et,sale,VAT Out of Scope rated sales,,percent,tag_et_10,l10n_et3007,l10n_et3007
+id_tax02,tax02,l10n_et,sale,Withholding 2% rated sales,-2,percent,"tag_et_15,tag_et_27",l10n_et3006,l10n_et3006
+id_tax13,tax13,l10n_et,sale,Withholding 35% rated sales,-35,percent,"tag_et_16,tag_et_28",l10n_et3006,l10n_et3006
+id_tax14,tax14,l10n_et,sale,Withholding VAT 15% rated sales,-15,percent,"tag_et_17,tag_et_29",l10n_et3006,l10n_et3006
+id_tax08,tax08,l10n_et,purchase,VAT 15% rated purchases,15,percent,"tag_et_05,tag_et_20",l10n_et2212,l10n_et2212
+id_tax07,tax07,l10n_et,purchase,VAT 0% rated purchases,,percent,tag_et_04,l10n_et2212,l10n_et2212
+id_tax10,tax10,l10n_et,purchase,VAT Exempt rated purchases,,percent,tag_et_03,l10n_et2212,l10n_et2212
+id_tax09,tax09,l10n_et,purchase,VAT Out of Scope rated purchases,,percent,tag_et_02,l10n_et2212,l10n_et2212
+id_tax05,tax05,l10n_et,purchase,Withholding 2% rated purchases,-2,percent,"tag_et_07,tag_et_24",l10n_et2213,l10n_et2213
+id_tax12,tax12,l10n_et,purchase,Withholding 35% rated purchases,-35,percent,"tag_et_08,tag_et_25",l10n_et2213,l10n_et2213
diff --git a/addons/l10n_et/data/account_account_tag.xml b/addons/l10n_et/data/account_account_tag.xml
index 13c9856c815..8d22ca80fb9 100644
--- a/addons/l10n_et/data/account_account_tag.xml
+++ b/addons/l10n_et/data/account_account_tag.xml
@@ -1,71 +1,120 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-
     <!-- Account Tags -->
-
-        <record id="tax_tax03" model="account.account.tag">
-            <field name="name">tax03</field>
-            <field name="applicability">taxes</field>
-        </record>
-
-        <record id="tax_tax04" model="account.account.tag">
-            <field name="name">tax04</field>
-            <field name="applicability">taxes</field>
-        </record>
-
-        <record id="tax_tax06" model="account.account.tag">
-            <field name="name">tax06</field>
-            <field name="applicability">taxes</field>
-        </record>
-
-        <record id="tax_tax11" model="account.account.tag">
-            <field name="name">tax11</field>
-            <field name="applicability">taxes</field>
-        </record>
-
-        <record id="tax_tax02" model="account.account.tag">
-            <field name="name">tax02</field>
-            <field name="applicability">taxes</field>
-        </record>
-
-        <record id="tax_tax13" model="account.account.tag">
-            <field name="name">tax13</field>
-            <field name="applicability">taxes</field>
-        </record>
-
-        <record id="tax_tax14" model="account.account.tag">
-            <field name="name">tax14</field>
-            <field name="applicability">taxes</field>
-        </record>
-
-        <record id="tax_tax08" model="account.account.tag">
-            <field name="name">tax08</field>
-            <field name="applicability">taxes</field>
-        </record>
-
-        <record id="tax_tax07" model="account.account.tag">
-            <field name="name">tax07</field>
-            <field name="applicability">taxes</field>
-        </record>
-
-        <record id="tax_tax10" model="account.account.tag">
-            <field name="name">tax10</field>
-            <field name="applicability">taxes</field>
-        </record>
-
-        <record id="tax_tax09" model="account.account.tag">
-            <field name="name">tax09</field>
-            <field name="applicability">taxes</field>
-        </record>
-
-        <record id="tax_tax05" model="account.account.tag">
-            <field name="name">tax05</field>
-            <field name="applicability">taxes</field>
-        </record>
-
-        <record id="tax_tax12" model="account.account.tag">
-            <field name="name">tax12</field>
-            <field name="applicability">taxes</field>
-        </record>
-
-</odoo>
+    <record id="tag_et_01" model="account.account.tag">
+        <field name="name">Taxable Purchases - VAT</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_et_02" model="account.account.tag">
+        <field name="name">Taxable Purchase VAT Out of Scope</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_et_03" model="account.account.tag">
+        <field name="name">Taxable Purchase VAT Exempt</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_et_04" model="account.account.tag">
+        <field name="name">Taxable Purchase VAT Rated 0%</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_et_05" model="account.account.tag">
+        <field name="name">Taxable Purchase VAT Rated 15%</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_et_06" model="account.account.tag">
+        <field name="name">Taxable Purchases - Witholding</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_et_07" model="account.account.tag">
+        <field name="name">Taxable 2% Withholding on Purchases</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_et_08" model="account.account.tag">
+        <field name="name">Taxable 35% Withholding on Purchases</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_et_09" model="account.account.tag">
+        <field name="name">Taxable Sales - VAT</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_et_10" model="account.account.tag">
+        <field name="name">Taxable Sales VAT Out of Scope (Sales)</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_et_11" model="account.account.tag">
+        <field name="name">Taxable Sales VAT Exempt</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_et_12" model="account.account.tag">
+        <field name="name">Taxable Sales VAT Rated 0%</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_et_13" model="account.account.tag">
+        <field name="name">Taxable Sales VAT Rated 15%</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_et_14" model="account.account.tag">
+        <field name="name">Taxable Sales - Withholding</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_et_15" model="account.account.tag">
+        <field name="name">Taxable 2% Withholding on Sales</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_et_16" model="account.account.tag">
+        <field name="name">Taxable 35% Withholding on Sales</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_et_17" model="account.account.tag">
+        <field name="name">Taxable VAT Withholding on Sales</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_et_18" model="account.account.tag">
+        <field name="name">Net VAT to be Paid/Reclaimed</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_et_19" model="account.account.tag">
+        <field name="name">Purchase VAT</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_et_20" model="account.account.tag">
+        <field name="name">Purchase VAT Rated 15%</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_et_21" model="account.account.tag">
+        <field name="name">Sales VAT</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_et_22" model="account.account.tag">
+        <field name="name">Sales VAT Rated 15%</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_et_23" model="account.account.tag">
+        <field name="name">Withholding on Purchases</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_et_24" model="account.account.tag">
+        <field name="name">2% Withholding on Purchases</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_et_25" model="account.account.tag">
+        <field name="name">35% Withholding on Purchases</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_et_26" model="account.account.tag">
+        <field name="name">Withholding on Sales</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_et_27" model="account.account.tag">
+        <field name="name">2% Withheld on Sales</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_et_28" model="account.account.tag">
+        <field name="name">35% Withheld on Sales</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_et_29" model="account.account.tag">
+        <field name="name">VAT Withheld on Sales</field>
+        <field name="applicability">taxes</field>
+    </record>
+</odoo>
\ No newline at end of file

From 1936367fd2253d8c362b37f92674b434f22e8565 Mon Sep 17 00:00:00 2001
From: rmu-odoo <rmu@openerp.com>
Date: Tue, 9 Feb 2016 15:39:38 +0530
Subject: [PATCH 11/27] [IMP] l10n_et: Added post migration file

---
 addons/l10n_et/__openerp__.py                               | 2 +-
 addons/l10n_et/migrations/2.0/post-migrate_tags_on_taxes.py | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 addons/l10n_et/migrations/2.0/post-migrate_tags_on_taxes.py

diff --git a/addons/l10n_et/__openerp__.py b/addons/l10n_et/__openerp__.py
index 39ed4801e67..f2bfd51be1d 100644
--- a/addons/l10n_et/__openerp__.py
+++ b/addons/l10n_et/__openerp__.py
@@ -5,7 +5,7 @@
 
 {
     'name': 'Ethiopia - Accounting',
-    'version': '1.0',
+    'version': '2.0',
     'category': 'Localization/Account Charts',
     'description': """
 Base Module for Ethiopian Localization
diff --git a/addons/l10n_et/migrations/2.0/post-migrate_tags_on_taxes.py b/addons/l10n_et/migrations/2.0/post-migrate_tags_on_taxes.py
new file mode 100644
index 00000000000..fa56fd00dfa
--- /dev/null
+++ b/addons/l10n_et/migrations/2.0/post-migrate_tags_on_taxes.py
@@ -0,0 +1,6 @@
+from openerp.modules.registry import RegistryManager
+
+def migrate(cr, version):
+    registry = RegistryManager.get(cr.dbname)
+    from openerp.addons.account.models.chart_template import migrate_tags_on_taxes
+    migrate_tags_on_taxes(cr, registry)

From 2abc2ceee005cf03ac0dff240898466b1c439738 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@odoo.com>
Date: Wed, 23 Mar 2016 11:17:42 +0100
Subject: [PATCH 12/27] [IMP] gamification: split multi function field to avoid
 massive prefetching of user records

Issue: website_forum takes 15 to 30 seconds to load the user page
---
 addons/gamification/models/badge.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/gamification/models/badge.py b/addons/gamification/models/badge.py
index 69d36def904..5fffc29f488 100644
--- a/addons/gamification/models/badge.py
+++ b/addons/gamification/models/badge.py
@@ -182,12 +182,12 @@ class gamification_badge(osv.Model):
 
         'stat_count': fields.function(_get_owners_info, string='Total',
             type="integer",
-            multi='unique_users',
+            multi='stat_users',
             help="The number of time this badge has been received."),
         'stat_count_distinct': fields.function(_get_owners_info,
             type="integer",
             string='Number of users',
-            multi='unique_users',
+            multi='stat_users',
             help="The number of time this badge has been received by unique users."),
         'stat_this_month': fields.function(_get_badge_user_stats,
             type="integer",

From bad14a54d348a6bc9e76a98687470197f8abb057 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@odoo.com>
Date: Wed, 23 Mar 2016 12:53:01 +0100
Subject: [PATCH 13/27] [IMP] gamification: add sql index on
 'gamification.badge.user' to improve speed of 'gamification.badge' function
 fields

---
 addons/gamification/models/badge.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/gamification/models/badge.py b/addons/gamification/models/badge.py
index 5fffc29f488..59ccdfdd1b8 100644
--- a/addons/gamification/models/badge.py
+++ b/addons/gamification/models/badge.py
@@ -21,9 +21,9 @@ class gamification_badge_user(osv.Model):
     _rec_name = "badge_name"
 
     _columns = {
-        'user_id': fields.many2one('res.users', string="User", required=True, ondelete="cascade"),
+        'user_id': fields.many2one('res.users', string="User", required=True, ondelete="cascade", select=True),
         'sender_id': fields.many2one('res.users', string="Sender", help="The user who has send the badge"),
-        'badge_id': fields.many2one('gamification.badge', string='Badge', required=True, ondelete="cascade"),
+        'badge_id': fields.many2one('gamification.badge', string='Badge', required=True, ondelete="cascade", select=True),
         'challenge_id': fields.many2one('gamification.challenge', string='Challenge originating', help="If this badge was rewarded through a challenge"),
         'comment': fields.text('Comment'),
         'badge_name': fields.related('badge_id', 'name', type="char", string="Badge Name"),

From 1c92a88003491966c7577839c4cea58ef71f244c Mon Sep 17 00:00:00 2001
From: sha-odoo <sha@odoo.com>
Date: Fri, 4 Mar 2016 18:08:36 +0530
Subject: [PATCH 14/27] [IMP] l10n_nl: Created tags and Assign to Taxes

---
 addons/l10n_nl/account_chart_netherlands.xml | 350 ++++++++++---------
 1 file changed, 189 insertions(+), 161 deletions(-)

diff --git a/addons/l10n_nl/account_chart_netherlands.xml b/addons/l10n_nl/account_chart_netherlands.xml
index f5e68f248ee..ae9aa36f8ac 100644
--- a/addons/l10n_nl/account_chart_netherlands.xml
+++ b/addons/l10n_nl/account_chart_netherlands.xml
@@ -2,7 +2,7 @@
 <openerp>
     <menuitem id="account_reports_nl_statements_menu" name="Dutch Statements" parent="account.menu_finance_reports" sequence="3" groups="account.group_account_user"/>
 
-    <data noupdate="True">
+    <data>
     
     <record id="transfer_account_id" model="account.account.template">
        <field name="name">Overschrijvingen</field>
@@ -3135,134 +3135,162 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
 
 -->
 <!-- Account Tags -->
-    <record id="tax_tag_1" model="account.account.tag">
-        <field name="name">0% BTW</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tax_tag_2" model="account.account.tag">
-        <field name="name">6% BTW verkopen</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tax_tag_3" model="account.account.tag">
-        <field name="name">21% BTW verkopen</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tax_tag_4" model="account.account.tag">
-        <field name="name">variabel BTW verkopen</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tax_tag_5" model="account.account.tag">
-        <field name="name">6% BTW inkopen</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tax_tag_6" model="account.account.tag">
-        <field name="name">21% BTW inkopen</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tax_tag_7" model="account.account.tag">
-        <field name="name">variabel BTW inkopen</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tax_tag_8" model="account.account.tag">
-        <field name="name">0% BTW verlegd</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tax_tag_9" model="account.account.tag">
-        <field name="name">BTW te vorderen verlegd (inkopen1)</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tax_tag_10" model="account.account.tag">
-        <field name="name">BTW af te dragen verlegd (inkopen2)</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tax_tag_11" model="account.account.tag">
-        <field name="name">21% BTW verlegd</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tax_tag_12" model="account.account.tag">
-        <field name="name">Inkopen import binnen EU laag(1)</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tax_tag_13" model="account.account.tag">
-        <field name="name">Inkopen import binnen EU laag(2)</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tax_tag_14" model="account.account.tag">
-        <field name="name">6% BTW import binnen EU</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tax_tag_15" model="account.account.tag">
-        <field name="name">Inkopen import binnen EU hoog(1)</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tax_tag_16" model="account.account.tag">
-        <field name="name">Inkopen import binnen EU hoog(2)</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tax_tag_17" model="account.account.tag">
-        <field name="name">21% BTW import binnen EU</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tax_tag_18" model="account.account.tag">
-        <field name="name">Inkopen import binnen EU overig(1)</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tax_tag_19" model="account.account.tag">
-        <field name="name">Inkopen import binnen EU overig(2)</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tax_tag_20" model="account.account.tag">
-        <field name="name">0% BTW import binnen EU</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tax_tag_21" model="account.account.tag">
-        <field name="name">BTW export binnen EU</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tax_tag_22" model="account.account.tag">
-        <field name="name">Inst./afst.verkopen binnen EU</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tax_tag_23" model="account.account.tag">
-        <field name="name">Inkopen import buiten EU laag(1)</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tax_tag_24" model="account.account.tag">
-        <field name="name">Inkopen import buiten EU laag(2)</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tax_tag_25" model="account.account.tag">
-        <field name="name">BTW import buiten EU laag inkopen</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tax_tag_26" model="account.account.tag">
-        <field name="name">Inkopen import buiten EU hoog(1)</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tax_tag_27" model="account.account.tag">
-        <field name="name">Inkopen import buiten EU hoog(2)</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tax_tag_28" model="account.account.tag">
-        <field name="name">BTW import buiten EU hoog inkopen</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tax_tag_29" model="account.account.tag">
-        <field name="name">Inkopen import buiten EU overig(1)</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tax_tag_30" model="account.account.tag">
-        <field name="name">Inkopen import buiten EU overig(2)</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tax_tag_31" model="account.account.tag">
-        <field name="name">BTW import buiten EU overig inkopen</field>
-        <field name="applicability">taxes</field>
-    </record>
-    <record id="tax_tag_32" model="account.account.tag">
-        <field name="name">BTW export buiten EU</field>
-        <field name="applicability">taxes</field>
-    </record>
+        <record id="tag_nl_01" model="account.account.tag">
+            <field name="name">Gegevens omzet</field>
+            <field name="applicability">taxes</field>
+        </record>
+        <record id="tag_nl_02" model="account.account.tag">
+            <field name="name">Rubriek 1: Prestaties binnenland</field>
+            <field name="applicability">taxes</field>
+        </record>
+        <record id="tag_nl_03" model="account.account.tag">
+            <field name="name">1a. Leveringen/diensten belast met hoog tarief (omzet)</field>
+            <field name="applicability">taxes</field>
+        </record>
+        <record id="tag_nl_04" model="account.account.tag">
+            <field name="name">Leveringen/diensten belast met hoog tarief (omzet)</field>
+            <field name="applicability">taxes</field>
+        </record>
+        <record id="tag_nl_05" model="account.account.tag">
+            <field name="name">1b. Leveringen/diensten belast met laag tarief (omzet)</field>
+            <field name="applicability">taxes</field>
+        </record>
+        <record id="tag_nl_06" model="account.account.tag">
+            <field name="name">1c. Leveringen/diensten belast met overige tarieven behalve 0% (omzet)</field>
+            <field name="applicability">taxes</field>
+        </record>
+        <record id="tag_nl_07" model="account.account.tag">
+            <field name="name">1d. Privégebruik (omzet)</field>
+            <field name="applicability">taxes</field>
+        </record>
+        <record id="tag_nl_08" model="account.account.tag">
+            <field name="name">1e. Leveringen/diensten belast met 0% of niet bij u belast (omzet)</field>
+            <field name="applicability">taxes</field>
+        </record>
+        <record id="tag_nl_09" model="account.account.tag">
+            <field name="name">Rubriek 2: Verleggingsregelingen binnenland (omzet)</field>
+            <field name="applicability">taxes</field>
+        </record>
+        <record id="tag_nl_10" model="account.account.tag">
+            <field name="name">2a. Leveringen/diensten waarbij de heffing van omzetbelasting naar u is verlegd (omzet)</field>
+            <field name="applicability">taxes</field>
+        </record>
+        <record id="tag_nl_11" model="account.account.tag">
+            <field name="name">Rubriek 3: Prestaties naar of in het buitenland (omzet)</field>
+            <field name="applicability">taxes</field>
+        </record>
+        <record id="tag_nl_12" model="account.account.tag">
+            <field name="name">3a. Leveringen naar landen buiten de EU (uitvoer) (omzet)</field>
+            <field name="applicability">taxes</field>
+        </record>
+        <record id="tag_nl_13" model="account.account.tag">
+            <field name="name">3b. Leveringen naar/diensten in landen binnen de EU (omzet)</field>
+            <field name="applicability">taxes</field>
+        </record>
+        <record id="tag_nl_14" model="account.account.tag">
+            <field name="name">3c. Installatie/afstandsverkopen binnen de EU (omzet)</field>
+            <field name="applicability">taxes</field>
+        </record>
+        <record id="tag_nl_15" model="account.account.tag">
+            <field name="name">Rubriek 4: Prestaties vanuit het buitenland aan u verricht (omzet)</field>
+            <field name="applicability">taxes</field>
+        </record>
+        <record id="tag_nl_16" model="account.account.tag">
+            <field name="name">4a. Leveringen/diensten uit landen buiten de EU (invoer) (omzet)</field>
+            <field name="applicability">taxes</field>
+        </record>
+        <record id="tag_nl_17" model="account.account.tag">
+            <field name="name">4b. Leveringen/diensten uit landen binnen de EU (omzet)</field>
+            <field name="applicability">taxes</field>
+        </record>
+        <record id="tag_nl_18" model="account.account.tag">
+            <field name="name">Gegevens omzetbelasting (BTW)</field>
+            <field name="applicability">taxes</field>
+        </record>
+        <record id="tag_nl_19" model="account.account.tag">
+            <field name="name">Rubriek 1: Prestaties binnenland (BTW)</field>
+            <field name="applicability">taxes</field>
+        </record>
+        <record id="tag_nl_20" model="account.account.tag">
+            <field name="name">1a. Leveringen/diensten belast met 21% (BTW)</field>
+            <field name="applicability">taxes</field>
+        </record>
+        <record id="tag_nl_21" model="account.account.tag">
+            <field name="name">Leveringen/diensten belast met hoog tarief (BTW)</field>
+            <field name="applicability">taxes</field>
+        </record>
+        <record id="tag_nl_22" model="account.account.tag">
+            <field name="name">1b. Leveringen/diensten belast met laag tarief (BTW)</field>
+            <field name="applicability">taxes</field>
+        </record>
+        <record id="tag_nl_23" model="account.account.tag">
+            <field name="name">1c. Leveringen/diensten belast met overige tarieven behalve 0% (BTW)</field>
+            <field name="applicability">taxes</field>
+        </record>
+        <record id="tag_nl_24" model="account.account.tag">
+            <field name="name">1d. Privégebruik (BTW)</field>
+            <field name="applicability">taxes</field>
+        </record>
+        <record id="tag_nl_25" model="account.account.tag">
+            <field name="name">1e. Leveringen/diensten belast met 0% of niet bij u belast (BTW)</field>
+            <field name="applicability">taxes</field>
+        </record>
+        <record id="tag_nl_26" model="account.account.tag">
+            <field name="name">Rubriek 2: Verleggingsregelingen binnenland (BTW)</field>
+            <field name="applicability">taxes</field>
+        </record>
+        <record id="tag_nl_27" model="account.account.tag">
+            <field name="name">2a. Leveringen/diensten waarbij de heffing van Heffing van omzetbelasting naar u is verlegd (BTW)</field>
+            <field name="applicability">taxes</field>
+        </record>
+        <record id="tag_nl_28" model="account.account.tag">
+            <field name="name">Rubriek 4: Prestaties vanuit het buitenland aan u verricht (BTW)</field>
+            <field name="applicability">taxes</field>
+        </record>
+        <record id="tag_nl_29" model="account.account.tag">
+            <field name="name">4a. Leveringen/diensten uit landen buiten de EU (BTW)</field>
+            <field name="applicability">taxes</field>
+        </record>
+        <record id="tag_nl_30" model="account.account.tag">
+            <field name="name">4b. Leveringen/diensten uit landen binnen de EU (BTW)</field>
+            <field name="applicability">taxes</field>
+        </record>
+        <record id="tag_nl_31" model="account.account.tag">
+            <field name="name">Rubriek 5: Voorbelasting, kleineondernemersregeling en totaal (BTW)</field>
+            <field name="applicability">taxes</field>
+        </record>
+        <record id="tag_nl_32" model="account.account.tag">
+            <field name="name">5a. Verschuldigde omzetbelasting (rubrieken 1a t/m 4b) (BTW)</field>
+            <field name="applicability">taxes</field>
+        </record>
+        <record id="tag_nl_33" model="account.account.tag">
+            <field name="name">5b. Voorbelasting (BTW)</field>
+            <field name="applicability">taxes</field>
+        </record>
+        <record id="tag_nl_34" model="account.account.tag">
+            <field name="name">Voorbelasting (BTW) bis</field>
+            <field name="applicability">taxes</field>
+        </record>
+        <record id="tag_nl_35" model="account.account.tag">
+            <field name="name">5c. Subtotaal (rubriek 5a min 5b) (BTW)</field>
+            <field name="applicability">taxes</field>
+        </record>
+        <record id="tag_nl_36" model="account.account.tag">
+            <field name="name">5d. Vermindering volgens de kleineondernemersregeling (BTW)</field>
+            <field name="applicability">taxes</field>
+        </record>
+        <record id="tag_nl_37" model="account.account.tag">
+            <field name="name">5e. Schatting vorige aangifte(n) (BTW)</field>
+            <field name="applicability">taxes</field>
+        </record>
+        <record id="tag_nl_38" model="account.account.tag">
+            <field name="name">5f. Schatting deze aangifte (BTW)</field>
+            <field name="applicability">taxes</field>
+        </record>
+        <record id="tag_nl_39" model="account.account.tag">
+            <field name="name">5g. Totaal te betalen/terug te vragen (BTW)</field>
+            <field name="applicability">taxes</field>
+        </record>
 <!-- Binnen Nederland -->
 <!-- Verkoop BTW -->
 
@@ -3276,7 +3304,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
             <field name="refund_account_id" ref="vat_payable0"/>
             <field name="account_id" ref="vat_payable0"/>
             <field name="type_tax_use">sale</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tax_tag_1')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_08')])]"/>
         </record>
         <record id="btw_6" model="account.tax.template">
             <field name="sequence">10</field>
@@ -3288,7 +3316,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
             <field name="refund_account_id" ref="vat_payable_low"/>
             <field name="account_id" ref="vat_payable_low"/>
             <field name="type_tax_use">sale</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tax_tag_2')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_05'),ref('tag_nl_22')])]"/>
         </record>
         <record id="btw_21" model="account.tax.template">
             <field name="sequence">5</field>
@@ -3300,7 +3328,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
             <field name="refund_account_id" ref="vat_payable_high"/>
             <field name="account_id" ref="vat_payable_high"/>
             <field name="type_tax_use">sale</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tax_tag_3')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_03'),ref('tag_nl_20')])]"/>
         </record>
 <!-- TODO - nakijken btw overig op percentage-->
         <record id="btw_overig" model="account.tax.template">
@@ -3313,7 +3341,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
             <field name="refund_account_id" ref="vat_payable_high"/>
             <field name="account_id" ref="vat_payable_high"/>
             <field name="type_tax_use">sale</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tax_tag_4')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_04'),ref('tag_nl_06'),ref('tag_nl_21'),ref('tag_nl_23')])]"/>
         </record>
 
 <!--Inkoop BTW -->
@@ -3327,7 +3355,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
             <field name="refund_account_id" ref="vat_refund_low"/>
             <field name="account_id" ref="vat_refund_low"/>
             <field name="type_tax_use">purchase</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tax_tag_5')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_33')])]"/>
         </record>
         <record id="btw_6_buy_incl" model="account.tax.template">
             <field name="sequence">10</field>
@@ -3352,7 +3380,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
             <field name="refund_account_id" ref="vat_refund_high"/>
             <field name="account_id" ref="vat_refund_high"/>
             <field name="type_tax_use">purchase</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tax_tag_6')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_33')])]"/>
         </record>
         <record id="btw_21_buy_incl" model="account.tax.template">
             <field name="sequence">5</field>
@@ -3377,7 +3405,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
             <field name="refund_account_id" ref="vat_refund_high"/>
             <field name="account_id" ref="vat_refund_high"/>
             <field name="type_tax_use">purchase</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tax_tag_7')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_33')])]"/>
         </record>
 <!--BTW verlegd-->
         <record id="btw_verk_0" model="account.tax.template">
@@ -3390,7 +3418,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
             <field name="refund_account_id" ref="vat_payable_verlegd"/>
             <field name="account_id" ref="vat_payable_verlegd"/>
             <field name="type_tax_use">sale</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tax_tag_8')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_08')])]"/>
         </record>
         <record id="btw_ink_0_1" model="account.tax.template">
             <field name="sequence">98</field>
@@ -3402,7 +3430,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
             <field name="refund_account_id" ref="vat_payable_verlegd"/>
             <field name="account_id" ref="vat_payable_verlegd"/>
             <field name="type_tax_use">none</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tax_tag_9')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_27')])]"/>
         </record>
         <record id="btw_ink_0_2" model="account.tax.template">
             <field name="sequence">99</field>
@@ -3414,7 +3442,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
             <field name="refund_account_id" ref="vat_payable_verlegd"/>
             <field name="account_id" ref="vat_payable_verlegd"/>
             <field name="type_tax_use">none</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tax_tag_10')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_34')])]"/>
         </record>
         <record id="btw_ink_0" model="account.tax.template">
             <field name="sequence">15</field>
@@ -3426,7 +3454,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
             <field name="refund_account_id" ref="vat_payable_verlegd"/>
             <field name="account_id" ref="vat_payable_verlegd"/>
             <field name="type_tax_use">purchase</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tax_tag_11')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_10')])]"/>
             <field name="children_tax_ids" eval="[(6, 0, [ref('btw_ink_0_1'), ref('btw_ink_0_2')])]"/>
         </record>
 <!-- Binnen de EU -->
@@ -3441,7 +3469,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
             <field name="refund_account_id" ref="vat_payable_low"/>
             <field name="account_id" ref="vat_payable_low"/>
             <field name="type_tax_use">none</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tax_tag_12')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_30')])]"/>
         </record>
         <record id="btw_I_6_2" model="account.tax.template">
             <field name="chart_template_id" ref="l10nnl_chart_template"/>
@@ -3453,7 +3481,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
             <field name="refund_account_id" ref="vat_refund_low"/>
             <field name="account_id" ref="vat_refund_low"/>
             <field name="type_tax_use">none</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tax_tag_13')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_33')])]"/>
         </record>
         <record id="btw_I_6" model="account.tax.template">
             <field name="sequence">20</field>
@@ -3463,7 +3491,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
             <field eval="6" name="amount"/>
             <field name="amount_type">group</field>
             <field name="type_tax_use">purchase</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tax_tag_14')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_17')])]"/>
             <field name="children_tax_ids" eval="[(6, 0, [ref('btw_I_6_1'), ref('btw_I_6_2')])]"/>
         </record>
         <record id="btw_I_21_1" model="account.tax.template">
@@ -3476,7 +3504,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
             <field name="refund_account_id" ref="vat_payable_high"/>
             <field name="account_id" ref="vat_payable_high"/>
             <field name="type_tax_use">none</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tax_tag_15')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_30')])]"/>
         </record>
         <record id="btw_I_21_2" model="account.tax.template">
             <field name="chart_template_id" ref="l10nnl_chart_template"/>
@@ -3488,7 +3516,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
             <field name="refund_account_id" ref="vat_refund_high"/>
             <field name="account_id" ref="vat_refund_high"/>
             <field name="type_tax_use">none</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tax_tag_16')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_33')])]"/>
         </record>
         <record id="btw_I_21" model="account.tax.template">
             <field name="chart_template_id" ref="l10nnl_chart_template"/>
@@ -3498,7 +3526,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
             <field eval="21" name="amount"/>
             <field name="amount_type">group</field>
             <field name="type_tax_use">purchase</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tax_tag_17')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_17')])]"/>
             <field name="children_tax_ids" eval="[(6, 0, [ref('btw_I_21_1'), ref('btw_I_21_2')])]"/>
         </record>
         <record id="btw_I_overig_1" model="account.tax.template">
@@ -3511,7 +3539,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
             <field name="refund_account_id" ref="vat_payable_high"/>
             <field name="account_id" ref="vat_payable_high"/>
             <field name="type_tax_use">none</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tax_tag_18')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_30')])]"/>
         </record>
         <record id="btw_I_overig_2" model="account.tax.template">
             <field name="chart_template_id" ref="l10nnl_chart_template"/>
@@ -3523,7 +3551,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
             <field name="account_id" ref="vat_refund_high"/>
             <field name="sequence">98</field>
             <field name="type_tax_use">none</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tax_tag_19')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_33')])]"/>
         </record>
         <record id="btw_I_overig" model="account.tax.template">
             <field name="sequence">20</field>
@@ -3533,7 +3561,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
             <field eval="0" name="amount"/>
             <field name="amount_type">group</field>
             <field name="type_tax_use">purchase</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tax_tag_20')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_17')])]"/>
             <field name="children_tax_ids" eval="[(6, 0, [ref('btw_I_overig_1'), ref('btw_I_overig_2')])]"/>
         </record>
 <!-- BTW verkoop -->                        
@@ -3547,7 +3575,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
             <field name="refund_account_id" ref="vat_payable0"/>
             <field name="account_id" ref="vat_payable0"/>
             <field name="type_tax_use">sale</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tax_tag_21')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_13')])]"/>
         </record>
         <record id="btw_X2" model="account.tax.template">
             <field name="sequence">20</field>
@@ -3559,7 +3587,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
             <field name="refund_account_id" ref="vat_payable0"/>
             <field name="account_id" ref="vat_payable0"/>
             <field name="type_tax_use">sale</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tax_tag_22')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_14')])]"/>
         </record>
 
 <!-- Buiten de EU -->
@@ -3574,7 +3602,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
             <field name="account_id" ref="vat_payable_low"/>
             <field name="sequence">21</field>
             <field name="type_tax_use">none</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tax_tag_23')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_29')])]"/>
         </record>
         <record id="btw_E1_2" model="account.tax.template">
             <field name="chart_template_id" ref="l10nnl_chart_template"/>
@@ -3586,7 +3614,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
             <field name="account_id" ref="vat_refund_low"/>
             <field name="sequence">22</field>
             <field name="type_tax_use">none</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tax_tag_24')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_33')])]"/>
         </record>
         <record id="btw_E1" model="account.tax.template">
             <field name="sequence">20</field>
@@ -3596,7 +3624,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
             <field eval="6" name="amount"/>
             <field name="amount_type">group</field>
             <field name="type_tax_use">purchase</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tax_tag_25')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_16')])]"/>
             <field name="children_tax_ids" eval="[(6, 0, [ref('btw_E1_1'), ref('btw_E1_2')])]"/>
         </record>
         <record id="btw_E2_1" model="account.tax.template">
@@ -3609,7 +3637,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
             <field name="sequence">21</field>
             <field name="account_id" ref="vat_payable_high"/>
             <field name="type_tax_use">none</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tax_tag_26')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_29')])]"/>
         </record>
         <record id="btw_E2_2" model="account.tax.template">
             <field name="chart_template_id" ref="l10nnl_chart_template"/>
@@ -3621,7 +3649,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
             <field name="refund_account_id" ref="vat_refund_high"/>
             <field name="account_id" ref="vat_refund_high"/>
             <field name="type_tax_use">none</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tax_tag_27')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_34')])]"/>
         </record>
         <record id="btw_E2" model="account.tax.template">
             <field name="sequence">20</field>
@@ -3631,7 +3659,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
             <field eval="21" name="amount"/>
             <field name="amount_type">group</field>
             <field name="type_tax_use">purchase</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tax_tag_28')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_16')])]"/>
             <field name="children_tax_ids" eval="[(6, 0, [ref('btw_E2_1'), ref('btw_E2_2')])]"/>
         </record>
         <record id="btw_E_overig_1" model="account.tax.template">
@@ -3644,7 +3672,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
             <field name="account_id" ref="vat_payable_high"/>
             <field name="type_tax_use">none</field>
             <field name="sequence">21</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tax_tag_29')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_29')])]"/>
         </record>
         <record id="btw_E_overig_2" model="account.tax.template">
             <field name="chart_template_id" ref="l10nnl_chart_template"/>
@@ -3656,7 +3684,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
             <field name="account_id" ref="vat_refund_high"/>
             <field name="type_tax_use">none</field>
             <field name="sequence">22</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tax_tag_30')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_33')])]"/>
         </record>
         <record id="btw_E_overig" model="account.tax.template">
             <field name="sequence">20</field>
@@ -3666,7 +3694,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
             <field eval="21" name="amount"/>
             <field name="amount_type">group</field>
             <field name="type_tax_use">purchase</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tax_tag_31')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_16')])]"/>
             <field name="children_tax_ids" eval="[(6, 0, [ref('btw_E_overig_1'), ref('btw_E_overig_2')])]"/>
         </record>
 <!-- BTW Verkoop -->
@@ -3680,7 +3708,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
             <field name="refund_account_id" ref="vat_payable0"/>
             <field name="account_id" ref="vat_payable0"/>
             <field name="type_tax_use">sale</field>
-            <field name="tag_ids" eval="[(6,0,[ref('tax_tag_32')])]"/>
+            <field name="tag_ids" eval="[(6,0,[ref('tag_nl_12')])]"/>
         </record>
     </data>
 </openerp>

From b253c3323ea0704233a187b3fbe223eb8081e105 Mon Sep 17 00:00:00 2001
From: sha-odoo <sha@odoo.com>
Date: Fri, 4 Mar 2016 18:46:26 +0530
Subject: [PATCH 15/27] [IMP] l10n_nl: Added pre and post migration file

---
 addons/l10n_nl/__openerp__.py                              | 2 +-
 .../l10n_nl/migrations/2.0/post-migrate_tags_on_taxes.py   | 7 +++++++
 .../migrations/2.0/pre-set_tags_and_taxes_updatable.py     | 7 +++++++
 3 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 addons/l10n_nl/migrations/2.0/post-migrate_tags_on_taxes.py
 create mode 100644 addons/l10n_nl/migrations/2.0/pre-set_tags_and_taxes_updatable.py

diff --git a/addons/l10n_nl/__openerp__.py b/addons/l10n_nl/__openerp__.py
index d5c374cf8c5..1a5df633730 100644
--- a/addons/l10n_nl/__openerp__.py
+++ b/addons/l10n_nl/__openerp__.py
@@ -65,7 +65,7 @@
 
 {
     'name' : 'Netherlands - Accounting',
-    'version' : '1.5',
+    'version' : '2.0',
     'category': 'Localization/Account Charts',
     'description': """
 This is the module to manage the accounting chart for Netherlands in OpenERP.
diff --git a/addons/l10n_nl/migrations/2.0/post-migrate_tags_on_taxes.py b/addons/l10n_nl/migrations/2.0/post-migrate_tags_on_taxes.py
new file mode 100644
index 00000000000..a37770d2c1c
--- /dev/null
+++ b/addons/l10n_nl/migrations/2.0/post-migrate_tags_on_taxes.py
@@ -0,0 +1,7 @@
+from openerp.modules.registry import RegistryManager
+
+
+def migrate(cr, version):
+    registry = RegistryManager.get(cr.dbname)
+    from openerp.addons.account.models.chart_template import migrate_tags_on_taxes
+    migrate_tags_on_taxes(cr, registry)
diff --git a/addons/l10n_nl/migrations/2.0/pre-set_tags_and_taxes_updatable.py b/addons/l10n_nl/migrations/2.0/pre-set_tags_and_taxes_updatable.py
new file mode 100644
index 00000000000..b9bdb2af7c5
--- /dev/null
+++ b/addons/l10n_nl/migrations/2.0/pre-set_tags_and_taxes_updatable.py
@@ -0,0 +1,7 @@
+from openerp.modules.registry import RegistryManager
+
+
+def migrate(cr, version):
+    registry = RegistryManager.get(cr.dbname)
+    from openerp.addons.account.models.chart_template import migrate_set_tags_and_taxes_updatable
+    migrate_set_tags_and_taxes_updatable(cr, registry, 'l10n_nl')

From e1b1f2451656648ddb79f781d0e03aa2e9014541 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Wed, 23 Mar 2016 14:05:23 +0100
Subject: [PATCH 16/27] [FIX] payment, website_sale: back port of f89e8f9

---
 addons/payment/models/payment_acquirer.py |  8 ++++++++
 addons/website_sale/controllers/main.py   | 10 ++++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/addons/payment/models/payment_acquirer.py b/addons/payment/models/payment_acquirer.py
index d634c217ec9..3f7e45f8888 100644
--- a/addons/payment/models/payment_acquirer.py
+++ b/addons/payment/models/payment_acquirer.py
@@ -454,6 +454,14 @@ class PaymentTransaction(osv.Model):
             'partner_phone': partner and partner.phone or False,
         }}
 
+    def get_next_reference(self, cr, uid, reference, context=None):
+        ref_suffix = 1
+        init_ref = reference
+        while self.pool['payment.transaction'].search_count(cr, uid, [('reference', '=', reference)], context=context):
+            reference = init_ref + '-' + str(ref_suffix)
+            ref_suffix += 1
+        return reference
+
     # --------------------------------------------------
     # FORM RELATED METHODS
     # --------------------------------------------------
diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index c9ceabb568e..b50836ee065 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -687,18 +687,16 @@ class website_sale(http.Controller):
         values['errors'] = sale_order_obj._get_errors(cr, uid, order, context=context)
         values.update(sale_order_obj._get_website_data(cr, uid, order, context))
 
-        # fetch all registered payment means
-        # if tx:
-        #     acquirer_ids = [tx.acquirer_id.id]
-        # else:
         if not values['errors']:
+            # find an already existing transaction
+            tx = request.website.sale_get_transaction()
             acquirer_ids = payment_obj.search(cr, SUPERUSER_ID, [('website_published', '=', True), ('company_id', '=', order.company_id.id)], context=context)
             values['acquirers'] = list(payment_obj.browse(cr, uid, acquirer_ids, context=context))
             render_ctx = dict(context, submit_class='btn btn-primary', submit_txt=_('Pay Now'))
             for acquirer in values['acquirers']:
                 acquirer.button = payment_obj.render(
                     cr, SUPERUSER_ID, acquirer.id,
-                    order.name,
+                    tx and tx.reference or request.env['payment.transaction'].get_next_reference(order.name),
                     order.amount_total,
                     order.pricelist_id.currency_id.id,
                     partner_id=shipping_partner_id,
@@ -748,7 +746,7 @@ class website_sale(http.Controller):
                 'currency_id': order.pricelist_id.currency_id.id,
                 'partner_id': order.partner_id.id,
                 'partner_country_id': order.partner_id.country_id.id,
-                'reference': order.name,
+                'reference': request.env['payment.transaction'].get_next_reference(order.name),
                 'sale_order_id': order.id,
             }, context=context)
             request.session['sale_transaction_id'] = tx_id

From a430e2c8c53f3c18274236db4d913072318d78f2 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Wed, 23 Mar 2016 14:06:26 +0100
Subject: [PATCH 17/27] [FIX] payment, website_sale: back port of cb9d798

---
 addons/payment/models/payment_acquirer.py | 3 ++-
 addons/website_sale/controllers/main.py   | 3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/payment/models/payment_acquirer.py b/addons/payment/models/payment_acquirer.py
index 3f7e45f8888..2e4512cdbd3 100644
--- a/addons/payment/models/payment_acquirer.py
+++ b/addons/payment/models/payment_acquirer.py
@@ -2,6 +2,7 @@
 
 import logging
 
+import openerp
 from openerp.osv import osv, fields
 from openerp.tools import float_round, float_repr
 from openerp.tools.translate import _
@@ -457,7 +458,7 @@ class PaymentTransaction(osv.Model):
     def get_next_reference(self, cr, uid, reference, context=None):
         ref_suffix = 1
         init_ref = reference
-        while self.pool['payment.transaction'].search_count(cr, uid, [('reference', '=', reference)], context=context):
+        while self.pool['payment.transaction'].search_count(cr, openerp.SUPERUSER_ID, [('reference', '=', reference)], context=context):
             reference = init_ref + '-' + str(ref_suffix)
             ref_suffix += 1
         return reference
diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index b50836ee065..cb6a416c068 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -730,12 +730,11 @@ class website_sale(http.Controller):
         tx = request.website.sale_get_transaction()
         if tx:
             tx_id = tx.id
-            if tx.reference != order.name:
+            if tx.sale_order_id.id != order.id or tx.state in ['error', 'cancel'] or tx.acquirer_id.id != acquirer_id:
                 tx = False
                 tx_id = False
             elif tx.state == 'draft':  # button cliked but no more info -> rewrite on tx or create a new one ?
                 tx.write({
-                    'acquirer_id': acquirer_id,
                     'amount': order.amount_total,
                 })
         if not tx:

From a0c473379ae8ff1b7a0e70d786dc3aad49570ba9 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Wed, 23 Mar 2016 14:11:32 +0100
Subject: [PATCH 18/27] [FIX] website_sale: back port of
 15f27b2614a4d6f86ded20fc7b3d8e796a2db078

---
 addons/website_sale/controllers/main.py         | 17 +++++++++++++----
 .../static/src/js/website_sale_payment.js       |  1 +
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index cb6a416c068..410f976dd98 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -688,15 +688,13 @@ class website_sale(http.Controller):
         values.update(sale_order_obj._get_website_data(cr, uid, order, context))
 
         if not values['errors']:
-            # find an already existing transaction
-            tx = request.website.sale_get_transaction()
             acquirer_ids = payment_obj.search(cr, SUPERUSER_ID, [('website_published', '=', True), ('company_id', '=', order.company_id.id)], context=context)
             values['acquirers'] = list(payment_obj.browse(cr, uid, acquirer_ids, context=context))
             render_ctx = dict(context, submit_class='btn btn-primary', submit_txt=_('Pay Now'))
             for acquirer in values['acquirers']:
                 acquirer.button = payment_obj.render(
                     cr, SUPERUSER_ID, acquirer.id,
-                    tx and tx.reference or request.env['payment.transaction'].get_next_reference(order.name),
+                    '/',
                     order.amount_total,
                     order.pricelist_id.currency_id.id,
                     partner_id=shipping_partner_id,
@@ -718,6 +716,7 @@ class website_sale(http.Controller):
                                 user is redirected to the checkout page
         """
         cr, uid, context = request.cr, request.uid, request.context
+        payment_obj = request.registry.get('payment.acquirer')
         transaction_obj = request.registry.get('payment.transaction')
         order = request.website.sale_get_order(context=context)
 
@@ -749,6 +748,7 @@ class website_sale(http.Controller):
                 'sale_order_id': order.id,
             }, context=context)
             request.session['sale_transaction_id'] = tx_id
+            tx = transaction_obj.browse(cr, SUPERUSER_ID, tx_id, context=context)
 
         # update quotation
         request.registry['sale.order'].write(
@@ -757,7 +757,16 @@ class website_sale(http.Controller):
                 'payment_tx_id': request.session['sale_transaction_id']
             }, context=context)
 
-        return tx_id
+        return payment_obj.render(
+            cr, SUPERUSER_ID, tx.acquirer_id.id,
+            tx.reference,
+            order.amount_total,
+            order.pricelist_id.currency_id.id,
+            partner_id=order.partner_shipping_id.id or order.partner_invoice_id.id,
+            tx_values={
+                'return_url': '/shop/payment/validate',
+            },
+            context=dict(context, submit_class='btn btn-primary', submit_txt=_('Pay Now')))
 
     @http.route('/shop/payment/get_status/<int:sale_order_id>', type='json', auth="public", website=True)
     def payment_get_status(self, sale_order_id, **post):
diff --git a/addons/website_sale/static/src/js/website_sale_payment.js b/addons/website_sale/static/src/js/website_sale_payment.js
index 8ca1b85f907..94ebde001b2 100644
--- a/addons/website_sale/static/src/js/website_sale_payment.js
+++ b/addons/website_sale/static/src/js/website_sale_payment.js
@@ -19,6 +19,7 @@ $(document).ready(function () {
         return false;
       }
       openerp.jsonRpc('/shop/payment/transaction/' + acquirer_id, 'call', {}).then(function (data) {
+        $form.html(data);
         $form.submit();
       });
    });

From 9752aedb4ec3977a634299d7683c03fda7e005a6 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Wed, 23 Mar 2016 14:59:22 +0100
Subject: [PATCH 19/27] [FIX] website_sale: update partner details when reusing
 payment transaction

When attempting to pay a cart in the ecommerce,
if the customer went on the payment acquirer site
(meaning, the `payment.transaction` is created
in the database), then come back to the checkout form
using the browser back button, and changed his customer
details (address, email, phone,...),
these changes in the details were not applied
in the `payment.transaction` record that was being
re-used.

e.g.
Checkout > Confirm > Choose Paypal, Pay Now
> History back to the checkout and apply changes
in the address > Confirm > Pay Now.
---
 addons/website_sale/controllers/main.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index 410f976dd98..e6ec0ddc785 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -733,9 +733,7 @@ class website_sale(http.Controller):
                 tx = False
                 tx_id = False
             elif tx.state == 'draft':  # button cliked but no more info -> rewrite on tx or create a new one ?
-                tx.write({
-                    'amount': order.amount_total,
-                })
+                tx.write(dict(transaction_obj.on_change_partner_id(cr, uid, None, order.partner_id.id, context=context).get('values', {}), amount=order.amount_total))
         if not tx:
             tx_id = transaction_obj.create(cr, SUPERUSER_ID, {
                 'acquirer_id': acquirer_id,

From 48eb674a7003f046207485cc127e314c0936313a Mon Sep 17 00:00:00 2001
From: Joren Van Onder <jov@odoo.com>
Date: Wed, 23 Mar 2016 14:58:51 +0100
Subject: [PATCH 20/27] [FIX] pos_mercury: allow for 40 bit mercury invoice
 numbers

We generate the Mercury invoice number in JavaScript based on the uid
property of the order. That uid is generated by
Order.generate_unique_id() which generates a 12 digit number. A decimal
12 digit number can contain a maximum value of 10^12 - 1 which requires
40 bits to store. The issue is that Integer fields by default are backed
by a PostgreSQL integer type which is only 4 bytes. This means you can
end up with an invoice number you won't be able to store in the
database.

In order to resolve this we will update the field to be a Float field
instead which will result in a PostgreSQL double precision type which
allows values up to 10^308.

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

diff --git a/addons/pos_mercury/models/pos_mercury.py b/addons/pos_mercury/models/pos_mercury.py
index 0abf956d726..fb5b52d01d0 100644
--- a/addons/pos_mercury/models/pos_mercury.py
+++ b/addons/pos_mercury/models/pos_mercury.py
@@ -36,7 +36,7 @@ class account_bank_statement_line(models.Model):
     mercury_card_owner_name = fields.Char(string='Card Owner Name', help='The name of the card owner')
     mercury_ref_no = fields.Char(string='Mercury reference number', help='Payment reference number from Mercury Pay')
     mercury_record_no = fields.Char(string='Mercury record number', help='Payment record number from Mercury Pay')
-    mercury_invoice_no = fields.Integer(string='Mercury invoice number', help='Invoice number from Mercury Pay')
+    mercury_invoice_no = fields.Float(string='Mercury invoice number', help='Invoice number from Mercury Pay')
 
     @api.one
     def _compute_prefixed_card_number(self):

From a4f8464be7eecc90a2be4552a29742298abbe8bd Mon Sep 17 00:00:00 2001
From: Damien Bouvy <dbo@odoo.com>
Date: Wed, 16 Mar 2016 15:12:12 +0100
Subject: [PATCH 21/27] [FIX] website_sale: when paying by wire transfer,
 display payment info

In 8.0, when paying by wire tranfer, the confirmation page
contained the detailed payment information.

This behaviour was lost in 9, this revision reintroduces it.
---
 addons/website_sale/views/templates.xml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml
index cd4efc6a967..f8a2256bb86 100644
--- a/addons/website_sale/views/templates.xml
+++ b/addons/website_sale/views/templates.xml
@@ -1376,7 +1376,7 @@
     <t t-if="tx_ids and state == 'cancel'">
       <p>The payment seems to have been canceled.</p>
     </t>
-    <t t-if="tx_ids and state == 'pending' and validation == 'manual'">
+    <t t-if="tx_ids and state == 'pending' and validation">
       <p>Your transaction is waiting a manual confirmation.</p><br />
       <t t-if="tx_post_msg">
         <div class="hidden-print"><t t-raw="tx_post_msg"/></div>
@@ -1426,8 +1426,11 @@
 <!-- payment acquirer information -->
 <template id="payment_confirmation_status">
     <t t-if="order.payment_acquirer_id.auto_confirm == 'none'">
-      <div class="alert alert-info" role="alert">
-        <t t-raw="order.payment_acquirer_id.pending_msg"/>
+      <div class="panel panel-info">
+        <div class="panel-heading" t-raw="order.payment_acquirer_id.pending_msg" />
+        <div class="panel-body" t-if="order.payment_acquirer_id.post_msg">
+            <t t-raw="order.payment_acquirer_id.post_msg"/>
+        </div>
       </div>
     </t>
     <t t-if="order.payment_acquirer_id.auto_confirm == 'at_pay_confirm'">

From 7682760dcad232829fbb5d4221f66a1ebb9d6c91 Mon Sep 17 00:00:00 2001
From: Damien Bouvy <dbo@odoo.com>
Date: Wed, 23 Mar 2016 14:38:21 +0100
Subject: [PATCH 22/27] [FIX] website_sale,website_quote: form must be in dom
 to be submitted

Revision 15f27b2 introduced a dynamic form submission to
avoid some payment transaction problems.

It so happens that form submission in jquery necessitates
said form to actually be in the dom (at least for Firefox
and some version of MSIE); this revision ensures that the
form is updated in the dom by the rpc call then properly
submitted.
---
 addons/website_quote/static/src/js/website_quotation.js   | 3 ++-
 addons/website_sale/static/src/js/website_sale_payment.js | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/website_quote/static/src/js/website_quotation.js b/addons/website_quote/static/src/js/website_quotation.js
index 3221eeba0a4..2ff25986179 100644
--- a/addons/website_quote/static/src/js/website_quotation.js
+++ b/addons/website_quote/static/src/js/website_quotation.js
@@ -212,7 +212,8 @@ odoo.define('website_quote.payment_method', function (require) {
       var token = href.match(/quote\/[0-9]+\/([^\/?]*)/);
       token = token ? token[1] : '';
       ajax.jsonRpc('/quote/' + order_id +'/transaction/' + acquirer_id + (token ? '/' + token : ''), 'call', {}).then(function (data) {
-          $(data).submit();
+          $form.html(data);
+          $form.submit();
       });
    });
 });
diff --git a/addons/website_sale/static/src/js/website_sale_payment.js b/addons/website_sale/static/src/js/website_sale_payment.js
index d16a91b8b86..5b02f5b7c61 100644
--- a/addons/website_sale/static/src/js/website_sale_payment.js
+++ b/addons/website_sale/static/src/js/website_sale_payment.js
@@ -30,7 +30,8 @@ $(document).ready(function () {
         return false;
       }
       ajax.jsonRpc('/shop/payment/transaction/' + acquirer_id, 'call', {}).then(function (data) {
-          $(data).submit();
+          $form.html(data);
+          $form.submit();
       });
    });
 

From 4fdd741b3b843d95baff68f80ace299a1af3ce97 Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Thu, 24 Mar 2016 09:31:29 +0100
Subject: [PATCH 23/27] [FIX] crm: default subscription

When a CRM activity is defined, the subscription is activated by default
for any user. There is no way to change it since the field is not in
the form view. Therefore, a customer is automatically subscribed to any
internal activity, and the user must manually remove the subscription
afterwards.

The `default` field is displayed in the forw view, so this default
behavior can now be configured for a given activity.

opw-672453
---
 addons/crm/views/crm_action_views.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/crm/views/crm_action_views.xml b/addons/crm/views/crm_action_views.xml
index 1d46749b652..e57cf153dff 100644
--- a/addons/crm/views/crm_action_views.xml
+++ b/addons/crm/views/crm_action_views.xml
@@ -25,6 +25,7 @@
                         <field name="team_id"/>
                         <field name="description"/>
                         <field name="days"/>
+                        <field name="default"/>
                     </group>
                     <group>
                         <field name="activity_1_id"/>

From 64e8d9c9727caebdb33b8b0f1d9ded05abcca934 Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Thu, 24 Mar 2016 11:09:02 +0100
Subject: [PATCH 24/27] [FIX] web: clear filename if image error

When the user chooses as product image a file which is not an image, the
message "Could not display the selected image" is displayed. However, at
saving, a traceback is thrown since the file chosen is uploaded anyway.

If the image cannot be displayed, the image field is cleared.

opw-672206
---
 addons/web/static/src/js/views/form_widgets.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/web/static/src/js/views/form_widgets.js b/addons/web/static/src/js/views/form_widgets.js
index 92782b5923a..7f5e6c54da4 100644
--- a/addons/web/static/src/js/views/form_widgets.js
+++ b/addons/web/static/src/js/views/form_widgets.js
@@ -1362,6 +1362,7 @@ var FieldBinaryImage = FieldBinary.extend({
             $img.css("max-height", "" + self.options.size[1] + "px");
         });
         $img.on('error', function() {
+            self.on_clear();
             $img.attr('src', self.placeholder);
             self.do_warn(_t("Image"), _t("Could not display the selected image."));
         });

From 3f9c383a0e0f9e53583cecb4519185f528743b88 Mon Sep 17 00:00:00 2001
From: qdp-odoo <qdp@odoo.com>
Date: Thu, 24 Mar 2016 12:26:43 +0100
Subject: [PATCH 25/27] [FIX] account_full_reconcile: migration script fixed in
 order to work also on databases that has been used after the migration +
 query optimization

---
 addons/account_full_reconcile/__init__.py | 159 ++++++++++++----------
 1 file changed, 85 insertions(+), 74 deletions(-)

diff --git a/addons/account_full_reconcile/__init__.py b/addons/account_full_reconcile/__init__.py
index 9c0ea901d41..a4eeb6338a6 100644
--- a/addons/account_full_reconcile/__init__.py
+++ b/addons/account_full_reconcile/__init__.py
@@ -19,79 +19,90 @@ def _migrate_full_reconcile(cr, registry):
         WHERE table_name = 'account_move_line'
           AND column_name = 'reconcile_id'
         """)
-    if not cr.fetchone():
-        #if no, it's a fresh v9 database and we cannot migrate anything. Rebuild the whole table based on partial
-        all_partial_rec_ids = registry['account.partial.reconcile'].search(cr, SUPERUSER_ID, [])
-        already_processed = {}
-        for partial in registry['account.partial.reconcile'].browse(cr, SUPERUSER_ID, all_partial_rec_ids):
-            partial_rec_set = OrderedDict.fromkeys([partial])
-            aml_set = set()
-            total_debit = 0
-            total_credit = 0
-            for partial_rec in partial_rec_set:
-                if partial_rec in already_processed:
-                    continue
-                for aml in [partial_rec.debit_move_id, partial_rec.credit_move_id]:
-                    if aml not in aml_set:
-                        total_debit += aml.debit
-                        total_credit += aml.credit
-                        aml_set |= set([aml])
-                    for x in aml.matched_debit_ids | aml.matched_credit_ids:
-                        partial_rec_set[x] = None
-            partial_rec_ids = []
-            for x in partial_rec_set.keys():
-                partial_rec_ids.append(x.id)
-                already_processed[x] = None
-            aml_ids = [x.id for x in aml_set]
-            if aml_ids and partial_rec_ids:
-                #then, if the total debit and credit are equal, the reconciliation is full
-                digits_rounding_precision = aml.company_id.currency_id.rounding
-                if float_compare(total_debit, total_credit, precision_rounding=digits_rounding_precision) == 0:
-                    #in that case, mark the reference on the partial reconciliations and the entries
-                    registry['account.full.reconcile'].create(cr, SUPERUSER_ID, {
-                        'partial_reconcile_ids': [(6, 0, partial_rec_ids)],
-                        'reconciled_line_ids': [(6, 0, aml_ids)]
-                        }, context={'check_move_validity': False})
-        return
-
-    #otherwise, use the table account_move_reconcile if it exists (not dropped by migration)
-    cr.execute("SELECT 1 FROM information_schema.tables WHERE table_name = 'account_move_reconcile'")
     if cr.fetchone():
-        #account_move_reconcile exists
-        #copy old table
-        cr.execute("""
-            INSERT INTO account_full_reconcile (id, name, create_date)
-                SELECT id, name, create_date
-                FROM account_move_reconcile
-                WHERE id IN (
-                    SELECT DISTINCT reconcile_id FROM account_move_line WHERE reconcile_id IS NOT NULL)
-            """)
-    else:
-        #account_move_reconcile was dropped during migration, rebuild that table
-        cr.execute("""
-            INSERT INTO account_full_reconcile (id, name)
-                SELECT DISTINCT reconcile_id, reconcile_ref FROM account_move_line WHERE reconcile_id IS NOT NULL
-            """)
-    #update the index of account_full_reconcile
-    cr.execute("SELECT setval('account_full_reconcile_id_seq', (SELECT MAX(id) FROM account_full_reconcile))")
+        #if yes, use the table account_move_reconcile if it exists (not dropped by migration)
+        cr.execute("SELECT 1 FROM information_schema.tables WHERE table_name = 'account_move_reconcile'")
+        if cr.fetchone():
+            #account_move_reconcile exists
+            #copy old table
+            cr.execute("""
+                INSERT INTO account_full_reconcile (id, name, create_date)
+                    SELECT id, name, create_date
+                    FROM account_move_reconcile
+                    WHERE id IN (
+                        SELECT DISTINCT reconcile_id FROM account_move_line WHERE reconcile_id IS NOT NULL)
+                """)
+        else:
+            #account_move_reconcile was dropped during migration, rebuild that table
+            cr.execute("""
+                INSERT INTO account_full_reconcile (id, name)
+                    SELECT DISTINCT reconcile_id, reconcile_ref FROM account_move_line WHERE reconcile_id IS NOT NULL
+                """)
+        #update the index of account_full_reconcile
+        cr.execute("SELECT setval('account_full_reconcile_id_seq', (SELECT MAX(id) FROM account_full_reconcile))")
 
-    #copy values on account.move.line
-    cr.execute("UPDATE account_move_line SET full_reconcile_id = reconcile_id WHERE reconcile_id IS NOT NULL")
-    #copy the full_reconcile_id existing of account.move.line to their account.partial.reconcile
-    cr.execute("""
-        WITH tmp_table AS (
-            SELECT rec.id AS partial_id, aml.reconcile_id AS full_id
-            FROM account_move_line aml
-            RIGHT JOIN account_partial_reconcile rec
-                ON aml.id = rec.debit_move_id
-            WHERE aml.reconcile_id IS NOT NULL
-            UNION
-            SELECT rec.id AS partial_id, aml.reconcile_id AS full_id
-            FROM account_move_line aml
-            RIGHT JOIN account_partial_reconcile rec
-                ON aml.id = rec.credit_move_id
-            WHERE aml.reconcile_id IS NOT NULL)
-        UPDATE account_partial_reconcile p
-        SET full_reconcile_id = (SELECT full_id FROM tmp_table tmp WHERE p.id = tmp.partial_id)
-        WHERE p.id IN (SELECT partial_id FROM tmp_table)
-        """)
+        #copy the full_reconcile_id existing of account.move.line to their account.partial.reconcile
+        cr.execute("""
+            WITH tmp_table AS (
+              SELECT partial_id, MAX(full_id) AS full_id FROM (
+                SELECT rec.id AS partial_id, aml.reconcile_id AS full_id
+                FROM account_move_line aml
+                RIGHT JOIN account_partial_reconcile rec
+                    ON aml.id = rec.debit_move_id
+                WHERE aml.reconcile_id IS NOT NULL
+                UNION
+                SELECT rec.id AS partial_id, aml.reconcile_id AS full_id
+                FROM account_move_line aml
+                RIGHT JOIN account_partial_reconcile rec
+                    ON aml.id = rec.credit_move_id
+                WHERE aml.reconcile_id IS NOT NULL) tmp_table_with_duplicated_recs
+             GROUP BY partial_id HAVING COUNT(partial_id) = 1)
+            UPDATE account_partial_reconcile p
+            SET full_reconcile_id = tmp.full_id FROM tmp_table tmp WHERE p.id = tmp.partial_id
+            """)
+    #if it's a fresh v9 database, or it has been used after the migration, we need to fill the table based on partial
+    all_partial_rec_ids = registry['account.partial.reconcile'].search(cr, SUPERUSER_ID, [('full_reconcile_id', '=', False)])
+    already_processed = {}
+    for partial in registry['account.partial.reconcile'].browse(cr, SUPERUSER_ID, all_partial_rec_ids):
+        partial_rec_set = OrderedDict.fromkeys([partial])
+        aml_set = set()
+        total_debit = 0
+        total_credit = 0
+        for partial_rec in partial_rec_set:
+            if partial_rec in already_processed:
+                continue
+            for aml in [partial_rec.debit_move_id, partial_rec.credit_move_id]:
+                if aml not in aml_set:
+                    total_debit += aml.debit
+                    total_credit += aml.credit
+                    aml_set |= set([aml])
+                for x in aml.matched_debit_ids | aml.matched_credit_ids:
+                    partial_rec_set[x] = None
+        partial_rec_ids = []
+        for x in partial_rec_set.keys():
+            partial_rec_ids.append(x.id)
+            already_processed[x] = None
+        aml_ids = [x.id for x in aml_set]
+        if aml_ids and partial_rec_ids:
+            #then, if the total debit and credit are equal, the reconciliation is full
+            digits_rounding_precision = aml.company_id.currency_id.rounding
+            if float_compare(total_debit, total_credit, precision_rounding=digits_rounding_precision) == 0:
+                #in that case, mark the reference on the partial reconciliations and the entries
+                registry['account.full.reconcile'].create(cr, SUPERUSER_ID, {
+                    'partial_reconcile_ids': [(6, 0, partial_rec_ids)],
+                    }, context={'check_move_validity': False})
+        #copy values on account.move.line: rely on partial reconciliations only, as the reconcile_id column may not be
+        #up-to-date, as unreconciliations/new reconciliations may have been done after migration
+        cr.execute("""
+            WITH tmp_table AS (
+                SELECT debit_move_id AS aml_id, full_reconcile_id
+                FROM account_partial_reconcile rec
+                WHERE rec.full_reconcile_id IS NOT NULL
+                UNION ALL
+                SELECT credit_move_id AS aml_id, full_reconcile_id
+                FROM account_partial_reconcile rec
+                WHERE rec.full_reconcile_id IS NOT NULL)
+            UPDATE account_move_line aml
+            SET full_reconcile_id = tmp.full_reconcile_id FROM tmp_table tmp WHERE aml.id = tmp.aml_id
+            """)
+    return

From 5e84021cbb1762f67410c5803ad4dbf1c47d9be7 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Thu, 24 Mar 2016 14:29:24 +0100
Subject: [PATCH 26/27] [FIX] product: fixed price decimal priecision in
 pricelist

The fixed price decimal precision must use the same precision
than the other price field referencing a product price,
as this field is expected to contain a product price.

opw-672877
---
 addons/product/pricelist.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py
index 7e2467d3d2e..3b27a84edbf 100644
--- a/addons/product/pricelist.py
+++ b/addons/product/pricelist.py
@@ -319,7 +319,7 @@ class product_pricelist_item(osv.osv):
         'date_start': fields.date('Start Date', help="Starting date for the pricelist item validation"),
         'date_end': fields.date('End Date', help="Ending valid for the pricelist item validation"),
         'compute_price': fields.selection([('fixed', 'Fix Price'), ('percentage', 'Percentage (discount)'), ('formula', 'Formula')], select=True, default='fixed'),
-        'fixed_price': fields.float('Fixed Price'),
+        'fixed_price': fields.float('Fixed Price', digits_compute=dp.get_precision('Product Price')),
         'percent_price': fields.float('Percentage Price'),
     }
 

From a2c5fe4a64bcceb56fc7df16391c2acbfec6b178 Mon Sep 17 00:00:00 2001
From: Damien Bouvy <dbo@odoo.com>
Date: Thu, 24 Mar 2016 14:27:19 +0100
Subject: [PATCH 27/27] [FIX] website_portal_sale: ACL are too wide for
 employees

In revision 15b8f35, we decided to 'let ACL and ir_rules
do their job', which is an excellent idea for portal
users but a catastrophe for employee users (since, with
ACLs and rules, they have access to an giganormous amount
of SO, invoices, etc.), which made the server timeout for
big databases.

This commits reintroduces a limitation of the search that
matches ir_rules for portal users but which should limit
the number of elements visible to employees.
---
 addons/website_portal_sale/controllers/main.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/website_portal_sale/controllers/main.py b/addons/website_portal_sale/controllers/main.py
index 79512a90c67..fc169bccd06 100644
--- a/addons/website_portal_sale/controllers/main.py
+++ b/addons/website_portal_sale/controllers/main.py
@@ -17,12 +17,15 @@ class website_account(website_account):
         res_sale_order = request.env['sale.order']
         res_invoices = request.env['account.invoice']
         quotations = res_sale_order.search([
+            ('message_partner_ids', 'child_of', [partner.commercial_partner_id.id]),
             ('state', 'in', ['sent', 'cancel'])
         ])
         orders = res_sale_order.search([
+            ('message_partner_ids', 'child_of', [partner.commercial_partner_id.id]),
             ('state', 'in', ['sale', 'done'])
         ])
         invoices = res_invoices.search([
+            ('message_partner_ids', 'child_of', [partner.commercial_partner_id.id]),
             ('state', 'in', ['open', 'paid', 'cancelled'])
         ])