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

1. 7.0_size_header_report_dev_luis
2. Dependent merge proposals