[MERGE] trunk-restaurant-wip-fva

Merge branch lp:~openerp-usertesting/openobject-addons/trunk-restaurant-wip-fva