diff options
| -rw-r--r-- | addons/account/wizard/account_invoice_refund.py | 3 | ||||
| -rw-r--r-- | addons/sale_stock/i18n/en.po | 24 | ||||
| -rw-r--r-- | addons/survey/survey.py | 4 | ||||
| -rw-r--r-- | addons/website_google_map/controllers/main.py | 7 |
4 files changed, 34 insertions, 4 deletions
diff --git a/addons/account/wizard/account_invoice_refund.py b/addons/account/wizard/account_invoice_refund.py index adfa6538c95..8f6cc34d06a 100644 --- a/addons/account/wizard/account_invoice_refund.py +++ b/addons/account/wizard/account_invoice_refund.py @@ -99,7 +99,8 @@ class AccountInvoiceRefund(models.TransientModel): 'tax_line_ids': tax_lines, 'date': date, 'name': description, - 'origin': inv.origin + 'origin': inv.origin, + 'fiscal_position': inv.fiscal_position.id, }) for field in ('partner_id', 'account_id', 'currency_id', 'payment_term_id', 'journal_id'): 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/survey/survey.py b/addons/survey/survey.py index 7802bf03d7a..5f5581261f0 100644 --- a/addons/survey/survey.py +++ b/addons/survey/survey.py @@ -1152,7 +1152,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: @@ -1184,7 +1184,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) |