[MERGE] Bzr branch lp:~openerp-usertesting/openobject-addons/trunk-restaurant-wip-fva
Pull request feedback by chs
merge upstream
[WIP] removing incomplete fidelity points feature for the v8.0 release
[MERGE] from master
Merge branch 'master' into master-pos-restaurant-cleanup-v8-fva
[FIX] point_of_sale: do not use local jquery replace inside widget
[FIX] point_of_sale: the webclient needs a html stub to instanciate itself
Merge branch 'master' into master-pos-restaurant-cleanup-v8-fva
[WIP] point_of_sale: trying to make the web client instanciation work
[FIX] point_of_sale: finally made the webclient instanciate the pos
[FIX] website_sale_options: enable tour test
[FIX] website_sale_options: tour and filter by attributes
[FIX] website: customize menu stay empty if it's open to quick. Don't throw an exception when the tour have an error: log error and close tour.
Merge branch 'master' into master-pos-restaurant-fva
[FIX] website: enable test for blog, event...
[FIX] website_sale: change picture in function of the product selected
[FIX] website: blog and event must be tested with admin login
[IMP] point_of_sale: load assets with templating sytem so that scripts are not minified in debug mode
[FIX] point_of_sale: typo in the template field blocked the point of sale launch