[MERGE] trunk-restaurant-wip-fva

Merge branch lp:~openerp-usertesting/openobject-addons/trunk-restaurant-wip-fva
no `partner_id` field?

or maybe un model `pos.fidelity.config` with `fidpoints_*` fields.
Then this model is just has just the fields `partner_id`, `fidpoint_config_id` and `name` (card number)