From afc2ddd40c0cb33e2b971c6a7c92311c961ff02a Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 30 Aug 2013 16:42:04 +0200
Subject: [PATCH] [FIX] website_sale: checkout

bzr revid: chm@openerp.com-20130830144204-5x4k7345nmzni65c
---
 addons/website_sale/controllers/main.py    |  3 ++-
 addons/website_sale/views/website_sale.xml | 16 ++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index 61febc115f0..6389a21d9b3 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -268,7 +268,8 @@ class Ecommerce(http.Controller):
         if request.uid != website.get_public_user().id:
             partner = user_obj.browse(request.cr, request.uid, request.uid).partner_id
             partner_id = partner.id
-            checkout = user_obj.read(request.cr, SUPERUSER_ID, [partner_id], [])[0]
+            fields = ["name", "phone", "fax", "company", "email", "street", "city", "state_id", "zip", "country_id"]
+            checkout = user_obj.read(request.cr, SUPERUSER_ID, [partner_id], fields)[0]
             checkout['company'] = partner.parent_id and partner.parent_id.name or ''
 
             shipping_ids = partner_obj.search(request.cr, request.uid, [("parent_id", "=", partner_id), ('type', "=", 'delivery')])
diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml
index 523a1b7df2f..849109c33d9 100644
--- a/addons/website_sale/views/website_sale.xml
+++ b/addons/website_sale/views/website_sale.xml
@@ -380,25 +380,25 @@
                             <div t-attf-class="form-group #{error.get('company', '')}">
                                 <label class="col-lg-3 control-label" for="contact_name">Company</label>
                                 <div class="col-lg-4">
-                                    <input type="tel" name="company" class="form-control" t-att-value="checkout.get('company', '')"/>
+                                    <input type="text" name="company" class="form-control" t-att-value="checkout.get('company', '')"/>
                                 </div>
                             </div>
                             <div t-attf-class="form-group #{error.get('email', '')}">
                                 <label class="col-lg-3 control-label" for="contact_name">Email address</label>
                                 <div class="col-lg-4">
-                                    <input type="tel" name="email" class="form-control" t-att-value="checkout.get('email', '')"/>
+                                    <input type="email" name="email" class="form-control" t-att-value="checkout.get('email', '')"/>
                                 </div>
                             </div>
                             <div t-attf-class="form-group #{error.get('street', '')}">
                                 <label class="col-lg-3 control-label" for="contact_name">Street</label>
                                 <div class="col-lg-4">
-                                    <input type="tel" name="street" class="form-control" t-att-value="checkout.get('street', '')"/>
+                                    <input type="text" name="street" class="form-control" t-att-value="checkout.get('street', '')"/>
                                 </div>
                             </div>
                             <div t-attf-class="form-group #{error.get('city', '')}">
                                 <label class="col-lg-3 control-label" for="contact_name">City</label>
                                 <div class="col-lg-4">
-                                    <input type="tel" name="city" class="form-control" t-att-value="checkout.get('city', '')"/>
+                                    <input type="text" name="city" class="form-control" t-att-value="checkout.get('city', '')"/>
                                 </div>
                             </div>
                             <div t-attf-class="form-group #{error.get('state_id', '')}">
@@ -415,7 +415,7 @@
                             <div t-attf-class="form-group #{error.get('zip', '')}">
                                 <label class="col-lg-3 control-label" for="contact_name">Zip / Postal Code</label>
                                 <div class="col-lg-4">
-                                    <input type="tel" name="zip" class="form-control" t-att-value="checkout.get('zip', '')"/>
+                                    <input type="text" name="zip" class="form-control" t-att-value="checkout.get('zip', '')"/>
                                 </div>
                             </div>
                             <div t-attf-class="form-group #{error.get('country_id', '')}">
@@ -462,13 +462,13 @@
                             <div t-attf-class="form-group #{error.get('shipping_street', '')}">
                                 <label class="col-lg-3 control-label" for="contact_name">Street</label>
                                 <div class="col-lg-4">
-                                    <input type="tel" name="shipping_street" class="form-control" t-att-value="checkout.get('shipping_street', '')"/>
+                                    <input type="text" name="shipping_street" class="form-control" t-att-value="checkout.get('shipping_street', '')"/>
                                 </div>
                             </div>
                             <div t-attf-class="form-group #{error.get('shipping_city', '')}">
                                 <label class="col-lg-3 control-label" for="contact_name">City</label>
                                 <div class="col-lg-4">
-                                    <input type="tel" name="shipping_city" class="form-control" t-att-value="checkout.get('shipping_city', '')"/>
+                                    <input type="text" name="shipping_city" class="form-control" t-att-value="checkout.get('shipping_city', '')"/>
                                 </div>
                             </div>
                             <div t-attf-class="form-group #{error.get('shipping_state_id', '')}">
@@ -485,7 +485,7 @@
                             <div t-attf-class="form-group #{error.get('shipping_zip', '')}">
                                 <label class="col-lg-3 control-label" for="contact_name">Zip / Postal Code</label>
                                 <div class="col-lg-4">
-                                    <input type="tel" name="shipping_zip" class="form-control" t-att-value="checkout.get('shipping_zip', '')"/>
+                                    <input type="text" name="shipping_zip" class="form-control" t-att-value="checkout.get('shipping_zip', '')"/>
                                 </div>
                             </div>
                             <div t-attf-class="form-group #{error.get('shipping_country_id', '')}">