[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9691 rev-id: dle@openerp...
authorDenis Ledoux <dle@openerp.com>
Wed, 11 Dec 2013 13:43:17 +0000 (14:43 +0100)
committerDenis Ledoux <dle@openerp.com>
Wed, 11 Dec 2013 13:43:17 +0000 (14:43 +0100)
commit7f00274384acf45b6e0c1017ceaf2caff8768731
treed434fa7041742bc44592d8098fb871bb365531dd
parent15e39ebb3bbee86e2952918eab9918ea3f156f3b
parent89a9dbee75bbf53b9ef5f62da5629d566d42ab54
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9691 rev-id: dle@openerp.com-20131211134120-fco4rlqjh258ba36

bzr revid: dle@openerp.com-20131210184409-cd9wy856v5bg0f17
bzr revid: dle@openerp.com-20131211134317-f0ev1vbinhrkgjf4
addons/mail/__openerp__.py
addons/mail/static/src/js/mail.js
addons/mrp/report/price.py
addons/point_of_sale/point_of_sale.py
addons/purchase/stock.py