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

[REF] refactoring the code 

bzr revid: mva@openerp.com-20120217112914-79w333mjeh1jhrtp
This commit is contained in:
MVA 2012-02-17 12:29:14 +01:00
parent 20290764ad
commit a91557d4c1
4 changed files with 34 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
addons/event/event.py
View File

@ -27,6 +27,7 @@ from tools.translate import _
import decimal_precision as dp import decimal_precision as dp
from crm import wizard from crm import wizard
import time import time
from datetime import datetime
wizard.mail_compose_message.SUPPORTED_MODELS.append('event.registration') wizard.mail_compose_message.SUPPORTED_MODELS.append('event.registration')
@ -36,7 +37,7 @@ class event_type(osv.osv):
_description = __doc__ _description = __doc__
_columns = { _columns = {
'name': fields.char('Event type', size=64, required=True), 'name': fields.char('Event type', size=64, required=True),
'default_reply_to': fields.char('Default Reply-To', size=64,help="It will select this default reply-to value when you choose this event" ), 'default_reply_to': fields.char('Default Reply-To', size=64,help="The email address of the organizer which is put in the 'Reply-To' of all emails sent automatically at event or registrations confirmation. You can also put your email address of your mail gateway if you use one." ),
'default_email_event': fields.many2one('email.template','Event Confirmation Email', help="It will select this default confirmation event mail value when you choose this event"), 'default_email_event': fields.many2one('email.template','Event Confirmation Email', help="It will select this default confirmation event mail value when you choose this event"),
'default_email_registration':fields.many2one('email.template','Registration Confirmation Email',help="It will select this default confirmation registration mail value when you choose this event"), 'default_email_registration':fields.many2one('email.template','Registration Confirmation Email',help="It will select this default confirmation registration mail value when you choose this event"),
'default_registration_min':fields.integer('Default Minimum Registration',help="It will select this default minimum value when you choose this event"), 'default_registration_min':fields.integer('Default Minimum Registration',help="It will select this default minimum value when you choose this event"),
@ -62,7 +63,7 @@ class event_event(osv.osv):
res = [] res = []
for record in reads: for record in reads:
date= time.strptime(record.date_begin,'%Y-%m-%d %H:%M:%S') date= time.strptime(record.date_begin,'%Y-%m-%d %H:%M:%S')
date =time.strftime('%Y-%m-%d',date) date =time.strftime('%d/%m/%Y',date)
registers='' registers=''
if record.register_max !=0: if record.register_max !=0:
register_max = str(record.register_max) register_max = str(record.register_max)
@ -117,7 +118,7 @@ class event_event(osv.osv):
('state', 'not in', ['draft', 'cancel'])], context=context) ('state', 'not in', ['draft', 'cancel'])], context=context)
register_pool.mail_user_confirm(cr, uid, reg_ids) register_pool.mail_user_confirm(cr, uid, reg_ids)
return self.write(cr, uid, ids, {'state': 'confirm'}, context=context) return self.write(cr, uid, ids, {'state': 'confirm'}, context=context)
def _get_register(self, cr, uid, ids, fields, args, context=None): def _get_register(self, cr, uid, ids, fields, args, context=None):
"""Get Confirm or uncofirm register value. """Get Confirm or uncofirm register value.
@param ids: List of Event registration type's id @param ids: List of Event registration type's id
@ -132,24 +133,19 @@ class event_event(osv.osv):
for field in fields: for field in fields:
res[event.id][field] = False res[event.id][field] = False
state = [] state = []
state_done = []
if 'register_current' in fields: if 'register_current' in fields:
state += ['open', 'done'] state += ['open']
if 'register_prospect' in fields: if 'register_prospect' in fields:
state.append('draft') state.append('draft')
#TODO refactor this part of code to have only one search
reg_ids = register_pool.search(cr, uid, [('event_id', '=', event.id),('state', '=', 'open')], context=context)
reg_ids1= register_pool.search(cr, uid, [('event_id', '=', event.id),('state', '=', 'done')], context=context)
reg_ids2= register_pool.search(cr, uid, [('event_id', '=', event.id),('state', '=', 'draft')], context=context)
res[event.id]['register_current'] = len(reg_ids)
res[event.id]['register_prospect'] = len(reg_ids2)
res[event.id]['register_participated'] = len(reg_ids1)
reg_ids = register_pool.search(cr, uid, [
('event_id', '=', event.id),
('state', 'in', state)], context=context)
number = 0.0
if reg_ids:
cr.execute('SELECT SUM(nb_register) FROM event_registration WHERE id IN %s', (tuple(reg_ids),))
number = cr.fetchone()
if 'register_current' in fields:
res[event.id]['register_current'] = number and number[0] or 0.0
if 'register_prospect' in fields:
res[event.id]['register_prospect'] = number and number[0] or 0.0
return res return res
@ -159,10 +155,9 @@ class event_event(osv.osv):
'type': fields.many2one('event.type', 'Type of Event', readonly=False, states={'done': [('readonly', True)]}), 'type': fields.many2one('event.type', 'Type of Event', readonly=False, states={'done': [('readonly', True)]}),
'register_max': fields.integer('Maximum Registrations', help="You can for each event define a maximum registration level. If you have too much registrations you are not able to confirm your event. (put 0 to ignore this rule )", readonly=True, states={'draft': [('readonly', False)]}), 'register_max': fields.integer('Maximum Registrations', help="You can for each event define a maximum registration level. If you have too much registrations you are not able to confirm your event. (put 0 to ignore this rule )", readonly=True, states={'draft': [('readonly', False)]}),
'register_min': fields.integer('Minimum Registrations', help="You can for each event define a minimum registration level. If you do not enough registrations you are not able to confirm your event. (put 0 to ignore this rule )", readonly=True, states={'draft': [('readonly', False)]}), 'register_min': fields.integer('Minimum Registrations', help="You can for each event define a minimum registration level. If you do not enough registrations you are not able to confirm your event. (put 0 to ignore this rule )", readonly=True, states={'draft': [('readonly', False)]}),
'register_current': fields.function(_get_register, string='Confirmed Registrations', multi='register_current', 'register_current': fields.function(_get_register, string='Confirmed Registrations', multi='register_current'),
help="Total of Confirmed and Done Registrations"), 'register_prospect': fields.function(_get_register, string='Unconfirmed Registrations', multi='register_prospect'),
'register_prospect': fields.function(_get_register, string='Unconfirmed Registrations', multi='register_prospect', 'register_participated': fields.function(_get_register, string='Participated Registrations', multi='register_prospect'),
),
'registration_ids': fields.one2many('event.registration', 'event_id', 'Registrations', readonly=False, states={'done': [('readonly', True)]}), 'registration_ids': fields.one2many('event.registration', 'event_id', 'Registrations', readonly=False, states={'done': [('readonly', True)]}),
'date_begin': fields.datetime('Starting Date', required=True, readonly=True, states={'draft': [('readonly', False)]}), 'date_begin': fields.datetime('Starting Date', required=True, readonly=True, states={'draft': [('readonly', False)]}),
'date_end': fields.datetime('Closing Date', required=True, readonly=True, states={'draft': [('readonly', False)]}), 'date_end': fields.datetime('Closing Date', required=True, readonly=True, states={'draft': [('readonly', False)]}),
@ -223,16 +218,16 @@ class event_registration(osv.osv):
_name= 'event.registration' _name= 'event.registration'
_description = __doc__ _description = __doc__
_inherit = ['mail.thread','res.partner.address'] _inherit = ['mail.thread','res.partner.address']
_columns = { _columns = {
'id': fields.integer('ID'), 'id': fields.integer('ID'),
'origin': fields.char('Origin', size=124,readonly=True), 'origin': fields.char('Origin', size=124,readonly=True,help="Name of the sale order which create the registration"),
'nb_register': fields.integer('Number of Participants', required=True, readonly=True, states={'draft': [('readonly', False)]}, help="Number of participants for this registration."), 'nb_register': fields.integer('Number of Participants', required=True, readonly=True, states={'draft': [('readonly', False)]}),
'event_id': fields.many2one('event.event', 'Event', required=True, readonly=True, states={'draft': [('readonly', False)]}), 'event_id': fields.many2one('event.event', 'Event', required=True, readonly=True, states={'draft': [('readonly', False)]}),
'partner_id': fields.many2one('res.partner', 'Partner', states={'done': [('readonly', True)]}), 'partner_id': fields.many2one('res.partner', 'Partner', states={'done': [('readonly', True)]}),
'partner_id_address': fields.many2one('res.partner.address', 'Partner', states={'done': [('readonly', True)]}), 'partner_id_address': fields.many2one('res.partner.address', 'Partner', states={'done': [('readonly', True)]}),
"contact_id": fields.many2one('res.partner.address', 'Partner Contact', readonly=False, states={'done': [('readonly', True)]}), #TODO: filter only the contacts that have a function into the selected partner_id "contact_id": fields.many2one('res.partner.address', 'Partner Contact', readonly=False, states={'done': [('readonly', True)]}), #TODO: filter only the contacts that have a function into the selected partner_id
'date_closed': fields.datetime('Closure Date', readonly=True), 'create_date': fields.datetime('Creation Date' , readonly=True),
'date_closed': fields.datetime('Participated Date', readonly=True),
'date_open': fields.datetime('Registration Date', readonly=True), 'date_open': fields.datetime('Registration Date', readonly=True),
'email_from': fields.related('event_id','reply_to',string='Reply-to Email', type='char', size=128, readonly=True,), 'email_from': fields.related('event_id','reply_to',string='Reply-to Email', type='char', size=128, readonly=True,),
'log_ids': fields.one2many('mail.message', 'res_id', 'Logs', domain=[('email_from', '=', False),('model','=',_name)]), 'log_ids': fields.one2many('mail.message', 'res_id', 'Logs', domain=[('email_from', '=', False),('model','=',_name)]),
@ -243,23 +238,24 @@ class event_registration(osv.osv):
'state': fields.selection([('draft', 'Unconfirmed'), 'state': fields.selection([('draft', 'Unconfirmed'),
('open', 'Confirmed'), ('open', 'Confirmed'),
('cancel', 'Cancelled'), ('cancel', 'Cancelled'),
('done', 'Done')], 'State', \ ('done', 'Participated')], 'State', \
size=16, readonly=True) size=16, readonly=True)
} }
_defaults = { _defaults = {
'nb_register': 1, 'nb_register': 1,
'state': 'draft', 'state': 'draft',
'user_id': lambda self, cr, uid, ctx: uid, 'user_id': lambda self, cr, uid, ctx: uid,
'date_open':fields.date.context_today,
} }
_order = 'date_open desc' _order = 'create_date desc'
def do_draft(self, cr, uid, ids, context=None): def do_draft(self, cr, uid, ids, context=None):
return self.write(cr, uid, ids, {'state': 'draft'}, context=context) return self.write(cr, uid, ids, {'state': 'draft'}, context=context)
def registration_open(self, cr, uid, ids, context=None): def registration_open(self, cr, uid, ids, context=None):
""" Open Registration """ Open Registration
""" """
res = self.write(cr, uid, ids, {'state': 'open','date_open':time.strftime('%Y-%m-%d %H:%M:%S')}, context=context) res = self.write(cr, uid, ids, {'state': 'open'}, context=context)
self.mail_user(cr, uid, ids) self.mail_user(cr, uid, ids)
self.message_append(cr, uid, ids, _('Open')) self.message_append(cr, uid, ids, _('Open'))
return res return res

