diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-06-15 12:40:59 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-06-15 12:40:59 +0200 |
| commit | baf494c67ba7ecba331b24bcfa5eed9bde8a16da (patch) | |
| tree | 3b2c9ec3cacabcf0a5b0fb78a667d5e1b27505dc /addons/website_payment/controllers | |
| parent | 133490b4d0e347d75bab20da8e5e0ad1f95d3a2d (diff) | |
| parent | 1d81bb06a47b1aee1b7a0dcdaa03084ddedf8b7b (diff) | |
[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
Diffstat (limited to 'addons/website_payment/controllers')
| -rw-r--r-- | addons/website_payment/controllers/main.py | 6 |
1 files changed, 3 insertions, 3 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) |