From 9a9720ac14d3508e93339e351ba19de4b3ca2fd6 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Mon, 24 Aug 2015 18:05:26 +0200
Subject: [PATCH 01/14] [FIX] sale: in a SO line, changing uom qty must change
 uos qty

This is a regression from rev.
1cedcf6abb433beb78675557fabd9ee6e49c504e

Not updating the product uos qty on updating the uom qty
is wrong, and it has multiple side-effect.

The SO line margin not being correctly recomputed
when changing the quantity is one of them.

opw-647902
---
 addons/sale/sale.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 0457abc0fa1..da75b51eba4 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -1199,7 +1199,10 @@ class sale_order_line(osv.osv):
             else:
                 result.update({'price_unit': price})
                 if context.get('uom_qty_change', False):
-                    return {'value': {'price_unit': price}, 'domain': {}, 'warning': False}
+                    values = {'price_unit': price}
+                    if result.get('product_uos_qty'):
+                        values['product_uos_qty'] = result['product_uos_qty']
+                    return {'value': values, 'domain': {}, 'warning': False}
         if warning_msgs:
             warning = {
                        'title': _('Configuration Error!'),

From 802d1abe7a446e4034f0af74d023acdd4dd45324 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Mon, 24 Aug 2015 18:16:05 +0200
Subject: [PATCH 02/14] [FIX] account: invoice lines amounts must be rounded
 when converted to journal items

This revision is related to cfbd086b09faa77f44505e1ba952841e77da6002.
This is the same use case than above, but with a different
currency than the one of the company, for the field
`amount_currency` this time.

Closes #8135
opw-647639
---
 addons/account/account_invoice.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index 1cd11d9fb11..116f5d2d684 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -739,7 +739,7 @@ class account_invoice(models.Model):
             if self.currency_id != company_currency:
                 currency = self.currency_id.with_context(date=self.date_invoice or fields.Date.context_today(self))
                 line['currency_id'] = currency.id
-                line['amount_currency'] = line['price']
+                line['amount_currency'] = currency.round(line['price'])
                 line['price'] = currency.compute(line['price'], company_currency)
             else:
                 line['currency_id'] = False

From 2d3973481f6252797ca8f405fabca153e6ec040b Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Mon, 24 Aug 2015 18:27:02 +0200
Subject: [PATCH 03/14] [FIX] point_of_sale: Sales details products
 translations

In the Sales Details report, the products were
not translated in the user language.

opw-647700
---
 addons/point_of_sale/report/pos_details.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/point_of_sale/report/pos_details.py b/addons/point_of_sale/report/pos_details.py
index f430029ea2d..927d5a7611f 100644
--- a/addons/point_of_sale/report/pos_details.py
+++ b/addons/point_of_sale/report/pos_details.py
@@ -47,7 +47,7 @@ class pos_details(report_sxw.rml_parse):
         user_ids = form['user_ids'] or self._get_all_users()
         company_id = user_obj.browse(self.cr, self.uid, self.uid).company_id.id
         pos_ids = pos_obj.search(self.cr, self.uid, [('date_order','>=',form['date_start'] + ' 00:00:00'),('date_order','<=',form['date_end'] + ' 23:59:59'),('user_id','in',user_ids),('state','in',['done','paid','invoiced']),('company_id','=',company_id)])
-        for pos in pos_obj.browse(self.cr, self.uid, pos_ids):
+        for pos in pos_obj.browse(self.cr, self.uid, pos_ids, context=self.localcontext):
             for pol in pos.lines:
                 result = {
                     'code': pol.product_id.default_code,

From 1f57c9a5a662f4be41b1e08d9cd21061b1c59a64 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@odoo.com>
Date: Mon, 24 Aug 2015 17:01:30 +0200
Subject: [PATCH 04/14] [FIX] website_mail: do not reveal full email address in
 contact name

When subscribing a document, a partner is created based on the email address.
Instead of using the email address as the name (which is a bit too spammer
friendly), only keep the first part of the email address as a name.

Following discussion https://www.odoo.com/groups/59/13640169
---
 addons/website_mail/controllers/main.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/website_mail/controllers/main.py b/addons/website_mail/controllers/main.py
index 18bddd09a58..092465850f0 100644
--- a/addons/website_mail/controllers/main.py
+++ b/addons/website_mail/controllers/main.py
@@ -46,7 +46,8 @@ class WebsiteMail(http.Controller):
             partner_ids = _object._find_partner_from_emails(
                 cr, SUPERUSER_ID, _id, [email], context=context, check_followers=True)
             if not partner_ids or not partner_ids[0]:
-                partner_ids = [partner_obj.create(cr, SUPERUSER_ID, {'name': email, 'email': email}, context=context)]
+                name = email.split('@')[0]
+                partner_ids = [partner_obj.create(cr, SUPERUSER_ID, {'name': name, 'email': email}, context=context)]
 
         # add or remove follower
         if _message_is_follower:

From 3e82c94d695327d5fa85cf6c9eca5039d7bc1bb6 Mon Sep 17 00:00:00 2001
From: Nicolas Lempereur <nle@odoo.com>
Date: Thu, 20 Aug 2015 10:32:43 +0200
Subject: [PATCH 05/14] [FIX] point_of_sale,base: use context timezone for
 sequence

Previously when replacing time related sequence in a prefix or suffix of
a sequence, the timezone used for the time values would always be the
server's timezone.

With this fix, the context timezone is used if available (UTC is used
otherwise).

closes #8159
opw-646487
---
 addons/point_of_sale/point_of_sale.py |  2 +-
 openerp/addons/base/ir/ir_sequence.py | 29 +++++++++++++--------------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index cc51b8823ea..5ba591b39a7 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -425,7 +425,7 @@ class pos_session(osv.osv):
             bank_statement_ids.append(statement_id)
 
         values.update({
-            'name': self.pool['ir.sequence'].get(cr, uid, 'pos.session'),
+            'name': self.pool['ir.sequence'].get(cr, uid, 'pos.session', context=context),
             'statement_ids' : [(6, 0, bank_statement_ids)],
             'config_id': config_id
         })
diff --git a/openerp/addons/base/ir/ir_sequence.py b/openerp/addons/base/ir/ir_sequence.py
index 999f12a9d18..f93d7ba7eee 100644
--- a/openerp/addons/base/ir/ir_sequence.py
+++ b/openerp/addons/base/ir/ir_sequence.py
@@ -19,7 +19,9 @@
 #
 ##############################################################################
 
+from datetime import datetime
 import logging
+import pytz
 import time
 
 import openerp
@@ -218,21 +220,18 @@ class ir_sequence(openerp.osv.osv.osv):
             return s % d
         return  ''
 
-    def _interpolation_dict(self):
-        t = time.localtime() # Actually, the server is always in UTC.
-        return {
-            'year': time.strftime('%Y', t),
-            'month': time.strftime('%m', t),
-            'day': time.strftime('%d', t),
-            'y': time.strftime('%y', t),
-            'doy': time.strftime('%j', t),
-            'woy': time.strftime('%W', t),
-            'weekday': time.strftime('%w', t),
-            'h24': time.strftime('%H', t),
-            'h12': time.strftime('%I', t),
-            'min': time.strftime('%M', t),
-            'sec': time.strftime('%S', t),
+    def _interpolation_dict_context(self, context=None):
+        if context is None:
+            context = {}
+        t = datetime.now(pytz.timezone(context.get('tz') or 'UTC'))
+        sequences = {
+            'year': '%Y', 'month': '%m', 'day': '%d', 'y': '%y', 'doy': '%j', 'woy': '%W',
+            'weekday': '%w', 'h24': '%H', 'h12': '%I', 'min': '%M', 'sec': '%S'
         }
+        return {key: t.strftime(sequence) for key, sequence in sequences.iteritems()}
+
+    def _interpolation_dict(self):
+        return self._interpolation_dict_context()
 
     def _next(self, cr, uid, ids, context=None):
         if not ids:
@@ -252,7 +251,7 @@ class ir_sequence(openerp.osv.osv.osv):
             cr.execute("SELECT number_next FROM ir_sequence WHERE id=%s FOR UPDATE NOWAIT", (seq['id'],))
             cr.execute("UPDATE ir_sequence SET number_next=number_next+number_increment WHERE id=%s ", (seq['id'],))
             self.invalidate_cache(cr, uid, ['number_next'], [seq['id']], context=context)
-        d = self._interpolation_dict()
+        d = self._interpolation_dict_context(context=context)
         try:
             interpolated_prefix = self._interpolate(seq['prefix'], d)
             interpolated_suffix = self._interpolate(seq['suffix'], d)

From 3b02e3d63dcb62ed24cdbbdb7bd06f67849e1a24 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Tue, 25 Aug 2015 14:52:20 +0200
Subject: [PATCH 06/14] [FIX] sale*: company tax filtering

f26b94f had as goal to filter the taxes of the product
according to the company when the sale.order
was created/edited as SUPERUSER_ID
(Who ignores the record rules).

Unfortunetaly, to filter the taxes,
it used the company of the customer,
while it's actually the company of the order which
should be used.

Indeed, for instance,
partners can be shared among all companies.

It was way less simple to access the company
of the sale.order, this parameter being
not available in the on_change method signature.

This is the easiest way to solve this issue
without breaking the API / retro-compatibility.

opw-647819
---
 addons/sale/sale.py                                   |  7 ++++---
 addons/sale/sale_view.xml                             | 11 ++++++-----
 addons/sale_stock/sale_stock_view.xml                 | 10 +++++-----
 addons/website_quote/controllers/main.py              |  2 +-
 .../website_quote/views/website_quotation_backend.xml |  2 +-
 addons/website_sale/models/sale_order.py              |  2 +-
 6 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index da75b51eba4..a0ccaf86361 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -1078,7 +1078,7 @@ class sale_order_line(osv.osv):
                 date_order=order['date_order'],
                 fiscal_position=order['fiscal_position'][0] if order['fiscal_position'] else False,
                 flag=False,  # Force name update
-                context=context
+                context=dict(context, company_id=values.get('company_id'))
             )['value']
             if defaults.get('tax_id'):
                 defaults['tax_id'] = [[6, 0, defaults['tax_id']]]
@@ -1134,8 +1134,9 @@ class sale_order_line(osv.osv):
             # The superuser is used by website_sale in order to create a sale order. We need to make
             # sure we only select the taxes related to the company of the partner. This should only
             # apply if the partner is linked to a company.
-            if uid == SUPERUSER_ID and partner.company_id:
-                taxes = product_obj.taxes_id.filtered(lambda r: r.company_id == partner.company_id)
+            if uid == SUPERUSER_ID and context.get('company_id'):
+                print 'company_id found', context['company_id']
+                taxes = product_obj.taxes_id.filtered(lambda r: r.company_id.id == context['company_id'])
             else:
                 taxes = product_obj.taxes_id
             result['tax_id'] = self.pool.get('account.fiscal.position').map_tax(cr, uid, fpos, taxes)
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 7a0925e990a..93df0e5f714 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -123,17 +123,17 @@
                                     <group>
                                         <group>
                                             <field name="product_id"
-                                                context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'uom':product_uom}"
+                                                context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'uom':product_uom, 'company_id': parent.company_id}"
                                                 groups="base.group_user"
                                                 on_change="product_id_change(parent.pricelist_id, product_id, product_uom_qty, False, product_uos_qty, False, name, parent.partner_id, False, True, parent.date_order, False, parent.fiscal_position, False, context)"/>
                                             <label for="product_uom_qty"/>
                                             <div>
                                                 <field
