From f2c59460512cfef87117db5952f9bcef3018c7a8 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@odoo.com>
Date: Fri, 24 Oct 2014 12:14:15 +0200
Subject: [PATCH 1/3] [FIX] tour.js: popover position when scrolling down

---
 addons/web/static/src/js/tour.js | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/js/tour.js b/addons/web/static/src/js/tour.js
index 8a08751646e..5d962844f73 100644
--- a/addons/web/static/src/js/tour.js
+++ b/addons/web/static/src/js/tour.js
@@ -241,12 +241,20 @@ var Tour = {
     },
     repositionPopover: function() {
         var popover = Tour.$element.data("bs.popover");
-        var $tip = Tour.$element.data("bs.popover").tip();
+        var $tip = popover.tip();
 
         if (popover.options.orphan) {
             return $tip.css("top", $(window).outerHeight() / 2 - $tip.outerHeight() / 2);
         }
 
+        if (Tour.$element.parents("div").filter(function(){ return getComputedStyle(this).position === 'fixed'; }).length) {
+            var pos = popover.getPosition();
+            var top = pos.top;
+            if (popover.options.placement === "top") top -= $tip.height();
+            if (popover.options.placement === "bottom") top += pos.height;
+            $tip.css({'top': top+'px'});
+        }
+
         var offsetBottom, offsetHeight, offsetRight, offsetWidth, originalLeft, originalTop, tipOffset;
         offsetWidth = $tip[0].offsetWidth;
         offsetHeight = $tip[0].offsetHeight;
@@ -270,10 +278,10 @@ var Tour = {
         $tip.offset(tipOffset);
         if (popover.options.placement === "bottom" || popover.options.placement === "top") {
                 var left = Tour.$element.offset().left + Tour.$element.outerWidth()/2 - tipOffset.left;
-                $tip.find(".arrow").css("left", left ? left + "px" : "");
+                popover.arrow().css("left", left ? left + "px" : "");
         } else if (popover.options.placement !== "auto") {
                 var top = Tour.$element.offset().top + Tour.$element.outerHeight()/2 - tipOffset.top;
-                $tip.find(".arrow").css("top", top ? top + "px" : "");
+                popover.arrow().css("top", top ? top + "px" : "");
         }
     },
     _load_template: false,

From cf4c826aa7e096ab389e49e87f0f6cf83e9624f7 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Mon, 8 Dec 2014 17:48:00 +0100
Subject: [PATCH 2/3] [FIX] website_sale: set partner lang according to website
 lang

On ecommerce checkout, the language of the partner wasn't set according to the language in which he is visiting the website.
Therefore, its partner was set with the default language (English in most cases), and any emails sent to him were not translated in his own language (in the email templates, such as the quotation email he received on order confirmation)
---
 addons/website_sale/controllers/main.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index 17f788c8ff4..7544a9d654d 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -510,7 +510,12 @@ class website_sale(http.Controller):
         orm_user = registry.get('res.users')
         order_obj = request.registry.get('sale.order')
 
-        billing_info = self.checkout_parse('billing', checkout, True)
+        partner_lang = request.lang if request.lang in [lang.code for lang in request.website.language_ids] else None
+
+        billing_info = {}
+        if partner_lang:
+            billing_info['lang'] = partner_lang
+        billing_info.update(self.checkout_parse('billing', checkout, True))
 
         # set partner_id
         partner_id = None
@@ -531,7 +536,10 @@ class website_sale(http.Controller):
 
         # create a new shipping partner
         if checkout.get('shipping_id') == -1:
-            shipping_info = self.checkout_parse('shipping', checkout, True)
+            shipping_info = {}
+            if partner_lang:
+                shipping_info['lang'] = partner_lang
+            shipping_info.update(self.checkout_parse('shipping', checkout, True))
             shipping_info['type'] = 'delivery'
             shipping_info['parent_id'] = partner_id
             checkout['shipping_id'] = orm_partner.create(cr, SUPERUSER_ID, shipping_info, context)

From 3ea978bc115f1121f841be6ec5d50b224579b497 Mon Sep 17 00:00:00 2001
From: fka-odoo <fka@openerp.com>
Date: Mon, 8 Dec 2014 18:28:29 +0530
Subject: [PATCH 3/3] [IMP] crm_partner_assign: add field assigned_partner_id
 in view

website_customer filters the partners based on assigned_partner_id (the list of
customers that were impletemented by another partner). This field was not
visible so no way to actually display a partner in this list.
Fixes #430, opw 619254
---
 addons/crm_partner_assign/res_partner_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/crm_partner_assign/res_partner_view.xml b/addons/crm_partner_assign/res_partner_view.xml
index 4d613c5ddd0..1474da025a3 100644
--- a/addons/crm_partner_assign/res_partner_view.xml
+++ b/addons/crm_partner_assign/res_partner_view.xml
@@ -111,6 +111,7 @@
                             <separator string="Partner Activation" colspan="2"/>
                             <field name="grade_id" widget="selection"/>
                             <field name="activation" widget="selection"/>
+                            <field name="assigned_partner_id"/>
                             <field name="partner_weight"/>
                         </group>
                         <group>