[Merge]Merge lp:openobject-addons
authorVishmita Jadeja (openerp) <vja@tinyerp.com>
Thu, 18 Apr 2013 09:03:37 +0000 (14:33 +0530)
committerVishmita Jadeja (openerp) <vja@tinyerp.com>
Thu, 18 Apr 2013 09:03:37 +0000 (14:33 +0530)
commitfe128d7498491ef2e67270e2dc03740699b68310
tree15f99f6b5d221c428a9b5fec533698989438cc18
parent1c8227eb7d16753a2068ca595aac85333eb62bd2
parentc8c95c1e9e04469dde15e3b197307cbdb44fd9ce
[Merge]Merge lp:openobject-addons

bzr revid: vja@tinyerp.com-20130418090337-51vfkhfl3lzg7mpf
addons/hr/hr.py
addons/hr_holidays/hr_holidays.py
addons/hr_holidays/hr_holidays_view.xml
addons/hr_recruitment/hr_recruitment.py
addons/mrp/mrp_view.xml
addons/product/pricelist.py
addons/project/project.py
addons/project/project_view.xml
addons/purchase/purchase_view.xml