Merge proposals dependent on lp://staging/~vauxoo/openerp-mexico-localization/addons-mx-trunk-facturae_email-dev-moylop260

1. addons-mx-trunk-facturae_email-dev-moylop260
2. Dependent merge proposals