Migration v7 en cours

diff --git a/data/base.xml b/data/base.xml
index 395b1a4..7003d7c 100644 (file)
--- a/data/base.xml
+++ b/data/base.xml
@@ -4,10 +4,6 @@
         <record id="base.main_partner" model="res.partner">
             <field name="name">L'Heureux Cyclage</field>
             <field name="website">www.heureux-cyclage.org</field>
-        </record>
-
-        <record id="base.main_address" model="res.partner.address">
-            <field name="name"></field>
             <field name="street">À Pignon sur Rue</field>
             <field name="street2">10 rue Saint-Polycarpe</field>
             <field name="zip">69001</field>
@@ -25,9 +21,10 @@
             <field name="rml_footer2"></field>
             <field name="currency_id" ref="base.EUR"/>
         </record>
-
+        <!--
         <record id="base.user_root" model="res.users">
             <field name="groups_id" eval="[(4,ref('base.group_extended'))]"/>
         </record>
+        -->
     </data>
 </openerp>

diff --git a/demo/account.xml b/demo/account.xml
index d7eed39..dc1697f 100644 (file)
--- a/demo/account.xml
+++ b/demo/account.xml
@@ -7,7 +7,6 @@
             <field name="name">Accountant</field>
             <field name="signature">Accountant</field>
             <field name="company_id" ref="base.main_company"/>
-            <field name="groups_id" eval="[(4,ref('base.group_extended'))]"/>
             <field name="groups_id" eval="[(4,ref('account.group_account_user'))]"/>
             <field name="groups_id" eval="[(4,ref('account.group_account_invoice'))]"/>
         </record>
@@ -17,7 +16,6 @@
             <field name="name">Treasurer</field>
             <field name="signature">Treasurer</field>
             <field name="company_id" ref="base.main_company"/>
-            <field name="groups_id" eval="[(4,ref('base.group_extended'))]"/>
             <field name="groups_id" eval="[(4,ref('account.group_account_user'))]"/>
             <field name="groups_id" eval="[(4,ref('account.group_account_invoice'))]"/>
             <field name="groups_id" eval="[(4,ref('account.group_account_manager'))]"/>

diff --git a/demo/product.xml b/demo/product.xml
index 1f1e3f3..bc87ba8 100644 (file)
--- a/demo/product.xml
+++ b/demo/product.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <openerp>
     <data>
-        <record id="uom_halfday" model="product.uom">
+        <record id="product_uom_halfday" model="product.uom">
             <field name="name">Half day</field>
             <field ref="product.uom_categ_wtime" name="category_id"/>
             <field name="factor" eval="1.0"/>
@@ -94,8 +94,8 @@
             <field name="name">Bike school for one hour</field>
             <field name="list_price">60.00</field>
             <field name="standard_price">0.00</field>
-            <field name="uom_id" ref="product.uom_hour"/>
-            <field name="uom_po_id" ref="product.uom_hour"/>
+            <field name="uom_id" ref="product.product_uom_hour"/>
+            <field name="uom_po_id" ref="product.product_uom_hour"/>
             <field name="type">service</field>
             <field name="categ_id" ref="product_category_anim_bikeschool"/>
         </record>
@@ -103,8 +103,8 @@
             <field name="name">Bike school for an half day</field>
             <field name="list_price">250.00</field>
             <field name="standard_price">0.00</field>
-            <field name="uom_id" ref="uom_halfday"/>
-            <field name="uom_po_id" ref="uom_halfday"/>
+            <field name="uom_id" ref="product_uom_halfday"/>
+            <field name="uom_po_id" ref="product_uom_halfday"/>
             <field name="type">service</field>
             <field name="categ_id" ref="product_category_anim_bikeschool"/>
         </record>
@@ -112,8 +112,8 @@
             <field name="name">Bike school for one day</field>
             <field name="list_price">400.00</field>
             <field name="standard_price">0.00</field>
