lp:~openerp-dev/openobject-addons/trunk-imp-event-ptr

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~openerp-dev/openobject-addons/trunk-imp-event-psa at revision 9339

OpenERP R&D Team: Pending requested 2014-04-18

Diff: 688 lines (+82/-81)

19 files modified

event/board_association_view.xml (+3/-3)
event/email_template.xml (+2/-2)
event/event.py (+15/-15)
event/event_demo.xml (+3/-3)
event/event_reports.xml (+2/-2)
event/event_view.xml (+14/-14)
event/report/report_event_registration.py (+2/-2)
event/report/report_event_registration_view.xml (+5/-5)
event/security/event_security.xml (+2/-2)
event/security/ir.model.access.csv (+4/-3)
event/test/process/event_draft2done.yml (+10/-10)
event/test/ui/demo_data.yml (+3/-3)
event/test/ui/duplicate_event.yml (+1/-1)
event/views/report_event_attendees_registration.xml (+6/-7)
event_sale/event_sale.py (+3/-3)
event_sale/event_sale_view.xml (+4/-4)
event_sale/test/confirm.yml (+1/-1)
website/models/website.py (+1/-0)
website_event/models/event.py (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

9336. By Pariket Trivedi(OpenERP) on 2014-04-24

[MERGE]: merge branch trunk-imp-event-psa.

9335. By Pariket Trivedi(OpenERP) on 2014-04-22

[MERGE]: merge with trunk-imp-event-psa.

9334. By Pariket Trivedi(OpenERP) on 2014-04-22

[IMP]: remove markers argument.

9333. By Pariket Trivedi(OpenERP) on 2014-04-18

[IMP]: add marker in website.

9332. By Pariket Trivedi(OpenERP) on 2014-04-18

[IMP]: replace event.registration by event.registration_attendee object.

9331. By Pariket Trivedi(OpenERP) on 2014-04-18

[IMP]: change width and set proper path.

9330. By Pariket Trivedi(OpenERP) on 2014-04-18

[IMP]: event attendees registration qweb report.

9329. By Paramjit Singh Sahota(OpenERP) on 2014-04-17

[ADD] Added qweb reports and svg images for flags and little bit improvemnt.

9328. By Paramjit Singh Sahota(OpenERP) on 2014-04-16

[IMP] Improved code by adding some fields in event,
improving the view of event to make the available tickets, published/unpublished button and reminders make available at single place,
added from website_event whole promotion group which consists sharing no twitter and fb.

9327. By Paramjit Singh Sahota(OpenERP) on 2014-04-14

[ADD] Added In Marketing settings, add some option
Title of the section: 'Event Management'
> Manage different kind of tickets: vip, free, ...
> Publish your event in the web
> Manage advanced event features like etracking, agenda, sponsors