lp:~openerp-dev/openobject-addons/trunk-email-invitation-template-aja

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:openobject-addons

OpenERP Core Team: Pending requested 2013-10-14

Diff: 1729 lines (+803/-540)

20 files modified

base_calendar/__init__.py (+1/-0)
base_calendar/__openerp__.py (+8/-1)
base_calendar/base_calendar.py (+159/-526)
base_calendar/controllers/__init__.py (+3/-0)
base_calendar/controllers/main.py (+77/-0)
base_calendar/crm_meeting.py (+110/-3)
base_calendar/crm_meeting_data.xml (+128/-0)
base_calendar/crm_meeting_view.xml (+19/-7)
base_calendar/doc/calnedar_attendee.rst (+23/-0)
base_calendar/doc/changelog.rst (+29/-0)
base_calendar/doc/crm_meeting.rst (+38/-0)
base_calendar/security/calendar_security.xml (+1/-1)
base_calendar/security/ir.model.access.csv (+1/-1)
base_calendar/static/src/css/base_calender.css (+65/-0)
base_calendar/static/src/js/base_calendar.js (+80/-0)
base_calendar/static/src/xml/base_calendar.xml (+43/-0)
portal/security/ir.model.access.csv (+1/-1)
portal_crm/__openerp__.py (+1/-0)
portal_crm/security/ir.model.access.csv (+3/-0)
portal_hr_employees/hr_employee.py (+13/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

8863. By Antony Lesuisse (OpenERP) on 2013-11-07

more slaughtering

8862. By Antony Lesuisse (OpenERP) on 2013-11-07

slaughtering

8861. By ajay javiya (OpenERP) on 2013-11-01

[IMP]: if opt_out is checked invitation mail is not send to attendee

8860. By ajay javiya (OpenERP) on 2013-11-01

[MERGE]: with trunk

8859. By ajay javiya (OpenERP) on 2013-10-29

[MERGE]: with trunk

8858. By ajay javiya (OpenERP) on 2013-10-24

[REV]: noupdate in data

8857. By ajay javiya (OpenERP) on 2013-10-22

[IMP]: improve align in email template

8856. By ajay javiya (OpenERP) on 2013-10-22

[REM]: Rmove unwanted access rights and record rule

8855. By ajay javiya (OpenERP) on 2013-10-22

[MERGE]: with trunk

8854. By ajay javiya (OpenERP) on 2013-10-22

[FIX]: Traceback , create an recurrent meeting and then accept/decline from invitation tab