Merge proposals dependent on lp://qastaging/~vauxoo/openerp-mexico-localization/7.0-oml-facturae-report-format-vauxoo-dev-ernesto

1. 7.0-oml-facturae-report-format-vauxoo-dev-ernesto
2. Dependent merge proposals