-                                                    context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'uom':product_uom, 'uom_qty_change':True}"
+                                                    context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'uom':product_uom, 'uom_qty_change':True, 'company_id': parent.company-id}"
                                                     name="product_uom_qty" class="oe_inline"
                                                     on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, False, parent.fiscal_position, True, context)"/>
                                                 <field name="product_uom" groups="product.group_uom" class="oe_inline oe_no_button"
-
+                                                    context="{'company_id': parent.company_id}"
                                                     on_change="product_uom_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, context)"/>
                                             </div>
                                             <label for="product_uos_qty" groups="product.group_uos"/>
@@ -166,14 +166,15 @@
                                     <field name="state" invisible="1"/>
                                     <field name="th_weight" invisible="1"/>
                                     <field name="product_id"
-                                        context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'uom':product_uom}"
+                                        context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'uom':product_uom, 'company_id': parent.company_id}"
                                         groups="base.group_user"
                                         on_change="product_id_change(parent.pricelist_id, product_id, product_uom_qty, False, product_uos_qty, False, name, parent.partner_id, False, True, parent.date_order, False, parent.fiscal_position, False, context)"/>
                                     <field name="name"/>
                                     <field name="product_uom_qty"
-                                        context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'uom':product_uom}"
+                                        context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'uom':product_uom, 'company_id': parent.company_id}"
                                         on_change="product_id_change(parent.pricelist_id, product_id, product_uom_qty, product_uom, product_uos_qty, product_uos, name, parent.partner_id, False, False, parent.date_order, False, parent.fiscal_position, True, context)"/>
                                     <field name="product_uom"
