From 489742873d12e331a54f045078bd1db981add5e2 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Wed, 4 Jun 2014 11:25:51 +0200
Subject: [PATCH] [FIX] website_sale: backport commit
 3cc4785ba6d27475323a606fef9466286024ad0e of master

This fix aimed saas-5, not master.
original Commit message:
display accessory field in form view and display the good accessory product inside ecommerce
This is related to previous rev 86055fb8cd5f86d9b4416d9d9a1a736e1c06aba9
---
 addons/website_sale/models/sale_order.py | 4 ++--
 addons/website_sale/views/templates.xml  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/website_sale/models/sale_order.py b/addons/website_sale/models/sale_order.py
index dacc7caf02d..d9855034018 100644
--- a/addons/website_sale/models/sale_order.py
+++ b/addons/website_sale/models/sale_order.py
@@ -111,10 +111,10 @@ class sale_order(osv.Model):
 
     def _cart_accessories(self, cr, uid, ids, context=None):
         for order in self.browse(cr, uid, ids, context=context):
-            s = set(j.product_tmpl_id.id for l in (order.website_order_line or []) for j in (l.product_id.accessory_product_ids or []))
+            s = set(j.id for l in (order.website_order_line or []) for j in (l.product_id.accessory_product_ids or []))
             s -= set(l.product_id.id for l in order.order_line)
             product_ids = random.sample(s, min(len(s),3))
-            return self.pool['product.template'].browse(cr, uid, product_ids, context=context)
+            return self.pool['product.product'].browse(cr, uid, product_ids, context=context)
 
 class website(orm.Model):
     _inherit = 'website'
diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml
index 925353d6de6..470ca8383f4 100644
--- a/addons/website_sale/views/templates.xml
+++ b/addons/website_sale/views/templates.xml
@@ -726,14 +726,14 @@
               <tr t-foreach="suggested_products" t-as="product">
 
                   <td>
-                      <a t-attf-href="/shop/product/#{ slug(product) }">
+                      <a t-attf-href="/shop/product/#{ slug(product.product_tmpl_id) }">
                           <span t-field="product.image_small"
                                 t-field-options='{"widget": "image", "class": "img-rounded"}'/>
                       </a>
                   </td>
                   <td>
                       <div>
-                          <a t-attf-href="/shop/product/#{ slug(product) }">
+                          <a t-attf-href="/shop/product/#{ slug(product.product_tmpl_id) }">
                               <strong t-field="product.name"/>
                           </a>
                       </div>