Merge proposals dependent on lp://staging/~txerpa-openerp/openerp-spain/7.0-l10n_es_account_asset_extensions

1. 7.0-l10n_es_account_asset_extensions
2. Dependent merge proposals