Merge proposals dependent on lp:~echeverrifm/openerp-mexico-localization/7.0-l10n_mx_fix_translate-dev-echeverri

1. 7.0-l10n_mx_fix_translate-dev-echeverri
2. Dependent merge proposals