merge upstream

diff --cc addons/product/product.py
Simple merge

diff --cc addons/website_sale/controllers/main.py
Simple merge

diff --cc addons/website_sale/static/src/js/website.tour.sale.js
Simple merge

diff --cc addons/website_sale/tests/test_sale_process.py
index 584a4e4,a57a2d6..9e9f12a
--- 1/addons/website_sale/tests/test_sale_process.py
--- 2/addons/website_sale/tests/test_sale_process.py
+++ b/addons/website_sale/tests/test_sale_process.py
@@@ -11,14 -11,14 +11,22 @@@ inject = 
  @openerp.tests.common.post_install(True)
  class TestUi(openerp.tests.HttpCase):
      def test_01_admin_shop_tour(self):
++<<<<<<< HEAD
 +        self.phantom_js("/", "openerp.website.Tour.run('shop', 'test')", "openerp.website.Tour.tours.shop", login="admin")
 +        self.phantom_js("/", "openerp.website.Tour.run('shop_customize', 'test')", "openerp.website.Tour.tours.shop_customize", login="admin", inject=inject)
 +
 +    def test_02_admin_checkout(self):
 +        self.phantom_js("/", "openerp.website.Tour.run('shop_buy_product', 'test')", "openerp.website.Tour.tours.shop_buy_product", login="admin", inject=inject)
++=======
+         self.phantom_js("/", "openerp.Tour.run('shop', 'test')", "openerp.Tour.tours.shop", login="admin")
+ 
+     def test_02_admin_checkout(self):
+         self.phantom_js("/", "openerp.Tour.run('shop_customize', 'test')", "openerp.Tour.tours.shop_customize", login="admin", inject=inject)
+         self.phantom_js("/", "openerp.Tour.run('shop_buy_product', 'test')", "openerp.Tour.tours.shop_buy_product", login="admin", inject=inject)
++>>>>>>> remotes/odoo/master
  
      def test_03_demo_checkout(self):
-         self.phantom_js("/", "openerp.website.Tour.run('shop_buy_product', 'test')", "openerp.website.Tour.tours.shop_buy_product", login="demo", inject=inject)
+         self.phantom_js("/", "openerp.Tour.run('shop_buy_product', 'test')", "openerp.Tour.tours.shop_buy_product", login="demo", inject=inject)
  
      def test_04_public_checkout(self):
-         self.phantom_js("/", "openerp.website.Tour.run('shop_buy_product', 'test')", "openerp.website.Tour.tours.shop_buy_product", inject=inject)
+         self.phantom_js("/", "openerp.Tour.run('shop_buy_product', 'test')", "openerp.Tour.tours.shop_buy_product", inject=inject)

diff --cc addons/website_sale/views/templates.xml
Simple merge