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

..

data

[IMP] hr_equipment: grammar/spellcheck

2015-09-11 03:03:43 +02:00

i18n

[MERGE] forward port of branch 9.0 up to bfbe2d6

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

models

[IMP] Inventory loss -> inventory adjustment

2016-04-02 12:59:23 -07:00

security

[IMP] hr_equipment: grammar/spellcheck

2015-09-11 03:03:43 +02:00

static/description

[IMP] Speed up app switcher loading: 645k --> 137k lossless compression for all icons

2016-02-26 11:39:38 +01:00

tests

[FIX] hr_equipment test: equipment only visible to assigned employee and managers

2015-09-11 03:00:40 +02:00

views

[ADD] Add (Un)archive button on form view of following model

2016-03-10 13:06:03 +01:00

__init__.py

[LEGAL] Use global LICENSE/COPYRIGHT files, remove boilerplate text

2015-06-02 03:16:04 +02:00

__openerp__.py

[IMP] Remove 'author' and 'website' on odoo modules' manisfest

2016-01-26 14:09:47 +01:00