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

1. 7.0-oml_settings_facturae_dev_jorge
2. Dependent merge proposals