diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CurrencyPurchase_getQuantity.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CurrencyPurchase_getQuantity.xml index 4e4545ec781a96ac1305d85862cef31514e04325..6b994bbfa8d34682601fc189cf63ea90d73e6682 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CurrencyPurchase_getQuantity.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CurrencyPurchase_getQuantity.xml @@ -72,6 +72,8 @@ commission_price = context.getDiscount()\n \n if commission_ratio is not None and commission_ratio !=0 and commission_price is not None and commission_price !=0:\n price = None\n +if price is None:\n + return price\n if commission_ratio == 0 or commission_price == 0:\n price = round(price,0)\n if commission_ratio is None and commission_price is None:\n @@ -84,9 +86,6 @@ if commission_ratio is not None:\n if commission_price is not None:\n commission_value = commission_price\n \n -if price is None:\n - return price\n -\n quantity = price - commission_value\n quantity = round(quantity,0)\n if quantity!=context.getQuantity():\n diff --git a/bt5/erp5_banking_core/bt/revision b/bt5/erp5_banking_core/bt/revision index eb8f2fa1aeb162439e4756fc55642cad6c193cff..a99c3866eb06f622a4283e6b82da2def644b3aa2 100644 --- a/bt5/erp5_banking_core/bt/revision +++ b/bt5/erp5_banking_core/bt/revision @@ -1 +1 @@ -379 \ No newline at end of file +380 \ No newline at end of file