[MERGE]merge with latest trunk
authorCedric Snauwaert <csn@openerp.com>
Mon, 10 Feb 2014 16:15:56 +0000 (17:15 +0100)
committerCedric Snauwaert <csn@openerp.com>
Mon, 10 Feb 2014 16:15:56 +0000 (17:15 +0100)
commit9b249181e381d837c696ee678a72748472d9f5cd
tree0ccda77999538a5065b178fb63350ee3aa739b6e
parente0362bf34c43e2c9cf3604de3f8bc7642f32897f
parent04a6074b1a09fdab3922f014c0737480e0ea6138
[MERGE]merge with latest trunk

bzr revid: csn@openerp.com-20140210161556-qq52vvhdegyda7k6
addons/event_sale/event_sale_view.xml
addons/sale/sale_view.xml