[MERGE]
authorHarry (OpenERP) <hmo@tinyerp.com>
Thu, 1 Jul 2010 15:29:07 +0000 (20:59 +0530)
committerHarry (OpenERP) <hmo@tinyerp.com>
Thu, 1 Jul 2010 15:29:07 +0000 (20:59 +0530)
commit2aed96496c54c642ed8110e88ea654403187b5a1
treeed47f54bf3062426f308b5ce90f229297ff0e9e4
parent4d47e847b061e6503c02047898d761e471a66763
parentb2ac3bc718f8d962ad9e7efe3ae2a3cdd55cc975
[MERGE]

bzr revid: hmo@tinyerp.com-20100701152907-j8l0i0da6moljb73
addons/association/security/ir.model.access.csv
addons/event/event.py
addons/event/event_view.xml
addons/event/wizard/event_make_invoice.py
addons/event/wizard/partner_event_registration.py
addons/event/wizard/partner_event_registration_view.xml
addons/event_project/wizard/event_project.py
addons/event_project/wizard/event_project_view.xml