[MERGE] forward port of branch 7.0 up to ab5ecef
authorChristophe Simonis <chs@odoo.com>
Wed, 12 Nov 2014 09:56:38 +0000 (10:56 +0100)
committerChristophe Simonis <chs@odoo.com>
Wed, 12 Nov 2014 09:56:38 +0000 (10:56 +0100)
commite74fb09a0092526567896f7e645e956371960a88
tree3edab8963d726d7aaee095ea543d033a96a77685
parente4fdd85424b4e205024ebf6353a4780871af9907
parentab5ecef476b82c7e00dbd1868de19832ac044f15
[MERGE] forward port of branch 7.0 up to ab5ecef
addons/mrp/mrp.py
addons/project_timesheet/project_timesheet.py