Merge proposals dependent on lp://staging/~vauxoo/openerp-mexico-localization/7.0_trunk_fecha_timbrado_cfdi_dev_jorge

1. 7.0_trunk_fecha_timbrado_cfdi_dev_jorge
2. Dependent merge proposals