From 61ff37d19c97ae0b6a11433c19e6f0f94027b5ab Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Mon, 3 Sep 2012 08:22:46 +0200
Subject: [PATCH] [IMP] membership usability form view

bzr revid: fp@openerp.com-20120903062246-s4nwewrzmepqmj7t
---
 addons/membership/membership.py       | 10 +---------
 addons/membership/membership_view.xml | 16 ++--------------
 2 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/addons/membership/membership.py b/addons/membership/membership.py
index 3439f97f833..2a006814629 100644
--- a/addons/membership/membership.py
+++ b/addons/membership/membership.py
@@ -146,7 +146,7 @@ class membership_line(osv.osv):
         'date_to': fields.date('To', readonly=True),
         'date_cancel': fields.date('Cancel date'),
         'date': fields.date('Join Date', help="Date on which member has joined the membership"),
-        'member_price': fields.float('Member Price', digits_compute= dp.get_precision('Product Price'), required=True, help='Amount for the membership'),
+        'member_price': fields.float('Membership Fee', digits_compute= dp.get_precision('Product Price'), required=True, help='Amount for the membership'),
         'account_invoice_line': fields.many2one('account.invoice.line', 'Account Invoice line', readonly=True),
         'account_invoice_id': fields.related('account_invoice_line', 'invoice_id', type='many2one', relation='account.invoice', string='Invoice', readonly=True),
         'state': fields.function(_state,
@@ -444,14 +444,6 @@ class Partner(osv.osv):
 
 Partner()
 
-class product_template(osv.osv):
-    _inherit = 'product.template'
-    _columns = {
-        'member_price': fields.float('Member Price', digits_compute= dp.get_precision('Product Price')),
-    }
-
-product_template()
-
 class Product(osv.osv):
 
     def fields_view_get(self, cr, user, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index fb128585fd2..ce0e55e37c9 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -88,11 +88,11 @@
             <field name="arch" type="xml">
                 <page string="Information" position="after">
                     <page string="Membership">
-                        <group>
+                        <group col="1">
                             <group>
                                 <field name="membership" readonly="0"/>
                             </group>
-                            <group>
+                            <group attrs="{'invisible':[('membership','=',False)]}">
                                 <field name="membership_date_from" readonly="0" attrs="{'required':[('membership','=',True)]}"/>
                                 <field name="membership_date_to" readonly="0" attrs="{'required':[('membership','=',True)]}"/>
                             </group>
@@ -270,17 +270,5 @@
         <!-- MEMBERSHIP/REPORTING -->
         <menuitem name="Reporting" id="base.menu_report_association" parent="base.menu_association" sequence="20"/>
 
-        <!-- View for product.product object inherited from product module -->
-        <record model="ir.ui.view" id="view_product_form_inherit1">
-            <field name="name">product.normal.form</field>
-            <field name="model">product.product</field>
-            <field name="inherit_id" ref="product.product_normal_form_view"/>
-            <field name="arch" type="xml">
-                <field name="list_price" position="after">
-                    <field name="member_price" groups="base.group_user"/>
-                </field>
-            </field>
-        </record>
-
     </data>
 </openerp>