[MERGE] forward port of branch 7.0 up to d0a0b7d
authorChristophe Simonis <chs@odoo.com>
Wed, 20 Aug 2014 15:45:05 +0000 (17:45 +0200)
committerChristophe Simonis <chs@odoo.com>
Wed, 20 Aug 2014 15:45:05 +0000 (17:45 +0200)
commit8f13e8320edaca58fe19bb4ed4a2ad515f1c8515
tree22a8c42f09f49edca74f557c88cf0af2e69f939e
parentf32c88f932f6a27868a24aefb6fe46c0e635bf22
parentd0a0b7d91de08612cb03bdead4d2789185884402
[MERGE] forward port of branch 7.0 up to d0a0b7d
12 files changed:
addons/account/account.py
addons/account/account_move_line.py
addons/account_voucher/account_voucher.py
addons/point_of_sale/report/pos_order_report.py
addons/product/product.py
addons/purchase/stock.py
addons/stock/product.py
addons/web/static/src/js/view_list_editable.js
addons/web/static/src/xml/base.xml
openerp/addons/base/res/res_partner_view.xml
openerp/osv/fields.py
openerp/tools/translate.py