[MERGE] forward port of branch 7.0 up to 0c4bc1c
authorChristophe Simonis <chs@odoo.com>
Tue, 3 Jun 2014 17:11:44 +0000 (19:11 +0200)
committerChristophe Simonis <chs@odoo.com>
Tue, 3 Jun 2014 17:11:44 +0000 (19:11 +0200)
commit7dd69540e8ee223a2d14b00f8435fd08e935b170
treedbf700b4f21d7bf97da4dbdf8de55a0ba2b74b5c
parente7a0b1bb9095048914e11eb1915c20d336f74c08
parent0c4bc1cf72d69110246fd133f6c9f55245fa3bd0
[MERGE] forward port of branch 7.0 up to 0c4bc1c
addons/delivery/sale.py
addons/mail/mail_thread.py
addons/purchase/purchase.py
addons/sale/sale.py
addons/stock/stock.py
openerp/addons/base/security/ir.model.access.csv