[IMP] membership:-boolean field 'membership' now remains True and added search_view_i...

bzr revid: mtr@mtr-20101027112433-94kx0odrgdo7vti5

diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index e3c0bb9..efbd8cc 100644 (file)
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -61,6 +61,7 @@
                       <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"/>

diff --git a/addons/membership/wizard/membership_invoice.py b/addons/membership/wizard/membership_invoice.py
index 2e5072c..670e347 100644 (file)
--- a/addons/membership/wizard/membership_invoice.py
+++ b/addons/membership/wizard/membership_invoice.py
@@ -39,6 +39,7 @@ class membership_invoice(osv.osv_memory):
         return {'value': {'member_price': self.pool.get('product.product').price_get(cr, uid, [product_id])[product_id]}}
 
     def membership_invoice(self, cr, uid, ids, context=None):
+        mod_obj = self.pool.get('ir.model.data')
         partner_obj = self.pool.get('res.partner')
         datas = {}
         if not context:
@@ -51,6 +52,9 @@ class membership_invoice(osv.osv_memory):
                 'amount': data.member_price
             }
         invoice_list = partner_obj.create_membership_invoice(cr, uid, context.get('active_ids', []), datas=datas, context=context)
+        
+        res = mod_obj.get_object_reference(cr, uid, 'account', 'view_account_invoice_filter')
+        
         return  {
             'domain': [('id', 'in', invoice_list)],
             'name': 'Membership Invoices',
@@ -58,7 +62,7 @@ class membership_invoice(osv.osv_memory):
             'view_mode': 'tree,form',
             'res_model': 'account.invoice',
             'type': 'ir.actions.act_window',
-            # missing search view ?
+            'search_view_id': res and res[1] or False
         }
 
 membership_invoice()