+                                        context="{'company_id': parent.company_id}"
                                         on_change="product_uom_change(parent.pricelist_id, product_id, product_uom_qty, product_uom, product_uos_qty, product_uos, name, parent.partner_id, False, False, parent.date_order, context)"
                                         groups="product.group_uom" options='{"no_open": True}'/>
                                     <field name="product_uos_qty" groups="product.group_uos" invisible="1"/>
diff --git a/addons/sale_stock/sale_stock_view.xml b/addons/sale_stock/sale_stock_view.xml
index 338034f3331..791696a9e7c 100644
--- a/addons/sale_stock/sale_stock_view.xml
+++ b/addons/sale_stock/sale_stock_view.xml
@@ -31,23 +31,23 @@
                     </field>
                    <xpath expr="//field[@name='order_line']/form//field[@name='product_id']" position="replace">
                        <field name="product_id"
-                       context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'uom':False}"
+                       context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'uom':False, 'company_id': parent.company_id}"
                        groups="base.group_user"
                        on_change="product_id_change_with_wh(parent.pricelist_id,product_id,product_uom_qty,False,product_uos_qty,False,name,parent.partner_id, False, True, parent.date_order, product_packaging, parent.fiscal_position, False, parent.warehouse_id, context)"/>
                    </xpath>
                    <xpath expr="//field[@name='order_line']/tree//field[@name='product_id']" position="replace">
                        <field name="product_id"
