Merge proposals dependent on lp://qastaging/~pedro.baeza/openerp-spain/6.1-l10n_es_cash_basis

1. 6.1-l10n_es_cash_basis
2. Dependent merge proposals