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

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp:openobject-addons

OpenERP Core Team: Pending requested 2014-04-14

Diff: 2247 lines (+875/-343)

43 files modified

event/__openerp__.py (+3/-2)
event/email_template.xml (+2/-2)
event/event.py (+179/-27)
event/event_data.xml (+15/-1)
event/event_demo.xml (+34/-6)
event/event_view.xml (+111/-119)
event/report/report_event_registration.py (+5/-5)
event/report/report_event_registration_view.xml (+15/-5)
event/res_config_view.xml (+24/-0)
event/security/event_security.xml (+2/-2)
event/security/ir.model.access.csv (+4/-3)
event/static/src/css/event.css (+9/-20)
event/static/src/js/event.js (+29/-0)
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/event.xml (+1/-0)
event_sale/__init__.py (+1/-0)
event_sale/__openerp__.py (+2/-0)
event_sale/event_sale.py (+23/-7)
event_sale/event_sale_data.xml (+12/-2)
event_sale/event_sale_view.xml (+37/-25)
event_sale/res_config.py (+11/-0)
event_sale/res_config_view.xml (+23/-0)
event_sale/security/event_sale_security.xml (+11/-0)
event_sale/test/confirm.yml (+3/-1)
marketing/res_config_view.xml (+24/-20)
website_event/__openerp__.py (+2/-1)
website_event/models/__init__.py (+1/-0)
website_event/models/res_config.py (+14/-0)
website_event/security/website_event.xml (+13/-0)
website_event/static/src/js/website.tour.event.js (+2/-2)
website_event/views/res_config_view.xml (+25/-0)
website_event/views/website_event.xml (+12/-3)
website_event/views/website_event_sale_backend.xml (+19/-7)
website_event_sale/__openerp__.py (+0/-1)
website_event_sale/controllers/main.py (+42/-9)
website_event_sale/models/sale_order.py (+29/-0)
website_event_sale/static/src/js/website.tour.event_sale.js (+26/-11)
website_event_sale/views/website_event_sale.xml (+87/-5)
website_event_track/views/event_backend.xml (+0/-40)
website_event_track/views/website_event.xml (+1/-1)
website_sale/models/sale_order.py (+8/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

9431. By Paramjit Singh Sahota(OpenERP) on 2014-06-09

[IMP] Improved test case and improved code for the free tickets and little bit improvement.

9430. By Pariket Trivedi(OpenERP) on 2014-06-04

[IMP]: change condition.

9429. By Paramjit Singh Sahota(OpenERP) on 2014-06-04

TEST

9428. By Pariket Trivedi(OpenERP) on 2014-06-04

[IMP] Improved code to inhibits the session stuffs when SO is created manually.
Reverted the test cases

9427. By Paramjit Singh Sahota(OpenERP) on 2014-06-04

Testing for test cases.

9426. By Paramjit Singh Sahota(OpenERP) on 2014-06-03

[IMP] Improved code for button_confirm method through which the test cases are failed.

9425. By Paramjit Singh Sahota(OpenERP) on 2014-05-31

[IMP] Improved the attendee form and added event details on attendee page.

9424. By Paramjit Singh Sahota(OpenERP) on 2014-05-30

[IMP] Improved code and removed the test case bcz we can't get the request.

9423. By Paramjit Singh Sahota(OpenERP) on 2014-05-30

[FIX] Fixed the issue 'if i add one attendee then sys will add two attendee(one from SO) that is wrong.'

9422. By Pariket Trivedi(OpenERP) on 2014-05-30

[IMP]:remove registration_date field and change cron job for create_date.