Merge proposals dependent on lp:~vauxoo/openerp-mexico-localization/7.0_l10n_mx_isinstance_ids_dev_carlos

1. 7.0_l10n_mx_isinstance_ids_dev_carlos
2. Dependent merge proposals