[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9684 rev-id: dle@openerp...
authorDenis Ledoux <dle@openerp.com>
Mon, 9 Dec 2013 15:57:21 +0000 (16:57 +0100)
committerDenis Ledoux <dle@openerp.com>
Mon, 9 Dec 2013 15:57:21 +0000 (16:57 +0100)
commit20be322c4571aae52863c32503c9e03da972e4b3
tree170c60e0c1e8bece62c7427cb0bea0dc6a663c5b
parent5200639f393db814722818ce821cab4f05c1bca1
parent3be327c0aef39ce2dfbdd312a9ff1e4488cbf452
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9684 rev-id: dle@openerp.com-20131209145652-3g9rgnfz1w8k0whw

bzr revid: chs@openerp.com-20131202105848-33gcz1715w370rve
bzr revid: dle@openerp.com-20131204150643-is3y0b9n8enh3yql
bzr revid: chs@openerp.com-20131206152726-pirikn7v8pev90ic
bzr revid: dle@openerp.com-20131206162437-b9niay99mirk44qm
bzr revid: tde@openerp.com-20131209102019-kjeg0rx2au1d5e5v
bzr revid: dle@openerp.com-20131209155721-589zihxx8jmvlpvp
addons/account/account.py
addons/account/account_move_line.py
addons/mail/mail_thread.py
addons/point_of_sale/static/src/js/devices.js
openerp/addons/base/ir/ir_attachment.py
openerp/addons/base/res/res_config.py
openerp/addons/base/res/res_users_view.xml
openerp/osv/fields.py
openerp/osv/orm.py
openerp/tools/convert.py