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

7 files changed, 65 insertions, 57 deletions

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 9d9f90a89df..18a9d55e601 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -4,6 +4,7 @@ import base64
 import csv
 import functools
 import glob
+import imghdr
 import itertools
 import jinja2
 import logging
@@ -1067,7 +1068,8 @@ class Binary(http.Controller):
         '/logo.png',
     ], type='http', auth="none", cors="*")
     def company_logo(self, dbname=None, **kw):
-        imgname = 'logo.png'
+        imgname = 'logo'
+        imgext = '.png'
         placeholder = functools.partial(get_resource_path, 'web', 'static', 'src', 'img')
         uid = None
         if request.session.db:
@@ -1080,7 +1082,7 @@ class Binary(http.Controller):
             uid = openerp.SUPERUSER_ID
 
         if not dbname:
-            response = http.send_file(placeholder(imgname))
+            response = http.send_file(placeholder(imgname + imgext))
         else:
             try:
                 # create an empty registry
@@ -1094,12 +1096,14 @@ class Binary(http.Controller):
                                """, (uid,))
                     row = cr.fetchone()
                     if row and row[0]:
-                        image_data = StringIO(str(row[0]).decode('base64'))
-                        response = http.send_file(image_data, filename=imgname, mtime=row[1])
+                        image_base64 = str(row[0]).decode('base64')
+                        image_data = StringIO(image_base64)
+                        imgext = '.' + (imghdr.what(None, h=image_base64) or 'png')
+                        response = http.send_file(image_data, filename=imgname + imgext, mtime=row[1])
                     else:
                         response = http.send_file(placeholder('nologo.png'))
             except Exception:
-                response = http.send_file(placeholder(imgname))
+                response = http.send_file(placeholder(imgname + imgext))
 
         return response
 
diff --git a/addons/web/i18n/ar.po b/addons/web/i18n/ar.po
index ddf45501aaf..e348c5d88aa 100644
--- a/addons/web/i18n/ar.po
+++ b/addons/web/i18n/ar.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-01-18 04:43+0000\n"
-"PO-Revision-Date: 2016-03-08 22:36+0000\n"
+"PO-Revision-Date: 2016-05-18 18:20+0000\n"
 "Last-Translator: Martin Trigaux\n"
 "Language-Team: Arabic (http://www.transifex.com/odoo/odoo-9/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -2015,7 +2015,7 @@ msgstr "مشاركة مع كافة المستخدمين"
 #: code:addons/web/static/src/js/apps.js:189
 #, python-format
 msgid "Showing locally available modules"
-msgstr ""
+msgstr "Showing locally available modules"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/ca.po b/addons/web/i18n/ca.po
index 479c2f1824a..0f59e363d38 100644
--- a/addons/web/i18n/ca.po
+++ b/addons/web/i18n/ca.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-01-18 04:43+0000\n"
-"PO-Revision-Date: 2016-02-12 21:46+0000\n"
+"PO-Revision-Date: 2016-05-20 07:27+0000\n"
 "Last-Translator: Martin Trigaux\n"
 "Language-Team: Catalan (http://www.transifex.com/odoo/odoo-9/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -246,7 +246,7 @@ msgstr ""
 #: code:addons/web/static/src/js/framework/crash_manager.js:25
 #, python-format
 msgid "Access Denied"
-msgstr ""
+msgstr "Accés Denegat"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/fi.po b/addons/web/i18n/fi.po
index 7ecc8532dfa..d4b0ca63311 100644
--- a/addons/web/i18n/fi.po
+++ b/addons/web/i18n/fi.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-01-18 04:43+0000\n"
-"PO-Revision-Date: 2016-03-24 17:17+0000\n"
+"PO-Revision-Date: 2016-05-20 14:22+0000\n"
 "Last-Translator: Tuomo Aura <tuomo.aura@web-veistamo.fi>\n"
 "Language-Team: Finnish (http://www.transifex.com/odoo/odoo-9/language/fi/)\n"
 "MIME-Version: 1.0\n"
@@ -290,7 +290,7 @@ msgstr "Toiminnon ID:"
 #: code:addons/web/static/src/js/views/form_widgets.js:660
 #, python-format
 msgid "Activate"
-msgstr ""
+msgstr "Aktivoi"
 
 #. module: web
 #. openerp-web
@@ -320,7 +320,7 @@ msgstr "Lisää"
 #: code:addons/web/static/src/xml/base.xml:1216
 #, python-format
 msgid "Add Custom Filter"
-msgstr ""
+msgstr "Lisää oma suodatin"
 
 #. module: web
 #. openerp-web
@@ -341,7 +341,7 @@ msgstr "Lisää kohta"
 #: code:addons/web/static/src/xml/base.xml:1227
 #, python-format
 msgid "Add custom group"
-msgstr ""
+msgstr "Lisää oma ryhmittely"
 
 #. module: web
 #. openerp-web
@@ -369,7 +369,7 @@ msgstr "Tarkempi haku..."
 #: code:addons/web/static/src/js/framework/dialog.js:162
 #, python-format
 msgid "Alert"
-msgstr ""
+msgstr "Varoitus"
 
 #. module: web
 #. openerp-web
@@ -383,7 +383,7 @@ msgstr "Kaikki käyttäjät"
 #: code:addons/web/static/src/xml/base.xml:1508
 #, python-format
 msgid "And more"
-msgstr ""
+msgstr "Ja lisää"
 
 #. module: web
 #. openerp-web
@@ -413,7 +413,7 @@ msgstr "Arkistoitu"
 #: code:addons/web/static/src/js/views/search_menus.js:243
 #, python-format
 msgid "Are you sure that you want to remove this filter?"
-msgstr ""
+msgstr "Haluatko varmasti poistaa tämän suodattimen?"
 
 #. module: web
 #. openerp-web
@@ -434,7 +434,7 @@ msgstr "Mahdolliset kentät"
 #: code:addons/web/static/src/xml/base.xml:616
 #, python-format
 msgid "Bar Chart"
-msgstr ""
+msgstr "Pylväsdiagrammi"
 
 #. module: web
 #. openerp-web
@@ -561,7 +561,7 @@ msgstr "Ehto:"
 #: code:addons/web/static/src/xml/base.xml:53
 #, python-format
 msgid "Confirm New Password:"
-msgstr ""
+msgstr "Vahvista uusi salasana:"
 
 #. module: web
 #. openerp-web
@@ -582,7 +582,7 @@ msgstr "Konteksti:"
 #: code:addons/web/static/src/xml/base.xml:116
 #, python-format
 msgid "Copyright © 2004-2015 Odoo S.A."
-msgstr ""
+msgstr "Copyright © 2004-2015 Odoo S.A."
 
 #. module: web
 #. openerp-web
@@ -642,7 +642,7 @@ msgstr "Luo ja muokkaa..."
 #: code:addons/web/static/src/js/views/form_relational_widgets.js:40
 #, python-format
 msgid "Create and edit"
-msgstr ""
+msgstr "Luo ja muokkaa"
 
 #. module: web
 #. openerp-web
@@ -691,7 +691,7 @@ msgstr "Tietokanta"
 #: code:addons/web/static/src/xml/base.xml:110
 #, python-format
 msgid "Database expiration:"
-msgstr ""
+msgstr "Tietokanta vanhenee:"
 
 #. module: web
 #. openerp-web
@@ -705,7 +705,7 @@ msgstr "päivä"
 #: code:addons/web/static/src/js/views/form_widgets.js:658
 #, python-format
 msgid "Deactivate"
-msgstr ""
+msgstr "Passivoi"
 
 #. module: web
 #. openerp-web
@@ -772,7 +772,7 @@ msgstr "Oletko varma että haluat poistaa nämä tietueet?"
 #: code:addons/web/static/src/xml/base.xml:82
 #, python-format
 msgid "Documentation"
-msgstr ""
+msgstr "Dokumentaatio"
 
 #. module: web
 #. openerp-web
@@ -808,7 +808,7 @@ msgstr "Lataa \"%s\""
 #: code:addons/web/static/src/js/views/pivot_view.js:123
 #, python-format
 msgid "Download xls"
-msgstr ""
+msgstr "Lataa xls-tiedosto"
 
 #. module: web
 #. openerp-web
@@ -893,7 +893,7 @@ msgstr "Evaluointivirhe"
 #: code:addons/web/static/src/xml/base.xml:599
 #, python-format
 msgid "Expand all"
-msgstr ""
+msgstr "Laajenna kaikki"
 
 #. module: web
 #. openerp-web
@@ -950,7 +950,7 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:1197
 #, python-format
 msgid "Favorites"
-msgstr ""
+msgstr "Suosikit"
 
 #. module: web
 #. openerp-web
@@ -1007,7 +1007,7 @@ msgstr "Suodin"
 #: code:addons/web/static/src/js/views/search_menus.js:83
 #, python-format
 msgid "Filter name is required."
-msgstr ""
+msgstr "Suodattimen nimi on pakollinen."
 
 #. module: web
 #. openerp-web
@@ -1021,7 +1021,7 @@ msgstr "Suodatin: %s"
 #: code:addons/web/static/src/js/views/search_menus.js:90
 #, python-format
 msgid "Filter with same name already exists."
-msgstr ""
+msgstr "Samanniminen suodatin on jo olemassa."
 
 #. module: web
 #. openerp-web
@@ -1035,7 +1035,7 @@ msgstr "Suotimet"
 #: code:addons/web/static/src/xml/base.xml:649
 #, python-format
 msgid "Flip axis"
-msgstr ""
+msgstr "Vaihda akseleita"
 
 #. module: web
 #. openerp-web
@@ -1057,7 +1057,7 @@ msgstr "Lomake"
 #: code:addons/web/static/src/xml/base.xml:118
 #, python-format
 msgid "GNU Lesser General Public License"
-msgstr ""
+msgstr "GNU Lesser General Public -lisenssi"
 
 #. module: web
 #. openerp-web
@@ -1178,7 +1178,7 @@ msgstr "Viimeisin muutos:"
 #: code:addons/web/static/src/xml/base.xml:223
 #, python-format
 msgid "Leave Debug Mode"
-msgstr ""
+msgstr "Poistu kehittäjätilasta"
 
 #. module: web
 #. openerp-web
@@ -1368,14 +1368,14 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:1303
 #, python-format
 msgid "Move Down"
-msgstr ""
+msgstr "Siirrä alas"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:1302
 #, python-format
 msgid "Move Up"
-msgstr ""
+msgstr "Siirrä ylös"
 
 #. module: web
 #. openerp-web
@@ -1424,7 +1424,7 @@ msgstr "Uusi"
 #: code:addons/web/static/src/xml/base.xml:48
 #, python-format
 msgid "New Password:"
-msgstr ""
+msgstr "Uusi salasana:"
 
 #. module: web
 #. openerp-web
@@ -1477,7 +1477,7 @@ msgstr "Ei dataa tarjolla."
 #: code:addons/web/static/src/js/views/graph_widget.js:88
 #, python-format
 msgid "No data to display"
-msgstr ""
+msgstr "Ei näytettävää dataa"
 
 #. module: web
 #. openerp-web
@@ -1491,14 +1491,14 @@ msgstr "Ei näytettävää dataa."
 #: code:addons/web/static/src/js/views/form_common.js:243
 #, python-format
 msgid "No results to show..."
-msgstr ""
+msgstr "Ei näytettäviä tietoja..."
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/views/form_widgets.js:456
 #, python-format
 msgid "No selected record"
-msgstr ""
+msgstr "Ei valittuja tietueita"
 
 #. module: web
 #. openerp-web
@@ -1540,7 +1540,7 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:838
 #, python-format
 msgid "Not shown in kanban"
-msgstr ""
+msgstr "Ei näytetä kanban-näkymässä"
 
 #. module: web
 #. openerp-web
@@ -1562,7 +1562,7 @@ msgstr "Odoo"
 #: code:addons/web/static/src/xml/base.xml:101
 #, python-format
 msgid "Odoo (Formerly OpenERP)"
-msgstr ""
+msgstr "Odoo (entinen OpenERP)"
 
 #. module: web
 #. openerp-web
@@ -1576,14 +1576,14 @@ msgstr "Odoo sovellukset ovat pian saatavilla"
 #: code:addons/web/static/src/js/views/form_widgets.js:1675
 #, python-format
 msgid "Odoo Enterprise"
-msgstr ""
+msgstr "Odoo Enterprise"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:117
 #, python-format
 msgid "Odoo S.A."
-msgstr ""
+msgstr "Odoo S.A."
 
 #. module: web
 #: model:ir.ui.view,arch_db:web.qunit_suite
@@ -1602,7 +1602,7 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:119
 #, python-format
 msgid "Odoo.com"
-msgstr ""
+msgstr "Odoo.com"
 
 #. module: web
 #. openerp-web
@@ -1626,7 +1626,7 @@ msgstr "OK"
 #: code:addons/web/static/src/xml/base.xml:43
 #, python-format
 msgid "Old Password:"
-msgstr ""
+msgstr "Vanha salasana:"
 
 #. module: web
 #. openerp-web
@@ -1661,7 +1661,7 @@ msgstr "Vain sinä"
 #: code:addons/web/static/src/xml/base.xml:198
 #, python-format
 msgid "Open Debug Menu"
-msgstr ""
+msgstr "Avaa kehittäjävalikko"
 
 #. module: web
 #. openerp-web
@@ -1874,7 +1874,7 @@ msgstr "Tallenna nimellä:"
 #: code:addons/web/static/src/xml/base.xml:1245
 #, python-format
 msgid "Save current search"
-msgstr ""
+msgstr "Tallenna kyseinen haku"
 
 #. module: web
 #. openerp-web
@@ -1973,7 +1973,7 @@ msgstr ""
 #: code:addons/web/static/src/js/views/form_widgets.js:468
 #, python-format
 msgid "Selected records"
-msgstr ""
+msgstr "Valitut tietueet"
 
 #. module: web
 #. openerp-web
@@ -2028,7 +2028,7 @@ msgstr "Koko:"
 #: code:addons/web/controllers/main.py:1067
 #, python-format
 msgid "Something horrible happened"
-msgstr ""
+msgstr "Jotain kamalaa tapahtui"
 
 #. module: web
 #. openerp-web
@@ -2056,7 +2056,7 @@ msgstr "Ladataan edelleen...<br />Ole hyvä ja odota."
 #: code:addons/web/static/src/xml/base.xml:83
 #, python-format
 msgid "Support"
-msgstr ""
+msgstr "Tuki"
 
 #. module: web
 #. openerp-web
@@ -2234,7 +2234,7 @@ msgstr "Puu"
 #: code:addons/web/static/src/js/framework/crash_manager.js:48
 #, python-format
 msgid "Trying to reconnect... "
-msgstr ""
+msgstr "Yritetään yhdistää uudelleen..."
 
 #. module: web
 #. openerp-web
@@ -2329,7 +2329,7 @@ msgstr "Ei tuettu operaattori  %s toimialueella %s"
 #: code:addons/web/static/src/js/views/form_widgets.js:1658
 #, python-format
 msgid "Upgrade now"
-msgstr ""
+msgstr "Päivitä nyt"
 
 #. module: web
 #. openerp-web
@@ -2366,7 +2366,7 @@ msgstr "Siirtää..."
 #: code:addons/web/static/src/xml/base.xml:1204
 #, python-format
 msgid "Use by default"
-msgstr "Käytä normaalisti"
+msgstr "Käytä oletuksena"
 
 #. module: web
 #. openerp-web
@@ -2380,7 +2380,7 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:105
 #, python-format
 msgid "Version"
-msgstr ""
+msgstr "Versio"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/mk.po b/addons/web/i18n/mk.po
index f3ea4deffa6..4c5b1ff1dc2 100644
--- a/addons/web/i18n/mk.po
+++ b/addons/web/i18n/mk.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-01-18 04:43+0000\n"
-"PO-Revision-Date: 2016-05-12 15:16+0000\n"
+"PO-Revision-Date: 2016-05-19 11:48+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"
@@ -319,7 +319,7 @@ msgstr "Додади"
 #: code:addons/web/static/src/xml/base.xml:1216
 #, python-format
 msgid "Add Custom Filter"
-msgstr ""
+msgstr "Додади рачен филтер"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/static/src/js/views/graph_widget.js b/addons/web/static/src/js/views/graph_widget.js
index a86ea35e449..e458cc483ed 100644
--- a/addons/web/static/src/js/views/graph_widget.js
+++ b/addons/web/static/src/js/views/graph_widget.js
@@ -162,7 +162,9 @@ return Widget.extend({
         svg.transition().duration(0);
 
         var chart = nv.models.multiBarChart();
+        var maxVal = _.max(values, function(v) {return v.y})
         chart.options({
+          margin: {left: 12 * String(maxVal && maxVal.y || 0).length},
           delay: 250,
           transition: 10,
           showLegend: _.size(data) <= MAX_LEGEND_LENGTH,
@@ -292,8 +294,9 @@ return Widget.extend({
         svg.transition().duration(0);
 
         var chart = nv.models.lineChart();
+        var maxVal = _.max(values, function(v) {return v.y})
         chart.options({
-          margin: {left: 50, right: 50},
+          margin: {left: 12 * String(maxVal && maxVal.y || 0).length, right: 50},
           useInteractiveGuideline: true,
           showLegend: _.size(data) <= MAX_LEGEND_LENGTH,
           showXAxis: true,
@@ -301,6 +304,7 @@ return Widget.extend({
         });
         chart.xAxis.tickValues(tickValues)
             .tickFormat(tickFormat);
+        chart.yAxis.tickFormat(function(d) { return openerp.web.format_value(d, { type : 'float' });});
 
         chart(svg);
         this.to_remove = chart.update;
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index c3670c9aa56..726c30e43fa 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1060,7 +1060,7 @@
                         <t t-raw="file.name || file.filename"/>
                     </span>
                     <t t-if="(!file.upload or file.percent_loaded&gt;=100)">
-                        <a class="o_image" t-att-href="file.url" t-attf-title="#{(file.name || file.filename) + (file.date?' \n('+file.date+')':'' )}" t-att-data-mimetype="file.mimetype" t-attf-data-src="/web/image/#{file.id}/100x80">
+                        <a class="o_image" target="_blank" t-att-href="file.url" t-attf-title="#{(file.name || file.filename) + (file.date?' \n('+file.date+')':'' )}" t-att-data-mimetype="file.mimetype" t-attf-data-src="/web/image/#{file.id}/100x80">
                             <t t-raw="file.name || file.filename"/>
                         </a>
                         <span class="fa fa-stack oe_delete" title="Delete this file" t-attf-data-id="#{file.id}">
@@ -1075,7 +1075,7 @@
             <t t-foreach="widget.get('value')" t-as="id">
                 <t t-set="file" t-value="widget.data[id]"/>
                 <div>
-                    <a t-att-href="file.url" t-attf-title="#{(file.name || file.filename) + (file.date?' \n('+file.date+')':'' )}">
+                    <a target="_blank" t-att-href="file.url" t-attf-title="#{(file.name || file.filename) + (file.date?' \n('+file.date+')':'' )}">
                         <t t-raw="file.name || file.filename"/>
                     </a>
                 </div>