[DATA] +members and their volunteer activities and membership lines

diff --git a/__openerp__.py b/__openerp__.py
index 64566c9..161b048 100644 (file)
--- a/__openerp__.py
+++ b/__openerp__.py
@@ -44,6 +44,9 @@ It installs the profile for bike co-ops to manage some features like:
         'data/plan_comptable_general.xml',
         'data/products_categories.xml',
         'data/products_products.xml',
+        'data/members.xml',
+        'data/volunteer_activities.xml',
+        'data/membership_lines.xml',
         'view/bikecoop.xml',
         'view/point_of_sale.xml',
         'security/velosenville.xml',

diff --git a/data/bikecoop.xml b/data/bikecoop.xml
index 66f17b6..835c81d 100644 (file)
--- a/data/bikecoop.xml
+++ b/data/bikecoop.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <openerp>
   <data noupdate="1">
-        <record id="bikecoop.bikecoop_partner_occupation_none" model="bikecoop.partner.theme">
+        <record id="bikecoop.bikecoop_partner_occupation_other" model="bikecoop.partner.theme">
             <field name="code">9</field>
             <field name="name">Non-renseigné</field>
             <field name="sequence">9</field>
         </record>
-        <record id="bikecoop.bikecoop_partner_occupation_other" model="bikecoop.partner.theme">
-            <field name="code">84</field>
+        <record id="bikecoop.bikecoop_partner_occupation_none" model="bikecoop.partner.theme">
+            <field name="code">8</field>
             <field name="name">Autres personnes sans activité professionnelle</field>
-            <field name="sequence">84</field>
+            <field name="sequence">8</field>
             <field name="domain">occupation</field>
         </record>
   </data>

diff --git a/data/bikecoop_partner_themes.xml b/data/bikecoop_partner_themes.xml
index 4da86ca..4c36dd0 100644 (file)
--- a/data/bikecoop_partner_themes.xml
+++ b/data/bikecoop_partner_themes.xml
@@ -106,12 +106,19 @@
       <field name="name">Masseur Kin&#233;sith&#233;rapeute et sp&#233;cialistes de la r&#233;&#233;ducation</field>
       <field name="sequence">432</field>
     </record>
-    <record id="bikecoop_main_activity_occupation_434-5" model="bikecoop.partner.theme">
+    <record id="bikecoop_main_activity_occupation_435" model="bikecoop.partner.theme">
       <field eval="True" name="active"/>
       <field name="domain">occupation</field>
-      <field name="code">434-5</field>
+      <field name="code">435</field>
       <field name="name">&#201;ducateurs, Moniteurs, animateurs socioculturelle ou socio-&#233;ducative</field>
-      <field name="sequence">4345</field>
+      <field name="sequence">435</field>
+    </record>
+    <record id="bikecoop_main_activity_occupation_434" model="bikecoop.partner.theme">
+      <field eval="True" name="active"/>
+      <field name="domain">occupation</field>
+      <field name="code">434</field>
+      <field name="name">Sp&#233;cialistes de l'intervention socio-&#233;ducative</field>
+      <field name="sequence">434</field>
     </record>
     <record id="bikecoop_main_activity_occupation_465A" model="bikecoop.partner.theme">
       <field eval="True" name="active"/>
@@ -155,76 +162,83 @@
       <field name="name">Retrait&#233;s</field>
       <field name="sequence">7</field>
     </record>
-    <record id="bikecoop_main_activity_occupation_81" model="bikecoop.partner.theme">
+    <record id="bikecoop_main_activity_occupation_841" model="bikecoop.partner.theme">
       <field eval="True" name="active"/>
       <field name="domain">occupation</field>
-      <field name="code">81</field>
+      <field name="code">841</field>
       <field name="name">&#201;l&#232;ves</field>
-      <field name="sequence">81</field>
+      <field name="sequence">841</field>
     </record>
-    <record id="bikecoop_main_activity_occupation_82" model="bikecoop.partner.theme">
+    <record id="bikecoop_main_activity_occupation_842" model="bikecoop.partner.theme">
       <field eval="True" name="active"/>
       <field name="domain">occupation</field>
-      <field name="code">82</field>
+      <field name="code">842</field>
       <field name="name">Coll&#233;giens</field>
-      <field name="sequence">82</field>
+      <field name="sequence">842</field>
+    </record>
+    <record id="bikecoop_main_activity_occupation_843" model="bikecoop.partner.theme">
+      <field eval="True" name="active"/>
+      <field name="domain">occupation</field>
+      <field name="code">843</field>
+      <field name="name">Lyc&#233;ens</field>
+      <field name="sequence">843</field>
     </record>
-    <record id="bikecoop_main_activity_occupation_83" model="bikecoop.partner.theme">
+    <record id="bikecoop_main_activity_occupation_844" model="bikecoop.partner.theme">
       <field eval="True" name="active"/>
       <field name="domain">occupation</field>
-      <field name="code">83</field>
+      <field name="code">844</field>
       <field name="name">&#201;tudiants</field>
-      <field name="sequence">83</field>
+      <field name="sequence">844</field>
     </record>
-    <record id="bikecoop_main_activity_volunteer_CON" model="bikecoop.partner.theme">
+    <record id="bikecoop_volunteer_CON" model="bikecoop.partner.theme">
       <field eval="True" name="active"/>
       <field name="domain">volunteer</field>
       <field name="code">CON</field>
       <field name="name">&#192; contacter</field>
     </record>
