From b59586458bd10026a8e47411d4d9cb9fcf606b24 Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Wed, 13 Oct 2010 18:13:42 +0200
Subject: [PATCH] [IMP] membership, account: usability improvements

bzr revid: qdp-launchpad@tinyerp.com-20101013161342-xhpkr9sarxurs6be
---
 addons/account/account_view.xml       | 3 ++-
 addons/membership/membership_view.xml | 9 ++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 9cfbfc517ec..7c3e463f0e7 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -369,8 +369,9 @@
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
-                    <filter string="Type" context="{'group_by':'type'}" icon="terp-stock_effects-object-colorize"/>
                     <filter string="User" context="{'group_by':'user_id'}" icon="terp-personal"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Type" context="{'group_by':'type'}" icon="terp-stock_effects-object-colorize"/>
                     </group>
                 </tree>
             </field>
diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index 224748f08d7..a642ff8af4c 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -14,17 +14,16 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Membership Products">
-                   <filter string="To Sell" icon="terp-accessories-archiver-minus" domain="[('sale_ok','=',1)]"/>
-                   <filter string="To Purchase" icon="terp-accessories-archiver+" domain="[('purchase_ok', '=', 1)]" />
+                   <filter string="Inactive" icon="terp-inactive.png" domain="[('active','=',0)]"/>
                    <separator orientation="vertical"/>
-                   <field name="default_code"/>
+                   <field name="code"/>
                    <field name="name"/>
                    <field name="categ_id" widget="selection" operator="child_of"/>
                    <newline/>
                    <group  expand='0' string='Group by...' groups="base.group_extended">
                        <filter string='Category' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'categ_id'}" />
                        <separator orientation="vertical"/>
-                       <filter string='Default UOM' icon="terp-mrp" domain="[]" context="{'group_by' : 'uom_id'}" />
+                       <filter string='Date From' icon="terp-go-month" domain="[]" context="{'group_by' : 'membership_date_from'}" />
                    </group>
                    <newline/>
                    <group expand="0" string="Extended Filters..." groups="base.group_extended">
@@ -70,7 +69,7 @@
                       <page string="General">
                         <separator string="Accounting Info" colspan="2"/>
                         <separator string="Categorization" colspan="2"/>
-                        <field name="list_price" />
+                        <field name="list_price" string="Membership Fee"/>
                         <field name="type" />
                         <field name="property_account_income"/>
                         <field name="categ_id"/>