[MERGE] trunk-restaurant-wip-fva

Merge branch lp:~openerp-usertesting/openobject-addons/trunk-restaurant-wip-fva
I'll bring the lambda back in the meantime. Can't seem to make ``fields.datetime.context_now`` work...