[Merge]Merge lp:openobject-addons

bzr revid: vja@tinyerp.com-20130418090337-51vfkhfl3lzg7mpf

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

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

diff --cc addons/hr_holidays/hr_holidays_view.xml
Simple merge

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

diff --cc addons/mrp/mrp_view.xml
Simple merge

diff --cc addons/product/pricelist.py
Simple merge

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

diff --cc addons/project/project_view.xml
Simple merge

diff --cc addons/purchase/purchase_view.xml
Simple merge