From 9b0b918ed6a95da62642f5efff01e4166a45f719 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Wed, 14 May 2014 17:34:17 +0200 Subject: [PATCH] [FIX] website_sale: removed now unnecessary dependency towards crm for website-sale, as sales_team module is a dependancy of sale. Also reverted some changes in comments. --- addons/website_sale/__openerp__.py | 2 +- addons/website_sale/controllers/main.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/website_sale/__openerp__.py b/addons/website_sale/__openerp__.py index acfdca4c32f..68556cd8081 100644 --- a/addons/website_sale/__openerp__.py +++ b/addons/website_sale/__openerp__.py @@ -9,7 +9,7 @@ OpenERP E-Commerce """, 'author': 'OpenERP SA', - 'depends': ['website', 'sale', 'payment', 'crm'], + 'depends': ['website', 'sale', 'payment'], 'data': [ 'data/data.xml', 'views/views.xml', diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py index 55c170bc939..7bc2eb13712 100644 --- a/addons/website_sale/controllers/main.py +++ b/addons/website_sale/controllers/main.py @@ -253,7 +253,7 @@ class website_sale(http.Controller): def checkout_redirection(self, order): cr, uid, context, registry = request.cr, request.uid, request.context, request.registry - # must have a draft state of sale order with lines at this point, otherwise reset + # must have a draft sale order with lines at this point, otherwise reset if not order or order.state != 'draft': request.website_sale_reset(cr, uid, context=context) return request.redirect('/shop') @@ -454,7 +454,7 @@ class website_sale(http.Controller): """ Payment step. This page proposes several payment means based on available payment.acquirer. State at this point : - - a draft state sale order with lines; otherwise, clean context / session and + - a draft sale order with lines; otherwise, clean context / session and back to the shop - no transaction in context / session, or only a draft one, if the customer did go to a payment.acquirer website but closed the tab without