Merge proposals dependent on lp://qastaging/~vauxoo/openerp-mexico-localization/7.0-l10n_mx_invoice_discount-dependency-dev-ernesto

1. 7.0-l10n_mx_invoice_discount-dependency-dev-ernesto
2. Dependent merge proposals