[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9529 rev-id: mat@openerp...

bzr revid: dle@openerp.com-20131018121236-zp221von16vekthp

diff --cc addons/account/__openerp__.py
Simple merge

diff --cc addons/account/partner.py
Simple merge

diff --cc addons/hr/hr_view.xml
Simple merge

diff --cc addons/mrp_repair/mrp_repair.py
Simple merge

diff --cc addons/point_of_sale/point_of_sale.py
Simple merge

diff --cc addons/procurement/procurement.py
Simple merge

diff --cc addons/stock/stock.py
Simple merge