diff --git a/addons/payment/models/payment_acquirer.py b/addons/payment/models/payment_acquirer.py index d0dd3ec4691..69f8de774c2 100644 --- a/addons/payment/models/payment_acquirer.py +++ b/addons/payment/models/payment_acquirer.py @@ -454,7 +454,7 @@ class PaymentTransaction(models.Model): @api.onchange('partner_id') def _onchange_partner_id(self): onchange_vals = self.on_change_partner_id(self.partner_id.id).get('value', {}) - self.write(onchange_vals) + self.update(onchange_vals) @api.multi def on_change_partner_id(self, partner_id): diff --git a/addons/payment_ogone/tests/test_ogone.py b/addons/payment_ogone/tests/test_ogone.py index ac32f0c4fe5..79a1d745325 100644 --- a/addons/payment_ogone/tests/test_ogone.py +++ b/addons/payment_ogone/tests/test_ogone.py @@ -174,7 +174,4 @@ class OgonePayment(PaymentAcquirerCommon): 'number': '4000000000000002', 'brand': 'VISA'}) - # check an alias is set, containing at least OPENERP - self.assertIn('OPENERP', tx.partner_reference, 'ogone: wrong partner reference after creating an alias') - res = tx.ogone_s2s_execute({}) diff --git a/addons/payment_sips/models/payment.py b/addons/payment_sips/models/payment.py index f7024d3b025..515bb08ee97 100644 --- a/addons/payment_sips/models/payment.py +++ b/addons/payment_sips/models/payment.py @@ -48,7 +48,8 @@ class AcquirerSips(models.Model): 'prod': 'https://payment-webinit.sips-atos.com/paymentInit', 'test': 'https://payment-webinit.simu.sips-atos.com/paymentInit', } - return {'sips_form_url': url.get(environment, url['test']), } + icp_value = self.env['ir.config_parameter'].sudo().get_param('acquirer_sips_url_%s' % environment) + return {'sips_form_url': icp_value or url.get(environment, url['test']), } def _sips_generate_shasign(self, values): """ Generate the shasign for incoming or outgoing communications. @@ -171,8 +172,6 @@ class TxSips(models.Model): # check what is bought if float_compare(float(data.get('amount', '0.0')) / 100, self.amount, 2) != 0: invalid_parameters.append(('amount', data.get('amount'), '%.2f' % self.amount)) - if self.partner_reference and data.get('customerId') != self.partner_reference: - invalid_parameters.append(('customerId', data.get('customerId'), self.partner_reference)) return invalid_parameters diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js index 4edff2ce8ea..336e3b32848 100644 --- a/addons/point_of_sale/static/src/js/models.js +++ b/addons/point_of_sale/static/src/js/models.js @@ -1943,6 +1943,8 @@ exports.Order = Backbone.Model.extend({ initialize_validation_date: function () { this.validation_date = new Date(); + this.formatted_validation_date = formats.format_value( + this.validation_date, {type: 'datetime'}); }, set_tip: function(tip) { diff --git a/addons/point_of_sale/static/src/xml/pos.xml b/addons/point_of_sale/static/src/xml/pos.xml index 995a27ddd3b..ee5bef3456d 100644 --- a/addons/point_of_sale/static/src/xml/pos.xml +++ b/addons/point_of_sale/static/src/xml/pos.xml @@ -1402,7 +1402,7 @@
-
+