Merge proposals dependent on lp://staging/~vauxoo/openerp-mexico-localization/7.0-l10n_mx_diot_report-dev_ernesto

1. 7.0-l10n_mx_diot_report-dev_ernesto
2. Dependent merge proposals