-            <field name="uom_id" ref="product.uom_day"/>
-            <field name="uom_po_id" ref="product.uom_day"/>
+            <field name="uom_id" ref="product.product_uom_day"/>
+            <field name="uom_po_id" ref="product.product_uom_day"/>
             <field name="type">service</field>
             <field name="categ_id" ref="product_category_anim_bikeschool"/>
         </record>
@@ -121,8 +121,8 @@
             <field name="name">Rent strange bikes for an half day</field>
             <field name="list_price">100.00</field>
             <field name="standard_price">0.00</field>
-            <field name="uom_id" ref="uom_halfday"/>
-            <field name="uom_po_id" ref="uom_halfday"/>
+            <field name="uom_id" ref="product_uom_halfday"/>
+            <field name="uom_po_id" ref="product_uom_halfday"/>
             <field name="type">service</field>
             <field name="categ_id" ref="product_category_anim_strangebike"/>
         </record>
@@ -130,8 +130,8 @@
             <field name="name">Rent strange bikes for one day</field>
             <field name="list_price">200.00</field>
             <field name="standard_price">0.00</field>
-            <field name="uom_id" ref="product.uom_day"/>
-            <field name="uom_po_id" ref="product.uom_day"/>
+            <field name="uom_id" ref="product.product_uom_day"/>
+            <field name="uom_po_id" ref="product.product_uom_day"/>
             <field name="type">service</field>
             <field name="categ_id" ref="product_category_anim_strangebike"/>
         </record>
@@ -139,8 +139,8 @@
             <field name="name">Internal mecanical training for one hour</field>
             <field name="list_price">25.00</field>
             <field name="standard_price">0.00</field>
-            <field name="uom_id" ref="product.uom_hour"/>
-            <field name="uom_po_id" ref="product.uom_hour"/>
+            <field name="uom_id" ref="product.product_uom_hour"/>
+            <field name="uom_po_id" ref="product.product_uom_hour"/>
             <field name="type">service</field>
             <field name="categ_id" ref="product_category_training_internal"/>
         </record>
@@ -148,8 +148,8 @@
             <field name="name">External mecanical training for one hour</field>
             <field name="list_price">250.00</field>
             <field name="standard_price">0.00</field>
-            <field name="uom_id" ref="product.uom_hour"/>
-            <field name="uom_po_id" ref="product.uom_hour"/>
+            <field name="uom_id" ref="product.product_uom_hour"/>
+            <field name="uom_po_id" ref="product.product_uom_hour"/>
             <field name="type">service</field>
             <field name="categ_id" ref="product_category_training_external"/>
         </record>

diff --git a/demo/res_partner.xml b/demo/res_partner.xml
index 1a4e186..d19e721 100644 (file)
--- a/demo/res_partner.xml
+++ b/demo/res_partner.xml
@@ -62,59 +62,113 @@
         <record id="res_partner_recycleur" model="res.partner">
             <field name="name">Le Recycleur</field>
             <field eval="[(6, 0, [ref('res_partner_category_4')])]" name="category_id"/>
-            <field name="address" eval="[]"/>
             <field name="website">www.le-recycleur.fr/</field>
+            <field name="city">LYON</field>
+            <field name="zip">69001</field>
+            <field model="res.country" name="country_id" search="[('name','=','France')]"/>
+            <field name="email">hello@recycleur.org</field>
+            <field name="phone">00 33 4 72 00 23 57</field>
+            <field name="street">10 rue Saint-Polycarpe</field>
+            <field name="type">default</field>
         </record>
         <record id="res_partner_arapd" model="res.partner">
             <field name="name">Association Rhône-Alpes Petits Débrouillards</field>
             <field eval="[(6, 0, [ref('res_partner_category_2')])]" name="category_id"/>
             <field name="customer">1</field>
             <field name="supplier">1</field>
