[MERGE] forward port of branch 7.0 up to 9066da3
authorDenis Ledoux <dle@odoo.com>
Fri, 3 Oct 2014 10:13:07 +0000 (12:13 +0200)
committerDenis Ledoux <dle@odoo.com>
Fri, 3 Oct 2014 10:13:07 +0000 (12:13 +0200)
commitcd6dba5257b5243de2c2e891ce6164d05f4c85d7
tree19ebf6dc5d55c6bcf017cf9b45b66550d06bfe1e
parent76fdbec3bb056be0676037cd952b75947cbf4376
parent9066da3369ddf36ffe187c0d199667070ac32be6
[MERGE] forward port of branch 7.0 up to 9066da3
addons/point_of_sale/static/src/js/widget_base.js
openerp/addons/base/ir/ir_translation.py