Merge proposals dependent on lp://qastaging/~txerpa-openerp/openerp-spain/7.0-l10n_es_aeat_modelo303

1. 7.0-l10n_es_aeat_modelo303
2. Dependent merge proposals