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

1. 6.1_facturae_cbb_dev_carlos
2. Dependent merge proposals