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

1. sale_payment_method_dev_luis
2. Dependent merge proposals