Commit 171621a2 authored by Vincent Pelletier's avatar Vincent Pelletier

Externalize definition of former_coin_variation_list.

Check thet getFormer matches requirement, to avoid the case where a former coin would match in a current coin search.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@15285 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent f7c2f2ae
...@@ -200,11 +200,13 @@ class BaobabConduit(ERP5Conduit): ...@@ -200,11 +200,13 @@ class BaobabConduit(ERP5Conduit):
from Products.Baobab.Conduit import vault_code_to_path from Products.Baobab.Conduit import vault_code_to_path
from Products.Baobab.Conduit import variation_translate_dict from Products.Baobab.Conduit import variation_translate_dict
from Products.Baobab.Conduit import status_code_to_cash_status from Products.Baobab.Conduit import status_code_to_cash_status
from Products.Baobab.Conduit import former_coin_variation_list
except ImportError: except ImportError:
inventory_code_to_path = {} inventory_code_to_path = {}
vault_code_to_path = {} vault_code_to_path = {}
ariation_translate_dict = {} ariation_translate_dict = {}
status_code_to_cash_status = {} status_code_to_cash_status = {}
former_coin_variation_list = []
""" """
Methods below are tools to use the property_map. Methods below are tools to use the property_map.
...@@ -540,10 +542,10 @@ class BaobabConduit(ERP5Conduit): ...@@ -540,10 +542,10 @@ class BaobabConduit(ERP5Conduit):
currency_name not in (None, '') and \ currency_name not in (None, '') and \
currency_cash.getBasePrice() == base_price and \ currency_cash.getBasePrice() == base_price and \
currency_cash.getPriceCurrencyId() == currency_name: currency_cash.getPriceCurrencyId() == currency_name:
if currency_portal_type == 'Coin' and kw.get('variation', None) == 'ANC' and \ # getFormer value must match searched coin variation.
not currency_cash.getFormer(): if currency_portal_type == 'Coin' and \
# If we are searching for an 'ANC' variation of a coin, getFormer (kw.get('variation', None) in former_coin_variation_list) != \
# must be true for the currency cash to match. bool(currency_cash.getFormer()):
continue continue
line_currency_cash = currency_cash line_currency_cash = currency_cash
break break
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment