From a80b7e2884188d95bf734059965ee00be5243349 Mon Sep 17 00:00:00 2001 From: "qdp-launchpad@tinyerp.com" <> Date: Mon, 19 Jul 2010 03:21:49 +0530 Subject: [PATCH] [IMP] event: labels improvements bzr revid: qdp-launchpad@tinyerp.com-20100718215149-1vhhj4s044ct7eph --- addons/event/event.py | 4 ++-- addons/event/wizard/event_confirm.py | 2 +- addons/event/wizard/event_confirm_registration.py | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/addons/event/event.py b/addons/event/event.py index 127aa5b1b30..cf2b3f7b4c6 100644 --- a/addons/event/event.py +++ b/addons/event/event.py @@ -222,10 +222,10 @@ class event_event(osv.osv): 'mail_auto_confirm': fields.boolean('Mail Auto Confirm', readonly=False, states={'done': [('readonly', True)]}, help='Check this box if you want ot use the automatic confirmation emailing or the reminder'), 'mail_registr': fields.text('Registration Email', readonly=False, states={'done': [('readonly', True)]}, help='This email will be sent when someone subscribes to the event.'), 'mail_confirm': fields.text('Confirmation Email', readonly=False, states={'done': [('readonly', True)]}, help="This email will be sent when the event gets confimed or when someone subscribes to a confirmed event. This is also the email sent to remind someone about the event."), - 'product_id': fields.many2one('product.product', 'Product', required=True, readonly=True, states={'draft': [('readonly', False)]}, help="Product which is provided cost of event. Invoice of event will be created with this Product."), + 'product_id': fields.many2one('product.product', 'Product', required=True, readonly=True, states={'draft': [('readonly', False)]}, help="The invoices of this event registration will be created with this Product. Thus it allows you to set the default label and the accounting info you want by default on these invoices."), 'note': fields.text('Notes', help="Description or Summary of Event", readonly=False, states={'done': [('readonly', True)]}), 'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', readonly=True, states={'draft': [('readonly', False)]}, help="Pricelist version for current event."), - 'unit_price': fields.related('product_id', 'list_price', type='float', string='Registration Cost', readonly=True, states={'draft':[('readonly',False)]}), + 'unit_price': fields.related('product_id', 'list_price', type='float', string='Registration Cost', readonly=True, states={'draft':[('readonly',False)]}, help="This will be the default price used as registration cost when invoicing this event. Note that you can specify for each registration a specific amount if you want to"), 'main_speaker_id': fields.many2one('res.partner','Main Speaker', readonly=False, states={'done': [('readonly', True)]}), 'speaker_ids':fields.many2many('res.partner', 'event_speaker_rel', 'speaker_id', 'partner_id', 'Other Speakers', readonly=False, states={'done': [('readonly', True)]}), 'address_id': fields.many2one('res.partner.address','Location Address', readonly=False, states={'done': [('readonly', True)]}), diff --git a/addons/event/wizard/event_confirm.py b/addons/event/wizard/event_confirm.py index 3af4b1c12b3..563a0dc45a0 100644 --- a/addons/event/wizard/event_confirm.py +++ b/addons/event/wizard/event_confirm.py @@ -33,7 +33,7 @@ class event_confirm(osv.osv_memory): 'msg': fields.text('Message', readonly=True), } _defaults = { - 'msg': _('Total Registrations of this Event could not reached Minimum Registration Limit. What do you want to do?') + 'msg': _('Warning: This Event has not reached its Minimum Registration Limit. Are you sure you want to confirm it?') } def confirm(self, cr, uid, ids, context): diff --git a/addons/event/wizard/event_confirm_registration.py b/addons/event/wizard/event_confirm_registration.py index b592f2c8994..92f94474cb8 100644 --- a/addons/event/wizard/event_confirm_registration.py +++ b/addons/event/wizard/event_confirm_registration.py @@ -50,11 +50,10 @@ class event_confirm_registration(osv.osv_memory): register_max = registration.event_id.register_max if registration.event_id.id not in overlimit_event_ids: overlimit_event_ids.append(registration.event_id.id) - msg += _("The Event '%s' is reached Maximum Limit(%s).") \ + msg += _("Warning: The Event '%s' has reached its Maximum Limit (%s).") \ %(registration.event_id.name, register_max) if 'msg' in fields: res.update({'msg': msg}) - return res def confirm(self, cr, uid, ids, context):