[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 10025 rev-id odo@openerp...
authorOlivier Dony <odo@openerp.com>
Wed, 30 Apr 2014 11:00:48 +0000 (13:00 +0200)
committerOlivier Dony <odo@openerp.com>
Wed, 30 Apr 2014 11:00:48 +0000 (13:00 +0200)
commitc3e812f34a0d10076aee1ff6493888d983c87bc4
treea62aa95da8e5781b82c92c8e88206bee610f0984
parent81c251836d6bc826e2fbb39269160e9c05fa0418
parentc43fdfe32b52e2c770cb2f74c367361562cf04ec
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 10025 rev-id odo@openerp.com-20140430102552-qkwv20b20nve64th

bzr revid: odo@openerp.com-20140430110048-6971xplq8k073tto
addons/hr_timesheet_sheet/hr_timesheet_sheet.py
addons/mail/controllers/main.py
addons/mail/mail_mail.py
addons/multi_company/multi_company_demo.xml
addons/stock/product.py
addons/stock/stock_view.xml