-            <field name="address" eval="[]"/>
             <field name="website">www.lespetitsdebrouillards-ra.org</field>
+            <field name="city">GRENOBLE</field>
+            <field name="zip">38100</field>
+            <field model="res.country" name="country_id" search="[('name','=','France')]"/>
+            <field name="email">arapd@lespetitsdebrouillards-ra.org</field>
+            <field name="phone">00 33 4 76 42 65 14</field>
+            <field name="street">82-84 avenue Rhine et Danube</field>
+            <field name="type">default</field>
         </record>
         <record id="res_partner_villegre" model="res.partner">
             <field name="name">Ville de Grenoble</field>
             <field eval="[(6, 0, [ref('res_partner_category_3')])]" name="category_id"/>
             <field name="customer">1</field>
-            <field name="address" eval="[]"/>
             <field name="website">www.grenoble.fr</field>
+            <field name="city">GRENOBLE</field>
+            <field name="zip">38021</field>
+            <field model="res.country" name="country_id" search="[('name','=','France')]"/>
+            <field name="email">contact@ville-grenoble.fr</field>
+            <field name="phone">00 33 4 76 76 36 36</field>
+            <field name="street">11 boulevard Jean Pain</field>
+            <field name="type">default</field>
         </record>
         <record id="res_partner_fdf" model="res.partner">
             <field name="website">www.fondationdefrance.org</field>
             <field name="name">Fondation de France</field>
             <field eval="[(6, 0, [ref('res_partner_category_0')])]" name="category_id"/>
-            <field name="address" eval="[]"/>
+            <field name="city">PARIS</field>
+            <field name="zip">75008</field>
+            <field model="res.country" name="country_id" search="[('name','=','France')]"/>
+            <field name="email"></field>
+            <field name="phone"></field>
+            <field name="street">40 avenue Hoche</field>
+            <field name="type">default</field>
         </record>
         <record id="res_partner_ptitvelo" model="res.partner">
             <field name="website">www.ptitvelo.net</field>
             <field name="name">Un p'tit Vélo dans la Tête</field>
             <field eval="[(6, 0, [ref('res_partner_category_4')])]" name="category_id"/>
-            <field name="address" eval="[]"/>
+            <field name="city">GRENOBLE</field>
+            <field name="zip">38000</field>
+            <field model="res.country" name="country_id" search="[('name','=','France')]"/>
+            <field name="email">contact@ptitvelo.net</field>
+            <field name="phone"></field>
+            <field name="street">5 rue de Londres</field>
+            <field name="type">default</field>
         </record>
         <record id="res_partner_francois" model="res.partner">
             <field name="name">François BOUX</field>
             <field eval="[(6, 0, [ref('res_partner_category_11')])]" name="category_id"/>
-            <field name="address" eval="[]"/>
+            <field name="city">LE SAPPEY EN CHARTREUSE</field>
+            <field name="zip">38000</field>
+            <field model="res.country" name="country_id" search="[('name','=','France')]"/>
+            <field name="email">francois@ptitvelo.net</field>
+            <field name="phone"></field>
+            <field name="street">rue des clavettes égarées</field>
+            <field name="type">default</field>
         </record>
         <record id="res_partner_lucie" model="res.partner">
             <field name="name">Lucie SCARBEL</field>
             <field eval="[(6, 0, [ref('res_partner_category_7')])]" name="category_id"/>
-            <field name="address" eval="[]"/>
+            <field name="city">GRENOBLE</field>
+            <field name="zip">38000</field>
+            <field model="res.country" name="country_id" search="[('name','=','France')]"/>
+            <field name="email">lucie@ptitvelo.net</field>
+            <field name="phone"></field>
+            <field name="street">5 boulevard des Véloparades</field>
+            <field name="type">default</field>
         </record>
         <record id="res_partner_dupignon" model="res.partner">
             <field name="name">M. DUPIGNON</field>
             <field eval="[(6, 0, [ref('res_partner_category_9')])]" name="category_id"/>
