[MERGE] forward port of branch 7.0 up to df6b37c
authorChristophe Simonis <chs@odoo.com>
Wed, 25 Jun 2014 10:27:43 +0000 (12:27 +0200)
committerChristophe Simonis <chs@odoo.com>
Wed, 25 Jun 2014 10:27:43 +0000 (12:27 +0200)
commita66f3dd99243ee87281b3e44c9fc202609e34f49
tree6c919cc22ec3825c4150614bbd86cf248541b0ba
parenta1b3e22a17c0a5f0ecfae0723e349899bcccc273
parentdf6b37c472772ef8911671b54caee1769cf77706
[MERGE] forward port of branch 7.0 up to df6b37c
addons/account/wizard/account_subscription_generate.py
addons/purchase_requisition/purchase_requisition.py