[MERGE] forward port branch 11.0 up to e1104ac

Author: KangOl

.gitignore

@@ -24,6 +24,11 @@ odoo/addons/base/maintenance
 install/win32/*.bat
 install/win32/meta.py
 
+# needed only when building for win32
+setup/win32/static/less/
+setup/win32/static/wkhtmltopdf/
+setup/win32/static/postgresql*.exe
+
 # various virtualenv
 /bin/
 /build/

.tx/config

@@ -182,6 +182,11 @@ file_filter = addons/calendar/i18n/<lang>.po
 source_file = addons/calendar/i18n/calendar.pot
 source_lang = en
 
+[odoo-11.calendar_sms]
+file_filter = addons/calendar_sms/i18n/<lang>.po
+source_file = addons/calendar_sms/i18n/calendar_sms.pot
+source_lang = en
+
 [odoo-11.contacts]
 file_filter = addons/contacts/i18n/<lang>.po
 source_file = addons/contacts/i18n/contacts.pot
@@ -347,6 +352,11 @@ file_filter = addons/hr_timesheet_attendance/i18n/<lang>.po
 source_file = addons/hr_timesheet_attendance/i18n/hr_timesheet_attendance.pot
 source_lang = en
 
+[odoo-11.iap]
+file_filter = addons/iap/i18n/<lang>.po
+source_file = addons/iap/i18n/iap.pot
+source_lang = en
+
 [odoo-11.im_livechat]
 file_filter = addons/im_livechat/i18n/<lang>.po
 source_file = addons/im_livechat/i18n/im_livechat.pot
@@ -662,6 +672,11 @@ file_filter = addons/sales_team/i18n/<lang>.po
 source_file = addons/sales_team/i18n/sales_team.pot
 source_lang = en
 
+[odoo-11.sms]
+file_filter = addons/sms/i18n/<lang>.po
+source_file = addons/sms/i18n/sms.pot
+source_lang = en
+
 [odoo-11.stock]
 file_filter = addons/stock/i18n/<lang>.po
 source_file = addons/stock/i18n/stock.pot

README.md

@@ -1,7 +1,7 @@
 [![Build Status](http://runbot.odoo.com/runbot/badge/flat/1/master.svg)](http://runbot.odoo.com/runbot)
-[![Tech Doc](http://img.shields.io/badge/master-docs-875A7B.svg?style=flat)](http://www.odoo.com/documentation/master)
-[![Help](http://img.shields.io/badge/master-help-875A7B.svg?style=flat)](https://www.odoo.com/forum/help-1)
-[![Nightly Builds](http://img.shields.io/badge/master-nightly-875A7B.svg?style=flat)](http://nightly.odoo.com/)
+[![Tech Doc](http://img.shields.io/badge/master-docs-875A7B.svg?style=flat&colorA=8F8F8F)](http://www.odoo.com/documentation/master)
+[![Help](http://img.shields.io/badge/master-help-875A7B.svg?style=flat&colorA=8F8F8F)](https://www.odoo.com/forum/help-1)
+[![Nightly Builds](http://img.shields.io/badge/master-nightly-875A7B.svg?style=flat&colorA=8F8F8F)](http://nightly.odoo.com/)
 
 Odoo
 ----