[Erp5-report] r37591 yo - /erp5/trunk/products/ERP5/Document/InvoiceMovementGroup.py

[nobody at svn.erp5.org]

Author: yo
Date: Fri Aug  6 09:59:25 2010
New Revision: 37591

URL: http://svn.erp5.org?rev=37591&view=rev
Log:
Use the portal method to retrieve invoice movement types instead of hardcoding them.

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

Modified: erp5/trunk/products/ERP5/Document/InvoiceMovementGroup.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/InvoiceMovementGroup.py?rev=37591&r1=37590&r2=37591&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/InvoiceMovementGroup.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/InvoiceMovementGroup.py [utf8] Fri Aug  6 09:59:25 2010
@@ -46,12 +46,14 @@ class InvoiceMovementGroup(MovementGroup
 
   def _getInvoiceUid(self, simulation_movement):
     parent_rule = simulation_movement.getParentValue()
+    portal = self.getPortalObject()
+    invoice_movement_types = portal.getPortalInvoiceMovementTypeList()
     while not parent_rule.isRootAppliedRule():
       parent_simulation_movement = parent_rule.getParentValue()
       grand_parent_rule = parent_simulation_movement.getParentValue()
       parent_delivery = parent_simulation_movement.getDeliveryValue()
       if parent_delivery is not None and \
-             parent_delivery.getPortalType() == 'Invoice Line':
+             parent_delivery.getPortalType() in invoice_movement_types:
         return parent_delivery.getExplanationValue().getUid()
       parent_rule = grand_parent_rule
     return None