Ajustes
Merge branch 'master' of github.com:monocon/openerp-boletos

Conflicts:
	__init__.py
	__openerp__.py
	account_invoice.py
	account_invoice_view.xml