[Erp5-report] r32489 kazuhiko - /erp5/trunk/products/ERP5/Document/Rule.py

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Fri Feb 12 12:20:14 2010
New Revision: 32489

URL: http://svn.erp5.org?rev=32489&view=rev
Log:
cast to a single value if compared target is a single value.

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

Modified: erp5/trunk/products/ERP5/Document/Rule.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/Rule.py?rev=32489&r1=32488&r2=32489&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/Rule.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/Rule.py [utf8] Fri Feb 12 12:20:14 2010
@@ -400,6 +400,8 @@
             for k, v in prevision.items():
               if movement.isPropertyRecorded(k):
                 movement_value = movement.getRecordedProperty(k)
+                if isinstance(movement_value, list) and not isinstance(v, list):
+                  movement_value = movement_value[0]
               else:
                 movement_value = movement.getProperty(k)
               if k not in ('quantity',) and v != movement_value:
@@ -528,6 +530,8 @@
               if k not in ('quantity', 'start_date', 'stop_date'):
                 if movement.isPropertyRecorded(k):
                   movement_value = movement.getRecordedProperty(k)
+                  if isinstance(movement_value, list) and not isinstance(v, list):
+                    movement_value = movement_value[0]
                 else:
                   movement_value = movement.getProperty(k)
                 if v != movement_value: