Merge lp:~openerp-dev/openobject-server/trunk-bug-907337-mma into lp:openobject-server

[Mayur Maheshwari(OpenERP)]

hello,

      Base : I Have add a http:// in partner demo data

Thanks.

[Antony Lesuisse (OpenERP) (al-openerp)]

I think this should be solved on the url widget. Either the widget will correct url's at input then we could merge this one or be tolerant when displaying them then we would not merge this.

Unmerged revisions

3908. By Mayur Maheshwari(OpenERP) on 2011-12-22

[FIX]base: add a http:// in partner demo data

=== modified file 'openerp/addons/base/res/res_partner_demo.xml'
--- openerp/addons/base/res/res_partner_demo.xml	2011-12-15 07:20:38 +0000
+++ openerp/addons/base/res/res_partner_demo.xml	2011-12-22 08:41:26 +0000
@@ -94,23 +94,23 @@
             <field name="supplier">1</field>
             <field eval="0" name="customer"/>
             <field name="address" eval="[]"/>
-            <field name="website">www.asustek.com</field>
+            <field name="website">http://www.asustek.com</field>
         </record>
         <record id="res_partner_agrolait" model="res.partner">
             <field name="name">Agrolait</field>
             <field eval="[(6, 0, [ref('base.res_partner_category_0')])]" name="category_id"/>
             <field name="address" eval="[]"/>
-            <field name="website">www.agrolait.com</field>
+            <field name="website">http://www.agrolait.com</field>
         </record>
         <record id="res_partner_c2c" model="res.partner">
             <field name="name">Camptocamp</field>
             <field eval="[(6, 0, [ref('res_partner_category_10'), ref('res_partner_category_5')])]" name="category_id"/>
             <field name="supplier">1</field>
             <field name="address" eval="[]"/>
-            <field name="website">www.camptocamp.com</field>
+            <field name="website">http://www.camptocamp.com</field>
         </record>
         <record id="res_partner_sednacom" model="res.partner">
-            <field name="website">www.syleam.fr</field>
+            <field name="website">http://www.syleam.fr</field>
             <field name="name">Syleam</field>
             <field eval="[(6, 0, [ref('res_partner_category_5')])]" name="category_id"/>
             <field name="address" eval="[]"/>
@@ -118,30 +118,30 @@
         <record id="res_partner_thymbra" model="res.partner">
             <field name="name">Thymbra</field>
             <field eval="[(6, 0, [ref('res_partner_category_4')])]" name="category_id"/>
-            <field name="website">www.thymbra.com/</field>
+            <field name="website">http://www.thymbra.com/</field>
         </record>
         <record id="res_partner_desertic_hispafuentes" model="res.partner">
             <field name="name">Axelor</field>
             <field eval="[(6, 0, [ref('res_partner_category_4')])]" name="category_id"/>
             <field name="supplier">1</field>
             <field name="address" eval="[]"/>
-            <field name="website">www.axelor.com/</field>
+            <field name="website">http://www.axelor.com/</field>
         </record>
         <record id="res_partner_tinyatwork" model="res.partner">
             <field name="name">Tiny AT Work</field>
             <field eval="[(6, 0, [ref('res_partner_category_5'), ref('res_partner_category_10')])]" name="category_id"/>
-            <field name="website">www.tinyatwork.com/</field>
+            <field name="website">http://www.tinyatwork.com/</field>
         </record>
         <record id="res_partner_2" model="res.partner">
             <field name="name">Bank Wealthy and sons</field>
             <field name="address" eval="[]"/>
-            <field name="website">www.wealthyandsons.com/</field>
+            <field name="website">http://www.wealthyandsons.com/</field>
         </record>
         <record id="res_partner_3" model="res.partner">
             <field name="name">China Export</field>
             <field eval="[(6, 0, [ref('res_partner_category_9')])]" name="category_id"/>
             <field name="address" eval="[]"/>
-            <field name="website">www.chinaexport.com/</field>
+            <field name="website">http://www.chinaexport.com/</field>
         </record>
         <record id="res_partner_4" model="res.partner">
             <field name="name">Distrib PC</field>
@@ -149,13 +149,13 @@
             <field name="supplier">1</field>
             <field eval="0" name="customer"/>
             <field name="address" eval="[]"/>
-            <field name="website">www.distribpc.com/</field>
+            <field name="website">http://www.distribpc.com/</field>
         </record>
         <record id="res_partner_5" model="res.partner">
             <field name="name">Ecole de Commerce de Liege</field>
             <field eval="[(6, 0, [ref('res_partner_category_1')])]" name="category_id"/>
             <field name="address" eval="[]"/>
-            <field name="website">www.eci-liege.info//</field>
+            <field name="website">http://www.eci-liege.info//</field>
         </record>
         <record id="res_partner_6" model="res.partner">
             <field name="name">Elec Import</field>
@@ -186,7 +186,7 @@
             <field name="address" eval="[]"/>
         </record>
         <record id="res_partner_9" model="res.partner">
-            <field name="website">www.balmerinc.com</field>
+            <field name="website">http://www.balmerinc.com</field>
             <field name="name">BalmerInc S.A.</field>
             <field eval="12000.00" name="credit_limit"/>
             <field name="ref">or</field>
@@ -257,7 +257,7 @@
         <record id="res_partner_notsotinysarl0" model="res.partner">
             <field name="name">NotSoTiny SARL</field>
             <field name="address" eval="[]"/>
-            <field name="website">notsotiny.be</field>
+            <field name="website">http://notsotiny.be</field>
         </record>
 
         <record id="res_partner_theshelvehouse0" model="res.partner">
@@ -272,7 +272,7 @@
             <field name="supplier">1</field>
             <field name="customer">0</field>
             <field name="address" eval="[]"/>
-            <field name="website">vicking-direct.be</field>
+            <field name="website">http://vicking-direct.be</field>
         </record>
 
         <record id="res_partner_woodywoodpecker0" model="res.partner">
@@ -281,7 +281,7 @@
             <field name="supplier">1</field>
             <field eval="0" name="customer"/>
             <field name="address" eval="[]"/>
-            <field name="website">woodywoodpecker.com</field>
+            <field name="website">http://woodywoodpecker.com</field>
         </record>
 
         <record id="res_partner_zerooneinc0" model="res.partner">