Christophe Simonis 9fe4cf5f72 [MERGE] forward port of branch saas-11 up to dda0d3d ...

# Conflicts:
#	addons/product_uos/i18n/lo.po
#	addons/sales_team/models/__init__.py
#	addons/website_payment/views/website_payment_templates.xml
#	addons/website_portal_sale/views/templates.xml
#	openerp/addons/base/ir/ir_qweb.py

2016-06-15 13:10:45 +02:00

..

__init__.py

…

test_converter.py

[FIX] ir.qweb: update tests

2016-06-14 13:12:15 +02:00

test_ui.py

[FIX] web_editor: run rte tests in post_install

2016-06-13 15:32:44 +02:00