-            <field name="address" eval="[]"/>
+            <field name="city">GRENOBLE</field>
+            <field name="zip">38000</field>
+            <field model="res.country" name="country_id" search="[('name','=','France')]"/>
+            <field name="email">dupignon@ptitvelo.net</field>
+            <field name="phone"></field>
+            <field name="street">34 cours de la Libération de la Rue</field>
+            <field name="type">default</field>
         </record>
         <record id="res_partner_dupignon2" model="res.partner">
             <field name="name">Mme DUPIGNON</field>
-            <field name="address" eval="[]"/>
             <field name="associate_member" ref="res_partner_dupignon"/>
         </record>
         <record id="res_partner_matt" model="res.partner">
             <field name="name">Matthieu</field>
-            <field name="address" eval="[]"/>
+            <field name="city">GRENOBLE</field>
+            <field name="name">Matt</field>
+            <field name="zip">38000</field>
+            <field model="res.country" name="country_id" search="[('name','=','France')]"/>
+            <field name="email">matt@groggle.fr</field>
+            <field name="phone">00 00 00 00 00</field>
+            <field name="street">78 rue du col de l'Himalaya</field>
+            <field name="type">default</field>
         </record>
         <record id="res_partner_jeremy" model="res.partner">
             <field name="name">Jérémy</field>
@@ -131,17 +185,7 @@
         Resource: res.partner.address
         -->
 
-        <record id="res_partner_address_recycleur" model="res.partner.address">
-            <field name="city">LYON</field>
-            <field name="name"></field>
-            <field name="zip">69001</field>
-            <field model="res.country" name="country_id" search="[('name','=','France')]"/>
-            <field name="email">hello@recycleur.org</field>
-            <field name="phone">00 33 4 72 00 23 57</field>
-            <field name="street">10 rue Saint-Polycarpe</field>
-            <field name="type">default</field>
-            <field name="partner_id" ref="res_partner_recycleur"/>
-        </record>
+        <!--
         <record id="res_partner_address_recycleur_ludo" model="res.partner.address">
             <field name="city">LYON</field>
             <field name="name">Ludovic BOYER-BEARTH</field>
@@ -154,50 +198,6 @@
             <field name="function">Chargé de mission</field>            
             <field name="partner_id" ref="res_partner_recycleur"/>
         </record>
-        <record id="res_partner_address_arapd" model="res.partner.address">
-            <field name="city">GRENOBLE</field>
-            <field name="name"></field>
-            <field name="zip">38100</field>
-            <field model="res.country" name="country_id" search="[('name','=','France')]"/>
-            <field name="email">arapd@lespetitsdebrouillards-ra.org</field>
-            <field name="phone">00 33 4 76 42 65 14</field>
-            <field name="street">82-84 avenue Rhine et Danube</field>
-            <field name="type">default</field>
-            <field name="partner_id" ref="res_partner_arapd"/>
-        </record>
-        <record id="res_partner_address_villegre" model="res.partner.address">
-            <field name="city">GRENOBLE</field>
-            <field name="name">Hôtel de Ville</field>
-            <field name="zip">38021</field>
-            <field model="res.country" name="country_id" search="[('name','=','France')]"/>
-            <field name="email">contact@ville-grenoble.fr</field>
-            <field name="phone">00 33 4 76 76 36 36</field>
-            <field name="street">11 boulevard Jean Pain</field>
-            <field name="type">default</field>
-            <field name="partner_id" ref="res_partner_villegre"/>
-        </record>
-        <record id="res_partner_address_fdf" model="res.partner.address">
-            <field name="city">PARIS</field>
-            <field name="name"></field>
-            <field name="zip">75008</field>
-            <field model="res.country" name="country_id" search="[('name','=','France')]"/>
-            <field name="email"></field>
-            <field name="phone"></field>
-            <field name="street">40 avenue Hoche</field>
-            <field name="type">default</field>
-            <field name="partner_id" ref="res_partner_fdf"/>
-        </record>
-        <record id="res_partner_address_ptitvelo_londres" model="res.partner.address">
-            <field name="city">GRENOBLE</field>
-            <field name="name"></field>
-            <field name="zip">38000</field>
-            <field model="res.country" name="country_id" search="[('name','=','France')]"/>
-            <field name="email">contact@ptitvelo.net</field>
-            <field name="phone"></field>
-            <field name="street">5 rue de Londres</field>
-            <field name="type">default</field>
-            <field name="partner_id" ref="res_partner_ptitvelo"/>
-        </record>
         <record id="res_partner_address_ptitvelo_campus" model="res.partner.address">
             <field name="city">SAINT-MARTIN D'HÈRES</field>
             <field name="name">Atelier Campus</field>
