Merge proposals dependent on lp:~salvador-martinez/openerp-mexico-localization/l10n_mx_61_fix_cp_dev_salvador_martinez

1. l10n_mx_61_fix_cp_dev_salvador_martinez
2. Dependent merge proposals