[Membership] un peu de rangement

diff --git a/__openerp__.py b/__openerp__.py
index 1b609f8..9a36d1f 100644 (file)
--- a/__openerp__.py
+++ b/__openerp__.py
@@ -14,11 +14,11 @@
 This module is to configure modules related to a bike Co-op.
 ==============================================================
 
-It installs the profile for bike co-ops to manage memberships, membership products (schemes), stock, accounting, etc.
+It installs the profile for bike co-ops to manage some feature for ...
     """,
     'author': 'L\'Heureux Cyclage',
     'website': 'http://www.heureux-cyclage.org',
-    'depends': ['base','point_of_sale','account_voucher','account_accountant','remembership'],
+    'depends': ['base','point_of_sale','account_voucher','account_accountant'],
     'update_xml': [
         'security/ir.model.access.csv',
         'data/base.xml',
@@ -28,10 +28,9 @@ It installs the profile for bike co-ops to manage memberships, membership produc
         'demo/bikecoop.xml',
         'demo/product.xml',
         'demo/account.xml',
-        'demo/membership.xml',
         'demo/point_of_sale.xml',
-        'view/bikecoop_membership.xml',
         'view/partner.xml',
+        'view/bikecoop.xml',
     ],
     'installable': True,
     'auto_install': False,

diff --git a/bikecoop.py b/bikecoop.py
index 4eb804e..1db080d 100644 (file)
--- a/bikecoop.py
+++ b/bikecoop.py
@@ -24,7 +24,6 @@ class Partner(osv.osv):
     _inherit = 'res.partner'
 
     _columns = {
-        'associate_members': fields.one2many('res.partner', 'associate_member', 'Associate members', help='Members who are associated to this partner.'),
         'nationality_id': fields.many2one('res.country', 'Nationality', help='Partner\'s nationality if he is a person'),
         'occupation_id': fields.many2one('bikecoop.partner.theme', 'Occupation', help='Main occupation of this partner'),
         'volunteer_ids': fields.many2many('bikecoop.partner.theme', 'res_partner_bikecoop_theme_rel', 'partner_id', 'theme_id', 'Want to be volunteer?', help='What kind of volunteer activities you want to do with us?'),

diff --git a/membership_demo.xml b/membership_demo.xml
deleted file mode 100644 (file)
index 87548d5..0000000
--- a/membership_demo.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-
-<!-- Demo Data for Memberships  -->
-    <record id="membership_0" model="product.product">
-        <field name="membership">True</field>
-        <field eval="time.strftime('%Y-01-01')" name="membership_date_from"/>
-        <field eval="time.strftime('%Y-12-01')" name="membership_date_to"/>
-        <field name="name">Normal Membership</field>
-        <field name="list_price">25</field>
-        <field name="categ_id" ref="product.cat1"/>
-        <field name="type">service</field>
-    </record>
-    <record id="membership_1" model="product.product">
-        <field name="membership">True</field>
-        <field eval="time.strftime('%Y-01-01')" name="membership_date_from"/>
-        <field eval="time.strftime('%Y-12-01')" name="membership_date_to"/>
-        <field name="name">Reduce Membership</field>
-        <field name="categ_id" ref="product.cat1"/>
-        <field name="list_price">15</field>
-        <field name="type">service</field>
-    </record>
-    <record id="membership_2" model="product.product">
-        <field name="membership">True</field>
-        <field eval="time.strftime('%Y-01-01')" name="membership_date_from"/>
-        <field eval="time.strftime('%Y-12-01')" name="membership_date_to"/>
-        <field name="name">Family Membership</field>
-        <field name="categ_id" ref="product.cat1"/>
-        <field name="list_price">40</field>
-        <field name="type">service</field>
-    </record>
-
-<!-- Join Memberships  -->
-    <function model="res.partner" name="create_membership_invoice" eval="(ref('base.res_partner_agrolait'), ref('membership_0'), {'amount':25})"/>
-
-<!-- Demo data for free member -->
-    <record id="base.res_partner_desertic_hispafuentes" model="res.partner">
-        <field name="free_member">True</field>
-    </record>
-
-<!-- Demo data for associate member -->
-    <record id="base.res_partner_9" model="res.partner">
-        <field name="associate_member" ref="base.res_partner_agrolait"/>
-    </record>
-    <record id="base.res_partner_8" model="res.partner">
-        <field name="associate_member" ref="base.res_partner_agrolait"/>
-    </record>
-
-    </data>
-</openerp>

diff --git a/view/bikecoop.xml b/view/bikecoop.xml
new file mode 100644 (file)
index 0000000..11efd68
--- /dev/null
+++ b/view/bikecoop.xml
@@ -0,0 +1,103 @@
+<openerp>
+    <data>
+        <record id="view_bikecoop_members_tree" model="ir.ui.view">
+            <field name="name">res.partner.tree</field>
+            <field name="model">res.partner</field>
+            <field name="type">tree</field>
+            <field name="priority" eval="8"/>
+            <field name="arch" type="xml">
+            <tree string="Bikecoop Members">
+                <field name="name"/>
+            </tree>
+            </field>
+        </record>
+        
+        <record id="view_bikecoop_members_form" model="ir.ui.view">
+            <field name="name">res.partner.form</field>
+            <field name="model">res.partner</field>
+            <field name="type">form</field>
+            <field name="priority" eval="8"/>
+            <field name="arch" type="xml">
+            <form string="Bikecoop Member">
+                <group colspan="4" col="4">
+                    <field name="name" colspan="4"/>
+                </group>
+                <newline/>
+                <group string="Postal address" colspan="4">
+                    <field name="address" nolabel="1" mode="form">
+                        <form string="Address">
+                            <field name="zip"/>
+                            <field name="city"/>
+                            <field name="street" colspan="4"/>
+                            <field name="street2" colspan="4"/>
+                            <field name="email" colspan="4"/>
+                        </form>
+                    </field>
+                </group>
+                <group string="Civil informations" colspan="4">
+                    <field name="date" string="Birthdate" colspan="4"/>
+                    <field name="gender_id" domain="[('domain','=', 'gender')]" required="1" colspan="4"/>
+                    <field name="nationality_id" required="1" colspan="4"/>
+                    <field name="occupation_id" required="1" domain="[('domain','=', 'occupation')]" colspan="4"/>
+                </group>
+                <group string="Volunteer activities" colspan="4">
+                    <separator string="Want to be volunteer?" colspan="4"/>
+                    <field name="volunteer_ids" domain="[('domain','=', 'volunteer')]" colspan="4" nolabel="1"/>
+                    <separator string="Other volunteer activities" colspan="4"/>
+                    <field name="comment" colspan="4" nolabel="1"/>
+                </group>
+            </form>
+            </field>
+        </record>
+        
+        <record id="view_bikecoop_members_search" model="ir.ui.view">
+            <field name="name">res.partner.search</field>
+            <field name="model">res.partner</field>
+            <field name="type">search</field>
+            <field name="priority" eval="8"/>
+            <field name="arch" type="xml">
+            <search string="Bikecoop Members">
+                <field name="name" select="1"/>
+                <field name="volunteer_ids" select="1" domain="[('domain','=', 'volunteer')]" string="Volunteer activity"/>
+            </search>
+            </field>
+        </record>
+        
+        <record model="ir.actions.act_window" id="act_open_bikecoop_members_view">
+            <field name="name">Bikecoop Members</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">res.partner</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="view_bikecoop_members_search"/>
+            <field name="domain">[]</field>
+            <field name="context">{}</field>
+        </record>
+        
+        <record model="ir.actions.act_window.view" id="act_open_bikecoop_members_view_form">
+            <field name="act_window_id" ref="act_open_bikecoop_members_view"/>
+            <field name="sequence" eval="20"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_bikecoop_members_form"/>
+        </record>
+        
+        <record model="ir.actions.act_window.view" id="act_open_bikecoop_members_view_tree">
+            <field name="act_window_id" ref="act_open_bikecoop_members_view"/>
+            <field name="sequence" eval="10"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_bikecoop_members_tree"/>
+        </record>
+
+        <menuitem id="menu_bikecoop" 
+            sequence="20"
+            name="Bikecoop"
+            web_icon="images/bikecoop.png"
+            web_icon_hover="images/bikecoop-hover.png"
+            action="act_open_bikecoop_members_view"/>
+
+        <menuitem id="menu_bikecoop_members"
+            parent="menu_bikecoop"
+            sequence="20"
+            action="act_open_bikecoop_members_view"/>
+    </data>
+</openerp>