-    <record id="bikecoop_main_activity_volunteer_ADMIN_CO" model="bikecoop.partner.theme">
+    <record id="bikecoop_volunteer_ADMIN_CO" model="bikecoop.partner.theme">
       <field eval="True" name="active"/>
       <field name="domain">volunteer</field>
       <field name="code">ADMIN_CO</field>
       <field name="name">Administration</field>
     </record>
-    <record id="bikecoop_main_activity_volunteer_BSCHOOL_" model="bikecoop.partner.theme">
+    <record id="bikecoop_volunteer_BSCHOOL_" model="bikecoop.partner.theme">
       <field eval="True" name="active"/>
       <field name="domain">volunteer</field>
       <field name="code">BSCHOOL_</field>
       <field name="name">V&#233;lo-&#201;cole</field>
     </record>
-    <record id="bikecoop_main_activity_volunteer_BWAY_COM" model="bikecoop.partner.theme">
+    <record id="bikecoop_volunteer_BWAY_COM" model="bikecoop.partner.theme">
       <field eval="True" name="active"/>
       <field name="domain">volunteer</field>
       <field name="code">BWAY_COM</field>
       <field name="name">Am&#233;nagements cyclables</field>
     </record>
-    <record id="bikecoop_main_activity_volunteer_COM_COM" model="bikecoop.partner.theme">
+    <record id="bikecoop_volunteer_COM_COM" model="bikecoop.partner.theme">
       <field eval="True" name="active"/>
       <field name="domain">volunteer</field>
       <field name="code">COM_COM</field>
       <field name="name">Communication</field>
     </record>
-    <record id="bikecoop_main_activity_volunteer_ECOM_COM" model="bikecoop.partner.theme">
+    <record id="bikecoop_volunteer_ECOM_COM" model="bikecoop.partner.theme">
       <field eval="True" name="active"/>
       <field name="domain">volunteer</field>
       <field name="code">ECOM_COM</field>
       <field name="name">&#201;co-mobilit&#233;</field>
     </record>
-    <record id="bikecoop_main_activity_volunteer_EVENTS_C" model="bikecoop.partner.theme">
+    <record id="bikecoop_volunteer_EVENTS_C" model="bikecoop.partner.theme">
       <field eval="True" name="active"/>
       <field name="domain">volunteer</field>
       <field name="code">EVENTS_C</field>
       <field name="name">&#201;v&#233;nements</field>
     </record>
-    <record id="bikecoop_main_activity_volunteer_RIDE_COM" model="bikecoop.partner.theme">
+    <record id="bikecoop_volunteer_RIDE_COM" model="bikecoop.partner.theme">
       <field eval="True" name="active"/>
       <field name="domain">volunteer</field>
       <field name="code">RIDE_COM</field>
       <field name="name">Balades &#224; v&#233;lo</field>
     </record>
-    <record id="bikecoop_main_activity_volunteer_WKS_COM" model="bikecoop.partner.theme">
+    <record id="bikecoop_volunteer_WKS_COM" model="bikecoop.partner.theme">
       <field eval="True" name="active"/>
       <field name="domain">volunteer</field>
       <field name="code">WKS_COM</field>

diff --git a/data/members.xml b/data/members.xml
new file mode 120000 (symlink)
index 0000000..80cfc17
--- /dev/null
+++ b/data/members.xml
@@ -0,0 +1 @@
+../sec/data/members.xml
\ No newline at end of file

diff --git a/data/membership_lines.xml b/data/membership_lines.xml
new file mode 120000 (symlink)
index 0000000..bea53d2
--- /dev/null
+++ b/data/membership_lines.xml
@@ -0,0 +1 @@
+../sec/data/membership_lines.xml
\ No newline at end of file

diff --git a/data/plan_comptable_general.xml b/data/plan_comptable_general.xml
index 2b73cfe..1f6d487 100644 (file)
--- a/data/plan_comptable_general.xml
+++ b/data/plan_comptable_general.xml
@@ -1,5 +1,5 @@
 <openerp>
-    <data noupdate="0">
+    <data noupdate="1">
         <record id="pcg_6073" model="account.account.template">
             <field name="name">Antivol</field>
             <field name="code">6073</field>

diff --git a/data/products_categories.xml b/data/products_categories.xml
index 561aaf7..4f96703 100644 (file)
--- a/data/products_categories.xml
+++ b/data/products_categories.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <openerp>
-  <data>
+  <data noupdate="1">
     <record id="product_category_0" model="product.category">
       <field name="parent_id" ref="product.product_category_all"/>
       <field name="name">Tous</field>

diff --git a/data/products_products.xml b/data/products_products.xml
index a0ba216..053e5fa 100644 (file)
--- a/data/products_products.xml
+++ b/data/products_products.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <openerp>
-  <data>
+  <data noupdate="1">
     <record id="product_product_0" model="product.product">
       <field name="sale_ok">False</field>
       <field name="type">consu</field>

diff --git a/data/volunteer_activities.xml b/data/volunteer_activities.xml
new file mode 120000 (symlink)
index 0000000..21fe473
--- /dev/null
+++ b/data/volunteer_activities.xml
@@ -0,0 +1 @@
+../sec/data/volunteer_activities.xml
\ No newline at end of file