Modulos Curso-Estudiante-Profesor
Modulos Curso-Estudiante-Profesor
Merge branch 'master' of https://github.com/hernanxavier/cec_academico

Conflicts:
	cec_academico/__init__.py
	cec_academico/__openerp__.py
	cec_academico/_validation.py
	cec_academico/cec_academico.py
	cec_academico/report/README.md
	cec_academico/report/__init__.py
	cec_academico/report/certificado/.~lock.template.odt#
	cec_academico/report/certificado/__init__.py
	cec_academico/report/certificado/certificado.xml
	cec_academico/report/certificado/parser.py
	cec_academico/report/certificado/template.odt
	cec_academico/security/.#ir.model.access.csv
	cec_academico/security/ir.model.access.csv
	cec_academico/security/ir.model.access.csv~
	cec_academico/views/cec_academico_actions.xml
	cec_academico/views/cec_academico_menus.xml
	cec_academico/views/cec_academico_views.xml
	cec_alumnos/__init__.py
	cec_auth_signup/__init__.py
	cec_auth_signup/__openerp__.py
	cec_base/cec_base.py
	cec_courses/__init__.py
	cec_courses/__openerp__.py
	cec_courses/_validation.py
	cec_courses/cec_courses.py
	cec_courses/report/README.md
	cec_courses/report/__init__.py
	cec_courses/report/certificado/.~lock.template.odt#
	cec_courses/report/certificado/__init__.py
	cec_courses/report/certificado/certificado.xml
	cec_courses/report/certificado/parser.py
	cec_courses/report/certificado/template.odt
	cec_courses/security/.#ir.model.access.csv
	cec_courses/security/ir.model.access.csv
	cec_courses/security/ir.model.access.csv~
	cec_courses/views/cec_course_actions.xml
	cec_courses/views/cec_course_views.xml
	cec_docentes/__openerp__.py
	cec_students/__init__.py
	cec_students/__openerp__.py
	cec_students/security/ir.model.access.csv
	cec_students/static/src/img/icon.png
	cec_students/validation.py
	cec_students/views/cec_students_actions.xml
	cec_students/views/cec_students_menus.xml
	cec_students/views/cec_students_views.xml
	cec_students/views/res_partner_actions.xml
	cec_teachers/__init__.py
	cec_teachers/__openerp__.py
	cec_teachers/security/ir.model.access.csv
	cec_teachers/static/src/img/icon.png
	cec_teachers/validation.py
	cec_teachers/views/.res_partner_menus.xml.swo
	cec_teachers/views/iaen_docentes_actions.xml
	curso/__init__.py
	curso/__openerp__.py
	curso/_validation.py
	curso/curso.py
	curso/report/README.md
	curso/report/__init__.py
	curso/report/certificado/.~lock.template.odt#
	curso/report/certificado/__init__.py
	curso/report/certificado/certificado.xml
	curso/report/certificado/parser.py
	curso/report/certificado/template.odt
	curso/security/.#ir.model.access.csv
	curso/security/ir.model.access.csv
	curso/security/ir.model.access.csv~
	curso/views/curso_actions.xml
	curso/views/curso_views.xml