From 7e6ee97dddcb5e31308598cad814e6d6f62025e8 Mon Sep 17 00:00:00 2001
From: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date: Thu, 15 Jul 2010 12:47:52 +0000
Subject: [PATCH] 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
---
 product/ERP5/Document/PaymentCondition.py |  6 ------
 product/ERP5/Document/TradeModelLine.py   | 14 --------------
 2 files changed, 20 deletions(-)

diff --git a/product/ERP5/Document/PaymentCondition.py b/product/ERP5/Document/PaymentCondition.py
index 727229ce9b..3740125743 100644
--- a/product/ERP5/Document/PaymentCondition.py
+++ b/product/ERP5/Document/PaymentCondition.py
@@ -73,9 +73,3 @@ class PaymentCondition(TradeModelLine):
       return method
     method = self._getTypeBasedMethod('calculateMovement')
     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
diff --git a/product/ERP5/Document/TradeModelLine.py b/product/ERP5/Document/TradeModelLine.py
index 8582d05edf..03207428fe 100644
--- a/product/ERP5/Document/TradeModelLine.py
+++ b/product/ERP5/Document/TradeModelLine.py
@@ -93,9 +93,6 @@ class TradeModelLine(MappedValue, XMLMatrix, Amount, AmountGeneratorMixin):
     if result:
       return result
     return ('base_contribution', 'trade_phase', )
-                                     'portal_roundings').getRoundingProxy
-      movement_list = [rounding_proxy(movement, context=self)
-        'use': self.getUse(),
 
   #
   security.declareProtected(Permissions.AccessContentsInformation,
@@ -104,14 +101,3 @@ class TradeModelLine(MappedValue, XMLMatrix, Amount, AmountGeneratorMixin):
     """
     """
     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()))
-       )
-      )
-- 
2.30.9