[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

5 files changed, 19 insertions, 18 deletions

diff --git a/addons/website_payment/controllers/main.py b/addons/website_payment/controllers/main.py
index c351e939578..800860a783b 100644
--- a/addons/website_payment/controllers/main.py
+++ b/addons/website_payment/controllers/main.py
@@ -35,8 +35,8 @@ class website_payment(http.Controller):
 
         # Try default one then fallback on first
         acquirer_id = acquirer_id and int(acquirer_id) or \
-            env['ir.values'].get_default('payment.acquirer', 'acquirer_id') or \
-            env['payment.acquirer'].search([('website_published', '=', True)])[0].id
+            env['ir.values'].get_default('payment.transaction', 'acquirer_id', company_id=user.company_id.id) or \
+            env['payment.acquirer'].search([('website_published', '=', True), ('company_id', '=', user.company_id.id)])[0].id
 
         acquirer = env['payment.acquirer'].with_context(submit_class='btn btn-primary pull-right',
                                                         submit_txt=_('Pay Now')).browse(acquirer_id)
@@ -50,7 +50,7 @@ class website_payment(http.Controller):
             'reference': reference,
             'acquirer': acquirer,
             'currency': currency,
-            'amount': amount,
+            'amount': float(amount),
             'payment_form': payment_form,
         }
         return request.website.render('website_payment.pay', values)
diff --git a/addons/website_payment/i18n/de.po b/addons/website_payment/i18n/de.po
index a8b9dfcc1ec..c00e2941e69 100644
--- a/addons/website_payment/i18n/de.po
+++ b/addons/website_payment/i18n/de.po
@@ -3,14 +3,15 @@
 # * website_payment
 # 
 # Translators:
+# Thorsten Vocks <thorsten.vocks@openbig.org>, 2016
 # Wolfgang Taferner, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-09-07 14:41+0000\n"
-"PO-Revision-Date: 2016-03-13 11:12+0000\n"
-"Last-Translator: Wolfgang Taferner\n"
+"PO-Revision-Date: 2016-06-09 17:40+0000\n"
+"Last-Translator: Thorsten Vocks <thorsten.vocks@openbig.org>\n"
 "Language-Team: German (http://www.transifex.com/odoo/odoo-9/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -47,7 +48,7 @@ msgstr "Konfiguriere Zahlungsanbieter"
 #. module: website_payment
 #: model:ir.model.fields,field_description:website_payment.field_account_config_settings_default_acquirer
 msgid "Default Acquirer"
-msgstr ""
+msgstr "Standard Zahlungsmittel"
 
 #. module: website_payment
 #: model:ir.model.fields,help:website_payment.field_account_config_settings_default_acquirer
diff --git a/addons/website_payment/i18n/es_PE.po b/addons/website_payment/i18n/es_PE.po
index f2fd827f2e5..17bb2c4bd1d 100644
--- a/addons/website_payment/i18n/es_PE.po
+++ b/addons/website_payment/i18n/es_PE.po
@@ -3,13 +3,14 @@
 # * website_payment
 # 
 # Translators:
+# Carlos Eduardo Rodriguez Rossi <crodriguez@samemotion.com>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-09-07 14:41+0000\n"
-"PO-Revision-Date: 2016-02-09 23:06+0000\n"
-"Last-Translator: Martin Trigaux\n"
+"PO-Revision-Date: 2016-06-10 22:23+0000\n"
+"Last-Translator: Carlos Eduardo Rodriguez Rossi <crodriguez@samemotion.com>\n"
 "Language-Team: Spanish (Peru) (http://www.transifex.com/odoo/odoo-9/language/es_PE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -58,12 +59,12 @@ msgstr ""
 #. module: website_payment
 #: model:ir.ui.view,arch_db:website_payment.pay_methods
 msgid "Delete <span class=\"fa fa-long-arrow-right\"/>"
-msgstr ""
+msgstr "Eliminar <span class=\"fa fa-long-arrow-right\"/>"
 
 #. module: website_payment
 #: model:ir.ui.view,arch_db:website_payment.pay_methods
 msgid "Delete a payment method:"
-msgstr ""
+msgstr "Eliminar un método de pago:"
 
 #. module: website_payment
 #: model:ir.ui.view,arch_db:website_payment.website_settings_payment
@@ -110,7 +111,7 @@ msgstr ""
 #. module: website_payment
 #: model:ir.ui.view,arch_db:website_payment.pay_methods
 msgid "Payment Methods"
-msgstr "Metodos de Pago"
+msgstr "Métodos de Pago"
 
 #. module: website_payment
 #: model:ir.ui.view,arch_db:website_payment.confirm
diff --git a/addons/website_payment/i18n/pl.po b/addons/website_payment/i18n/pl.po
index ad9941a073d..4eb4b6a4c3e 100644
--- a/addons/website_payment/i18n/pl.po
+++ b/addons/website_payment/i18n/pl.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:41+0000\n"
-"PO-Revision-Date: 2016-06-03 10:40+0000\n"
+"PO-Revision-Date: 2016-06-08 11:56+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"
@@ -59,12 +59,12 @@ msgstr ""
 #. module: website_payment
 #: model:ir.ui.view,arch_db:website_payment.pay_methods
 msgid "Delete <span class=\"fa fa-long-arrow-right\"/>"
-msgstr ""
+msgstr "Usuń <span class=\"fa fa-long-arrow-right\"/>"
 
 #. module: website_payment
 #: model:ir.ui.view,arch_db:website_payment.pay_methods
 msgid "Delete a payment method:"
-msgstr ""
+msgstr "Usuń metodę płatności:"
 
 #. module: website_payment
 #: model:ir.ui.view,arch_db:website_payment.website_settings_payment
@@ -116,7 +116,7 @@ msgstr "Metody płatności"
 #. module: website_payment
 #: model:ir.ui.view,arch_db:website_payment.confirm
 msgid "Payment processed by"
-msgstr ""
+msgstr "Zapłatę wykonano przez"
 
 #. module: website_payment
 #: model:ir.ui.view,arch_db:website_payment.confirm
diff --git a/addons/website_payment/views/website_payment_templates.xml b/addons/website_payment/views/website_payment_templates.xml
index 0395b6ccfaf..10763c24b23 100644
--- a/addons/website_payment/views/website_payment_templates.xml
+++ b/addons/website_payment/views/website_payment_templates.xml
@@ -104,12 +104,10 @@
                                     <div class="form-group">
                                         <label for="form_amount" class="col-sm-3 control-label">Amount</label>
                                         <div class="col-sm-9">
-                                            <span name="form_amount" class="form-control" t-esc="amount"/>
-                                            <!--
                                             <span name="form_amount" class="form-control" t-esc="amount" t-esc-options='{"widget": "monetary", "display_currency": "currency"}'/>
-                                            -->
                                         </div>
                                     </div>
+                                    <div class="col-sm-9 col-sm-offset-3 text-muted mt16" t-raw="acquirer.pre_msg"/>
                                     <div class="col-sm-12 o_website_payment_form" t-raw="payment_form"/>
                                     <div class="col-sm-6 col-sm-offset-6 text-muted mt16">
                                         <img alt="payment_provider_logo" class="pull-right ml8" t-att-src="website.image_url(acquirer, 'image_small')"/>
@@ -117,6 +115,7 @@
                                     </div>
                                 </div>
                             </div>
+                            <div class="oe_structure"/>
                         </div>
                     </div>
                 </div>