[Erp5-report] r7186 - in /erp5/trunk/products/ERP5Banking: ./ Document/

[nobody at svn.erp5.org]

Author: aurel
Date: Thu May 11 11:49:52 2006
New Revision: 7186

URL: http://svn.erp5.org?rev=7186&view=rev
Log:
add support for getBaobabSource/DestinationVariationText and remove
some hardcoded stuff

Modified:
    erp5/trunk/products/ERP5Banking/BaobabMixin.py
    erp5/trunk/products/ERP5Banking/Document/CashDeliveryCell.py
    erp5/trunk/products/ERP5Banking/Document/CashDeliveryLine.py

Modified: erp5/trunk/products/ERP5Banking/BaobabMixin.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Banking/BaobabMixin.py?rev=7186&r1=7185&r2=7186&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Banking/BaobabMixin.py (original)
+++ erp5/trunk/products/ERP5Banking/BaobabMixin.py Thu May 11 11:49:52 2006
@@ -112,7 +112,8 @@
                  'source_section', 'destination_section',
                  'source_payment', 'destination_payment',
                  'source_function', 'destination_function',
-                 'source_project', 'destination_project'):
+                 'source_project', 'destination_project',
+                 'source_variation_text', 'destination_variation_text',):
   getter_id = 'getBaobab%s' % (convertToUpperCase(category))
   original_getter_id = 'get%s' % (convertToUpperCase(category))
   method = BaobabGetter(getter_id, original_getter_id)
@@ -130,4 +131,4 @@
     setattr(BaobabMixin, prop_getter_id, method)
     BaobabMixin.security.declareProtected(Permissions.View, prop_getter_id)
 
-InitializeClass(BaobabMixin)
+InitializeClass(BaobabMixin)

Modified: erp5/trunk/products/ERP5Banking/Document/CashDeliveryCell.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Banking/Document/CashDeliveryCell.py?rev=7186&r1=7185&r2=7186&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Banking/Document/CashDeliveryCell.py (original)
+++ erp5/trunk/products/ERP5Banking/Document/CashDeliveryCell.py Thu May 11 11:49:52 2006
@@ -130,3 +130,21 @@
     """
     """
     return self.aq_parent.getBaobabDestinationProject(**kw)
+
+  security.declareProtected(Permissions.View, 'getBaobabSourceVariationText')
+  def getBaobabSourceVariationText(self, **kw):
+    """
+    """
+    script = self._getTypeBasedMethod('getBaobabSourceVariationText')
+    if script is not None:
+      return script(self)      
+    return self.aq_parent.getBaobabSourceVariationText(**kw)
+
+  security.declareProtected(Permissions.View, 'getBaobabDestinationVariationText')
+  def getBaobabDestinationVariationText(self, **kw):
+    """
+    """
+    script = self._getTypeBasedMethod('getBaobabDestinationVariationText')
+    if script is not None:
+      return script(self)      
+    return self.aq_parent.getBaobabDestinationVariationText(**kw)

Modified: erp5/trunk/products/ERP5Banking/Document/CashDeliveryLine.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Banking/Document/CashDeliveryLine.py?rev=7186&r1=7185&r2=7186&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Banking/Document/CashDeliveryLine.py (original)
+++ erp5/trunk/products/ERP5Banking/Document/CashDeliveryLine.py Thu May 11 11:49:52 2006
@@ -30,10 +30,6 @@
 from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
 from Products.ERP5.Document.DeliveryLine import DeliveryLine
 from Products.ERP5Banking.BaobabMixin import BaobabMixin
-
-in_portal_type_list = ('Cash Exchange Line In', 'Cash To Currency Sale Line In','Cash To Currency Purchase Line In', 'Cash Incident Line In')
-out_portal_type_list = ('Cash Exchange Line Out', 'Cash To Currency Sale Line Out','Cash To Currency Purchase Line Out','Cash Incident Line Out')
-
 
 class CashDeliveryLine(BaobabMixin, DeliveryLine):
   """
@@ -79,10 +75,6 @@
     script = self._getTypeBasedMethod('getBaobabSource')
     if script is not None:
       return script(self)      
-    if self.portal_type in out_portal_type_list:
-      return self.portal_categories.resolveCategory(self.getSource()).unrestrictedTraverse('sortante').getRelativeUrl()
-    elif self.portal_type in in_portal_type_list:
-      return None
     return self.getSource()
 
   security.declareProtected(Permissions.View, 'getBaobabDestination')
@@ -93,9 +85,24 @@
     script = self._getTypeBasedMethod('getBaobabDestination')
     if script is not None:
       return script(self)
-    if self.portal_type in in_portal_type_list:
-      return self.portal_categories.resolveCategory(self.getSource()).unrestrictedTraverse('entrante').getUid()
-    elif self.portal_type in out_portal_type_list :
-      return None
     return self.getDestination()
 
+  security.declareProtected(Permissions.View, 'getBaobabSourceVariationText')
+  def getBaobabSourceVariationText(self):
+    """
+      Returns a calculated source variation text
+    """
+    script = self._getTypeBasedMethod('getBaobabSourceVariationText')
+    if script is not None:
+      return script(self)      
+    return self.getVariationText()
+
+  security.declareProtected(Permissions.View, 'getBaobabDestinationVariationText')
+  def getBaobabDestinationVariationText(self):
+    """
+      Returns a calculated destination variation text
+    """
+    script = self._getTypeBasedMethod('getBaobabDestinationVariationText')
+    if script is not None:
+      return script(self)
+    return self.getVariationText()