Commit e95df10a authored by Jean-Paul Smets's avatar Jean-Paul Smets

renames business_link to trade_model_path to match with intention

git-svn-id: https://svn.erp5.org/repos/public/erp5/sandbox/amount_generator@36834 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 14da89cc
...@@ -678,10 +678,10 @@ class BusinessProcess(Path, XMLObject): ...@@ -678,10 +678,10 @@ class BusinessProcess(Path, XMLObject):
result = [] result = []
id_index = 0 id_index = 0
base_id = amount.getId() base_id = amount.getId()
for business_link in self.getTradeModelPathValueList(context=amount, trade_phase=trade_phase): for trade_model_path in self.getTradeModelPathValueList(context=amount, trade_phase=trade_phase):
id_index += 1 id_index += 1
movement = newTempMovement(business_link, '%s_%s' % (base_id, id_index)) movement = newTempMovement(trade_model_path, '%s_%s' % (base_id, id_index))
kw = self._getPropertyAndCategoryDict(explanation, amount, business_link, delay_mode=delay_mode) kw = self._getPropertyAndCategoryDict(explanation, amount, trade_model_path, delay_mode=delay_mode)
movement._edit(**kw) movement._edit(**kw)
result.append(movement) result.append(movement)
...@@ -708,7 +708,7 @@ class BusinessProcess(Path, XMLObject): ...@@ -708,7 +708,7 @@ class BusinessProcess(Path, XMLObject):
return stripped_result return stripped_result
def _getPropertyAndCategoryDict(self, explanation, amount, business_link, delay_mode=None): def _getPropertyAndCategoryDict(self, explanation, amount, trade_model_path, delay_mode=None):
"""A private method to merge an amount and a business_link and return """A private method to merge an amount and a business_link and return
a dict of properties and categories which can be used to create a a dict of properties and categories which can be used to create a
new movement. new movement.
...@@ -718,7 +718,7 @@ class BusinessProcess(Path, XMLObject): ...@@ -718,7 +718,7 @@ class BusinessProcess(Path, XMLObject):
amount -- an IAmount instance or an IMovement instance amount -- an IAmount instance or an IMovement instance
business_link -- an IBusinessLink instance trade_model_path -- an ITradeModelPath instance
delay_mode -- optional value to specify calculation mode ('min', 'max') delay_mode -- optional value to specify calculation mode ('min', 'max')
if no value specified use average delay if no value specified use average delay
...@@ -737,16 +737,16 @@ class BusinessProcess(Path, XMLObject): ...@@ -737,16 +737,16 @@ class BusinessProcess(Path, XMLObject):
# Arrow categories # Arrow categories
for base_category, category_url_list in \ for base_category, category_url_list in \
business_link.getArrowCategoryDict(context=amount).iteritems(): trade_model_path.getArrowCategoryDict(context=amount).iteritems():
property_dict[base_category] = category_url_list property_dict[base_category] = category_url_list
# Amount quantities - XXX-JPS maybe we should consider handling unit conversions here # Amount quantities - XXX-JPS maybe we should consider handling unit conversions here
# and specifying units # and specifying units
if business_link.getQuantity(): if trade_model_path.getQuantity():
property_dict['quantity'] = business_link.getQuantity() property_dict['quantity'] = trade_model_path.getQuantity()
elif business_link.getEfficiency(): elif business_link.getEfficiency():
property_dict['quantity'] = amount.getQuantity() *\ property_dict['quantity'] = amount.getQuantity() *\
business_link.getEfficiency() trade_model_path.getEfficiency()
else: else:
property_dict['quantity'] = amount.getQuantity() property_dict['quantity'] = amount.getQuantity()
...@@ -763,14 +763,14 @@ class BusinessProcess(Path, XMLObject): ...@@ -763,14 +763,14 @@ class BusinessProcess(Path, XMLObject):
# XXX-JPS could be extended with a rule property instead # XXX-JPS could be extended with a rule property instead
# of supports only in root applied rule case # of supports only in root applied rule case
start_date, stop_date = self.getExpectedTradeModelPathStartAndStopDate( start_date, stop_date = self.getExpectedTradeModelPathStartAndStopDate(
explanation, business_link, delay_mode=delay_mode) explanation, trade_model_path, delay_mode=delay_mode)
property_dict['start_date'] = start_date property_dict['start_date'] = start_date
property_dict['stop_date'] = stop_date property_dict['stop_date'] = stop_date
else: else:
raise TypeError("Explanation must be an Applied Rule in expand process") # Nothing to do raise TypeError("Explanation must be an Applied Rule in expand process") # Nothing to do
# Set causality to business link # Set causality to trade model path
property_dict['causality'] = business_link.getRelativeUrl() # XXX-JPS Will not work if we do not use real object property_dict['causality'] = trade_model_path.getRelativeUrl() # XXX-JPS Will not work if we do not use real object
return property_dict return property_dict
......
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