[MERGE] Merged lp:openobject-addons.

diff --cc addons/sale/sale_view.xml
Simple merge

diff --cc addons/website_sale/__openerp__.py
Simple merge

diff --cc addons/website_sale/controllers/main.py
index c051f61,7511e30..4b78812
--- 1/addons/website_sale/controllers/main.py
--- 2/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@@ -323,9 -348,9 +348,9 @@@ class Ecommerce(http.Controller)
  
          # must have a draft sale order with lines at this point, otherwise reset
          order = self.get_order()
 -        if order and order.state != 'draft':
 +        if order and order.state not in ['draft','shopping_cart']:
-             request.registry['website'].sale_reset_order(cr, uid, context=context)
-             return request.redirect('/shop/')
+             request.registry['website'].ecommerce_reset(cr, uid, context=context)
+             return request.redirect('/shop')
  
          self.get_pricelist()