Commit 7e6ee97d authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

remove needless code that are added by sync with r37114.


git-svn-id: https://svn.erp5.org/repos/public/erp5/sandbox/amount_generator@37131 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent c1ae57b0
...@@ -73,9 +73,3 @@ class PaymentCondition(TradeModelLine): ...@@ -73,9 +73,3 @@ class PaymentCondition(TradeModelLine):
return method return method
method = self._getTypeBasedMethod('calculateMovement') method = self._getTypeBasedMethod('calculateMovement')
return method return method
def _isMatchedMovement(self, movement, base_application_list, tmp_movement):
"""Override the original implementation and allow payment condition to
match to any movements
"""
return True
...@@ -93,9 +93,6 @@ class TradeModelLine(MappedValue, XMLMatrix, Amount, AmountGeneratorMixin): ...@@ -93,9 +93,6 @@ class TradeModelLine(MappedValue, XMLMatrix, Amount, AmountGeneratorMixin):
if result: if result:
return result return result
return ('base_contribution', 'trade_phase', ) return ('base_contribution', 'trade_phase', )
'portal_roundings').getRoundingProxy
movement_list = [rounding_proxy(movement, context=self)
'use': self.getUse(),
# #
security.declareProtected(Permissions.AccessContentsInformation, security.declareProtected(Permissions.AccessContentsInformation,
...@@ -104,14 +101,3 @@ class TradeModelLine(MappedValue, XMLMatrix, Amount, AmountGeneratorMixin): ...@@ -104,14 +101,3 @@ class TradeModelLine(MappedValue, XMLMatrix, Amount, AmountGeneratorMixin):
""" """
""" """
return self._baseGetPrice() return self._baseGetPrice()
def _isMatchedMovement(self, movement, base_application_list, tmp_movement):
return (
set(base_application_list).intersection(
set(movement.getBaseContributionList())) and
(len(movement.getVariationCategoryList()) == 0 or
len(tmp_movement.getVariationCategoryList()) == 0 or
set(movement.getVariationCategoryList()).intersection(
set(tmp_movement.getVariationCategoryList()))
)
)
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