[MERGE] Merged with main addons.
authorThibault Delavallée <tde@openerp.com>
Thu, 28 Jun 2012 12:44:20 +0000 (14:44 +0200)
committerThibault Delavallée <tde@openerp.com>
Thu, 28 Jun 2012 12:44:20 +0000 (14:44 +0200)
commit282f72391b9d3a2de8b68abcdf6c8857c62b00e5
treede2ca1615d4681068096866dce350bf5185d7a00
parent9b30d01cf22dfce7ef70585efddd226581d8c4f7
parent3905f5248f6ecd6383f8f68bf60e8ca0ad2a0e51
[MERGE] Merged with main addons.

bzr revid: tde@openerp.com-20120628124420-bxjjo2jhtzps0wsf
addons/hr/hr.py
addons/hr/hr_view.xml
addons/product/product.py
addons/product/product_view.xml
addons/project/project_view.xml
addons/stock/product_view.xml