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
..
2016-03-16 10:27:19 +01:00
2016-06-14 19:27:16 +02:00
2016-05-26 14:06:36 +02:00
2016-03-21 14:02:10 +01:00
2016-03-21 14:02:10 +01:00
2016-03-21 14:02:10 +01:00