From 6b91bc24d7e8f3191db4aa76387c057f6fc11a21 Mon Sep 17 00:00:00 2001 From: "ajay javiya (OpenERP)" Date: Thu, 11 Jul 2013 17:06:24 +0530 Subject: [PATCH] [ADD]:widget for invitation status on many2many field , will see the status of attendee if accepted then green, declined then red otherwise grey buttton [IMP]: onclick accept/decline open form view of meeting and if click on direct to openerp will open calneder view of meeting -> Message in chatter when accept/decline. bzr revid: aja@tinyerp.com-20130711113624-baqko9b4b1fjoh8o --- addons/base_calendar/__openerp__.py | 4 + addons/base_calendar/base_calendar.py | 10 +- addons/base_calendar/base_calendar_data.xml | 4 +- addons/base_calendar/crm_meeting_view.xml | 2 +- .../static/src/css/base_calender.css | 15 ++ .../static/src/js/base_calendar.js | 131 +++++++++++++++++- .../static/src/xml/base_calender.xml | 13 ++ 7 files changed, 170 insertions(+), 9 deletions(-) create mode 100644 addons/base_calendar/static/src/css/base_calender.css create mode 100644 addons/base_calendar/static/src/xml/base_calender.xml diff --git a/addons/base_calendar/__openerp__.py b/addons/base_calendar/__openerp__.py index 7d5b82a3cdf..6ca94ecd7f4 100644 --- a/addons/base_calendar/__openerp__.py +++ b/addons/base_calendar/__openerp__.py @@ -50,6 +50,10 @@ If you need to manage your meetings, you should install the CRM module. 'js': [ 'static/src/js/*.js' ], + 'qweb': ['static/src/xml/*.xml'], + 'css': [ + 'static/src/css/base_calender.css' + ], 'test' : ['test/base_calendar_test.yml'], 'installable': True, 'application': True, diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py index 53dadecd437..c92b4dc325f 100644 --- a/addons/base_calendar/base_calendar.py +++ b/addons/base_calendar/base_calendar.py @@ -450,7 +450,7 @@ property or property parameter."), 'responsible': res_obj.user_id and res_obj.user_id.name or 'OpenERP User', 'company': company, 'description': res_obj.description or '-', - 'attendees': ', ' .join(att_info), + 'attendees': ',\n' .join(att_info), 'time': time, 'tz': tz, 'location': res_obj.location or '-', @@ -518,8 +518,8 @@ property or property parameter."), meeting_obj = self.pool.get('crm.meeting') for vals in self.browse(cr, uid, ids, context=context): meeting_id = meeting_obj.search(cr, uid, [('attendee_ids','=',vals.id)],context = context) - if meeting_id: - meeting_obj.message_post(cr, uid, meeting_id, body=_(("%s Accept Invitation") % (vals.cn)), context=context) + if meeting_id and vals.state != 'accepted': + meeting_obj.message_post(cr, uid, meeting_id, body=_(("%s has Accept Invitation") % (vals.cn)), context=context) self.write(cr, uid, vals.id, {'state': 'accepted'}, context) return True @@ -538,8 +538,8 @@ property or property parameter."), meeting_obj = self.pool.get('crm.meeting') for vals in self.browse(cr, uid, ids, context=context): meeting_id = meeting_obj.search(cr, uid, [('attendee_ids','=',vals.id)],context = context) - if meeting_id: - meeting_obj.message_post(cr, uid, meeting_id, body=_(("%s Reject Invitation") % (vals.cn)), context=context) + if meeting_id and vals.state != 'declined': + meeting_obj.message_post(cr, uid, meeting_id, body=_(("%s has Declined Invitation") % (vals.cn)), context=context) self.write(cr, uid, vals.id, {'state': 'declined'}, context) return True diff --git a/addons/base_calendar/base_calendar_data.xml b/addons/base_calendar/base_calendar_data.xml index 0f58f52c202..d7addfddcfd 100644 --- a/addons/base_calendar/base_calendar_data.xml +++ b/addons/base_calendar/base_calendar_data.xml @@ -177,9 +177,9 @@
You, %(organizer)s - Organizer
%(attendees)s
-
Accept | Decline
+
Accept | Decline
-
--
Sent by %(responsible)s from %(company)s.View this meeting detail directly in OpenERP
+
--
Sent by %(responsible)s from %(company)s.View this meeting detail directly in OpenERP
diff --git a/addons/base_calendar/crm_meeting_view.xml b/addons/base_calendar/crm_meeting_view.xml index 4298b193ea7..8b2efb8b44c 100644 --- a/addons/base_calendar/crm_meeting_view.xml +++ b/addons/base_calendar/crm_meeting_view.xml @@ -43,7 +43,7 @@