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

..

i18n

[MERGE] forward port of branch 9.0 up to bfbe2d6

2016-06-14 19:27:16 +02:00

models

[IMP] base,sales_team: Move res_groups and menuitems to sales_team

2016-06-09 16:05:25 +02:00

views

[IMP] base,sales_team: Move res_groups and menuitems to sales_team

2016-06-09 16:05:25 +02:00

__init__.py

[MOV] base_setup: reorganize module directory and files

2016-04-27 16:21:42 +02:00

__openerp__.py

[REM] base_setup : remove unused terminology wizard

2016-04-27 16:21:42 +02:00