[MERGE] Forward-port saas-5 up to f15cbd6
authorOlivier Dony <odo@openerp.com>
Thu, 12 Jun 2014 16:59:15 +0000 (18:59 +0200)
committerOlivier Dony <odo@openerp.com>
Thu, 12 Jun 2014 16:59:15 +0000 (18:59 +0200)
commit0f01df42eaf662987abe5f069ca8df2e2caf8e37
tree3cbe73598a919d0c037f68d991d5366afb496783
parent114e95b113ee30f8edb965b938739948496f2168
parentf15cbd652035d513b4dfb412025f5997323d3229
[MERGE] Forward-port saas-5 up to f15cbd6
addons/account_voucher/voucher_payment_receipt_view.xml
addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
addons/survey/views/survey_templates.xml
addons/website_forum/controllers/main.py
addons/website_forum/views/website_forum.xml