[FIX] payment_paypal: wrong handling fees computation formula
This commit is contained in:
parent
00dc3a59df
commit
df0ae7e4d1
|
@ -90,9 +90,12 @@ class AcquirerPaypal(osv.Model):
|
||||||
return 0.0
|
return 0.0
|
||||||
country = self.pool['res.country'].browse(cr, uid, country_id, context=context)
|
country = self.pool['res.country'].browse(cr, uid, country_id, context=context)
|
||||||
if country and acquirer.company_id.country_id.id == country.id:
|
if country and acquirer.company_id.country_id.id == country.id:
|
||||||
fees = amount * (1 + acquirer.fees_dom_var / 100.0) + acquirer.fees_dom_fixed - amount
|
percentage = acquirer.fees_dom_var
|
||||||
|
fixed = acquirer.fees_dom_fixed
|
||||||
else:
|
else:
|
||||||
fees = amount * (1 + acquirer.fees_int_var / 100.0) + acquirer.fees_int_fixed - amount
|
percentage = acquirer.fees_int_var
|
||||||
|
fixed = acquirer.fees_int_fixed
|
||||||
|
fees = (percentage / 100.0 * amount + fixed ) / (1 - percentage / 100.0)
|
||||||
return fees
|
return fees
|
||||||
|
|
||||||
def paypal_form_generate_values(self, cr, uid, id, partner_values, tx_values, context=None):
|
def paypal_form_generate_values(self, cr, uid, id, partner_values, tx_values, context=None):
|
||||||
|
|
|
@ -148,7 +148,7 @@ class PaypalForm(PaypalCommon):
|
||||||
for form_input in tree.input:
|
for form_input in tree.input:
|
||||||
if form_input.get('name') in ['handling']:
|
if form_input.get('name') in ['handling']:
|
||||||
handling_found = True
|
handling_found = True
|
||||||
self.assertEqual(form_input.get('value'), '1.56', 'paypal: wrong computed fees')
|
self.assertEqual(form_input.get('value'), '1.57', 'paypal: wrong computed fees')
|
||||||
self.assertTrue(handling_found, 'paypal: fees_active did not add handling input in rendered form')
|
self.assertTrue(handling_found, 'paypal: fees_active did not add handling input in rendered form')
|
||||||
|
|
||||||
@mute_logger('openerp.addons.payment_paypal.models.paypal', 'ValidationError')
|
@mute_logger('openerp.addons.payment_paypal.models.paypal', 'ValidationError')
|
||||||
|
|
Loading…
Reference in New Issue