From dd285d23af8060557f3bf5c5c1f7205e5bbdf8a5 Mon Sep 17 00:00:00 2001 From: jke-openerp Date: Thu, 19 Dec 2013 15:47:39 +0100 Subject: [PATCH] [TYPO] Rename base_calendar into calendar bzr revid: jke@openerp.com-20131219144739-9ic700ycef8uklbc --- .../{base_calendar => calendar}/__init__.py | 2 +- .../__openerp__.py | 14 ++-- .../base_calendar.py => calendar/calendar.py} | 70 +++++++++--------- .../calendar_data.xml} | 20 ++--- .../calendar_demo.xml} | 0 .../calendar_view.xml} | 2 +- .../controllers/__init__.py | 0 .../controllers/main.py | 13 ++-- .../doc/calnedar_attendee.rst | 0 .../doc/changelog.rst | 0 .../doc/crm_meeting.rst | 0 addons/{base_calendar => calendar}/i18n/af.po | 0 addons/{base_calendar => calendar}/i18n/ar.po | 0 .../i18n/base_calendar.pot | 0 addons/{base_calendar => calendar}/i18n/bg.po | 0 addons/{base_calendar => calendar}/i18n/bn.po | 0 addons/{base_calendar => calendar}/i18n/bs.po | 0 addons/{base_calendar => calendar}/i18n/ca.po | 0 addons/{base_calendar => calendar}/i18n/cs.po | 0 addons/{base_calendar => calendar}/i18n/da.po | 0 addons/{base_calendar => calendar}/i18n/de.po | 0 addons/{base_calendar => calendar}/i18n/el.po | 0 addons/{base_calendar => calendar}/i18n/es.po | 0 .../{base_calendar => calendar}/i18n/es_CR.po | 0 .../{base_calendar => calendar}/i18n/es_EC.po | 0 .../{base_calendar => calendar}/i18n/es_MX.po | 0 .../{base_calendar => calendar}/i18n/es_PY.po | 0 .../{base_calendar => calendar}/i18n/es_VE.po | 0 addons/{base_calendar => calendar}/i18n/et.po | 0 addons/{base_calendar => calendar}/i18n/fa.po | 0 addons/{base_calendar => calendar}/i18n/fi.po | 0 addons/{base_calendar => calendar}/i18n/fr.po | 0 addons/{base_calendar => calendar}/i18n/gl.po | 0 addons/{base_calendar => calendar}/i18n/hr.po | 0 addons/{base_calendar => calendar}/i18n/hu.po | 0 addons/{base_calendar => calendar}/i18n/id.po | 0 addons/{base_calendar => calendar}/i18n/it.po | 0 addons/{base_calendar => calendar}/i18n/ja.po | 0 addons/{base_calendar => calendar}/i18n/ln.po | 0 addons/{base_calendar => calendar}/i18n/lt.po | 0 addons/{base_calendar => calendar}/i18n/lv.po | 0 addons/{base_calendar => calendar}/i18n/mk.po | 0 addons/{base_calendar => calendar}/i18n/mn.po | 0 addons/{base_calendar => calendar}/i18n/nb.po | 0 addons/{base_calendar => calendar}/i18n/nl.po | 0 addons/{base_calendar => calendar}/i18n/pl.po | 0 addons/{base_calendar => calendar}/i18n/pt.po | 0 .../{base_calendar => calendar}/i18n/pt_BR.po | 0 addons/{base_calendar => calendar}/i18n/ro.po | 0 addons/{base_calendar => calendar}/i18n/ru.po | 0 addons/{base_calendar => calendar}/i18n/sk.po | 0 addons/{base_calendar => calendar}/i18n/sl.po | 0 addons/{base_calendar => calendar}/i18n/sq.po | 0 addons/{base_calendar => calendar}/i18n/sr.po | 0 .../i18n/sr@latin.po | 0 addons/{base_calendar => calendar}/i18n/sv.po | 0 addons/{base_calendar => calendar}/i18n/th.po | 0 addons/{base_calendar => calendar}/i18n/tr.po | 0 addons/{base_calendar => calendar}/i18n/vi.po | 0 .../{base_calendar => calendar}/i18n/zh_CN.po | 0 .../{base_calendar => calendar}/i18n/zh_TW.po | 0 .../security/calendar_security.xml | 0 .../security/ir.model.access.csv | 0 .../static/description/icon.png | Bin .../static/src/css/calendar.css} | 0 .../static/src/js/base_calendar.js | 12 +-- .../static/src/xml/base_calendar.xml | 0 .../test/base_calendar_test.yml | 2 +- .../test/test_crm_recurrent_meeting_case2.yml | 0 addons/crm/__openerp__.py | 2 +- addons/crm/base_partner_merge.py | 2 +- addons/crm/crm_lead.py | 2 +- addons/crm/crm_meeting.py | 2 +- addons/crm/crm_phonecall.py | 2 +- addons/crm/res_partner_view.xml | 2 +- addons/crm/test/lead2opportunity2win.yml | 2 +- addons/crm/wizard/crm_phonecall_to_meeting.py | 2 +- addons/google_calendar/__openerp__.py | 2 +- addons/google_calendar/res_config_view.xml | 2 +- addons/hr_evaluation/__openerp__.py | 2 +- addons/hr_holidays/__openerp__.py | 2 +- addons/hr_recruitment/__openerp__.py | 2 +- addons/hr_recruitment/hr_recruitment.py | 2 +- addons/note/note_demo.xml | 2 +- 84 files changed, 81 insertions(+), 84 deletions(-) rename addons/{base_calendar => calendar}/__init__.py (98%) rename addons/{base_calendar => calendar}/__openerp__.py (82%) rename addons/{base_calendar/base_calendar.py => calendar/calendar.py} (97%) rename addons/{base_calendar/base_calendar_data.xml => calendar/calendar_data.xml} (96%) rename addons/{base_calendar/base_calendar_demo.xml => calendar/calendar_demo.xml} (100%) rename addons/{base_calendar/base_calendar_view.xml => calendar/calendar_view.xml} (99%) rename addons/{base_calendar => calendar}/controllers/__init__.py (100%) rename addons/{base_calendar => calendar}/controllers/main.py (87%) rename addons/{base_calendar => calendar}/doc/calnedar_attendee.rst (100%) rename addons/{base_calendar => calendar}/doc/changelog.rst (100%) rename addons/{base_calendar => calendar}/doc/crm_meeting.rst (100%) rename addons/{base_calendar => calendar}/i18n/af.po (100%) rename addons/{base_calendar => calendar}/i18n/ar.po (100%) rename addons/{base_calendar => calendar}/i18n/base_calendar.pot (100%) rename addons/{base_calendar => calendar}/i18n/bg.po (100%) rename addons/{base_calendar => calendar}/i18n/bn.po (100%) rename addons/{base_calendar => calendar}/i18n/bs.po (100%) rename addons/{base_calendar => calendar}/i18n/ca.po (100%) rename addons/{base_calendar => calendar}/i18n/cs.po (100%) rename addons/{base_calendar => calendar}/i18n/da.po (100%) rename addons/{base_calendar => calendar}/i18n/de.po (100%) rename addons/{base_calendar => calendar}/i18n/el.po (100%) rename addons/{base_calendar => calendar}/i18n/es.po (100%) rename addons/{base_calendar => calendar}/i18n/es_CR.po (100%) rename addons/{base_calendar => calendar}/i18n/es_EC.po (100%) rename addons/{base_calendar => calendar}/i18n/es_MX.po (100%) rename addons/{base_calendar => calendar}/i18n/es_PY.po (100%) rename addons/{base_calendar => calendar}/i18n/es_VE.po (100%) rename addons/{base_calendar => calendar}/i18n/et.po (100%) rename addons/{base_calendar => calendar}/i18n/fa.po (100%) rename addons/{base_calendar => calendar}/i18n/fi.po (100%) rename addons/{base_calendar => calendar}/i18n/fr.po (100%) rename addons/{base_calendar => calendar}/i18n/gl.po (100%) rename addons/{base_calendar => calendar}/i18n/hr.po (100%) rename addons/{base_calendar => calendar}/i18n/hu.po (100%) rename addons/{base_calendar => calendar}/i18n/id.po (100%) rename addons/{base_calendar => calendar}/i18n/it.po (100%) rename addons/{base_calendar => calendar}/i18n/ja.po (100%) rename addons/{base_calendar => calendar}/i18n/ln.po (100%) rename addons/{base_calendar => calendar}/i18n/lt.po (100%) rename addons/{base_calendar => calendar}/i18n/lv.po (100%) rename addons/{base_calendar => calendar}/i18n/mk.po (100%) rename addons/{base_calendar => calendar}/i18n/mn.po (100%) rename addons/{base_calendar => calendar}/i18n/nb.po (100%) rename addons/{base_calendar => calendar}/i18n/nl.po (100%) rename addons/{base_calendar => calendar}/i18n/pl.po (100%) rename addons/{base_calendar => calendar}/i18n/pt.po (100%) rename addons/{base_calendar => calendar}/i18n/pt_BR.po (100%) rename addons/{base_calendar => calendar}/i18n/ro.po (100%) rename addons/{base_calendar => calendar}/i18n/ru.po (100%) rename addons/{base_calendar => calendar}/i18n/sk.po (100%) rename addons/{base_calendar => calendar}/i18n/sl.po (100%) rename addons/{base_calendar => calendar}/i18n/sq.po (100%) rename addons/{base_calendar => calendar}/i18n/sr.po (100%) rename addons/{base_calendar => calendar}/i18n/sr@latin.po (100%) rename addons/{base_calendar => calendar}/i18n/sv.po (100%) rename addons/{base_calendar => calendar}/i18n/th.po (100%) rename addons/{base_calendar => calendar}/i18n/tr.po (100%) rename addons/{base_calendar => calendar}/i18n/vi.po (100%) rename addons/{base_calendar => calendar}/i18n/zh_CN.po (100%) rename addons/{base_calendar => calendar}/i18n/zh_TW.po (100%) rename addons/{base_calendar => calendar}/security/calendar_security.xml (100%) rename addons/{base_calendar => calendar}/security/ir.model.access.csv (100%) rename addons/{base_calendar => calendar}/static/description/icon.png (100%) rename addons/{base_calendar/static/src/css/base_calender.css => calendar/static/src/css/calendar.css} (100%) rename addons/{base_calendar => calendar}/static/src/js/base_calendar.js (93%) rename addons/{base_calendar => calendar}/static/src/xml/base_calendar.xml (100%) rename addons/{base_calendar => calendar}/test/base_calendar_test.yml (97%) rename addons/{base_calendar => calendar}/test/test_crm_recurrent_meeting_case2.yml (100%) diff --git a/addons/base_calendar/__init__.py b/addons/calendar/__init__.py similarity index 98% rename from addons/base_calendar/__init__.py rename to addons/calendar/__init__.py index b76507766c5..862c470dcc7 100644 --- a/addons/base_calendar/__init__.py +++ b/addons/calendar/__init__.py @@ -19,7 +19,7 @@ # ############################################################################## -import base_calendar +import calendar import controllers #import res_config diff --git a/addons/base_calendar/__openerp__.py b/addons/calendar/__openerp__.py similarity index 82% rename from addons/base_calendar/__openerp__.py rename to addons/calendar/__openerp__.py index 79516e8d05f..a28e4f80581 100644 --- a/addons/base_calendar/__openerp__.py +++ b/addons/calendar/__openerp__.py @@ -38,28 +38,28 @@ If you need to manage your meetings, you should install the CRM module. 'author': 'OpenERP SA', 'category': 'Hidden/Dependency', 'website': 'http://www.openerp.com', - 'demo': ['base_calendar_demo.xml'], + 'demo': ['calendar_demo.xml'], 'data': [ 'security/calendar_security.xml', 'security/ir.model.access.csv', - 'base_calendar_view.xml', - 'base_calendar_data.xml', + 'calendar_view.xml', + 'calendar_data.xml', ], 'js': [ 'static/src/js/*.js' ], 'qweb': ['static/src/xml/*.xml'], 'css': [ - 'static/src/css/base_calender.css' + 'static/src/css/calendar.css' ], 'test' : [ - 'test/base_calendar_test.yml', + 'test/calendar_test.yml', 'test/test_crm_recurrent_meeting_case2.yml' ], 'installable': True, 'application': True, 'auto_install': False, - 'images': ['images/base_calendar1.jpeg','images/base_calendar2.jpeg','images/base_calendar3.jpeg','images/base_calendar4.jpeg'], + 'images': ['images/calendar1.jpeg','images/calendar2.jpeg','images/calendar3.jpeg','images/calendar4.jpeg'], } -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: + diff --git a/addons/base_calendar/base_calendar.py b/addons/calendar/calendar.py similarity index 97% rename from addons/base_calendar/base_calendar.py rename to addons/calendar/calendar.py index cdb24f3a3ba..18a74503e96 100644 --- a/addons/base_calendar/base_calendar.py +++ b/addons/calendar/calendar.py @@ -39,16 +39,16 @@ from openerp.tools.translate import _ -def base_calendar_id2real_id(base_calendar_id=None, with_date=False): +def calendar_id2real_id(calendar_id=None, with_date=False): """ Convert a "virtual/recurring event id" (type string) into a real event id (type int). E.g. virtual/recurring event id is 4-20091201100000, so it will return 4. - @param base_calendar_id: id of calendar - @param with_date: if a value is passed to this param it will return dates based on value of withdate + base_calendar_id + @param calendar_id: id of calendar + @param with_date: if a value is passed to this param it will return dates based on value of withdate + calendar_id @return: real event id """ - if base_calendar_id and isinstance(base_calendar_id, (str, unicode)): - res = base_calendar_id.split('-') + if calendar_id and isinstance(calendar_id, (str, unicode)): + res = calendar_id.split('-') if len(res) >= 2: real_id = res[0] if with_date: @@ -58,16 +58,16 @@ def base_calendar_id2real_id(base_calendar_id=None, with_date=False): return (int(real_id), real_date, end.strftime("%Y-%m-%d %H:%M:%S")) return int(real_id) - return base_calendar_id and int(base_calendar_id) or base_calendar_id + return calendar_id and int(calendar_id) or calendar_id def get_real_ids(ids): if isinstance(ids, (str, int, long)): - return base_calendar_id2real_id(ids) + return calendar_id2real_id(ids) if isinstance(ids, (list, tuple)): res = [] for id in ids: - res.append(base_calendar_id2real_id(id)) + res.append(calendar_id2real_id(id)) return res class calendar_attendee(osv.osv): @@ -221,8 +221,8 @@ class calendar_attendee(osv.osv): ids = [ids] for attendee in self.browse(cr, uid, ids, context=context): - dummy,template_id = data_pool.get_object_reference(cr, uid, 'base_calendar',template_xmlid) - dummy,act_id = data_pool.get_object_reference(cr, uid, 'base_calendar', "view_crm_meeting_calendar") + dummy,template_id = data_pool.get_object_reference(cr, uid, 'calendar',template_xmlid) + dummy,act_id = data_pool.get_object_reference(cr, uid, 'calendar', "view_crm_meeting_calendar") if attendee.email and email_from: ics_file = self.get_ics_file(cr, uid, attendee.event_id, context=context) @@ -280,8 +280,8 @@ class calendar_attendee(osv.osv): ids = [ids] for attendee in self.browse(cr, uid, ids, context=context): - dummy,template_id = data_pool.get_object_reference(cr, uid, 'base_calendar', template_xmlid) - dummy,act_id = data_pool.get_object_reference(cr, uid, 'base_calendar', "view_crm_meeting_calendar") + dummy,template_id = data_pool.get_object_reference(cr, uid, 'calendar', template_xmlid) + dummy,act_id = data_pool.get_object_reference(cr, uid, 'calendar', "view_crm_meeting_calendar") body = template_pool.browse(cr, uid, template_id, context=context).body_html if attendee.email and email_from: ics_file = self.get_ics_file(cr, uid, attendee.event_id, context=context) @@ -347,7 +347,7 @@ class calendar_attendee(osv.osv): meeting_obj = self.pool.get('crm.meeting') res = self.write(cr, uid, ids, {'state': 'accepted'}, context) for attendee in self.browse(cr, uid, ids, context=context): - meeting_obj.message_post(cr, uid, attendee.event_id.id, body=_(("%s has accepted invitation") % (attendee.cn)),subtype="base_calendar.subtype_invitation", context=context) + meeting_obj.message_post(cr, uid, attendee.event_id.id, body=_(("%s has accepted invitation") % (attendee.cn)),subtype="calendar.subtype_invitation", context=context) return res @@ -361,7 +361,7 @@ class calendar_attendee(osv.osv): meeting_obj = self.pool.get('crm.meeting') res = self.write(cr, uid, ids, {'state': 'declined'}, context) for attendee in self.browse(cr, uid, ids, context=context): - meeting_obj.message_post(cr, uid, attendee.event_id.id, body=_(("%s has declined invitation") % (attendee.cn)),subtype="base_calendar.subtype_invitation", context=context) + meeting_obj.message_post(cr, uid, attendee.event_id.id, body=_(("%s has declined invitation") % (attendee.cn)),subtype="calendar.subtype_invitation", context=context) return res def create(self, cr, uid, vals, context=None): @@ -628,8 +628,8 @@ class calendar_alarm_manager(osv.osv): } for attendee in event.attendee_ids: - dummy,template_id = data_pool.get_object_reference(cr, uid, 'base_calendar', 'crm_email_template_meeting_reminder') - dummy,act_id = data_pool.get_object_reference(cr, uid, 'base_calendar', "view_crm_meeting_calendar") + dummy,template_id = data_pool.get_object_reference(cr, uid, 'calendar', 'crm_email_template_meeting_reminder') + dummy,act_id = data_pool.get_object_reference(cr, uid, 'calendar', "view_crm_meeting_calendar") body = template_pool.browse(cr, uid, template_id, context=context).body_html #mail_from = tools.config.get('email_from',event.user_id.email) @@ -726,7 +726,7 @@ class ir_values(osv.osv): new_model = [] for data in models: if type(data) in (list, tuple): - new_model.append((data[0], base_calendar_id2real_id(data[1]))) + new_model.append((data[0], calendar_id2real_id(data[1]))) else: new_model.append(data) return super(ir_values, self).set(cr, uid, key, key2, name, new_model, \ @@ -738,7 +738,7 @@ class ir_values(osv.osv): new_model = [] for data in models: if type(data) in (list, tuple): - new_model.append((data[0], base_calendar_id2real_id(data[1]))) + new_model.append((data[0], calendar_id2real_id(data[1]))) else: new_model.append(data) return super(ir_values, self).get(cr, uid, key, key2, new_model, \ @@ -758,7 +758,7 @@ class ir_model(osv.osv): context=context, load=load) if data: for val in data: - val['id'] = base_calendar_id2real_id(val['id']) + val['id'] = calendar_id2real_id(val['id']) return isinstance(ids, (str, int, long)) and data[0] or data @@ -772,9 +772,9 @@ def exp_report(db, uid, object, ids, data=None, context=None): original_exp_report(db, uid, object, ids, data, context) new_ids = [] for id in ids: - new_ids.append(base_calendar_id2real_id(id)) + new_ids.append(calendar_id2real_id(id)) if data.get('id', False): - data['id'] = base_calendar_id2real_id(data['id']) + data['id'] = calendar_id2real_id(data['id']) return original_exp_report(db, uid, object, new_ids, data, context) openerp.service.report.exp_report = exp_report @@ -946,10 +946,10 @@ class crm_meeting(osv.Model): _track = { 'location': { - 'base_calendar.subtype_invitation': lambda self, cr, uid, obj, ctx=None: True, + 'calendar.subtype_invitation': lambda self, cr, uid, obj, ctx=None: True, }, 'date': { - 'base_calendar.subtype_invitation': lambda self, cr, uid, obj, ctx=None: True, + 'calendar.subtype_invitation': lambda self, cr, uid, obj, ctx=None: True, }, } _columns = { @@ -1133,7 +1133,7 @@ class crm_meeting(osv.Model): mail_from = current_user.email or tools.config.get('email_from', False) print "Send mail... from ",mail_from, " to ",att_id if self.pool.get('calendar.attendee')._send_mail_to_attendees(cr, uid, att_id, email_from = mail_from, context=context): - self.message_post(cr, uid, event.id, body=_("An invitation email has been sent to attendee %s") % (partner.name,),subtype="base_calendar.subtype_invitation", context=context) + self.message_post(cr, uid, event.id, body=_("An invitation email has been sent to attendee %s") % (partner.name,),subtype="calendar.subtype_invitation", context=context) if new_attendees: self.write(cr, uid, [event.id], {'attendee_ids': [(4, att) for att in new_attendees]},context=context) @@ -1226,7 +1226,7 @@ class crm_meeting(osv.Model): if [True for item in new_pile if not item]: continue - # idval = real_id2base_calendar_id(data['id'], r_date.strftime("%Y-%m-%d %H:%M:%S")) + # idval = real_id2calendar_id(data['id'], r_date.strftime("%Y-%m-%d %H:%M:%S")) idval = '%d-%s' % (ev.id, r_date.strftime("%Y%m%d%H%M%S")) result.append(idval) @@ -1365,7 +1365,7 @@ class crm_meeting(osv.Model): def message_get_subscription_data(self, cr, uid, ids, user_pid=None, context=None): res = {} for virtual_id in ids: - real_id = base_calendar_id2real_id(virtual_id) + real_id = calendar_id2real_id(virtual_id) result = super(crm_meeting, self).message_get_subscription_data(cr, uid, [real_id], user_pid=None, context=context) res[virtual_id] = result[real_id] return res @@ -1423,7 +1423,7 @@ class crm_meeting(osv.Model): if current_user.email: if self.pool.get('calendar.attendee')._send_mail_to_attendees(cr, uid, [att.id for att in event.attendee_ids], email_from = current_user.email, context=context): - self.message_post(cr, uid, event.id, body=_("An invitation email has been sent to attendee(s)"), subtype="base_calendar.subtype_invitation", context=context) + self.message_post(cr, uid, event.id, body=_("An invitation email has been sent to attendee(s)"), subtype="calendar.subtype_invitation", context=context) return; def get_attendee(self, cr, uid, meeting_id, context=None): @@ -1501,7 +1501,7 @@ class crm_meeting(osv.Model): default['attendee_ids'] = False - res = super(crm_meeting, self).copy(cr, uid, base_calendar_id2real_id(id), default, context) + res = super(crm_meeting, self).copy(cr, uid, calendar_id2real_id(id), default, context) return res def write(self, cr, uid, ids, values, context=None): @@ -1524,7 +1524,7 @@ class crm_meeting(osv.Model): continue ids.remove(event_id) - real_event_id = base_calendar_id2real_id(event_id) + real_event_id = calendar_id2real_id(event_id) # if we are setting the recurrency flag to False or if we are only changing fields that # should be only updated on the real ID and not on the virtual (like message_follower_ids): @@ -1586,7 +1586,7 @@ class crm_meeting(osv.Model): if mail_to_ids: current_user = self.pool.get('res.users').browse(cr, uid, uid, context=context) if self.pool.get('calendar.attendee')._send_mail_to_attendees(cr, uid, mail_to_ids, template_xmlid='crm_email_template_meeting_changedate',email_from=current_user.email, context=context): - self.message_post(cr, uid, the_id, body=_("A email has been send to specify that the date has been changed !"),subtype="base_calendar.subtype_invitation", context=context) + self.message_post(cr, uid, the_id, body=_("A email has been send to specify that the date has been changed !"),subtype="calendar.subtype_invitation", context=context) else: print 'Send mail return false' return res or True and False @@ -1643,25 +1643,25 @@ class crm_meeting(osv.Model): else: select = ids - select = map(lambda x: (x, base_calendar_id2real_id(x)), select) + select = map(lambda x: (x, calendar_id2real_id(x)), select) result = [] - real_data = super(crm_meeting, self).read(cr, uid, [real_id for base_calendar_id, real_id in select], fields=fields2, context=context, load=load) + real_data = super(crm_meeting, self).read(cr, uid, [real_id for calendar_id, real_id in select], fields=fields2, context=context, load=load) real_data = dict(zip([x['id'] for x in real_data], real_data)) - for base_calendar_id, real_id in select: + for calendar_id, real_id in select: res = real_data[real_id].copy() res = real_data[real_id].copy() - ls = base_calendar_id2real_id(base_calendar_id, with_date=res and res.get('duration', 0) or 0) + ls = calendar_id2real_id(calendar_id, with_date=res and res.get('duration', 0) or 0) if not isinstance(ls, (str, int, long)) and len(ls) >= 2: #recurrent_dates = [d.strftime("%Y-%m-%d %H:%M:%S") for d in get_recurrent_dates(res['rrule'], res['date'], res['exdate'],res['vtimezone'], context=context)] #if not (ls[1] in recurrent_dates or ls[1] in res['exdate']): #when update a recurrent event res['date'] = ls[1] res['date_deadline'] = ls[2] - res['id'] = base_calendar_id + res['id'] = calendar_id result.append(res) for r in result: diff --git a/addons/base_calendar/base_calendar_data.xml b/addons/calendar/calendar_data.xml similarity index 96% rename from addons/base_calendar/base_calendar_data.xml rename to addons/calendar/calendar_data.xml index 89de5b48787..b1ceb6cbd7c 100644 --- a/addons/base_calendar/base_calendar_data.xml +++ b/addons/calendar/calendar_data.xml @@ -3,7 +3,7 @@ - + Invitation crm.meeting Warning, a mandatory field has been modified since the creation of this event @@ -122,7 +122,7 @@ Meeting Invitation ${object.event_id.user_id.email or ''} ${object.event_id.name} - + ${('' if object.partner_id and object.partner_id.email and object.partner_id.email==object.email else object.email|safe)} ${object.partner_id and object.partner_id.email and object.partner_id.email==object.email and object.partner_id.id or False } @@ -230,9 +230,9 @@ @@ -245,7 +245,7 @@ Meeting Invitation ${object.event_id.user_id.email or ''} ${object.event_id.name} - Date has been updated - + ${('' if object.partner_id and object.partner_id.email and object.partner_id.email==object.email else object.email|safe)} ${object.partner_id and object.partner_id.email and object.partner_id.email==object.email and object.partner_id.id or False } @@ -355,9 +355,9 @@ @@ -370,7 +370,7 @@ Meeting Invitation ${object.event_id.user_id.email or ''} ${object.event_id.name} - Reminder - + ${('' if object.partner_id and object.partner_id.email and object.partner_id.email==object.email else object.email|safe)} ${object.partner_id and object.partner_id.email and object.partner_id.email==object.email and object.partner_id.id or False } diff --git a/addons/base_calendar/base_calendar_demo.xml b/addons/calendar/calendar_demo.xml similarity index 100% rename from addons/base_calendar/base_calendar_demo.xml rename to addons/calendar/calendar_demo.xml diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/calendar/calendar_view.xml similarity index 99% rename from addons/base_calendar/base_calendar_view.xml rename to addons/calendar/calendar_view.xml index fae289eebc8..97d6f34a56b 100644 --- a/addons/base_calendar/base_calendar_view.xml +++ b/addons/calendar/calendar_view.xml @@ -216,7 +216,7 @@ + use_contacts="True" quick_add="True" event_open_popup="%(calendar.view_crm_meeting_form_popup)s"> diff --git a/addons/base_calendar/controllers/__init__.py b/addons/calendar/controllers/__init__.py similarity index 100% rename from addons/base_calendar/controllers/__init__.py rename to addons/calendar/controllers/__init__.py diff --git a/addons/base_calendar/controllers/main.py b/addons/calendar/controllers/main.py similarity index 87% rename from addons/base_calendar/controllers/main.py rename to addons/calendar/controllers/main.py index c9b7a22a3f7..2b56779cb72 100644 --- a/addons/base_calendar/controllers/main.py +++ b/addons/calendar/controllers/main.py @@ -8,7 +8,7 @@ import json from openerp.addons.web.http import SessionExpiredException from werkzeug.exceptions import BadRequest -class meetting_invitation(http.Controller): +class meeting_invitation(http.Controller): def check_security(self, db, token): registry = openerp.modules.registry.RegistryManager.get(db) @@ -31,9 +31,8 @@ class meetting_invitation(http.Controller): raise BadRequest(error_message) return True - @http.route('/meeting_invitation/accept', type='http', auth="none") + @http.route('/calendar/meeting/accept', type='http', auth="none") def accept(self, db, token, action, id): - # http://hostname:8069/meeting_invitation/accept?db=#token=&action=&id= self.check_security(db, token) registry = openerp.modules.registry.RegistryManager.get(db) attendee_pool = registry.get('calendar.attendee') @@ -43,9 +42,8 @@ class meetting_invitation(http.Controller): attendee_pool.do_accept(cr, openerp.SUPERUSER_ID, attendee_id) return self.view(db, token, action, id, view='form') - @http.route('/meeting_invitation/decline', type='http', auth="none") + @http.route('/calendar/meeting/decline', type='http', auth="none") def declined(self, db, token, action, id): - # http://hostname:8069/meeting_invitation/decline?db=#token=&action=&id= self.check_security(db, token) registry = openerp.modules.registry.RegistryManager.get(db) attendee_pool = registry.get('calendar.attendee') @@ -55,9 +53,8 @@ class meetting_invitation(http.Controller): attendee_pool.do_decline(cr, openerp.SUPERUSER_ID, attendee_id) return self.view(db, token, action, id, view='form') - @http.route('/meeting_invitation/view', type='http', auth="none") + @http.route('/calendar/meeting/view', type='http', auth="none") def view(self, db, token, action, id, view='calendar'): - # http://hostname:8069/meeting_invitation/view?db=#token=&action=&id= self.check_security(db, token) registry = openerp.modules.registry.RegistryManager.get(db) meeting_pool = registry.get('crm.meeting') @@ -75,7 +72,7 @@ class meetting_invitation(http.Controller): 'js': js, 'css': css, 'modules': simplejson.dumps(webmain.module_boot(db)), - 'init': "s.base_calendar.event('%s', '%s', '%s', '%s' , '%s');" % (db, action, id, 'form', json.dumps(attendee_data)), + 'init': "s.calendar.event('%s', '%s', '%s', '%s' , '%s');" % (db, action, id, 'form', json.dumps(attendee_data)), } @http.route('/calendar/NextNotify', type='json', auth="none") diff --git a/addons/base_calendar/doc/calnedar_attendee.rst b/addons/calendar/doc/calnedar_attendee.rst similarity index 100% rename from addons/base_calendar/doc/calnedar_attendee.rst rename to addons/calendar/doc/calnedar_attendee.rst diff --git a/addons/base_calendar/doc/changelog.rst b/addons/calendar/doc/changelog.rst similarity index 100% rename from addons/base_calendar/doc/changelog.rst rename to addons/calendar/doc/changelog.rst diff --git a/addons/base_calendar/doc/crm_meeting.rst b/addons/calendar/doc/crm_meeting.rst similarity index 100% rename from addons/base_calendar/doc/crm_meeting.rst rename to addons/calendar/doc/crm_meeting.rst diff --git a/addons/base_calendar/i18n/af.po b/addons/calendar/i18n/af.po similarity index 100% rename from addons/base_calendar/i18n/af.po rename to addons/calendar/i18n/af.po diff --git a/addons/base_calendar/i18n/ar.po b/addons/calendar/i18n/ar.po similarity index 100% rename from addons/base_calendar/i18n/ar.po rename to addons/calendar/i18n/ar.po diff --git a/addons/base_calendar/i18n/base_calendar.pot b/addons/calendar/i18n/base_calendar.pot similarity index 100% rename from addons/base_calendar/i18n/base_calendar.pot rename to addons/calendar/i18n/base_calendar.pot diff --git a/addons/base_calendar/i18n/bg.po b/addons/calendar/i18n/bg.po similarity index 100% rename from addons/base_calendar/i18n/bg.po rename to addons/calendar/i18n/bg.po diff --git a/addons/base_calendar/i18n/bn.po b/addons/calendar/i18n/bn.po similarity index 100% rename from addons/base_calendar/i18n/bn.po rename to addons/calendar/i18n/bn.po diff --git a/addons/base_calendar/i18n/bs.po b/addons/calendar/i18n/bs.po similarity index 100% rename from addons/base_calendar/i18n/bs.po rename to addons/calendar/i18n/bs.po diff --git a/addons/base_calendar/i18n/ca.po b/addons/calendar/i18n/ca.po similarity index 100% rename from addons/base_calendar/i18n/ca.po rename to addons/calendar/i18n/ca.po diff --git a/addons/base_calendar/i18n/cs.po b/addons/calendar/i18n/cs.po similarity index 100% rename from addons/base_calendar/i18n/cs.po rename to addons/calendar/i18n/cs.po diff --git a/addons/base_calendar/i18n/da.po b/addons/calendar/i18n/da.po similarity index 100% rename from addons/base_calendar/i18n/da.po rename to addons/calendar/i18n/da.po diff --git a/addons/base_calendar/i18n/de.po b/addons/calendar/i18n/de.po similarity index 100% rename from addons/base_calendar/i18n/de.po rename to addons/calendar/i18n/de.po diff --git a/addons/base_calendar/i18n/el.po b/addons/calendar/i18n/el.po similarity index 100% rename from addons/base_calendar/i18n/el.po rename to addons/calendar/i18n/el.po diff --git a/addons/base_calendar/i18n/es.po b/addons/calendar/i18n/es.po similarity index 100% rename from addons/base_calendar/i18n/es.po rename to addons/calendar/i18n/es.po diff --git a/addons/base_calendar/i18n/es_CR.po b/addons/calendar/i18n/es_CR.po similarity index 100% rename from addons/base_calendar/i18n/es_CR.po rename to addons/calendar/i18n/es_CR.po diff --git a/addons/base_calendar/i18n/es_EC.po b/addons/calendar/i18n/es_EC.po similarity index 100% rename from addons/base_calendar/i18n/es_EC.po rename to addons/calendar/i18n/es_EC.po diff --git a/addons/base_calendar/i18n/es_MX.po b/addons/calendar/i18n/es_MX.po similarity index 100% rename from addons/base_calendar/i18n/es_MX.po rename to addons/calendar/i18n/es_MX.po diff --git a/addons/base_calendar/i18n/es_PY.po b/addons/calendar/i18n/es_PY.po similarity index 100% rename from addons/base_calendar/i18n/es_PY.po rename to addons/calendar/i18n/es_PY.po diff --git a/addons/base_calendar/i18n/es_VE.po b/addons/calendar/i18n/es_VE.po similarity index 100% rename from addons/base_calendar/i18n/es_VE.po rename to addons/calendar/i18n/es_VE.po diff --git a/addons/base_calendar/i18n/et.po b/addons/calendar/i18n/et.po similarity index 100% rename from addons/base_calendar/i18n/et.po rename to addons/calendar/i18n/et.po diff --git a/addons/base_calendar/i18n/fa.po b/addons/calendar/i18n/fa.po similarity index 100% rename from addons/base_calendar/i18n/fa.po rename to addons/calendar/i18n/fa.po diff --git a/addons/base_calendar/i18n/fi.po b/addons/calendar/i18n/fi.po similarity index 100% rename from addons/base_calendar/i18n/fi.po rename to addons/calendar/i18n/fi.po diff --git a/addons/base_calendar/i18n/fr.po b/addons/calendar/i18n/fr.po similarity index 100% rename from addons/base_calendar/i18n/fr.po rename to addons/calendar/i18n/fr.po diff --git a/addons/base_calendar/i18n/gl.po b/addons/calendar/i18n/gl.po similarity index 100% rename from addons/base_calendar/i18n/gl.po rename to addons/calendar/i18n/gl.po diff --git a/addons/base_calendar/i18n/hr.po b/addons/calendar/i18n/hr.po similarity index 100% rename from addons/base_calendar/i18n/hr.po rename to addons/calendar/i18n/hr.po diff --git a/addons/base_calendar/i18n/hu.po b/addons/calendar/i18n/hu.po similarity index 100% rename from addons/base_calendar/i18n/hu.po rename to addons/calendar/i18n/hu.po diff --git a/addons/base_calendar/i18n/id.po b/addons/calendar/i18n/id.po similarity index 100% rename from addons/base_calendar/i18n/id.po rename to addons/calendar/i18n/id.po diff --git a/addons/base_calendar/i18n/it.po b/addons/calendar/i18n/it.po similarity index 100% rename from addons/base_calendar/i18n/it.po rename to addons/calendar/i18n/it.po diff --git a/addons/base_calendar/i18n/ja.po b/addons/calendar/i18n/ja.po similarity index 100% rename from addons/base_calendar/i18n/ja.po rename to addons/calendar/i18n/ja.po diff --git a/addons/base_calendar/i18n/ln.po b/addons/calendar/i18n/ln.po similarity index 100% rename from addons/base_calendar/i18n/ln.po rename to addons/calendar/i18n/ln.po diff --git a/addons/base_calendar/i18n/lt.po b/addons/calendar/i18n/lt.po similarity index 100% rename from addons/base_calendar/i18n/lt.po rename to addons/calendar/i18n/lt.po diff --git a/addons/base_calendar/i18n/lv.po b/addons/calendar/i18n/lv.po similarity index 100% rename from addons/base_calendar/i18n/lv.po rename to addons/calendar/i18n/lv.po diff --git a/addons/base_calendar/i18n/mk.po b/addons/calendar/i18n/mk.po similarity index 100% rename from addons/base_calendar/i18n/mk.po rename to addons/calendar/i18n/mk.po diff --git a/addons/base_calendar/i18n/mn.po b/addons/calendar/i18n/mn.po similarity index 100% rename from addons/base_calendar/i18n/mn.po rename to addons/calendar/i18n/mn.po diff --git a/addons/base_calendar/i18n/nb.po b/addons/calendar/i18n/nb.po similarity index 100% rename from addons/base_calendar/i18n/nb.po rename to addons/calendar/i18n/nb.po diff --git a/addons/base_calendar/i18n/nl.po b/addons/calendar/i18n/nl.po similarity index 100% rename from addons/base_calendar/i18n/nl.po rename to addons/calendar/i18n/nl.po diff --git a/addons/base_calendar/i18n/pl.po b/addons/calendar/i18n/pl.po similarity index 100% rename from addons/base_calendar/i18n/pl.po rename to addons/calendar/i18n/pl.po diff --git a/addons/base_calendar/i18n/pt.po b/addons/calendar/i18n/pt.po similarity index 100% rename from addons/base_calendar/i18n/pt.po rename to addons/calendar/i18n/pt.po diff --git a/addons/base_calendar/i18n/pt_BR.po b/addons/calendar/i18n/pt_BR.po similarity index 100% rename from addons/base_calendar/i18n/pt_BR.po rename to addons/calendar/i18n/pt_BR.po diff --git a/addons/base_calendar/i18n/ro.po b/addons/calendar/i18n/ro.po similarity index 100% rename from addons/base_calendar/i18n/ro.po rename to addons/calendar/i18n/ro.po diff --git a/addons/base_calendar/i18n/ru.po b/addons/calendar/i18n/ru.po similarity index 100% rename from addons/base_calendar/i18n/ru.po rename to addons/calendar/i18n/ru.po diff --git a/addons/base_calendar/i18n/sk.po b/addons/calendar/i18n/sk.po similarity index 100% rename from addons/base_calendar/i18n/sk.po rename to addons/calendar/i18n/sk.po diff --git a/addons/base_calendar/i18n/sl.po b/addons/calendar/i18n/sl.po similarity index 100% rename from addons/base_calendar/i18n/sl.po rename to addons/calendar/i18n/sl.po diff --git a/addons/base_calendar/i18n/sq.po b/addons/calendar/i18n/sq.po similarity index 100% rename from addons/base_calendar/i18n/sq.po rename to addons/calendar/i18n/sq.po diff --git a/addons/base_calendar/i18n/sr.po b/addons/calendar/i18n/sr.po similarity index 100% rename from addons/base_calendar/i18n/sr.po rename to addons/calendar/i18n/sr.po diff --git a/addons/base_calendar/i18n/sr@latin.po b/addons/calendar/i18n/sr@latin.po similarity index 100% rename from addons/base_calendar/i18n/sr@latin.po rename to addons/calendar/i18n/sr@latin.po diff --git a/addons/base_calendar/i18n/sv.po b/addons/calendar/i18n/sv.po similarity index 100% rename from addons/base_calendar/i18n/sv.po rename to addons/calendar/i18n/sv.po diff --git a/addons/base_calendar/i18n/th.po b/addons/calendar/i18n/th.po similarity index 100% rename from addons/base_calendar/i18n/th.po rename to addons/calendar/i18n/th.po diff --git a/addons/base_calendar/i18n/tr.po b/addons/calendar/i18n/tr.po similarity index 100% rename from addons/base_calendar/i18n/tr.po rename to addons/calendar/i18n/tr.po diff --git a/addons/base_calendar/i18n/vi.po b/addons/calendar/i18n/vi.po similarity index 100% rename from addons/base_calendar/i18n/vi.po rename to addons/calendar/i18n/vi.po diff --git a/addons/base_calendar/i18n/zh_CN.po b/addons/calendar/i18n/zh_CN.po similarity index 100% rename from addons/base_calendar/i18n/zh_CN.po rename to addons/calendar/i18n/zh_CN.po diff --git a/addons/base_calendar/i18n/zh_TW.po b/addons/calendar/i18n/zh_TW.po similarity index 100% rename from addons/base_calendar/i18n/zh_TW.po rename to addons/calendar/i18n/zh_TW.po diff --git a/addons/base_calendar/security/calendar_security.xml b/addons/calendar/security/calendar_security.xml similarity index 100% rename from addons/base_calendar/security/calendar_security.xml rename to addons/calendar/security/calendar_security.xml diff --git a/addons/base_calendar/security/ir.model.access.csv b/addons/calendar/security/ir.model.access.csv similarity index 100% rename from addons/base_calendar/security/ir.model.access.csv rename to addons/calendar/security/ir.model.access.csv diff --git a/addons/base_calendar/static/description/icon.png b/addons/calendar/static/description/icon.png similarity index 100% rename from addons/base_calendar/static/description/icon.png rename to addons/calendar/static/description/icon.png diff --git a/addons/base_calendar/static/src/css/base_calender.css b/addons/calendar/static/src/css/calendar.css similarity index 100% rename from addons/base_calendar/static/src/css/base_calender.css rename to addons/calendar/static/src/css/calendar.css diff --git a/addons/base_calendar/static/src/js/base_calendar.js b/addons/calendar/static/src/js/base_calendar.js similarity index 93% rename from addons/base_calendar/static/src/js/base_calendar.js rename to addons/calendar/static/src/js/base_calendar.js index e5924a8fe75..d33f97d2a2a 100644 --- a/addons/base_calendar/static/src/js/base_calendar.js +++ b/addons/calendar/static/src/js/base_calendar.js @@ -1,7 +1,7 @@ -openerp.base_calendar = function(instance) { +openerp.calendar = function(instance) { var _t = instance.web._t; var QWeb = instance.web.qweb; - instance.base_calendar = {} + instance.calendar = {} instance.web.WebClient = instance.web.WebClient.extend({ @@ -28,7 +28,7 @@ openerp.base_calendar = function(instance) { $(".link2event").on('click', function() { self.rpc("/web/action/load", { - action_id: "base_calendar.action_crm_meeting_notify", + action_id: "calendar.action_crm_meeting_notify", }).then( function(r) { r.res_id = res.event_id; return self.action_manager.do_action(r); @@ -71,7 +71,7 @@ openerp.base_calendar = function(instance) { }); - instance.base_calendar.invitation = instance.web.Widget.extend({ + instance.calendar.invitation = instance.web.Widget.extend({ init: function(parent, db, action, id, view, attendee_data) { this._super(); @@ -139,9 +139,9 @@ openerp.base_calendar = function(instance) { 'many2manyattendee' : 'instance.web.form.Many2ManyAttendee', }); - instance.base_calendar.event = function (db, action, id, view, attendee_data) { + instance.calendar.event = function (db, action, id, view, attendee_data) { instance.session.session_bind(instance.session.origin).done(function () { - new instance.base_calendar.invitation(null,db,action,id,view,attendee_data).appendTo($("body").addClass('openerp')); + new instance.calendar.invitation(null,db,action,id,view,attendee_data).appendTo($("body").addClass('openerp')); }); } diff --git a/addons/base_calendar/static/src/xml/base_calendar.xml b/addons/calendar/static/src/xml/base_calendar.xml similarity index 100% rename from addons/base_calendar/static/src/xml/base_calendar.xml rename to addons/calendar/static/src/xml/base_calendar.xml diff --git a/addons/base_calendar/test/base_calendar_test.yml b/addons/calendar/test/base_calendar_test.yml similarity index 97% rename from addons/base_calendar/test/base_calendar_test.yml rename to addons/calendar/test/base_calendar_test.yml index c95646c0fc6..f9b59864a68 100644 --- a/addons/base_calendar/test/base_calendar_test.yml +++ b/addons/calendar/test/base_calendar_test.yml @@ -1,5 +1,5 @@ - - In Order to test base_calendar, I will first create One Simple Event with real data + In Order to test calendar, I will first create One Simple Event with real data - !record {model: crm.meeting, id: crm_meeting_technicalpresentation0}: class: private diff --git a/addons/base_calendar/test/test_crm_recurrent_meeting_case2.yml b/addons/calendar/test/test_crm_recurrent_meeting_case2.yml similarity index 100% rename from addons/base_calendar/test/test_crm_recurrent_meeting_case2.yml rename to addons/calendar/test/test_crm_recurrent_meeting_case2.yml diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py index e3443d5200f..0caacc88025 100644 --- a/addons/crm/__openerp__.py +++ b/addons/crm/__openerp__.py @@ -54,7 +54,7 @@ Dashboard for CRM will include: 'process', 'mail', 'email_template', - 'base_calendar', + 'calendar', 'resource', 'board', 'fetchmail', diff --git a/addons/crm/base_partner_merge.py b/addons/crm/base_partner_merge.py index c73b5fdf599..c07a32579f0 100644 --- a/addons/crm/base_partner_merge.py +++ b/addons/crm/base_partner_merge.py @@ -223,7 +223,7 @@ class MergePartnerAutomatic(osv.TransientModel): update_records = functools.partial(update_records, context=context) for partner in src_partners: - update_records('base.calendar', src=partner, field_model='model_id.model') + update_records('calendar', src=partner, field_model='model_id.model') update_records('ir.attachment', src=partner, field_model='res_model') update_records('mail.followers', src=partner, field_model='res_model') update_records('mail.message', src=partner) diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index eaf51293355..733849efb02 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -914,7 +914,7 @@ class crm_lead(format_address, osv.osv): :return dict: dictionary value for created Meeting view """ opportunity = self.browse(cr, uid, ids[0], context) - res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid, 'base_calendar', 'action_crm_meeting', context) + res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid, 'calendar', 'action_crm_meeting', context) res['context'] = { 'default_opportunity_id': opportunity.id, 'default_partner_id': opportunity.partner_id and opportunity.partner_id.id or False, diff --git a/addons/crm/crm_meeting.py b/addons/crm/crm_meeting.py index c31907bebe2..40aaa2228c0 100644 --- a/addons/crm/crm_meeting.py +++ b/addons/crm/crm_meeting.py @@ -24,7 +24,7 @@ import logging _logger = logging.getLogger(__name__) # -# crm.meeting is defined in module base_calendar +# crm.meeting is defined in module calendar # class crm_meeting(osv.Model): """ Model for CRM meetings """ diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py index e74fecc9bdf..bd30ef5c678 100644 --- a/addons/crm/crm_phonecall.py +++ b/addons/crm/crm_phonecall.py @@ -265,7 +265,7 @@ class crm_phonecall(osv.osv): :return dict: dictionary value for created meeting view """ phonecall = self.browse(cr, uid, ids[0], context) - res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid, 'base_calendar', 'action_crm_meeting', context) + res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid, 'calendar', 'action_crm_meeting', context) res['context'] = { 'default_phonecall_id': phonecall.id, 'default_partner_id': phonecall.partner_id and phonecall.partner_id.id or False, diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml index 8b941a395dd..ff4134b5570 100644 --- a/addons/crm/res_partner_view.xml +++ b/addons/crm/res_partner_view.xml @@ -96,7 +96,7 @@ context="{'search_default_partner_id': active_id}"/>