-                       context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'uom':product_uom}"
+                       context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'uom':product_uom, 'company_id': parent.company_id}"
                        groups="base.group_user" 
                        on_change="product_id_change_with_wh(parent.pricelist_id,product_id,product_uom_qty,False,product_uos_qty,False,name,parent.partner_id, False, True, parent.date_order, product_packaging, parent.fiscal_position, False, parent.warehouse_id, context)"/>
                    </xpath>
                    <xpath expr="//field[@name='order_line']/tree//field[@name='product_uom_qty']" position="replace">
-                       <field context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'uom':product_uom}"
+                       <field context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'uom':product_uom, 'company_id': parent.company_id}"
                              name="product_uom_qty" 
                        on_change="product_id_change_with_wh(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,False,name,parent.partner_id, False, False, parent.date_order, product_packaging, parent.fiscal_position, True, parent.warehouse_id, context)"/>
                    </xpath>
                    <xpath expr="//field[@name='order_line']/form//field[@name='product_uos_qty']" position="replace">
-                       <field context="{'partner_id':parent.partner_id, 'quantity':product_uos_qty, 'pricelist':parent.pricelist_id, 'uom':product_uom}"
+                       <field context="{'partner_id':parent.partner_id, 'quantity':product_uos_qty, 'pricelist':parent.pricelist_id, 'uom':product_uom, 'company_id': parent.company_id}"
                              name="product_uos_qty" class="oe_inline"
                        on_change="product_id_change_with_wh(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, product_packaging, parent.fiscal_position, True, parent.warehouse_id, context)"/>
                    </xpath>
@@ -64,7 +64,7 @@
                    </xpath>
                    <xpath expr="//page[@string='Order Lines']/field[@name='order_line']/form[@string='Sales Order Lines']/group/group/field[@name='tax_id']" position="before">
                        <field name="product_tmpl_id" invisible="1"/>
-                       <field name="product_packaging" context="{'default_product_tmpl_id': product_tmpl_id, 'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'uom':product_uom}" on_change="product_packaging_change(parent.pricelist_id, product_id, product_uom_qty, product_uom, parent.partner_id, product_packaging, True, context)" domain="[('product_tmpl_id','=',product_tmpl_id)]" groups="product.group_stock_packaging" />
+                       <field name="product_packaging" context="{'default_product_tmpl_id': product_tmpl_id, 'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'uom':product_uom, 'company_id': parent.company_id}" on_change="product_packaging_change(parent.pricelist_id, product_id, product_uom_qty, product_uom, parent.partner_id, product_packaging, True, context)" domain="[('product_tmpl_id','=',product_tmpl_id)]" groups="product.group_stock_packaging" />
                    </xpath>
                    <xpath expr="//page[@string='Order Lines']/field[@name='order_line']/tree[@string='Sales Order Lines']/field[@name='sequence']" position="after">
                        <field name="delay" invisible="1"/>
diff --git a/addons/website_quote/controllers/main.py b/addons/website_quote/controllers/main.py
index 6b8c5059de6..2eeb3c4a645 100644
--- a/addons/website_quote/controllers/main.py
+++ b/addons/website_quote/controllers/main.py
@@ -148,7 +148,7 @@ class sale_quote(http.Controller):
         res = request.registry.get('sale.order.line').product_id_change(request.cr, SUPERUSER_ID, order_id,
             False, option.product_id.id, option.quantity, option.uom_id.id, option.quantity, option.uom_id.id,
             option.name, order.partner_id.id, False, True, time.strftime('%Y-%m-%d'),
-            False, order.fiscal_position.id, True, request.context)
+            False, order.fiscal_position.id, True, dict(request.context or {}, company_id=order.company_id.id))
         vals = res.get('value', {})
         if 'tax_id' in vals:
             vals['tax_id'] = [(6, 0, vals['tax_id'])]
diff --git a/addons/website_quote/views/website_quotation_backend.xml b/addons/website_quote/views/website_quotation_backend.xml
index 7f830319e43..7d60b57656a 100644
--- a/addons/website_quote/views/website_quotation_backend.xml
+++ b/addons/website_quote/views/website_quotation_backend.xml
@@ -27,7 +27,7 @@
                     </page>
                 </xpath>
                 <xpath expr="//field[@name='client_order_ref']" position="after">
-                    <field name="template_id" on_change="onchange_template_id(template_id, partner_id, fiscal_position)"/>
+                    <field name="template_id" context="{'company_id': company_id}" on_change="onchange_template_id(template_id, partner_id, fiscal_position, context)"/>
                     <field name="validity_date"/>
                     <field name="website_description" invisible="1"/>
                 </xpath>
diff --git a/addons/website_sale/models/sale_order.py b/addons/website_sale/models/sale_order.py
index a67e32ba36d..06bba441c61 100644
--- a/addons/website_sale/models/sale_order.py
+++ b/addons/website_sale/models/sale_order.py
@@ -52,7 +52,7 @@ class sale_order(osv.Model):
             partner_id=so.partner_id.id,
             fiscal_position=so.fiscal_position.id,
             qty=qty,
-            context=context
+            context=dict(context or {}, company_id=so.company_id.id)
         )['value']
 
         if line_id:

