Merge proposals dependent on lp://staging/~isaako34/openerp-mexico-localization/addons-mx-6.0-invoice_discount-dev-yzk

1. addons-mx-6.0-invoice_discount-dev-yzk
2. Dependent merge proposals