[Erp5-report] r7468 - /erp5/trunk/products/ERP5Banking/Document/CashDeliveryCell.py

[nobody at svn.erp5.org]

Author: aurel
Date: Wed May 24 10:24:40 2006
New Revision: 7468

URL: http://svn.erp5.org?rev=7468&view=rev
Log:
cell can acquire getBaobabVariationText from line if there is only one cell

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

Modified: erp5/trunk/products/ERP5Banking/Document/CashDeliveryCell.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Banking/Document/CashDeliveryCell.py?rev=7468&r1=7467&r2=7468&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Banking/Document/CashDeliveryCell.py (original)
+++ erp5/trunk/products/ERP5Banking/Document/CashDeliveryCell.py Wed May 24 10:24:40 2006
@@ -137,8 +137,12 @@
     """
     script = self._getTypeBasedMethod('getBaobabSourceVariationText')
     if script is not None:
-      return script(self)      
-    return self.getVariationText()
+      return script(self)
+    if self.getVariationText() != self.aq_parent.getVariationText():
+      return self.getVariationText()
+    else:
+      # only one cell in a line
+      return  self.aq_parent.getBaobabSourceVariationText()
 
   security.declareProtected(Permissions.View, 'getBaobabDestinationVariationText')
   def getBaobabDestinationVariationText(self, **kw):
@@ -146,5 +150,9 @@
     """
     script = self._getTypeBasedMethod('getBaobabDestinationVariationText')
     if script is not None:
-      return script(self)      
-    return self.getVariationText()
+      return script(self)
+    if self.getVariationText() != self.aq_parent.getVariationText():
+      return self.getVariationText()
+    else:
+      # only one cell in a line
+      return  self.aq_parent.getBaobabDestinationVariationText()