Merge branch '7.0' of https://github.com/odoo/odoo into odoo-7.0

Conflicts:
	addons/account_analytic_plans/account_analytic_plans.py
Merge branch 'odoo-7.0' into 7.0
Merge branch 'Integracion&ControlDeCalidad' of https://github.com/pepetreshere/odoo into Core-devel-3Cloud
Bug al aprobar formas de pago en retail y en facturas normales resuelto
Merge pull request #5 from pepetreshere/2014-12HO/HfixCore

2014 12 ho/hfix core