[MERGE] forward port of branch 7.0 up to 6d4e1cc
authorDenis Ledoux <dle@odoo.com>
Fri, 3 Oct 2014 09:22:47 +0000 (11:22 +0200)
committerDenis Ledoux <dle@odoo.com>
Fri, 3 Oct 2014 09:22:47 +0000 (11:22 +0200)
1  2 
addons/account/account_move_line.py
openerp/addons/base/ir/ir_translation.py

Simple merge