[MERGE] forward port of branch 7.0 up to 7307227
authorDenis Ledoux <dle@odoo.com>
Wed, 3 Sep 2014 16:26:53 +0000 (18:26 +0200)
committerDenis Ledoux <dle@odoo.com>
Wed, 3 Sep 2014 16:26:53 +0000 (18:26 +0200)
commitff0f92acfa0dda7d5407b8d8bb097ae273ef376a
treeb35de306542809a73210cc893a3eadd1995534a0
parent00ea919699d0927604a21fdd5bc3974defad8317
parent73072272de8ab32b0fe199d54a90986dc02d1dbc
[MERGE] forward port of branch 7.0 up to 7307227
addons/account_payment/account_move_line.py
addons/mrp/stock.py
addons/web/static/src/js/views.js