Modulo de Cartera INICIO
Modulo de Cartera1
Actualizaciones

Conflicts:
	academy/__init__.py
	academy/__init__.pyc
	academy/__openerp__.py
	academy/academy.py
	academy/academy.pyc
	academy/academy_view.xml
	academy/wizard/__init__.py
	academy/wizard/__init__.pyc
	academy/wizard/wizard_academy.py
	academy/wizard/wizard_academy.pyc
	academy/wizard/wizard_academy.xml