X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=view%2Fmembership.xml;h=321417b00fb604e1a96e247d235213ec089f9413;hb=2c373b91155aff7f1d987fc944ab17f6d039473e;hp=624023985db7eebc714d1db9fc73ff16af9c6569;hpb=fbcf7c7592e09c3b74d61e6e895e6dc19e2e258c;p=burette%2Fremembership.git

diff --git a/view/membership.xml b/view/membership.xml
index 6240239..321417b 100644
--- a/view/membership.xml
+++ b/view/membership.xml
@@ -3,7 +3,7 @@
     <data>
         <record id="view_remembership_products_form" model="ir.ui.view">
             <field name="name">Membership product</field>
-            <field name="model">product.product</field>
+            <field name="model">product.template</field>
             <field name="inherit_id" ref="membership.membership_products_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='categ_id']" position="after">
@@ -16,21 +16,92 @@
                 <xpath expr="//div[child::field[@name='membership_date_from']]" position="attributes">
                     <attribute name="attrs">{'invisible': [('membership_date2date','=',True)]}</attribute>
                 </xpath>
+                <xpath expr="//field[@name='membership_date_from']" position="replace">
+                    <field name="membership_date_from" class="oe_inline" attrs="{'required': ['&amp;', ('membership', '=', True), ('membership_date2date','=', False)]}"/>
+                </xpath>
+                <xpath expr="//field[@name='membership_date_to']" position="replace">
+                    <field name="membership_date_to" class="oe_inline" attrs="{'required': ['&amp;', ('membership', '=', True), ('membership_date2date','=', False)]}"/>
+                </xpath>
             </field>
         </record>
-        <record id="view_remembership_product_normal_form" model="ir.ui.view">
-            <field name="name">product.product.form</field>
-            <field name="model">product.product</field>
-            <field name="inherit_id" ref="membership.product_normal_form_view"/>
+
+        <record id="view_membership_membership_line_tree" model="ir.ui.view">
+            <field name="name">membership.membership_line.tree</field>
+            <field name="model">membership.membership_line</field>
+            <field name="type">tree</field>
+            <field name="priority" eval="8"/>
             <field name="arch" type="xml">
-                <xpath expr="//field[@name='membership']" position="after">
-                    <field name="membership_grouped" attrs="{'invisible': [('membership','=', False)]}"/>
-                    <field name="membership_date2date" attrs="{'invisible': [('membership','=', False)]}"/>
-                </xpath>
-                <xpath expr="//group[child::field[@name='membership_date_from']]" position="attributes">
-                    <attribute name="attrs">{'invisible': ['|',('membership','=',False),('membership_date2date','=',True)]}</attribute>
-                </xpath>
+            <tree string="Memberships">
+                <field name="partner"/>
+                <field name="membership_id"/>
+                <field name="date_from"/>
+                <field name="date_to"/>
+                <field name="member_price"/>
+                <field name="state"/>
+            </tree>
+            </field>
+        </record>
+        
+        <record id="view_membership_membership_line_form" model="ir.ui.view">
+            <field name="name">membership.membership_line.form</field>
+            <field name="model">membership.membership_line</field>
+            <field name="type">form</field>
+            <field name="priority" eval="8"/>
+            <field name="arch" type="xml">
+            <form string="Memberships">
+                <field name="partner" readonly="1"/>
+                <field name="membership_id" readonly="1"/>
+                <field name="date_from" readonly="1"/>
+                <field name="date_to" readonly="1"/>
+                <field name="member_price" readonly="1"/>
+                <field name="state" readonly="1"/>
+            </form>
             </field>
         </record>
+        
+        <record id="view_membership_membership_line_search" model="ir.ui.view">
+            <field name="name">membership.membership_line.search</field>
+            <field name="model">membership.membership_line</field>
+            <field name="type">search</field>
+            <field name="priority" eval="8"/>
+            <field name="arch" type="xml">
+            <search string="Memberships">
+                <field name="partner"/>
+                <field name="membership_id"/>
+                <field name="date_from"/>
+                <field name="date_to"/>
+            </search>
+            </field>
+        </record>
+        
+        <record model="ir.actions.act_window" id="act_open_membership_membership_line_view">
+            <field name="name">Memberships</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">membership.membership_line</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="view_membership_membership_line_search"/>
+            <field name="domain">[]</field>
+            <field name="context">{}</field>
+        </record>
+        
+        <record model="ir.actions.act_window.view" id="act_open_membership_membership_line_view_form">
+            <field name="act_window_id" ref="act_open_membership_membership_line_view"/>
+            <field name="sequence" eval="20"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_membership_membership_line_form"/>
+        </record>
+        
+        <record model="ir.actions.act_window.view" id="act_open_membership_membership_line_view_tree">
+            <field name="act_window_id" ref="act_open_membership_membership_line_view"/>
+            <field name="sequence" eval="10"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_membership_membership_line_tree"/>
+        </record>
+        
+        <menuitem id="menu_membership_membership_line"
+            parent="membership.menu_membership"
+            sequence="20"
+            action="act_open_membership_membership_line_view"/>
     </data>
 </openerp>