[IMP] Improve the search view of membership members
bzr revid: ara@tinyerp.com-20101006065745-7pjxm806m23uz0jl
This commit is contained in:
ARA (OpenERP)
parent
51ac23058c
commit
50c7a36f60
|
|
@ -44,11 +44,10 @@ invoice and send propositions for membership renewal.
|
|||
'wizard/membership_invoice_view.xml',
|
||||
'membership_view.xml',
|
||||
'report/report_membership_view.xml',
|
||||
'wizard/membership_unpaid_invoice_view.xml',
|
||||
'process/membership_process.xml'
|
||||
],
|
||||
'demo_xml': ['membership_demo.xml'],
|
||||
'test': ['test/test_membership.yml'],
|
||||
'test': ['test/test_membership.yml'],
|
||||
'installable': True,
|
||||
'active': False,
|
||||
'certificate': '0042907796381',
|
||||
|
|
|
|||
|
|
@ -123,10 +123,11 @@
|
|||
<field name="arch" type="xml">
|
||||
<tree string="Members">
|
||||
<field name="name"/>
|
||||
<field name="membership_state"/>
|
||||
<field name="associate_member" attrs="{'invisible':[('membership_state', '!=', 'none')]}"/>
|
||||
<field name="membership_start"/>
|
||||
<field name="membership_stop"/>
|
||||
<field name="membership_state"/>
|
||||
<field name="user_id" invisible="1"/>
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
|
@ -137,14 +138,15 @@
|
|||
<field name="type">search</field>
|
||||
<field name="arch" type="xml">
|
||||
<field name="category_id" position="after">
|
||||
<filter icon="terp-personal" name="old" domain="[('membership_state', '=', 'old')]" string="Old Members" />
|
||||
<filter icon="terp-personal" name = "invoiced" domain="[('membership_state', '=', 'invoiced')]" string="Invoiced Members"/>
|
||||
<filter icon="terp-personal" domain="[('membership_state', '=', 'paid')]" string="Paid Members" />
|
||||
<filter icon="terp-personal" domain="[('membership_state', '=', 'waiting')]" string="Future Members" />
|
||||
<separator orientation="vertical"/>
|
||||
<field name="membership_state"/>
|
||||
<field name="membership_start"/>
|
||||
<newline/>
|
||||
<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>
|
||||
|
|
@ -158,8 +160,10 @@
|
|||
<field name="membership_start" position="after">
|
||||
<newline/>
|
||||
<group expand="0" string="Group By" colspan="10" col="8">
|
||||
<filter string="Associate Member" name = "associate" icon="terp-personal" domain="[]" context="{'group_by':'associate_member'}"/>
|
||||
<filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'membership_state'}"/>
|
||||
<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" icon="terp-go-month" domain="[]" context="{'group_by':'membership_start'}"/>
|
||||
<filter string="End Date" icon="terp-go-month" domain="[]" context="{'group_by':'membership_stop'}"/>
|
||||
|
|
@ -173,6 +177,7 @@
|
|||
<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">
|
||||
|
|
|
|||
|
|
@ -1,59 +0,0 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
##############################################################################
|
||||
#
|
||||
# OpenERP, Open Source Management Solution
|
||||
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU Affero General Public License as
|
||||
# published by the Free Software Foundation, either version 3 of the
|
||||
# License, or (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU Affero General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU Affero General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
##############################################################################
|
||||
import time
|
||||
|
||||
from osv import fields, osv
|
||||
|
||||
class member_unpaid_invoice(osv.osv_memory):
|
||||
_name = "membership.unpaid.invoice"
|
||||
_description = "List of Unpaid Partner"
|
||||
_columns ={
|
||||
'product': fields.many2one('product.product','Membership', size=64,required=True, help='Select Membership.'),
|
||||
}
|
||||
|
||||
def invoice_membership(self, cr, uid, ids, context):
|
||||
model_obj = self.pool.get('ir.model.data')
|
||||
partners = []
|
||||
result = model_obj._get_id(cr, uid, 'base', 'view_res_partner_filter')
|
||||
res = model_obj.read(cr, uid, result, ['res_id'], context=context)
|
||||
for data in self.read(cr, uid, ids, context=context):
|
||||
cr.execute('''select p.id from res_partner as p \
|
||||
left join account_invoice as i on p.id=i.partner_id \
|
||||
left join account_invoice_line as il on i.id=il.invoice_id \
|
||||
left join product_product as pr on pr.id=il.product_id \
|
||||
where i.state = 'open' and pr.id=%s \
|
||||
group by p.id''' % (data['product']))
|
||||
map(lambda x: partners.append(x[0]),cr.fetchall())
|
||||
|
||||
return {
|
||||
'domain': [('id', 'in', partners)],
|
||||
'name': 'Unpaid Members',
|
||||
'view_type': 'form',
|
||||
'view_mode': 'tree,form',
|
||||
'res_model': 'res.partner',
|
||||
'type': 'ir.actions.act_window',
|
||||
'res_id' : partners,
|
||||
'search_view_id' : res['res_id']
|
||||
}
|
||||
|
||||
member_unpaid_invoice()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
@ -1,36 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<openerp>
|
||||
<data>
|
||||
|
||||
<record id="view_unpaid_invoice_view" model="ir.ui.view">
|
||||
<field name="name">unpaid.invoice.view.form</field>
|
||||
<field name="model">membership.unpaid.invoice</field>
|
||||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="List Unpaid Members">
|
||||
<group colspan="4" >
|
||||
<field name="product" domain="[('membership','=',True)]" widget="selection"/>
|
||||
</group>
|
||||
<group colspan="4" col="6">
|
||||
<button icon="gtk-close" special="cancel" string="Close"/>
|
||||
<button icon="gtk-ok" string="Unpaid" name="invoice_membership" type="object"/>
|
||||
</group>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="action_unpaid_invoice_view" model="ir.actions.act_window">
|
||||
<field name="name">List Unpaid Members</field>
|
||||
<field name="res_model">membership.unpaid.invoice</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
<field name="view_id" ref="view_unpaid_invoice_view"/>
|
||||
<field name="target">new</field>
|
||||
</record>
|
||||
|
||||
<menuitem name="List Unpaid Members" id="menu_unpaid_invoice"
|
||||
action="action_unpaid_invoice_view"
|
||||
parent="menu_membership" />
|
||||
|
||||
</data>
|
||||
</openerp>
|
||||
Loading…
Reference in New Issue