@@ -209,39 +209,6 @@
             <field name="type"></field>
             <field name="partner_id" ref="res_partner_ptitvelo"/>
         </record>
-        <record id="res_partner_address_francois" model="res.partner.address">
-            <field name="city">LE SAPPEY EN CHARTREUSE</field>
-            <field name="name">François BOUX</field>
-            <field name="zip">38000</field>
-            <field model="res.country" name="country_id" search="[('name','=','France')]"/>
-            <field name="email">francois@ptitvelo.net</field>
-            <field name="phone"></field>
-            <field name="street">rue des clavettes égarées</field>
-            <field name="type">default</field>
-            <field name="partner_id" ref="res_partner_francois"/>
-        </record>
-        <record id="res_partner_address_lucie" model="res.partner.address">
-            <field name="city">GRENOBLE</field>
-            <field name="name">Lucie SCARBEL</field>
-            <field name="zip">38000</field>
-            <field model="res.country" name="country_id" search="[('name','=','France')]"/>
-            <field name="email">lucie@ptitvelo.net</field>
-            <field name="phone"></field>
-            <field name="street">5 boulevard des Véloparades</field>
-            <field name="type">default</field>
-            <field name="partner_id" ref="res_partner_lucie"/>
-        </record>
-        <record id="res_partner_address_dupignon" model="res.partner.address">
-            <field name="city">GRENOBLE</field>
-            <field name="name">M. DUPIGNON</field>
-            <field name="zip">38000</field>
-            <field model="res.country" name="country_id" search="[('name','=','France')]"/>
-            <field name="email">dupignon@ptitvelo.net</field>
-            <field name="phone"></field>
-            <field name="street">34 cours de la Libération de la Rue</field>
-            <field name="type">default</field>
-            <field name="partner_id" ref="res_partner_dupignon"/>
-        </record>
         <record id="res_partner_address_dupignon2" model="res.partner.address">
             <field name="city">GRENOBLE</field>
             <field name="name">Mme DUPIGNON</field>
@@ -252,17 +219,6 @@
             <field name="type">default</field>
             <field name="partner_id" ref="res_partner_dupignon2"/>
         </record>
-        <record id="res_partner_address_matt" model="res.partner.address">
-            <field name="city">GRENOBLE</field>
-            <field name="name">Matt</field>
-            <field name="zip">38000</field>
-            <field model="res.country" name="country_id" search="[('name','=','France')]"/>
-            <field name="email">matt@groggle.fr</field>
-            <field name="phone">00 00 00 00 00</field>
-            <field name="street">78 rue du col de l'Himalaya</field>
-            <field name="type">default</field>
-            <field name="partner_id" ref="res_partner_matt"/>
-        </record>
         <record id="res_partner_address_jeremy" model="res.partner.address">
             <field name="city">GRENOBLE</field>
             <field name="name">Jérémy</field>
@@ -285,6 +241,7 @@
             <field name="type">default</field>
             <field name="partner_id" ref="res_partner_renaud"/>
         </record>
+        -->
     </data>
 </openerp>