[MERGE] forward port of branch saas-9 up to 1d81bb0

# Conflicts:
#	addons/account_extra_reports/i18n/ca.po
#	addons/account_extra_reports/i18n/fi.po
#	addons/account_extra_reports/i18n/pl.po
#	addons/account_extra_reports/i18n/te.po
#	addons/account_extra_reports/i18n/zh_CN.po
#	addons/account_full_reconcile/i18n/hu.po
#	addons/account_full_reconcile/i18n/pl.po
#	addons/crm/crm_lead_menu.xml
#	addons/crm_claim/i18n/es_PE.po
#	addons/crm_claim/i18n/hu.po
#	addons/crm_claim/i18n/ja.po
#	addons/crm_claim/i18n/pl.po
#	addons/delivery/views/delivery_view.xml
#	addons/product/product_view.xml
#	addons/project_timesheet/i18n/es_PE.po
#	addons/stock/stock_view.xml

4 files changed, 10 insertions, 9 deletions

diff --git a/addons/link_tracker/i18n/hu.po b/addons/link_tracker/i18n/hu.po
index 0598b54ad7e..5fa9ce4cc19 100644
--- a/addons/link_tracker/i18n/hu.po
+++ b/addons/link_tracker/i18n/hu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-09-07 14:40+0000\n"
-"PO-Revision-Date: 2016-04-12 10:04+0000\n"
+"PO-Revision-Date: 2016-06-06 19:55+0000\n"
 "Last-Translator: krnkris\n"
 "Language-Team: Hungarian (http://www.transifex.com/odoo/odoo-9/language/hu/)\n"
 "MIME-Version: 1.0\n"
@@ -117,7 +117,7 @@ msgstr "Utoljára frissítve, által"
 #: model:ir.model.fields,field_description:link_tracker.field_link_tracker_code_write_date
 #: model:ir.model.fields,field_description:link_tracker.field_link_tracker_write_date
 msgid "Last Updated on"
-msgstr "Utoljára frissítve ekkor"
+msgstr "Utoljára frissítve "
 
 #. module: link_tracker
 #: model:ir.model.fields,field_description:link_tracker.field_link_tracker_click_link_id
diff --git a/addons/link_tracker/i18n/mk.po b/addons/link_tracker/i18n/mk.po
index 6b0794a8852..d457a549c63 100644
--- a/addons/link_tracker/i18n/mk.po
+++ b/addons/link_tracker/i18n/mk.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-09-07 14:40+0000\n"
-"PO-Revision-Date: 2016-05-26 13:23+0000\n"
+"PO-Revision-Date: 2016-06-08 13:21+0000\n"
 "Last-Translator: Aleksandar Vangelovski <aleksandarv@hbee.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/odoo/odoo-9/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -138,7 +138,7 @@ msgstr "Средно"
 #. module: link_tracker
 #: model:ir.model.fields,field_description:link_tracker.field_link_tracker_count
 msgid "Number of Clicks"
-msgstr ""
+msgstr "Број на кликања"
 
 #. module: link_tracker
 #: model:ir.model.fields,field_description:link_tracker.field_link_tracker_title
diff --git a/addons/link_tracker/i18n/pl.po b/addons/link_tracker/i18n/pl.po
index fa324268a0c..2c7f9d395aa 100644
--- a/addons/link_tracker/i18n/pl.po
+++ b/addons/link_tracker/i18n/pl.po
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-09-07 14:40+0000\n"
-"PO-Revision-Date: 2016-06-02 13:38+0000\n"
+"PO-Revision-Date: 2016-06-08 12:11+0000\n"
 "Last-Translator: Piotr Szlązak <szlazakpiotr@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/odoo/odoo-9/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -97,7 +97,7 @@ msgstr "ID"
 #. module: link_tracker
 #: model:ir.model.fields,field_description:link_tracker.field_link_tracker_click_ip
 msgid "Internet Protocol"
-msgstr ""
+msgstr "Protokół internetowy"
 
 #. module: link_tracker
 #: model:ir.model.fields,field_description:link_tracker.field_link_tracker___last_update
@@ -140,7 +140,7 @@ msgstr "Średni"
 #. module: link_tracker
 #: model:ir.model.fields,field_description:link_tracker.field_link_tracker_count
 msgid "Number of Clicks"
-msgstr ""
+msgstr "Liczba kliknięć"
 
 #. module: link_tracker
 #: model:ir.model.fields,field_description:link_tracker.field_link_tracker_title
diff --git a/addons/link_tracker/models/link_tracker.py b/addons/link_tracker/models/link_tracker.py
index f387a7e6e7f..4de629fc517 100644
--- a/addons/link_tracker/models/link_tracker.py
+++ b/addons/link_tracker/models/link_tracker.py
@@ -4,13 +4,14 @@ import random
 import re
 import string
 
-from lxml.html import parse
+from lxml import html
 from urllib2 import urlopen
 from urlparse import urljoin
 from urlparse import urlparse
 from werkzeug import url_encode
 
 from openerp import models, fields, api, _
+from openerp.tools import ustr
 
 URL_REGEX = r'(\bhref=[\'"](?!mailto:)([^\'"]+)[\'"])'
 
@@ -108,7 +109,7 @@ class link_tracker(models.Model):
     def _get_title_from_url(self, url):
         try:
             page = urlopen(url, timeout=5)
-            p = parse(page)
+            p = html.fromstring(ustr(page.read()).encode('utf-8'), parser=html.HTMLParser(encoding='utf-8'))
             title = p.find('.//title').text
         except:
             title = url