[MERGE] forward port branch 8.0 up to 9fe930e

5 files changed, 36 insertions, 6 deletions

diff --git a/addons/sale_stock/i18n/en.po b/addons/sale_stock/i18n/en.po
new file mode 100644
index 00000000000..0f50fbd8fe9
--- /dev/null
+++ b/addons/sale_stock/i18n/en.po
@@ -0,0 +1,24 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* sale_stock
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 8.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-01-21 14:08+0000\n"
+"PO-Revision-Date: 2015-01-21 14:08+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:343
+#, python-format
+msgid "You plan to sell %.2f %s but you only have %.2f %s available !\n"
+"The real stock is %.2f %s. (without reservations)"
+msgstr "You plan to sell %s %s but you only have %s %s available !\n"
+"The real stock is %s %s. (without reservations)"
diff --git a/addons/sale_stock/i18n/sale_stock.pot b/addons/sale_stock/i18n/sale_stock.pot
index db2bf052fb0..34ca26249f4 100644
--- a/addons/sale_stock/i18n/sale_stock.pot
+++ b/addons/sale_stock/i18n/sale_stock.pot
@@ -349,7 +349,7 @@ msgstr ""
 #. module: sale_stock
 #: code:addons/sale_stock/sale_stock.py:270
 #, python-format
-msgid "You selected a quantity of %d Units.\n"
+msgid "You selected a quantity of %s %s.\n"
 "But it's not compatible with the selected packaging.\n"
 "Here is a proposition of quantities according to the packaging:\n"
 "EAN: %s Quantity: %s Type of ul: %s"
diff --git a/addons/sale_stock/sale_stock.py b/addons/sale_stock/sale_stock.py
index b3be62c74af..51e17c4f832 100644
--- a/addons/sale_stock/sale_stock.py
+++ b/addons/sale_stock/sale_stock.py
@@ -268,11 +268,12 @@ class sale_order_line(osv.osv):
                 qty_pack = pack.qty
                 type_ul = pack.ul
                 if not warning_msgs:
-                    warn_msg = _("You selected a quantity of %d Units.\n"
+                    uom_obj = product_uom_obj.browse(cr, uid, uom, context=context)
+                    warn_msg = _("You selected a quantity of %s %s.\n"
                                 "But it's not compatible with the selected packaging.\n"
                                 "Here is a proposition of quantities according to the packaging:\n"
                                 "Barcode: %s Quantity: %s Type of ul: %s") % \
-                                    (qty, barcode, qty_pack, type_ul.name)
+                                    (qty, uom_obj.name, barcode, qty_pack, type_ul.name)
                     warning_msgs += _("Picking Information ! : ") + warn_msg + "\n\n"
                 warning = {
                        'title': _('Configuration Error!'),
diff --git a/addons/survey/survey.py b/addons/survey/survey.py
index b5b384fc182..29467f0b031 100644
--- a/addons/survey/survey.py
+++ b/addons/survey/survey.py
@@ -1171,7 +1171,7 @@ class survey_user_input_line(osv.Model):
         if old_uil:
             self.unlink(cr, SUPERUSER_ID, old_uil, context=context)
 
-        ca = dict_keys_startswith(post, answer_tag)
+        ca = dict_keys_startswith(post, answer_tag+"_")
         comment_answer = ca.pop(("%s_%s" % (answer_tag, 'comment')), '').strip()
         if len(ca) > 0:
             for a in ca:
@@ -1203,7 +1203,7 @@ class survey_user_input_line(osv.Model):
             self.unlink(cr, SUPERUSER_ID, old_uil, context=context)
 
         no_answers = True
-        ca = dict_keys_startswith(post, answer_tag)
+        ca = dict_keys_startswith(post, answer_tag+"_")
 
         comment_answer = ca.pop(("%s_%s" % (answer_tag, 'comment')), '').strip()
         if comment_answer:
diff --git a/addons/website_google_map/controllers/main.py b/addons/website_google_map/controllers/main.py
index 870cda8a435..991d9f87e6c 100644
--- a/addons/website_google_map/controllers/main.py
+++ b/addons/website_google_map/controllers/main.py
@@ -58,9 +58,14 @@ class google_map(http.Controller):
                 'longitude': escape(str(partner.partner_longitude)),
                 })
 
+        if 'customers' in post.get('partner_url', ''):
+            partner_url = '/customers/'
+        else:
+            partner_url = '/partners/'
+
         # generate the map
         values = {
-            'partner_url': post.get('partner_url'),
+            'partner_url': partner_url,
             'partner_data': json.dumps(partner_data)
         }
         return request.website.render("website_google_map.google_map", values)