Merge proposals dependent on lp://qastaging/~vauxoo/openerp-mexico-localization/7.0-fix-singned-identation-dev-luis

1. 7.0-fix-singned-identation-dev-luis
2. Dependent merge proposals