[Erp5-report] r32459 kazuhiko - /erp5/trunk/products/ERP5/Document/InvoiceRule.py

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Fri Feb 12 03:34:47 2010
New Revision: 32459

URL: http://svn.erp5.org?rev=32459&view=rev
Log:
define _getInputMovementList(), that helps to make DeliveryRule more simple.

Modified:
    erp5/trunk/products/ERP5/Document/InvoiceRule.py

Modified: erp5/trunk/products/ERP5/Document/InvoiceRule.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/InvoiceRule.py?rev=32459&r1=32458&r2=32459&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/InvoiceRule.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/InvoiceRule.py [utf8] Fri Feb 12 03:34:47 2010
@@ -58,7 +58,6 @@
       invoice movements should not be accountable either.
       """
       return 0
-
     security.declareProtected(Permissions.ModifyPortalContent, 'expand')
     def expand(self, applied_rule, **kw):
       """
@@ -68,3 +67,20 @@
           self.getPortalInvoiceMovementTypeList() + \
           self.getPortalTaxMovementTypeList()
       DeliveryRule.expand(self, applied_rule, **kw)
+
+  def _getInputMovementList(self, applied_rule):
+    """Return list of movements from delivery"""
+    delivery = applied_rule.getDefaultCausalityValue()
+    movement_list = []
+    delivery_movement_type_list = self.getPortalInvoiceMovementTypeList() + \
+                                  self.getPortalTaxMovementTypeList()
+    if delivery is not None:
+      existing_movement_list = applied_rule.objectValues()
+      for movement in delivery.getMovementList(
+        portal_type=delivery_movement_type_list):
+        simulation_movement = self._getDeliveryRelatedSimulationMovement(
+          movement)
+        if simulation_movement is None or \
+               simulation_movement in existing_movement_list:
+          movement_list.append(movement)
+    return movement_list