From b90c663702bd4abe867e01c225677dc1af9ab1f0 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@odoo.com>
Date: Fri, 21 Aug 2015 09:17:27 +0200
Subject: [PATCH 07/14] [FIX] website: two sliders or galleries can have the
 same id

(because the user can edit separate part like footer or using versioning)

Backport of 394a0c8bb40ffa6eb080dd9e3bc9bce16db3d6f1.
---
 .../website/static/src/js/website.snippets.editor.js | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index 6a5a334a0a0..d638146021e 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -944,23 +944,15 @@
     });
 
     website.snippet.options.slider = website.snippet.Option.extend({
-        unique_id: function () {
-            var id = 0;
-            $(".carousel").each(function () {
-                var cid = 1 + parseInt($(this).attr("id").replace(/[^0123456789]/g, ''),10);
-                if (id < cid) id = cid;
-            });
-            return "myCarousel" + id;
-        },
         drop_and_build_snippet: function() {
-            this.id = this.unique_id();
+            this.id = "myCarousel_" + new Date().getTime();
             this.$target.attr("id", this.id);
             this.$target.find("[data-slide]").attr("data-cke-saved-href", "#" + this.id);
             this.$target.find("[data-target]").attr("data-target", "#" + this.id);
             this.rebind_event();
         },
         on_clone: function ($clone) {
-            var id = this.unique_id();
+            var id = "myCarousel_" + new Date().getTime();
             $clone.attr("id", id);
             $clone.find("[data-slide]").attr("href", "#" + id);
             $clone.find("[data-slide-to]").attr("data-target", "#" + id);

From 503820acb6d82a85c0c49ac26f7e7f8cd73851dd Mon Sep 17 00:00:00 2001
From: Goffin Simon <sig@odoo.com>
Date: Mon, 24 Aug 2015 13:00:34 +0200
Subject: [PATCH 08/14] [FIX] account, purchase, sale: included taxes
 -account:_fix_tax_included_price If a fiscal position mapped an included tax
 on a SO or on a PO line then the price unit of the product must be
 recomputed.

-purchase: onchange_product_id test
Test that when an included tax is mapped by a fiscal position, the included tax must be
subtracted to the price of the product.

-sale:product_id_change test
Test that when an included tax is mapped by a fiscal position, the included tax must be
subtracted to the price of the product.

opw:647321
---
 addons/account/account.py                     |  7 +++
 addons/purchase/purchase.py                   |  1 +
 addons/purchase/tests/__init__.py             |  1 +
 .../tests/test_onchange_product_id.py         | 44 +++++++++++++++++++
 addons/sale/sale.py                           |  2 +
 addons/sale/tests/__init__.py                 |  1 +
 addons/sale/tests/test_product_id_change.py   | 41 +++++++++++++++++
 7 files changed, 97 insertions(+)
 create mode 100644 addons/purchase/tests/__init__.py
 create mode 100644 addons/purchase/tests/test_onchange_product_id.py
 create mode 100644 addons/sale/tests/__init__.py
 create mode 100644 addons/sale/tests/test_product_id_change.py

diff --git a/addons/account/account.py b/addons/account/account.py
index 929a01f92f3..83e362c5e59 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -2168,6 +2168,13 @@ class account_tax(osv.osv):
                 total += r['amount']
         return res
 
+    def _fix_tax_included_price(self, cr, uid, price, prod_taxes, line_taxes):
+        """Subtract tax amount from price when corresponding "price included" taxes do not apply"""
+        incl_tax = [tax for tax in prod_taxes if tax.id not in line_taxes and tax.price_include]
+        if incl_tax:
+            return self._unit_compute_inv(cr, uid, incl_tax, price)[0]['price_unit']
+        return price
+
     def _unit_compute_inv(self, cr, uid, taxes, price_unit, product=None, partner=None):
         taxes = self._applicable(cr, uid, taxes, price_unit,  product, partner)
         res = []
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index b2452d77735..3841bec12eb 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -1224,6 +1224,7 @@ class purchase_order_line(osv.osv):
         taxes = account_tax.browse(cr, uid, map(lambda x: x.id, product.supplier_taxes_id))
         fpos = fiscal_position_id and account_fiscal_position.browse(cr, uid, fiscal_position_id, context=context) or False
         taxes_ids = account_fiscal_position.map_tax(cr, uid, fpos, taxes)
+        price = self.pool['account.tax']._fix_tax_included_price(cr, uid, price, product.supplier_taxes_id, taxes_ids)
         res['value'].update({'price_unit': price, 'taxes_id': taxes_ids})
 
         return res
diff --git a/addons/purchase/tests/__init__.py b/addons/purchase/tests/__init__.py
new file mode 100644
index 00000000000..f08b4059ba9
--- /dev/null
+++ b/addons/purchase/tests/__init__.py
@@ -0,0 +1 @@
+from . import test_onchange_product_id
\ No newline at end of file
diff --git a/addons/purchase/tests/test_onchange_product_id.py b/addons/purchase/tests/test_onchange_product_id.py
new file mode 100644
index 00000000000..9abf7f1cb68
--- /dev/null
+++ b/addons/purchase/tests/test_onchange_product_id.py
@@ -0,0 +1,44 @@
+from openerp.tests.common import TransactionCase
+
+class TestOnchangeProductId(TransactionCase):
+    """Test that when an included tax is mapped by a fiscal position, the included tax must be
+    subtracted to the price of the product.
+    """
+
+    def setUp(self):
+        super(TestOnchangeProductId, self).setUp()
+        self.fiscal_position_model = self.registry('account.fiscal.position')
+        self.fiscal_position_tax_model = self.registry('account.fiscal.position.tax')
+        self.tax_model = self.registry('account.tax')
+        self.pricelist_model = self.registry('product.pricelist')
+        self.res_partner_model = self.registry('res.partner')
+        self.product_tmpl_model = self.registry('product.template')
+        self.product_model = self.registry('product.product')
+        self.product_uom_model = self.registry('product.uom')
+        self.so_line_model = self.registry('purchase.order.line')
+
+    def test_onchange_product_id(self):
+        cr, uid = self.cr, self.uid
+        uom_id = self.product_uom_model.search(cr, uid, [('name', '=', 'Unit(s)')])[0]
+        pricelist = self.pricelist_model.search(cr, uid, [('name', '=', 'Public Pricelist')])[0]
+        partner_id = self.res_partner_model.create(cr, uid, dict(name="George"))
+        tax_include_id = self.tax_model.create(cr, uid, dict(name="Include tax",
+                                                             type='percent',
+                                                             amount='0.21',
+                                                             price_include=True))
+        tax_exclude_id = self.tax_model.create(cr, uid, dict(name="Exclude tax",
+                                                             type='percent',
+                                                             amount='0.00'))
+        product_tmpl_id = self.product_tmpl_model.create(cr, uid, dict(name="Voiture",
+                                                                       list_price='121',
+                                                                       supplier_taxes_id=[(6, 0, [tax_include_id])]))
+        product_id = self.product_model.create(cr, uid, dict(product_tmpl_id=product_tmpl_id))
+        fp_id = self.fiscal_position_model.create(cr, uid, dict(name="fiscal position",
+                                                                sequence=1))
+        fp_tax_id = self.fiscal_position_tax_model.create(cr, uid, dict(position_id=fp_id,
+                                                                        tax_src_id=tax_include_id,
+                                                                        tax_dest_id=tax_exclude_id))
+        res = self.so_line_model.onchange_product_id(cr, uid, [], pricelist, product_id, 1.0, uom_id, partner_id,
+                                                     fiscal_position_id=fp_id)
+
+        self.assertEquals(100, res['value']['price_unit'], "The included tax must be subtracted to the price")
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index a0ccaf86361..6bc14afcfa2 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -1198,6 +1198,8 @@ class sale_order_line(osv.osv):
 
                 warning_msgs += _("No valid pricelist line found ! :") + warn_msg +"\n\n"
             else:
+                if update_tax:
+                    price = self.pool['account.tax']._fix_tax_included_price(cr, uid, price, product_obj.taxes_id, result['tax_id'])
                 result.update({'price_unit': price})
                 if context.get('uom_qty_change', False):
                     values = {'price_unit': price}
diff --git a/addons/sale/tests/__init__.py b/addons/sale/tests/__init__.py
new file mode 100644
index 00000000000..b7aaecb53ab
--- /dev/null
+++ b/addons/sale/tests/__init__.py
@@ -0,0 +1 @@
+from . import test_product_id_change
\ No newline at end of file
diff --git a/addons/sale/tests/test_product_id_change.py b/addons/sale/tests/test_product_id_change.py
new file mode 100644
index 00000000000..2f2957d3b4a
--- /dev/null
+++ b/addons/sale/tests/test_product_id_change.py
@@ -0,0 +1,41 @@
+from openerp.tests.common import TransactionCase
+
+class TestProductIdChange(TransactionCase):
+    """Test that when an included tax is mapped by a fiscal position, the included tax must be
+    subtracted to the price of the product.
+    """
+
+    def setUp(self):
+        super(TestProductIdChange, self).setUp()
+        self.fiscal_position_model = self.registry('account.fiscal.position')
+        self.fiscal_position_tax_model = self.registry('account.fiscal.position.tax')
+        self.tax_model = self.registry('account.tax')
+        self.pricelist_model = self.registry('product.pricelist')
+        self.res_partner_model = self.registry('res.partner')
+        self.product_tmpl_model = self.registry('product.template')
+        self.product_model = self.registry('product.product')
+        self.so_line_model = self.registry('sale.order.line')
+
+    def test_product_id_change(self):
+        cr, uid = self.cr, self.uid
+        pricelist = self.pricelist_model.search(cr, uid, [('name', '=', 'Public Pricelist')])[0]
+        partner_id = self.res_partner_model.create(cr, uid, dict(name="George"))
+        tax_include_id = self.tax_model.create(cr, uid, dict(name="Include tax",
+                                                             type='percent',
+                                                             amount='0.21',
+                                                             price_include=True))
+        tax_exclude_id = self.tax_model.create(cr, uid, dict(name="Exclude tax",
+                                                             type='percent',
+                                                             amount='0.00'))
+        product_tmpl_id = self.product_tmpl_model.create(cr, uid, dict(name="Voiture",
+                                                                       list_price='121',
+                                                                       taxes_id=[(6, 0, [tax_include_id])]))
+        product_id = self.product_model.create(cr, uid, dict(product_tmpl_id=product_tmpl_id))
+        fp_id = self.fiscal_position_model.create(cr, uid, dict(name="fiscal position",
+                                                                sequence=1))
+        fp_tax_id = self.fiscal_position_tax_model.create(cr, uid, dict(position_id=fp_id,
+                                                                        tax_src_id=tax_include_id,
+                                                                        tax_dest_id=tax_exclude_id))
+        res = self.so_line_model.product_id_change(cr, uid, [], pricelist, product_id, partner_id=partner_id,
+                                                   fiscal_position=fp_id)
+        self.assertEquals(100, res['value']['price_unit'], "The included tax must be subtracted to the price")

From cd9a77604fa7504b2fd920a35ad2f269df94ebf1 Mon Sep 17 00:00:00 2001
From: Goffin Simon <sig@odoo.com>
Date: Wed, 19 Aug 2015 11:14:28 +0200
Subject: [PATCH 09/14] [IMP] account: domain on tax_dest_id

It has no sens to map a tax by a tax included in the price because
when a tax is included in the price, the price must be computed
according to this tax.
---
 addons/account/partner_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index 181315105d3..5fafa6d1ecb 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -23,11 +23,11 @@
                     <field name="tax_ids" widget="one2many_list">
                         <tree string="Tax Mapping" editable="bottom">
                             <field name="tax_src_id" domain="[('parent_id','=',False)]"/>
-                            <field name="tax_dest_id" domain="[('parent_id','=',False)]"/>
+                            <field name="tax_dest_id" domain="[('parent_id','=',False), ('price_include', '=', False)]"/>
                         </tree>
                         <form string="Tax Mapping">
                             <field name="tax_src_id" domain="[('parent_id','=',False)]"/>
-                            <field name="tax_dest_id" domain="[('parent_id','=',False)]"/>
+                            <field name="tax_dest_id" domain="[('parent_id','=',False), ('price_include', '=', False)]"/>
                         </form>
                     </field>
                     <separator string="Accounts Mapping"/>

From 9b489e9d7c015228d2b7a10cd1595de9fce7170c Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Wed, 26 Aug 2015 11:06:36 +0200
Subject: [PATCH 10/14] [FIX] website_sale: deleted category on website product
 page

Product pages ulrs can be indexed by searches engines.
The product category can be included in the url.
If the category has been deleted, accessing
this page should still work anyway

opw-648008
---
 addons/website_sale/controllers/main.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index 1f1170c2ca9..e45f4031db6 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -241,6 +241,7 @@ class website_sale(http.Controller):
 
         if category:
             category = category_obj.browse(cr, uid, int(category), context=context)
+            category = category if category.exists() else False
 
         attrib_list = request.httprequest.args.getlist('attrib')
         attrib_values = [map(int,v.split("-")) for v in attrib_list if v]

From 8f2057a1c794513aa054850719f8f067ea03fcdd Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@odoo.com>
Date: Tue, 25 Aug 2015 16:17:32 +0200
Subject: [PATCH 11/14] [FIX] survey: allow duplicate user answer

No reason to prevent as long as remove token

Fixes #7983, Closes #8009
---
 addons/survey/survey.py | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/addons/survey/survey.py b/addons/survey/survey.py
index aae53c6a750..4b83617722f 100644
--- a/addons/survey/survey.py
+++ b/addons/survey/survey.py
@@ -848,7 +848,7 @@ class survey_user_input(osv.Model):
         'survey_id': fields.many2one('survey.survey', 'Survey', required=True,
                                      readonly=1, ondelete='restrict'),
         'date_create': fields.datetime('Creation Date', required=True,
-                                       readonly=1),
+                                       readonly=1, copy=False),
         'deadline': fields.datetime("Deadline",
                                 help="Date by which the person can open the survey and submit answers",
                                 oldname="date_deadline"),
@@ -861,7 +861,7 @@ class survey_user_input(osv.Model):
                                   'Status',
                                   readonly=True),
         'test_entry': fields.boolean('Test entry', readonly=1),
-        'token': fields.char("Identification token", readonly=1, required=1),
+        'token': fields.char("Identification token", readonly=1, required=1, copy=False),
 
         # Optional Identification data
         'partner_id': fields.many2one('res.partner', 'Partner', readonly=1),
@@ -872,7 +872,7 @@ class survey_user_input(osv.Model):
                                               'Last displayed page'),
         # The answers !
         'user_input_line_ids': fields.one2many('survey.user_input_line',
-                                               'user_input_id', 'Answers'),
+                                               'user_input_id', 'Answers', copy=True),
 
         # URLs used to display the answers
         'result_url': fields.related('survey_id', 'result_url', type='char',
@@ -895,10 +895,6 @@ class survey_user_input(osv.Model):
         ('deadline_in_the_past', 'CHECK (deadline >= date_create)', 'The deadline cannot be in the past')
     ]
 
