From 1c9a4ce12736664b8debbf48cae13350dc28fad8 Mon Sep 17 00:00:00 2001
From: Hardik <hsa@tinyerp.com>
Date: Tue, 26 Jun 2012 15:09:15 +0530
Subject: [PATCH 1/7] [IMP]association : membership product form view
 improvement

bzr revid: hsa@tinyerp.com-20120626093915-30fvknrjzwmpmfex
---
 addons/membership/membership_view.xml | 82 ++++++++++++++++-----------
 1 file changed, 50 insertions(+), 32 deletions(-)

diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index 15645294bb7..93840b51bea 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -52,38 +52,56 @@
             <field name="model">product.product</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Membership products">
-                  <group col="6">
-                      <field name="name"/>
-                      <field name="default_code"/>
-                      <field name="active"/>
-                      <field name="membership" invisible="1"/>
-                      <field name="membership_date_from" required="1"/>
-                      <field name="membership_date_to" required="1"/>
-                      <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                    </group>
-                    <notebook colspan="4">
-                      <page string="General">
-                        <separator string="Accounting Info" colspan="2"/>
-                        <separator string="Categorization" colspan="2"/>
-                        <field name="list_price" string="Membership Fee"/>
-                        <field name="type" />
-                        <field name="property_account_income" domain="[('type', '!=', 'view')]"/>
-                        <field name="categ_id"/>
-                        <separator string="Sale Taxes" colspan="2"/>
-                        <newline/>
-                        <field name="taxes_id" nolabel="1" colspan="4"/>
-                      </page>
-                      <page string="Description">
-                            <separator string="Description"/>
-                            <field colspan="4" name="description" nolabel="1"/>
-                            <separator string="Sale Description"/>
-                            <field colspan="4" name="description_sale" nolabel="1"/>
-                            <separator string="Purchase Description"/>
-                            <field colspan="4" name="description_purchase" nolabel="1"/>
-                      </page>
-                    </notebook>
-                </form>
+                <form string="Membership products" version="7.0">
+                    <sheet>
+                        <group>
+                            <group>
+                                <field name="name" />
+                                <field name="default_code" />
+                                <field name="type" />
+                                <field name="categ_id" />
+                            </group>
+                            <group>
+                                <field name="membership" invisible="1"/>
+                                <label for="membership_date_from"
+                                    string="Membership Duration" />
+                                <div>
+                                    <field name="membership_date_from"
+                                        required="1" class="oe_online"
+                                        nolabel="1" />
+                                    <label string="-" />
+                                    <field name="membership_date_to"
+                                        required="1" class="oe_online"
+                                        nolabel="1" />
+                                </div>
+                                <field name="list_price"
+                                    string="Membership Fee" />
+                                <field
+                                    name="property_account_income"
+                                    domain="[('type', '!=', 'view')]" />
+                            </group>
+                        </group>
+                        <field name="taxes_id" nolabel="1" colspan="4" />
+                        <group>
+                            <field name="company_id"
+                                groups="base.group_multi_company"
+                                widget="selection" />
+                            <field name="active" />
+                        </group>
+                        <group string="Description">
+                            <field colspan="4" name="description"
+                                nolabel="1" />
+                        </group>
+                        <group string="Sale Description">
+                            <field colspan="4" name="description_sale"
+                                nolabel="1" />
+                        </group>
+                        <group string="Purchase Description">
+                            <field colspan="4"
+                                name="description_purchase" nolabel="1" />
+                        </group>
+                    </sheet>
+                 </form>
             </field>
         </record>
 

From 41c0355b4fb0036990bb1a9f247f11f2232205a4 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Tue, 26 Jun 2012 16:18:24 +0530
Subject: [PATCH 2/7] [IMP] Membership: improve tax as m2m_tags

bzr revid: dbr@tinyerp.com-20120626104824-uwv8bjefgn03mfgq
---
 addons/membership/membership_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index 93840b51bea..9ecf4c908a6 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -81,7 +81,7 @@
                                     domain="[('type', '!=', 'view')]" />
                             </group>
                         </group>
-                        <field name="taxes_id" nolabel="1" colspan="4" />
+                        <field name="taxes_id" widget="many2many_tags"/>
                         <group>
                             <field name="company_id"
                                 groups="base.group_multi_company"

From e2067d9ceae5d3c65fb139f0fe023d89353be995 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Wed, 27 Jun 2012 15:53:10 +0530
Subject: [PATCH 3/7] [IMP]membership: Improve view for taxes

bzr revid: dbr@tinyerp.com-20120627102310-5vjntnem3re0wjdg
---
 addons/membership/membership_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index 9ecf4c908a6..20b06dd0d99 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -60,6 +60,7 @@
                                 <field name="default_code" />
                                 <field name="type" />
                                 <field name="categ_id" />
+                                <field name="taxes_id" widget="many2many_tags" string="Taxes"/>
                             </group>
                             <group>
                                 <field name="membership" invisible="1"/>
@@ -81,7 +82,6 @@
                                     domain="[('type', '!=', 'view')]" />
                             </group>
                         </group>
-                        <field name="taxes_id" widget="many2many_tags"/>
                         <group>
                             <field name="company_id"
                                 groups="base.group_multi_company"

From 51c05a3300084e2afbcf4aa37f066ecead05f62e Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Fri, 29 Jun 2012 10:51:57 +0530
Subject: [PATCH 4/7] [IMP]membership: set placeholder for descriptions

bzr revid: dbr@tinyerp.com-20120629052157-q1ba8scocramd92o
---
 addons/membership/membership_view.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index 20b06dd0d99..147023e6803 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -88,16 +88,16 @@
                                 widget="selection" />
                             <field name="active" />
                         </group>
