From bc0b0deafa3bae28c0b3e5181cf76fe867a86a17 Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Thu, 30 Dec 2010 13:34:53 +0530
Subject: [PATCH 1/2] [FIX] membership: can't open members via GTK client

lp bug: https://launchpad.net/bugs/695439 fixed

bzr revid: psi@tinyerp.co.in-20101230080453-sa54qo2j8bmzv030
---
 addons/membership/membership_view.xml | 54 ++++++++++-----------------
 1 file changed, 20 insertions(+), 34 deletions(-)

diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index 07fd35ddcb6..87d98ba3402 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -158,42 +158,30 @@
         </record>
 
         <record id="view_res_partner_member_filter" model="ir.ui.view">
-            <field name="name">res.partner.select</field>
+            <field name="name">res.partner.select1</field>
             <field name="model">res.partner</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-                <field name="category_id" position="after">
-          <filter string="Customers" name="customer" icon="terp-personal" domain="[('customer','=',1)]" help="Customer Partners"/>
-                     <filter string="Suppliers" name="supplier" icon="terp-personal" domain="[('supplier','=',1)]" help="Supplier Partners"/>
-          <separator orientation="vertical"/>
-          <filter icon="terp-personal" name="all_non_members" domain="[('membership_state', 'in', ['none','canceled','old','waiting'])]" string="All non Members" help="None/Canceled/Old/Waiting"/>
-          <filter icon="terp-personal" name="all_members" domain="[('membership_state', 'in', ['invoiced','paid','free'])]" string="All Members" help="Invoiced/Paid/Free"/>
-          <separator orientation="vertical"/>
-                   <field name="membership_stop" string="End Membership Date"/>
-                   <field name="membership_start" invisible="1"/>
-                   <newline/>
-               </field>
-            </field>
-        </record>
-
-        <record id="view_res_partner_member_filter2" model="ir.ui.view">
-            <field name="name">res.partner.select2</field>
-            <field name="model">res.partner</field>
-            <field name="inherit_id" ref="view_res_partner_member_filter"/>
-            <field name="type">search</field>
-            <field name="arch" type="xml">
-                <field name="membership_start" position="after">
-                <newline/>
-              <group expand="0" string="Group By" colspan="10" col="8">
-                <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by' : 'user_id'}" />
-                  <filter string="Associate Member" name = "associate" icon="terp-partner" domain="[]" context="{'group_by':'associate_member'}"/>
+              <search string="Search Memember">
+                  <filter string="Customers" name="customer" icon="terp-personal" domain="[('customer','=',1)]" help="Customer Partners"/>
+                  <filter string="Suppliers" name="supplier" icon="terp-personal" domain="[('supplier','=',1)]" help="Supplier Partners"/>
                   <separator orientation="vertical"/>
-                    <filter string=" Membership State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'membership_state'}"/>
-                    <separator orientation="vertical"/>
-                  <filter string="Start Date" help="Starting Date Of Membership" icon="terp-go-month" domain="[]" context="{'group_by':'membership_start'}"/>
-                  <filter string="End Date" help="Ending Date Of Membership" icon="terp-go-month" domain="[]" context="{'group_by':'membership_stop'}"/>
-                </group>
-                </field>
+                  <filter icon="terp-personal" name="all_non_members" domain="[('membership_state', 'in', ['none','canceled','old','waiting'])]" string="All non Members" help="None/Canceled/Old/Waiting"/>
+                  <filter icon="terp-personal" name="all_members" domain="[('membership_state', 'in', ['invoiced','paid','free'])]" string="All Members" help="Invoiced/Paid/Free"/>
+                  <separator orientation="vertical"/>
+                      <field name="membership_stop" string="End Membership Date"/>
+                      <field name="membership_start" invisible="1"/>
+                      <newline/>
+                      <group expand="0" string="Group By.." colspan="10" col="8">
+                          <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by' : 'user_id'}" />
+                          <filter string="Associate Member" name = "associate" icon="terp-partner" domain="[]" context="{'group_by':'associate_member'}"/>
+                          <separator orientation="vertical"/>
+                          <filter string=" Membership State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'membership_state'}"/>
+                          <separator orientation="vertical"/>
+                          <filter string="Start Date" help="Starting Date Of Membership" icon="terp-go-month" domain="[]" context="{'group_by':'membership_start'}"/>
+                          <filter string="End Date" help="Ending Date Of Membership" icon="terp-go-month" domain="[]" context="{'group_by':'membership_stop'}"/>
+                     </group>
+              </search>
             </field>
         </record>
 
@@ -201,8 +189,6 @@
             <field name="name">Members</field>
             <field name="res_model">res.partner</field>
             <field name="search_view_id" ref="view_res_partner_member_filter"/>
-            <field name="context">{"search_default_old": 1}</field>
-            <field name="context">{"search_default_all_members": 1}</field>
         </record>
 
         <record model="ir.actions.act_window.view" id="action_membership_members_view_tree">

From e6cd3e3f7edbb52bc90d1505f7b58336d494df6d Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Thu, 30 Dec 2010 16:42:56 +0530
Subject: [PATCH 2/2] [FIX] account_voucher:Pay button should not be there when
 you pay directly in Sales receipt form

lp bug: https://launchpad.net/bugs/693810 fixed

bzr revid: psi@tinyerp.co.in-20101230111256-9fyjhlmuxs9f32u9
---
 addons/account_voucher/voucher_sales_purchase_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 3367b08583b..c7cee57220f 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -158,7 +158,7 @@
                                    <field name="state"/>
                                    <field name="reconcile_id"/>
                                </tree>
-                            </field> 
+                            </field>
                         </page>
                     </notebook>
                     <group col="8" colspan="4">
@@ -167,7 +167,7 @@
                         <button name="cancel_voucher" string="Cancel" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to confirm this record ?"/>
                         <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward"/>
                         <group attrs="{'invisible':[('state','!=','posted')]}">
-                           <button icon="terp-dolar_ok!" name="%(act_pay_voucher)d" context="{'narration':narration, 'title':'Customer Payment', 'type':'receipt', 'partner_id':partner_id, 'reference':reference, 'amount':amount}" type="action" string="Pay" attrs="{'invisible':[('pay_now','!=','pay_now')]}"/>
+                           <button icon="terp-dolar_ok!" name="%(act_pay_voucher)d" context="{'narration':narration, 'title':'Customer Payment', 'type':'receipt', 'partner_id':partner_id, 'reference':reference, 'amount':amount}" type="action" string="Pay" attrs="{'invisible':[('pay_now','=','pay_now')]}"/>
                         </group>
                         <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
                     </group>
@@ -278,7 +278,7 @@
                                    <field name="state"/>
                                    <field name="reconcile_id"/>
                                </tree>
-                            </field> 
+                            </field>
                         </page>
                     </notebook>
                     <group col="10" colspan="4">