Christophe Simonis dda0d3d62d [MERGE] forward port of branch saas-10 up to baf494c ...

# Conflicts:
#	addons/hr_timesheet/project_timesheet.py
#	addons/sale_layout/i18n/es_PE.po
#	addons/sale_layout/i18n/hu.po
#	addons/sale_layout/i18n/lo.po
#	addons/sale_layout/i18n/pl.po
#	addons/sale_service/i18n/es_MX.po
#	addons/sale_service/i18n/es_PE.po
#	addons/sale_service/i18n/lo.po
#	addons/stock/stock.py
#	addons/stock/stock_view.xml
#	addons/warning/i18n/es_PE.po
#	addons/warning/i18n/lo.po
#	addons/warning/i18n/ru.po
#	addons/web/i18n/cs.po
#	addons/web/i18n/ja.po
#	addons/web/i18n/lo.po
#	addons/web/i18n/th.po

2016-06-15 12:59:39 +02:00

..

i18n

[MERGE] forward port of branch 8.0 up to baa4cc0

2016-06-14 18:53:27 +02:00

security

…

static

[MERGE] forward port of branch saas-10 up to baf494c

2016-06-15 12:59:39 +02:00

tests

[REF] base_import: simplify import by reducing choice for the columns based on heuristic

2016-04-07 09:42:23 +02:00

views

[IMP] base_import: ControlPanelMixin and new design compatibility

2015-07-29 08:41:03 +02:00

__init__.py

…

__openerp__.py

[REF] base_import: simplify import by reducing choice for the columns based on heuristic

2016-04-07 09:42:23 +02:00

controllers.py

[FIX] base_import: avoid JS error in callback

2016-04-01 20:44:10 +02:00

models.py

[FIX] base_import: currency symbol can be placed at the right of the value

2016-05-25 13:53:33 +02:00

odf_ods_reader.py

[ADD] base_import: support for XLS and ODS files

2015-08-26 16:50:09 +02:00

test_models.py

…