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

1. 7.0-oml_bug_tracking_id_dev_luis
2. Dependent merge proposals