[MERGE] forward port of branch 7.0 up to 529e920
authorDenis Ledoux <dle@odoo.com>
Wed, 19 Nov 2014 13:06:48 +0000 (14:06 +0100)
committerDenis Ledoux <dle@odoo.com>
Wed, 19 Nov 2014 13:06:48 +0000 (14:06 +0100)
commit6c13c8d96609deb876fab5ffcf7ef65209d5abae
treedc56befb10b54f7b888509384be7bc3b3c7ae8d5
parentc5714135c20e671990fbe4564884ebddacbe0206
parent529e920b2cc4673188dd209f91196a35dfdb7790
[MERGE] forward port of branch 7.0 up to 529e920
addons/account/project/project.py
addons/mrp/stock.py