odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] Membership: cleaning 

bzr revid: hmo@tinyerp.com-20100720125015-w9stiw8lde6hvipx
This commit is contained in:
Harry (OpenERP) 2010-07-20 18:20:15 +05:30
parent bdf36d7166
commit e89b48999c
13 changed files with 204 additions and 257 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/event/board_association_view.xml
View File

@ -84,7 +84,7 @@
<field name="view_mode">form</field>
<field name="view_id" ref="board_associations_manager_form"/>
</record>
<menuitem id="board_associations" icon="terp-graph" name="Dashboard" parent="menu_report_event" sequence="0"/>
<menuitem id="board_associations" icon="terp-graph" name="Dashboard" parent="base.menu_report_association" sequence="0"/>
<menuitem
name="Associations" parent="board_associations"
action="open_board_associations_manager"

2
addons/event/event_view.xml
View File

@ -489,6 +489,6 @@
name="Registrations"
id="menu_action_registration" parent="menu_event_main"
action="action_registration"/>
<menuitem name="Reporting" id="menu_report_event" parent="base.menu_association" sequence="20"/>
<menuitem name="Reporting" id="base.menu_report_association" parent="base.menu_association" sequence="20"/>
</data>
</openerp>

1
addons/event/report/report_event_registration.py
View File

