[MERGE] forward port of branch saas-2 up to revid 9149 chs@openerp.com-20140313163420...
authorChristophe Simonis <chs@openerp.com>
Thu, 13 Mar 2014 17:09:40 +0000 (18:09 +0100)
committerChristophe Simonis <chs@openerp.com>
Thu, 13 Mar 2014 17:09:40 +0000 (18:09 +0100)
commitee8174806e1df2c121ac52a12fd5855c02e6320a
tree89e4a63300591cb98928b6f978404635670b2b87
parent2b762083a35b7a8901fdd8339cd17989a19a168a
parent02459f8d4a97ef8ee82464389b269fafac7fec21
[MERGE] forward port of branch saas-2 up to revid 9149 chs@openerp.com-20140313163420-ifa4hyixj722d6jo

bzr revid: mat@openerp.com-20140313091920-bahej198pu339e28
bzr revid: chs@openerp.com-20140313170940-yoqg6izfw74s2i3a
addons/account/account.py
addons/calendar/calendar.py
addons/calendar/test/calendar_test.yml
addons/pad/static/src/js/pad.js
addons/stock/stock_view.xml