[Erp5-report] r28152 - /erp5/trunk/products/ERP5/Document/

[nobody at svn.erp5.org]

Author: luke
Date: Thu Jul 23 14:31:38 2009
New Revision: 28152

URL: http://svn.erp5.org?rev=28152&view=rev
Log:
 - update docstrings and small fixes
 - put more into base class
 - inform developer what is to overload and what is to not

Modified:
    erp5/trunk/products/ERP5/Document/BPMDeliveryRule.py
    erp5/trunk/products/ERP5/Document/BPMInvoiceTransactionRule.py
    erp5/trunk/products/ERP5/Document/BPMInvoicingRule.py
    erp5/trunk/products/ERP5/Document/BPMOrderRule.py
    erp5/trunk/products/ERP5/Document/BPMRule.py

Modified: erp5/trunk/products/ERP5/Document/BPMDeliveryRule.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/BPMDeliveryRule.py?rev=28152&r1=28151&r2=28152&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/BPMDeliveryRule.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/BPMDeliveryRule.py [utf8] Thu Jul 23 14:31:38 2009
@@ -49,15 +49,16 @@
   security.declareObjectProtected(Permissions.AccessContentsInformation)
 
   def _getInputMovementList(self, applied_rule):
-    """Returns list of input movements for applied rule"""
-    order = applied_rule.getDefaultCausalityValue()
-    if order is not None:
-      return order.getMovementList(
-                     portal_type=order.getPortalDeliveryMovementTypeList())
+    """Return list of movements from delivery"""
+    delivery = applied_rule.getDefaultCausalityValue()
+    if delivery is not None:
+      return delivery.getMovementList(
+                     portal_type=delivery.getPortalDeliveryMovementTypeList())
     return []
 
   def _getExpandablePropertyUpdateDict(self, applied_rule, movement, business_path,
       **kw):
+    """Delivery specific update dict"""
     return {
       'order_value': movement,
       'delivery_value': movement,

Modified: erp5/trunk/products/ERP5/Document/BPMInvoiceTransactionRule.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/BPMInvoiceTransactionRule.py?rev=28152&r1=28151&r2=28152&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/BPMInvoiceTransactionRule.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/BPMInvoiceTransactionRule.py [utf8] Thu Jul 23 14:31:38 2009
@@ -46,7 +46,7 @@
   add_permission = Permissions.AddPortalContent
   isPortalContent = 1
   isRADContent = 1
-  
+
   # Declarative security
   security = ClassSecurityInfo()
   security.declareObjectProtected(Permissions.AccessContentsInformation)

Modified: erp5/trunk/products/ERP5/Document/BPMInvoicingRule.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/BPMInvoicingRule.py?rev=28152&r1=28151&r2=28152&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/BPMInvoicingRule.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/BPMInvoicingRule.py [utf8] Thu Jul 23 14:31:38 2009
@@ -67,9 +67,5 @@
       'deliverable': 1
     }
 
-  def _getInputMovementList(self, applied_rule):
-    """Returns list of input movements for applied rule"""
-    return [applied_rule.getParentValue()]
-
   def isDeliverable(self, movement):
     return movement.getResource() is not None

Modified: erp5/trunk/products/ERP5/Document/BPMOrderRule.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/BPMOrderRule.py?rev=28152&r1=28151&r2=28152&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/BPMOrderRule.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/BPMOrderRule.py [utf8] Thu Jul 23 14:31:38 2009
@@ -48,7 +48,7 @@
   security.declareObjectProtected(Permissions.AccessContentsInformation)
 
   def _getInputMovementList(self, applied_rule):
-    """Returns list of input movements for applied rule"""
+    """Input movement list comes from order"""
     order = applied_rule.getDefaultCausalityValue()
     if order is not None:
       return order.getMovementList(
@@ -57,6 +57,7 @@
 
   def _getExpandablePropertyUpdateDict(self, applied_rule, movement, business_path,
       **kw):
+    """Order rule specific update dictionary"""
     return {
       'order_value': movement,
       'order_ratio': 1,

Modified: erp5/trunk/products/ERP5/Document/BPMRule.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/BPMRule.py?rev=28152&r1=28151&r2=28152&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/BPMRule.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/BPMRule.py [utf8] Thu Jul 23 14:31:38 2009
@@ -199,12 +199,22 @@
                 movement.getRelativeUrl())
     return (add_list, modify_dict, delete_list)
 
+  def _getExpandablePropertyUpdateDict(self, applied_rule, movement, business_path, **kw):
+    """Rule specific dictionary used to update _getExpandablePropertyDict
+    This method might be overloaded.
+    """
+    return {}
+
+  def _getInputMovementList(self, applied_rule):
+    """Return list of movements for applied rule.
+    This method might be overloaded"""
+    return [applied_rule.getParentValue()]
+
   def _getExpandablePropertyDict(self, applied_rule, movement, business_path,
       **kw):
     """
-    Return a Dictionary with the Properties used to edit 
-    the simulation movement. A supply path can be passed to assign more
-    information
+    Return a Dictionary with the Properties used to edit the simulation
+    Do NOT overload this method, use _getExpandablePropertyUpdateDict instead
     """
     property_dict = {}