2
addons/event/event_demo.xml
View File

@ -49,7 +49,7 @@
</record> </record>
<record id="event_type_3" model="event.type"> <record id="event_type_3" model="event.type">
<field name="name">Saloon</field> <field name="name">Show</field>
</record> </record>
<record id="event_type_4" model="event.type"> <record id="event_type_4" model="event.type">

12
addons/event/event_view.xml
View File

@ -76,7 +76,7 @@
<field name="phone"/> <field name="phone"/>
<field name="nb_register" /> <field name="nb_register" />
<field name="state"/> <field name="state"/>
<button name="button_reg_close" string="Close Registration" states="open" type="object" icon="gtk-close"/> <button name="button_reg_close" string="participated" states="open" type="object" icon="gtk-apply"/>
<button name="case_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/> <button name="case_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
<button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/> <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
</tree> </tree>
@ -96,7 +96,7 @@
<separator string="" colspan="4"/> <separator string="" colspan="4"/>
<newline/> <newline/>
<field name="state" select="1" colspan="2"/> <field name="state" select="1" colspan="2"/>
<button name="button_reg_close" string="Close Registration" states="open" type="object" icon="gtk-close"/> <button name="button_reg_close" string="participated" states="open" type="object" icon="gtk-apply"/>
<button name="case_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/> <button name="case_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
<button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/> <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
</group> </group>
@ -122,6 +122,7 @@
<field name="register_min"/> <field name="register_min"/>
<field name="register_max"/> <field name="register_max"/>
<field name="register_current"/> <field name="register_current"/>
<field name="register_participated"/>
<field name="register_prospect"/> <field name="register_prospect"/>
</group> </group>
<group col="2" colspan="2"> <group col="2" colspan="2">
@ -268,6 +269,7 @@
<field name="type">tree</field> <field name="type">tree</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="Registration" > <tree string="Registration" >
<field name="create_date"/>
<field name="name"/> <field name="name"/>
<field name="email"/> <field name="email"/>
<field name="event_id" /> <field name="event_id" />
@ -277,7 +279,7 @@
<field name="state"/> <field name="state"/>
<button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/> <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
<button name="case_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/> <button name="case_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
<button name="case_close" string="Close Registration" states="open" type="object" icon="gtk-close"/> <button name="case_close" string="participated" states="open" type="object" icon="gtk-apply"/>
<button string="Set To Unconfirmed" name="do_draft" states="cancel,done" type="object" icon="gtk-convert"/> <button string="Set To Unconfirmed" name="do_draft" states="cancel,done" type="object" icon="gtk-convert"/>
</tree> </tree>
</field> </field>
@ -307,7 +309,7 @@
</group> </group>
<group colspan="2" col="2" groups="base.group_extended"> <group colspan="2" col="2" groups="base.group_extended">
<separator string="Dates" colspan="2"/> <separator string="Dates" colspan="2"/>
<field name="date_open"/> <field name="create_date"/>
<field name="date_closed"/> <field name="date_closed"/>
<field name="date" /> <field name="date" />
<field name="date_deadline" /> <field name="date_deadline" />
@ -317,7 +319,7 @@
<group col="8" colspan="4"> <group col="8" colspan="4">
<field name="state" select="1" colspan="2" widget="statusbar" statusbar_visible="draft,open,done"/> <field name="state" select="1" colspan="2" widget="statusbar" statusbar_visible="draft,open,done"/>
<button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/> <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
<button name="button_reg_close" string="Close Registration" states="open" type="object" icon="gtk-close"/> <button name="button_reg_close" string="participated" states="open" type="object" icon="gtk-apply"/>
<button name="case_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/> <button name="case_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
<button string="Set To Unconfirmed" name="do_draft" states="cancel,done" type="object" icon="gtk-convert"/> <button string="Set To Unconfirmed" name="do_draft" states="cancel,done" type="object" icon="gtk-convert"/>
</group> </group>