-                        <group string="Description">
-                            <field colspan="4" name="description"
+                        <group>
+                            <field colspan="4" name="description" placeholder="Add a description"
                                 nolabel="1" />
                         </group>
-                        <group string="Sale Description">
-                            <field colspan="4" name="description_sale"
+                        <group>
+                            <field colspan="4" name="description_sale" placeholder="Add a sale description"
                                 nolabel="1" />
                         </group>
-                        <group string="Purchase Description">
-                            <field colspan="4"
+                        <group>
+                            <field colspan="4" placeholder="Add a purchase description"
                                 name="description_purchase" nolabel="1" />
                         </group>
                     </sheet>

From f9f511931f3ed56775a3b2266fa42aa918703886 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Mon, 2 Jul 2012 11:19:44 +0530
Subject: [PATCH 5/7] [IMP]membership: View imp for date fields

bzr revid: dbr@tinyerp.com-20120702054944-1ehvpr113zie4yrp
---
 addons/membership/membership_view.xml | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index 147023e6803..47b904e3028 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -67,13 +67,8 @@
                                 <label for="membership_date_from"
                                     string="Membership Duration" />
                                 <div>
-                                    <field name="membership_date_from"
-                                        required="1" class="oe_online"
-                                        nolabel="1" />
-                                    <label string="-" />
-                                    <field name="membership_date_to"
-                                        required="1" class="oe_online"
-                                        nolabel="1" />
+                                    <field name="membership_date_from" required="1" class="oe_inline"/> - 
+                                    <field name="membership_date_to" required="1"  class="oe_inline"/>
                                 </div>
                                 <field name="list_price"
                                     string="Membership Fee" />

From de9b8a7e9cc46ff6b439ae3d621d1eeac5eff433 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 4 Jul 2012 15:42:56 +0530
Subject: [PATCH 6/7] [IMP]:membership:improved view

bzr revid: apa@tinyerp.com-20120704101256-1ev49svrjymy2tsx
---
 addons/membership/membership_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index cdcd5780cca..21960ce1ec8 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -66,7 +66,7 @@
                                 <field name="membership" invisible="1"/>
                                 <label for="membership_date_from"
                                     string="Membership Duration" />
-                                <div>
+                                <div style="min-width:370px">
                                     <field name="membership_date_from" required="1" class="oe_inline"/> - 
                                     <field name="membership_date_to" required="1"  class="oe_inline"/>
                                 </div>

From 94b6dcd2b78c35269ec41c0001417f5ba3954012 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 12 Jul 2012 17:20:16 +0200
Subject: [PATCH 7/7] [IMP] membership: usability, review of form view of
 membership product

bzr revid: qdp-launchpad@openerp.com-20120712152016-r591xu1sxi730sgc
---
 addons/membership/membership_view.xml | 52 +++++++++++----------------
 1 file changed, 21 insertions(+), 31 deletions(-)

diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index 21960ce1ec8..9c566a69bde 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -54,47 +54,37 @@
             <field name="arch" type="xml">
                 <form string="Membership products" version="7.0">
                     <sheet>
+                        <label for="name" class="oe_edit_only"/>
+                        <h1>
+                            <field name="name"/>
+                        </h1>
                         <group>
                             <group>
-                                <field name="name" />
-                                <field name="default_code" />
-                                <field name="type" />
-                                <field name="categ_id" />
-                                <field name="taxes_id" widget="many2many_tags" string="Taxes"/>
+                                <field name="default_code"/>
+                                <field name="categ_id"/>
+                                <field name="membership" invisible="1"/>
+                                <field name="company_id"
+                                    groups="base.group_multi_company"
+                                    widget="selection"/>
+                                <field name="active"/>
                             </group>
                             <group>
-                                <field name="membership" invisible="1"/>
-                                <label for="membership_date_from"
-                                    string="Membership Duration" />
-                                <div style="min-width:370px">
+                                <label for="membership_date_from" string="Membership Duration"/>
+                                <div>
                                     <field name="membership_date_from" required="1" class="oe_inline"/> - 
-                                    <field name="membership_date_to" required="1"  class="oe_inline"/>
+                                    <field name="membership_date_to" required="1" class="oe_inline"/>
                                 </div>
-                                <field name="list_price"
-                                    string="Membership Fee" />
+                                <field name="list_price" string="Membership Fee"/>
                                 <field
                                     name="property_account_income"
-                                    domain="[('type', '!=', 'view')]" />
+                                    domain="[('type', '!=', 'view')]"/>
+                                <field name="taxes_id" widget="many2many_tags" string="Taxes"/>
                             </group>
                         </group>
-                        <group>
-                            <field name="company_id"
-                                groups="base.group_multi_company"
-                                widget="selection" />
-                            <field name="active" />
-                        </group>
-                        <group>
-                            <field colspan="4" name="description" placeholder="Add a description"
-                                nolabel="1" />
-                        </group>
-                        <group>
-                            <field colspan="4" name="description_sale" placeholder="Add a sale description"
-                                nolabel="1" />
-                        </group>
-                        <group>
-                            <field colspan="4" placeholder="Add a purchase description"
-                                name="description_purchase" nolabel="1" />
-                        </group>
+                        <label for="description"/>
+                        <field colspan="4" name="description" placeholder="Add a description..."/>
+                        <label for="description_sale"/>
+                        <field colspan="4" name="description_sale" placeholder="This note will be displayed on quotations..."/>
                     </sheet>
                  </form>
             </field>