From 1fb3cccef472585ab6dffa6164f2c0ce808cd0dd Mon Sep 17 00:00:00 2001
From: jke-openerp <jke@openerp.com>
Date: Thu, 30 Jan 2014 22:27:48 +0100
Subject: [PATCH] [FIX] Use only published carrier_delivery

bzr revid: jke@openerp.com-20140130212748-57udob0yxz73775r
---
 addons/website_sale_delivery/models/sale_order.py | 5 +----
 addons/website_sale_delivery/models/website.py    | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/addons/website_sale_delivery/models/sale_order.py b/addons/website_sale_delivery/models/sale_order.py
index cb4c391d8f5..9074e6768ea 100644
--- a/addons/website_sale_delivery/models/sale_order.py
+++ b/addons/website_sale_delivery/models/sale_order.py
@@ -56,9 +56,6 @@ class SaleOrder(orm.Model):
         ),
     }
 
-    def _add_delivery(self, cr, uid, order, context=None):
-        pass
-
     def _get_website_data(self, cr, uid, order, context=None):
         """ Override to add delivery-related website data. """
         values = super(SaleOrder, self)._get_website_data(cr, uid, order, context=context)
@@ -72,6 +69,6 @@ class SaleOrder(orm.Model):
 
         delivery_ctx = dict(context, order_id=order.id)
         DeliveryCarrier = self.pool.get('delivery.carrier')
-        delivery_ids = DeliveryCarrier.search(cr, uid, [], context=context)
+        delivery_ids = DeliveryCarrier.search(cr, uid, [('website_published','=',True)], context=context)
         values['deliveries'] = DeliveryCarrier.browse(cr, SUPERUSER_ID, delivery_ids, context=delivery_ctx)
         return values
diff --git a/addons/website_sale_delivery/models/website.py b/addons/website_sale_delivery/models/website.py
index 1a12fd551c0..5c4585de17f 100644
--- a/addons/website_sale_delivery/models/website.py
+++ b/addons/website_sale_delivery/models/website.py
@@ -35,7 +35,7 @@ class Website(orm.Model):
             if order.carrier_id:
                 self.pool['sale.order']._delivery_unset(cr, SUPERUSER_ID, order, context=context)
 
-            carrier_ids = self.pool.get('delivery.carrier').search(cr, uid, [], context=context)
+            carrier_ids = self.pool.get('delivery.carrier').search(cr, uid, [('website_published','=',True)], context=context)
             carrier_id = force_carrier_id or (carrier_ids and carrier_ids[0])
             order.write({'carrier_id': carrier_id}, context=context)
             #If carrier_id have no grid, we don't have delivery !