13
addons/event_sale/sale_order.py
View File

@ -33,7 +33,7 @@ class sale_order_line(osv.osv):
_inherit='sale.order.line' _inherit='sale.order.line'
_columns={ _columns={
'event':fields.many2one('event.event','Event',help="Choose an event and it will authomaticaly create a registration for this event"), 'event':fields.many2one('event.event','Event',help="Choose an event and it will authomaticaly create a registration for this event"),
'event_type_id':fields.related('event_type',type='many2one', relation="event.type", string="Event Type"), 'event_type_id':fields.related('event_type_id',type='many2one', relation="event.type", string="Event Type"),
'event_ok':fields.related('event_ok',string='event_ok' ,type='boolean'), 'event_ok':fields.related('event_ok',string='event_ok' ,type='boolean'),
} }
@ -85,14 +85,3 @@ class sale_order_line(osv.osv):
self.pool.get('event.registration').log(cr, uid, registration.event.id, message) self.pool.get('event.registration').log(cr, uid, registration.event.id, message)
return super(sale_order_line, self).button_confirm(cr, uid, ids, context) return super(sale_order_line, self).button_confirm(cr, uid, ids, context)
def copy(self, cr, uid, id, default=None, context=None):
print 'wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww'
if not default:
default = {}
default.update({
'event_id',1
})
print '<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<'
return super(sale_order, self).copy(cr, uid, id, default, context=context)