[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9789 revid:dle@openerp.com...
authorDenis Ledoux <dle@openerp.com>
Fri, 24 Jan 2014 12:10:27 +0000 (13:10 +0100)
committerDenis Ledoux <dle@openerp.com>
Fri, 24 Jan 2014 12:10:27 +0000 (13:10 +0100)
commit1fb1a6f2af794256b5e27c7a875169d02fc6381c
tree6d1c5a3958f5d0eb9e2b588fd1a865e79fbafa07
parent9f3ab4599c7267b82b1d5255f31ef67b56594a68
parent83677ed6e6d662ef715e14f99dda7f696dc23f93
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9789 revid:dle@openerp.com-20140124120102-we2yxio553ws2yz4

bzr revid: dle@openerp.com-20140120174449-tui0a24zgn9bien2
bzr revid: dle@openerp.com-20140121125538-ke7i6kaz486hwgl8
bzr revid: dle@openerp.com-20140122134115-0ogjemlqe327xoac
bzr revid: dle@openerp.com-20140123103655-mf2zslfbgue97ed2
bzr revid: dle@openerp.com-20140124121027-uk9zy4dx9tqlsblr
14 files changed:
addons/account_asset/account_asset.py
addons/document_ftp/ftpserver/abstracted_fs.py
addons/email_template/email_template.py
addons/mrp/mrp.py
addons/mrp/mrp_view.xml
addons/mrp_operations/mrp_operations_view.xml
addons/plugin/plugin_handler.py
addons/project_long_term/wizard/project_compute_phases.py
addons/purchase/purchase.py
addons/purchase/purchase_view.xml
addons/sale/sale_view.xml
addons/sale_stock/sale_stock_view.xml
addons/stock/product.py
addons/stock/stock.py