Merge proposals dependent on lp://qastaging/~jb.eficent/openerp-spain/6.0-bugfix-1061196

lp://qastaging/~jb.eficent/openerp-spain/6.0-bugfix-1061196 has no merge proposals.