-    def copy_data(self, cr, uid, id, default=None, context=None):
-        raise osv.except_osv(_('Warning!'), _('You cannot duplicate this \
-            element!'))
-
     def do_clean_emptys(self, cr, uid, automatic=False, context=None):
         ''' Remove empty user inputs that have been created manually
             (used as a cronjob declared in data/survey_cron.xml) '''
@@ -1027,10 +1023,6 @@ class survey_user_input_line(osv.Model):
             vals.update({'quizz_mark': self.__get_mark(cr, uid, value_suggested)})
         return super(survey_user_input_line, self).write(cr, uid, ids, vals, context=context)
 
-    def copy_data(self, cr, uid, id, default=None, context=None):
-        raise osv.except_osv(_('Warning!'), _('You cannot duplicate this \
-            element!'))
-
     def save_lines(self, cr, uid, user_input_id, question, post, answer_tag,
                    context=None):
         ''' Save answers to questions, depending on question type

From b4b373c965fef224f95356a3ca332d3d37f93383 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@odoo.com>
Date: Sun, 9 Aug 2015 22:02:56 +0100
Subject: [PATCH 12/14] [IMP] doc: better xpath example

The xpath syntax `"//selector` is mostly used in Odoo, is clearer on the meaning
and more flexible about view changes.
Give an example with the mostly used syntax.

Add a tip to indicate the shorter xpath syntax
---
 doc/howtos/backend.rst | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/doc/howtos/backend.rst b/doc/howtos/backend.rst
index 5ed3c622818..061e9fbc577 100644
--- a/doc/howtos/backend.rst
+++ b/doc/howtos/backend.rst
@@ -626,9 +626,9 @@ instead of a single view its ``arch`` field is composed of any number of
         <field name="model">idea.category</field>
         <field name="inherit_id" ref="id_category_list"/>
         <field name="arch" type="xml">
-            <!-- find field description inside tree, and add the field
+            <!-- find field description and add the field
                  idea_ids after it -->
-            <xpath expr="/tree/field[@name='description']" position="after">
+            <xpath expr="//field[@name='description']" position="after">
               <field name="idea_ids" string="Number of ideas"/>
             </xpath>
         </field>
@@ -652,6 +652,22 @@ instead of a single view its ``arch`` field is composed of any number of
         alters the attributes of the matched element using special
         ``attribute`` elements in the ``xpath``'s body
 
+.. tip::
+
+    When matching a single element, the ``position`` attribute can be set directly
+    on the element to be found. Both inheritances below will give the same result.
+
+    .. code-block:: xml
+
+        <xpath expr="//field[@name='description']" position="after">
+            <field name="idea_ids" />
+        </xpath>
+
+        <field name="description" position="after">
+            <field name="idea_ids" />
+        </field>
+
+
 .. exercise:: Alter existing content
 
     * Using model inheritance, modify the existing *Partner* model to add an

From dedc40ba1dd9e139d41a68a6fd107d315127a7b2 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Wed, 26 Aug 2015 13:37:31 +0200
Subject: [PATCH 13/14] [FIX] sale: context can be done

This rev. is related to 3b02e3d63dcb62ed24cdbbdb7bd06f67849e1a24
---
 addons/sale/sale.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 6bc14afcfa2..adff7138a3f 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -1078,7 +1078,7 @@ class sale_order_line(osv.osv):
                 date_order=order['date_order'],
                 fiscal_position=order['fiscal_position'][0] if order['fiscal_position'] else False,
                 flag=False,  # Force name update
-                context=dict(context, company_id=values.get('company_id'))
+                context=dict(context or {}, company_id=values.get('company_id'))
             )['value']
             if defaults.get('tax_id'):
                 defaults['tax_id'] = [[6, 0, defaults['tax_id']]]

From 42ecf5e346c10b8d60e649cacd4f643e2749d466 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Wed, 26 Aug 2015 13:38:38 +0200
Subject: [PATCH 14/14] [FIX] sale: remove useless print

Introduced with rev. 3b02e3d63dcb62ed24cdbbdb7bd06f67849e1a24
---
 addons/sale/sale.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index adff7138a3f..52738b1cf8b 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -1135,7 +1135,6 @@ class sale_order_line(osv.osv):
             # sure we only select the taxes related to the company of the partner. This should only
             # apply if the partner is linked to a company.
             if uid == SUPERUSER_ID and context.get('company_id'):
-                print 'company_id found', context['company_id']
                 taxes = product_obj.taxes_id.filtered(lambda r: r.company_id.id == context['company_id'])
             else:
                 taxes = product_obj.taxes_id