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

1. 7.0-oml-account_move_line_base_tax_calculated_dev_luis
2. Dependent merge proposals