@ -51,6 +51,7 @@ class report_event_registration(osv.osv):
initialize the sql view for the event registration
cr -- the cursor
"""
tools.drop_view_if_exists(cr, 'report_event_registration')
cr.execute("""
create or replace view report_event_registration as (
select

2
addons/event/report/report_event_registration_view.xml
View File

@ -124,7 +124,7 @@
</record>
<!--<menuitem parent="menu_report_event" action="action_event_registration" id="menu_report_event_registration"/>-->
<menuitem parent="menu_report_event" action="action_report_event_registration" id="menu_report_event_registration" />
<menuitem parent="base.menu_report_association" action="action_report_event_registration" id="menu_report_event_registration" />
<!-- end... -->
</data>

168
addons/membership/membership.py
View File

@ -22,7 +22,7 @@
from osv import fields, osv
from tools import config
import time
from tools.translate import _
import decimal_precision as dp
@ -46,96 +46,6 @@ STATE_PRIOR = {
'paid' : 7
}
#~ REQUETE = '''SELECT partner, state FROM (
#~ SELECT members.partner AS partner,
#~ CASE WHEN MAX(members.state) = 0 THEN 'none'
#~ ELSE CASE WHEN MAX(members.state) = 1 THEN 'canceled'
#~ ELSE CASE WHEN MAX(members.state) = 2 THEN 'old'
#~ ELSE CASE WHEN MAX(members.state) = 3 THEN 'waiting'
#~ ELSE CASE WHEN MAX(members.state) = 4 THEN 'invoiced'
#~ ELSE CASE WHEN MAX(members.state) = 6 THEN 'free'
#~ ELSE CASE WHEN MAX(members.state) = 7 THEN 'paid'
#~ END END END END END END END END
#~ AS state FROM (
#~ SELECT partner,
#~ CASE WHEN MAX(inv_digit.state) = 4 THEN 7
#~ ELSE CASE WHEN MAX(inv_digit.state) = 3 THEN 4
#~ ELSE CASE WHEN MAX(inv_digit.state) = 2 THEN 3
#~ ELSE CASE WHEN MAX(inv_digit.state) = 1 THEN 1
#~ END END END END
#~ AS state
#~ FROM (
#~ SELECT p.id as partner,
#~ CASE WHEN ai.state = 'paid' THEN 4
#~ ELSE CASE WHEN ai.state = 'open' THEN 3
#~ ELSE CASE WHEN ai.state = 'proforma' THEN 2
#~ ELSE CASE WHEN ai.state = 'draft' THEN 2
#~ ELSE CASE WHEN ai.state = 'cancel' THEN 1
#~ END END END END END
#~ AS state
#~ FROM res_partner p
#~ JOIN account_invoice ai ON (
#~ p.id = ai.partner_id
#~ )
#~ JOIN account_invoice_line ail ON (
#~ ail.invoice_id = ai.id
#~ )
#~ JOIN membership_membership_line ml ON (
#~ ml.account_invoice_line = ail.id
#~ )
#~ WHERE ml.date_from <= '%s'
#~ AND ml.date_to >= '%s'
#~ GROUP BY
#~ p.id,
#~ ai.state
#~ )
#~ AS inv_digit
#~ GROUP by partner
#~ UNION
#~ SELECT p.id AS partner,
#~ CASE WHEN p.free_member THEN 6
#~ ELSE CASE WHEN p.associate_member IN (
#~ SELECT ai.partner_id FROM account_invoice ai JOIN
#~ account_invoice_line ail ON (ail.invoice_id = ai.id AND ai.state = 'paid')
#~ JOIN membership_membership_line ml ON (ml.account_invoice_line = ail.id)
#~ WHERE ml.date_from <= '%s'
#~ AND ml.date_to >= '%s'
#~ )
#~ THEN 5
#~ END END
#~ AS state
#~ FROM res_partner p
#~ WHERE p.free_member
#~ OR p.associate_member > 0
#~ UNION
#~ SELECT p.id as partner,
#~ MAX(CASE WHEN ai.state = 'paid' THEN 2
#~ ELSE 0
#~ END)
#~ AS state
#~ FROM res_partner p
#~ JOIN account_invoice ai ON (
#~ p.id = ai.partner_id
#~ )
#~ JOIN account_invoice_line ail ON (
#~ ail.invoice_id = ai.id
#~ )
#~ JOIN membership_membership_line ml ON (
#~ ml.account_invoice_line = ail.id
#~ )
#~ WHERE ml.date_from < '%s'
#~ AND ml.date_to < '%s'
#~ AND ml.date_from <= ml.date_to
#~ GROUP BY
#~ p.id
#~ )
#~ AS members
#~ GROUP BY members.partner
#~ )
#~ AS final
#~ %s
#~ '''
class membership_line(osv.osv):
'''Member line'''
@ -215,12 +125,16 @@ class membership_line(osv.osv):
_name = 'membership.membership_line'
_columns = {
'partner': fields.many2one('res.partner', 'Partner', ondelete='cascade', select=1),
'membership_id': fields.many2one('product.product', string="Membership", required=True),
'date_from': fields.date('From', readonly=True),
'date_to': fields.date('To', readonly=True),
'date_cancel' : fields.date('Cancel date'),
'date': fields.date('Join Date'),
'member_price':fields.float('Member Price', digits_compute= dp.get_precision('Sale Price'), required=True),
'account_invoice_line': fields.many2one('account.invoice.line', 'Account Invoice line', readonly=True),
'account_invoice_id': fields.related('account_invoice_line', 'invoice_id', type='many2one', relation='account.invoice', string='Invoice', readonly=True),
'state': fields.function(_state, method=True, string='State', type='selection', selection=STATE),
}
}
_rec_name = 'partner'
_order = 'id desc'
_constraints = [
@ -381,14 +295,13 @@ class Partner(osv.osv):
_columns = {
'associate_member': fields.many2one('res.partner', 'Associate member'),
'member_lines': fields.one2many('membership.membership_line', 'partner', 'Membership'),
'member': fields.boolean('Member'),
'free_member': fields.boolean('Free member'),
'membership_amount': fields.float(
'Membership amount', digits=(16, 2),
help='The price negociated by the partner'),
'membership_state': fields.function(
__get_membership_state, method = True,
string = 'Current membership state', type = 'selection',
string = 'Current Membership State', type = 'selection',
selection = STATE ,store = {
'account.invoice':(_get_invoice_partner,['state'], 10),
'membership.membership_line':(_get_partner_id,['state'], 10),
@ -453,6 +366,59 @@ class Partner(osv.osv):
default = default.copy()
default['member_lines'] = []
return super(Partner, self).copy(cr, uid, id, default, context)
def create_membership_invoice(self, cr, uid, ids, datas=None, context=None):
""" Create Customer Invoice of Membership for partners.
@param datas: datas has dictionary value which consist Id of Membership product and Cost Amount of Membership.
datas = {'membership_product_id': None, 'amount':None}
"""
invoice_obj = self.pool.get('account.invoice')
product_obj = self.pool.get('product.product')
invoice_line_obj = self.pool.get('account.invoice.line')
invoice_tax_obj = self.pool.get('account.invoice.tax')
product_id = datas.get('membership_product_id',False)
amount = datas.get('amount', 0.0)
if not context:
context={}
invoice_list = []
for partner in self.browse(cr, uid, ids, context=context):
account_id = partner.property_account_receivable and partner.property_account_receivable.id or False
fpos_id = partner.property_account_position and partner.property_account_position.id or False
addr = self.address_get(cr, uid, [partner.id], ['invoice'])
if partner.free_member:
raise osv.except_osv(_('Error !'),
_("Partner is a free Member."))
if not addr.get('invoice', False):
raise osv.except_osv(_('Error !'),
_("Partner doesn't have an address to make the invoice."))
quantity = 1
line_value = {
'product_id' : product_id,
}
line_dict = invoice_line_obj.product_id_change(cr, uid, {},
product_id, False, quantity, '', 'out_invoice', partner.id, fpos_id, price_unit=amount, context=context)
line_value.update(line_dict['value'])
if line_value.get('invoice_line_tax_id', False):
tax_tab = [(6, 0, line_value['invoice_line_tax_id'])]
line_value['invoice_line_tax_id'] = tax_tab
invoice_id = invoice_obj.create(cr, uid, {
'partner_id' : partner.id,
'address_invoice_id': addr.get('invoice', False),
'account_id': account_id,
'fiscal_position': fpos_id or False
}
)
line_value['invoice_id'] = invoice_id
invoice_line_id = invoice_line_obj.create(cr, uid, line_value, context=context)
invoice_obj.write(cr, uid, invoice_id, {'invoice_line':[(6,0,[invoice_line_id])]}, context=context)
invoice_list.append(invoice_id)
if line_value['invoice_line_tax_id']:
tax_value = invoice_tax_obj.compute(cr, uid, invoice_id).values()
for tax in tax_value:
invoice_tax_obj.create(cr, uid, tax, context=context)
return invoice_list
Partner()
@ -460,7 +426,7 @@ class product_template(osv.osv):
_inherit = 'product.template'
_columns = {
'member_price':fields.float('Member Price', digits_compute= dp.get_precision('Sale Price')),
}
}
product_template()
class Product(osv.osv):
@ -484,8 +450,8 @@ class Product(osv.osv):
_inherit = 'product.product'
_columns = {
'membership': fields.boolean('Membership', help='Specify if this product is a membership product'),
'membership_date_from': fields.date('Date from'),
'membership_date_to': fields.date('Date to'),
'membership_date_from': fields.date('Date from', help='Active Membership since this date'),
'membership_date_to': fields.date('Date to', help='Expired date of Membership'),
# 'member_price':fields.float('Member Price'),
}
@ -535,6 +501,9 @@ class account_invoice_line(osv.osv):
date_from = line.invoice_id.date_invoice
line_id = member_line_obj.create(cr, uid, {
'partner': line.invoice_id.partner_id.id,
'membership_id': line.product_id.id,
'member_price': line.price_unit,
'date': time.strftime('%Y-%m-%d'),
'date_from': date_from,
'date_to': date_to,
'account_invoice_line': line.id,
@ -572,6 +541,9 @@ class account_invoice_line(osv.osv):
date_from = line.invoice_id.date_invoice
line_id = member_line_obj.create(cr, uid, {
'partner': line.invoice_id.partner_id and line.invoice_id.partner_id.id or False,
'membership_id': line.product_id.id,
'member_price': line.price_unit,
'date': time.strftime('%Y-%m-%d'),
'date_from': date_from,
'date_to': date_to,
'account_invoice_line': line.id,
@ -579,4 +551,4 @@ class account_invoice_line(osv.osv):
return result
account_invoice_line()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

51
addons/membership/membership_demo.xml
View File

@ -5,22 +5,31 @@
<!-- Demo Data for Membership Product -->
<record id="member_product_0" model="product.product">
<field name="membership">True</field>
<field name="membership_date_from">2009-01-01</field>
<field name="membership_date_to">2010-06-01</field>
<field name="name">Membership Product - 1</field>
<field name="list_price">80</field>
<field eval="time.strftime('%Y-01-01')" name="membership_date_from"/>
<field eval="time.strftime('%Y-06-01')" name="membership_date_to"/>
<field name="name">Golden Membership</field>
<field name="list_price">180</field>
<field name="categ_id" ref="product.cat1"/>
<field name="type">service</field>
</record>
<record id="member_product_1" model="product.product">
<field name="membership">True</field>
<field name="membership_date_from">2009-01-01</field>
<field name="membership_date_to">2010-08-01</field>
<field name="name">Membership Product - 2</field>
<field eval="time.strftime('%Y-01-01')" name="membership_date_from"/>
<field eval="time.strftime('%Y-08-01')" name="membership_date_to"/>
<field name="name">Silver Membership</field>
<field name="categ_id" ref="product.cat1"/>
<field name="list_price">80</field>
<field name="type">service</field>
</record>
<record id="member_product_2" model="product.product">
<field name="membership">True</field>
<field eval="time.strftime('%Y-01-01')" name="membership_date_from"/>
<field eval="time.strftime('%Y-08-01')" name="membership_date_to"/>
<field name="name">Basic Membership</field>
<field name="categ_id" ref="product.cat1"/>
<field name="list_price">40</field>
<field name="type">service</field>
</record>
<!-- Demo data for Accounts -->
@ -53,7 +62,7 @@
<field name="currency_id" ref="base.EUR"/>
<field name="address_invoice_id" ref="base.res_partner_address_8"/>
<field name="partner_id" ref="base.res_partner_agrolait"/>
<field name="date_invoice">2008-05-09</field>
<field eval="time.strftime('%Y-05-09')" name="date_invoice"/>
<field name="journal_id" ref="account.sales_journal"/>
<field name="state">paid</field>
<field name="type">out_invoice</field>
@ -64,7 +73,7 @@
<field name="currency_id" ref="base.EUR"/>
<field name="address_invoice_id" ref="base.res_partner_address_9"/>
<field name="partner_id" ref="base.res_partner_2"/>
<field name="date_invoice">2008-05-09</field>
<field eval="time.strftime('%Y-05-09')" name="date_invoice"/>
<field name="journal_id" ref="account.sales_journal"/>
<field name="state">open</field>
<field name="type">out_invoice</field>
@ -75,7 +84,7 @@
<field name="currency_id" ref="base.EUR"/>
<field name="address_invoice_id" ref="base.res_partner_address_zen"/>
<field name="partner_id" ref="base.res_partner_3"/>
<field name="date_invoice">2008-05-09</field>
<field eval="time.strftime('%Y-05-09')" name="date_invoice"/>
<field name="journal_id" ref="account.sales_journal"/>
<field name="state">cancel</field>
<field name="type">out_invoice</field>
@ -86,7 +95,7 @@
<field name="currency_id" ref="base.EUR"/>
<field name="address_invoice_id" ref="base.res_partner_address_14"/>
<field name="partner_id" ref="base.res_partner_15"/>
<field name="date_invoice">2008-05-09</field>
<field eval="time.strftime('%Y-05-09')" name="date_invoice"/>
<field name="journal_id" ref="account.sales_journal"/>
<field name="state">draft</field>
<field name="type">out_invoice</field>
@ -132,34 +141,34 @@
<!-- Demo data for membership line -->
<record id="member_line_1" model="membership.membership_line">
<field name="date_from">2008-01-01</field>
<field name="date_to">2009-08-01</field>
<field eval="time.strftime('%Y-01-01')" name="date_from"/>
<field eval="time.strftime('%Y-08-01')" name="date_to"/>
<field name="account_invoice_line" ref="account_invoice_line_membershipproduct0" />
<field name="state">paid</field>
<field name="partner" ref="base.res_partner_agrolait"/>
</record>
<record id="member_line_2" model="membership.membership_line">
<field name="date_from">2008-01-01</field>
<field name="date_to">2009-08-01</field>
<field eval="time.strftime('%Y-01-01')" name="date_from"/>
<field eval="time.strftime('%Y-08-01')" name="date_to"/>
<field name="account_invoice_line" ref="account_invoice_line_membershipproduct1" />
<field name="state">invoiced</field>
<field name="partner" ref="base.res_partner_2"/>
</record>
<record id="member_line_3" model="membership.membership_line">
<field name="date_from">2008-01-01</field>
<field name="date_to">2009-08-01</field>
<field name="date_cancel">2008-08-05</field>
<field eval="time.strftime('%Y-01-01')" name="date_from"/>
<field eval="time.strftime('%Y-08-01')" name="date_to"/>
<field eval="time.strftime('%Y-08-05')" name="date_cancel"/>
<field name="account_invoice_line" ref="account_invoice_line_membershipproduct2" />
<field name="state">canceled</field>
<field name="partner" ref="base.res_partner_3"/>
</record>
<record id="member_line_3" model="membership.membership_line">
<field name="date_from">2008-01-01</field>
<field name="date_to">2009-08-01</field>
<field eval="time.strftime('%Y-01-01')" name="date_from"/>
<field eval="time.strftime('%Y-08-01')" name="date_to"/>
<field name="account_invoice_line" ref="account_invoice_line_membershipproduct3" />
<field name="state">waiting</field>
<field name="partner" ref="base.res_partner_15"/>
</record>
</record>
<!-- Demo data for cancel member -->
<record id="base.res_partner_3" model="res.partner">

106
addons/membership/membership_view.xml
View File

@ -18,29 +18,26 @@
<field name="name"/>
<field name="membership_date_from"/>
<field name="membership_date_to"/>
<field name="lst_price"/>
<field name="list_price" string="Membership Fee"/>
</tree>
</field>
</record>
<record model="ir.ui.view" id="membership_products_form">
<field name="name">Membership products</field>
<field name="name">Memberships</field>
<field name="model">product.product</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Membership products">
<field name="default_code"/>
<form string="Membership products">
<field name="name"/>
<field name="membership_date_from" required="1"/>
<field name="membership_date_to" required="1"/>
<field name="list_price"/>
<field name="default_code"/>
<field name="type"/>
<field name="categ_id"/>
<field name="membership" colspan="1"/>
<field name="active" colspan="1"/>
<newline/>
<field name="membership_date_from" required="1"/>
<field name="membership_date_to" required="1"/>
<field name="list_price" string="Membership Fee"/>
<separator colspan="4" string="Customer Taxes:"/>
<field name="taxes_id" colspan="4" nolabel="1"/>
<field name="taxes_id" colspan="4" nolabel="1"/>
</form>
</field>
</record>
@ -62,7 +59,7 @@
</record>
<record model="ir.actions.act_window" id="action_membership_products">
<field name="name">Membership Products</field>
<field name="name">Memberships</field>
<field name="res_model">product.product</field>
<field name="domain">[('membership','=',True), ('type', '=', 'service')]</field>
<field name="context">{'membership':True, 'type':'service'}</field>
@ -82,16 +79,14 @@
<field name="act_window_id" ref="action_membership_products"/>
</record>
<menuitem name="Membership" id="menu_membership" icon="terp-crm" sequence="25"/>
<menuitem name="Members" parent="menu_membership"
id="menu_member"
sequence="1"/>
<menuitem name="Configuration" parent="menu_membership"
id="menu_conf"
sequence="3"/>
<menuitem name="Membership products" parent="menu_conf"
<menuitem name="Association" id="base.menu_association" icon="terp-calendar" sequence="9"/>
<menuitem name="Membership" id="menu_membership" icon="terp-crm" sequence="0" parent="base.menu_association"/>
<menuitem name="Memberships" parent="menu_membership"
id="menu_membership_products"
action="action_membership_products"/>
action="action_membership_products" sequence="1"/>
@ -129,7 +124,7 @@
</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>
@ -169,8 +164,8 @@
<field name="view_mode">form</field>
<field name="act_window_id" ref="action_membership_members"/>
</record>
<menuitem name="Members" parent="menu_member" id="menu_members" sequence="2" action="action_membership_members"/>
<menuitem name="Members" parent="menu_membership" id="menu_members" sequence="2" action="action_membership_members"/>
<!-- PARTNERS -->
<!--
@ -182,17 +177,7 @@
/>
-->
<record id="view_res_partner_member_form2" model="ir.ui.view">
<field name="name">res.partner.form2</field>
<field name="model">res.partner</field>
<field name="type">form</field>
<field name="inherit_id" ref="base.view_partner_form"/>
<field name="arch" type="xml">
<field name="supplier" position="after">
<field name="member"/>
</field>
</field>
</record>
<record model="ir.ui.view" id="view_partner_tree">
<field name="name">res.partner.tree.form.inherit</field>
@ -213,37 +198,44 @@
<field name="arch" type="xml">
<notebook position="inside">
<page string="Membership">
<field name="membership_state"/>
<field name="membership_amount"/>
<field name="associate_member"/>
<field name="free_member"/>
<field name="membership_start"/>
<field name="membership_stop"/>
<field name="membership_cancel"/>
<field name="member_lines" nolabel="1" colspan="4">
<tree string="Membership">
<field name="date_from"/>
<field name="date_to"/>
<group colspan="2" col="2">
<group colspan="4" col="3">
<field name="free_member"/>
<button name="%(action_membership_invoice_view)d" type="action" string="Join Membership" icon="gtk-apply"/>
<field colspan="4" name="associate_member" attrs="{'invisible':[('membership_state', '!=', 'none')], 'readonly':[('free_member','=',True)]}"/>
<field colspan="4" name="membership_state"/>
</group>
</group>
<group colspan="2" col="2">
<field name="membership_start"/>
<field name="membership_stop"/>
<field name="membership_cancel"/>
</group>
<field name="member_lines" nolabel="1" colspan="4" readonly="1">
<tree string="Memberships">
<field name="date"/>
<field name="membership_id"/>
<field name="member_price"/>
<field name="account_invoice_id"/>
<field name="state"/>
</tree>
<form string="Membership">
<field name="date_from"/>
<field name="date_to"/>
<field name="account_invoice_line"/>
<field name="state"/>
<form string="Memberships">
<field name="date"/>
<field name="member_price"/>
<field name="membership_id"/>
<field name="account_invoice_id"/>
<field name="state" colspan="4"/>
</form>
</field>
</field>
</page>
</notebook>
</field>
</record>
<!-- MEMBERSHIP/REPORTING -->
<menuitem name="Reporting" parent="menu_membership"
sequence="2"
id="menu_reporting"/>
<menuitem name="Reporting" id="base.menu_report_association" parent="base.menu_association" sequence="20"/>
<!-- View for product.product object inherited from product module................ -->
<record model="ir.ui.view" id="view_product_form_inherit1">
<field name="name">product.normal.form</field>

14
addons/membership/report/report_membership.py
View File

@ -55,13 +55,15 @@ class report_membership(osv.osv):
('done', 'Old Member'),
('open', 'Invoiced Member'),
('free', 'Free Member'), ('paid', 'Paid Member')], 'State'),
'partner_id': fields.many2one('res.partner', 'Members', readonly=True, select=3)
'partner_id': fields.many2one('res.partner', 'Members', readonly=True, select=3),
'membership_id': fields.many2one('product.product', 'Membership', readonly=True, select=3)
}
def init(self, cr):
'''Create the view'''
tools.drop_view_if_exists(cr, 'report_membership')
cr.execute("""
CREATE OR REPLACE VIEW report_membership AS (
SELECT
@ -78,6 +80,7 @@ class report_membership(osv.osv):
month,
create_date,
partner_id,
membership_id,
state,
currency
@ -105,7 +108,8 @@ class report_membership(osv.osv):
ai.partner_id AS partner_id,
ai.currency_id AS currency,
ai.state as state,
MIN(ml.id) AS id
MIN(ml.id) AS id,
ml.membership_id AS membership_id
FROM membership_membership_line ml
JOIN (account_invoice_line ail
LEFT JOIN account_invoice ai
@ -114,10 +118,10 @@ class report_membership(osv.osv):
JOIN res_partner p
ON (ml.partner = p.id)
GROUP BY TO_CHAR(ml.date_from, 'YYYY'), TO_CHAR(ml.date_from, 'MM'), TO_CHAR(ml.date_from, 'YYYY-MM-DD'), ai.state, ai.partner_id,
ai.currency_id, ml.id) AS foo
GROUP BY year, month, create_date, currency, partner_id, state)
ai.currency_id, ml.id, ml.membership_id) AS foo
GROUP BY year, month, create_date, currency, partner_id, membership_id, state)
""")
report_membership()
#
#

7
addons/membership/report/report_membership_view.xml
View File

@ -12,6 +12,7 @@
<tree colors="blue:state in ('draft');black:state in ('open','free');gray:state in ('done','cancel') " string="Membership">
<field name="state"/>
<field name="partner_id"/>
<field name="membership_id"/>
<field name="canceled_number"/>
<field name="waiting_number"/>
<field name="invoiced_number"/>
@ -47,12 +48,14 @@
<separator orientation="vertical"/>
<field name="partner_id"/>
<field name="membership_id"/>
</group>
<newline/>
<group expand="0" string="Group By..." colspan="4" col="12">
<filter string="Members" icon="terp-personal" name="member"
domain="[]" context="{'group_by':'partner_id'}"/>
<filter string="Memberships" icon="terp-personal" name="membership"
domain="[]" context="{'group_by':'membership_id'}"/>
<filter string="state" icon="terp-stock_effects-object-colorize"
domain="[]" context="{'group_by':'state'}"/>
@ -104,7 +107,7 @@
<field name="act_window_id" ref="action_report_membership_tree"/>
</record>
<menuitem name="Membership" parent="menu_reporting"
<menuitem name="Membership" parent="base.menu_report_association"
action="action_report_membership_tree"
id="menu_report_membership"/>

69
addons/membership/wizard/membership_invoice.py
View File

@ -23,6 +23,7 @@ import time
from osv import fields, osv
from tools.translate import _
import tools
import decimal_precision as dp
class membership_invoice(osv.osv_memory):
"""Membership Invoice"""
@ -30,56 +31,32 @@ class membership_invoice(osv.osv_memory):
_name = "membership.invoice"
_description = "Membership Invoice"
_columns = {
'product_id': fields.many2one('product.product','Membership Product', required=True),
'product_id': fields.many2one('product.product','Membership', required=True),
'member_price':fields.float('Member Price', digits_compute= dp.get_precision('Sale Price'), required=True),
}
def onchange_product(self, cr, uid, ids, product_id):
"""This function returns value of product's member price based on product id.
"""
if not product_id:
return {'value': {'unit_price': False}}
else:
unit_price=self.pool.get('product.product').price_get(cr, uid, [product_id])[product_id]
return {'value': {'member_price': unit_price}}
def membership_invoice(self, cr, uid, ids, context=None):
invoice_obj = self.pool.get('account.invoice')
partner_obj = self.pool.get('res.partner')
product_obj = self.pool.get('product.product')
invoice_line_obj = self.pool.get('account.invoice.line')
invoice_tax_obj = self.pool.get('account.invoice.tax')
datas = {}
if not context:
context={}
partner_ids = context.get('active_ids', [])
invoice_list = []
for partner in partner_obj.browse(cr, uid, partner_ids, context=context):
account_id = partner.property_account_receivable and partner.property_account_receivable.id or False
fpos_id = partner.property_account_position and partner.property_account_position.id or False
addr = partner_obj.address_get(cr, uid, [partner.id], ['invoice'])
if not addr.get('invoice', False):
continue
for data in self.browse(cr, uid, ids, context=context):
product_id = data.product_id and data.product_id.id or False
product_uom_id = data.product_id and data.product_id.uom_id.id
quantity = 1
line_value = {
'product_id' : product_id,
}
line_dict = invoice_line_obj.product_id_change(cr, uid, {},
product_id, product_uom_id, quantity, '', 'out_invoice', partner.id, fpos_id, context=context)
line_value.update(line_dict['value'])
if line_value.get('invoice_line_tax_id', False):
tax_tab = [(6, 0, line_value['invoice_line_tax_id'])]
line_value['invoice_line_tax_id'] = tax_tab
invoice_id = invoice_obj.create(cr, uid, {
'partner_id' : partner.id,
'address_invoice_id': addr.get('invoice', False),
'account_id': account_id,
'fiscal_position': fpos_id or False
}
)
line_value['invoice_id'] = invoice_id
invoice_line_id = invoice_line_obj.create(cr, uid, line_value, context=context)
invoice_obj.write(cr, uid, invoice_id, {'invoice_line':[(6,0,[invoice_line_id])]}, context=context)
invoice_list.append(invoice_id)
if line_value['invoice_line_tax_id']:
tax_value = invoice_tax_obj.compute(cr, uid, invoice_id).values()
for tax in tax_value:
invoice_tax_obj.create(cr, uid, tax, context=context)
context = {}
data = self.browse(cr, uid, ids)
if data:
data = data[0]
datas = {
'membership_product_id': data.product_id.id,
'amount': data.member_price
}
invoice_ids = context.get('active_ids', [])
invoice_list = partner_obj.create_membership_invoice(cr, uid, invoice_ids, datas=datas, context=context)
return {
'domain': [('id', 'in', invoice_list)],
@ -88,7 +65,7 @@ class membership_invoice(osv.osv_memory):
'view_mode': 'tree,form',
'res_model': 'account.invoice',
'type': 'ir.actions.act_window',
}
}
membership_invoice()

21
addons/membership/wizard/membership_invoice_view.xml
View File

@ -9,34 +9,23 @@
<field name="arch" type="xml">
<form string="Membership Invoice">
<group colspan="4" >
<field name="product_id" context="{'product':membership_product}" domain="[('membership','=',True)]" widget="selection"/>
<field name="product_id" colspan="4" domain="[('membership','=',True)]" widget="selection" on_change="onchange_product(product_id)"/>
<field name="member_price" colspan="4" readonly="1"/>
</group>
<group colspan="4" col="6">
<button icon="gtk-close" special="cancel" string="Close"/>
<button icon="gtk-apply" string="Confirm" name="membership_invoice" type="object"/>
<button icon="gtk-apply" string="Join" name="membership_invoice" type="object"/>
</group>
</form>
</field>
</record>
<record id="action_membership_invoice_view" model="ir.actions.act_window">
<field name="name">Membership Invoice</field>
<field name="name">Join Membership</field>
<field name="res_model">membership.invoice</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="view_id" ref="view_membership_invoice_view"/>
<field name="target">new</field>
</record>
<record id="action_idea_post_vote_values" model="ir.values">
<field name="model_id" ref="base.model_res_partner" />
<field name="object" eval="1" />
<field name="name">vote</field>
<field name="key2">client_action_multi</field>
<field name="value" eval="'ir.actions.act_window,' + str(ref('action_membership_invoice_view'))"/>
<field name="key">action</field>
<field name="model">res.partner</field>
</record>
</record>
</data>
</openerp>

6
addons/membership/wizard/membership_unpaid_invoice.py
View File

@ -26,8 +26,8 @@ class member_unpaid_invoice(osv.osv_memory):
_name = "membership.unpaid.invoice"
_description = "List of Unpaid Partner"
_columns ={
'product': fields.many2one('product.product','Membership product', size=64,required=True, help='Select Membership product'),
}
'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')
@ -45,7 +45,7 @@ class member_unpaid_invoice(osv.osv_memory):
return {
'domain': [('id', 'in', partners)],
'name': 'Unpaid Partners',
'name': 'Unpaid Members',
'view_type': 'form',
'view_mode': 'tree,form',
'res_model': 'res.partner',

12
addons/membership/wizard/membership_unpaid_invoice_view.xml
View File

@ -7,20 +7,20 @@
<field name="model">membership.unpaid.invoice</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="List Unpaid Partners">
<form string="List Unpaid Members">
<group colspan="4" >
<field name="product" context="{'product':membership_product}" domain="[('membership','=',True)]"/>
<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 Partners" name="invoice_membership" type="object"/>
<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 Partners</field>
<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>
@ -28,9 +28,9 @@
<field name="target">new</field>
</record>
<menuitem name="List Unpaid Partners" id="menu_unpaid_invoice"
<menuitem name="List Unpaid Members" id="menu_unpaid_invoice"
action="action_unpaid_invoice_view"
parent="menu_member" />
parent="menu_membership" />
</data>
</openerp>