[MERGE] forward port of branch saas-3 up to 6c13c8d
authorChristophe Simonis <chs@odoo.com>
Thu, 20 Nov 2014 10:37:23 +0000 (11:37 +0100)
committerChristophe Simonis <chs@odoo.com>
Thu, 20 Nov 2014 10:37:23 +0000 (11:37 +0100)
commitf51d4ea6d0af049d87fcb1c0f7f7e502b6e8ebbc
tree08d3224fc7db397b49e04c2b40dc0994e3e421f0
parent6cb2c9edc69d86e9b970dd2be86bc733f2e58652
parent6c13c8d96609deb876fab5ffcf7ef65209d5abae
[MERGE] forward port of branch saas-3 up to 6c13c8d
addons/account/project/project.py
addons/mrp/stock.py