openerp-dev-web team mailing list archive

["psi \(OpenERP\)" <psi@xxxxxxxxxxxxx>]

psi (OpenERP) has proposed merging lp:~openerp-commiter/openobject-addons/trunk-dev-addons3-psi2 into lp:~openerp-dev/openobject-addons/trunk-dev-addons3.

Requested reviews:
  OpenERP R&D Team (openerp-dev)
Related bugs:
  #568537 The __compute method of account_account needs optmization to improve Accounting Performance!
  https://bugs.launchpad.net/bugs/568537
  #686508 Not able to validate sales receipt
  https://bugs.launchpad.net/bugs/686508
  #686513 Not able to validate supplier vouchers
  https://bugs.launchpad.net/bugs/686513
  #691218 add an employee to a department
  https://bugs.launchpad.net/bugs/691218
  #692139 Account Journal onchange_type method context undefined error
  https://bugs.launchpad.net/bugs/692139
  #692962 In hr contract, shouldn't be able to enter an end date lower than a start date
  https://bugs.launchpad.net/bugs/692962
  #693476 [6.0] sale manager dashboard - "Sales by Customer" - incomplete
  https://bugs.launchpad.net/bugs/693476
  #695439 membership: can't open members via GTK client
  https://bugs.launchpad.net/bugs/695439

For more details, see:
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-dev-addons3-psi2/+merge/44887

Hello sir,

This merge proposal contains changes to fix following bug:
https://bugs.launchpad.net/openobject-addons/+bug/695439
membership: can't open members via GTK client

Thanks 
PSI
-- 
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-dev-addons3-psi2/+merge/44887
Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-commiter/openobject-addons/trunk-dev-addons3-psi2 into lp:~openerp-dev/openobject-addons/trunk-dev-addons3.

=== modified file 'membership/membership_view.xml'
--- membership/membership_view.xml	2010-11-11 05:48:20 +0000
+++ membership/membership_view.xml	2010-12-30 08:14:56 +0000
@@ -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="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'}"/>
-                  <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>
+            <field name="name">res.partner.select1</field>
+            <field name="model">res.partner</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+              <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 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">