[Erp5-report] r33328 kazuhiko - in /erp5/trunk/products: ERP5/Document/ ERP5Legacy/Document/

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Wed Mar  3 14:44:07 2010
New Revision: 33328

URL: http://svn.erp5.org?rev=33328&view=rev
Log:
support mapped value in divergence testers.

Modified:
    erp5/trunk/products/ERP5/Document/SimulationMovement.py
    erp5/trunk/products/ERP5Legacy/Document/CategoryDivergenceTester.py
    erp5/trunk/products/ERP5Legacy/Document/PropertyDivergenceTester.py

Modified: erp5/trunk/products/ERP5/Document/SimulationMovement.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/SimulationMovement.py?rev=33328&r1=33327&r2=33328&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/SimulationMovement.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/SimulationMovement.py [utf8] Wed Mar  3 14:44:07 2010
@@ -437,7 +437,7 @@
           Look are invocations of _isProfitAndLossMovement in
           ERP5.mixin.rule to understand how.
     """
-    quantity = self.getQuantity()
+    quantity = self.getMappedProperty('quantity')
     profit_quantity = self.getProfitQuantity() or 0
     delivery_error = self.getDeliveryError() or 0
     return quantity - profit_quantity + delivery_error

Modified: erp5/trunk/products/ERP5Legacy/Document/CategoryDivergenceTester.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Legacy/Document/CategoryDivergenceTester.py?rev=33328&r1=33327&r2=33328&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Legacy/Document/CategoryDivergenceTester.py [utf8] (original)
+++ erp5/trunk/products/ERP5Legacy/Document/CategoryDivergenceTester.py [utf8] Wed Mar  3 14:44:07 2010
@@ -70,13 +70,14 @@
     tested_property = self.getTestedPropertyList()
 
     delivery_mvt = simulation_movement.getDeliveryValue()
+    delivery_mvt_getProperty = delivery_mvt.getProperty
+    simulation_movement_getProperty = simulation_movement.getMappedProperty
     for tested_property_id, tested_property_title in \
                                   self._splitStringList(tested_property):
+      list_prop = '%s_list' % tested_property_id
       message = None
-      delivery_mvt_category_list = \
-          delivery_mvt.getPropertyList(tested_property_id)
-      simulation_category_list = \
-          simulation_movement.getPropertyList(tested_property_id)
+      delivery_mvt_category_list = delivery_mvt_getProperty(list_prop)
+      simulation_category_list = simulation_movement_getProperty(list_prop)
 
       # XXX Don't we need to check the order too ?
       delivery_mvt_category_list.sort()

Modified: erp5/trunk/products/ERP5Legacy/Document/PropertyDivergenceTester.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Legacy/Document/PropertyDivergenceTester.py?rev=33328&r1=33327&r2=33328&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Legacy/Document/PropertyDivergenceTester.py [utf8] (original)
+++ erp5/trunk/products/ERP5Legacy/Document/PropertyDivergenceTester.py [utf8] Wed Mar  3 14:44:07 2010
@@ -81,10 +81,12 @@
     tested_property = self.getTestedPropertyList()
 
     delivery_mvt = simulation_movement.getDeliveryValue()
+    delivery_mvt_getProperty = delivery_mvt.getProperty
+    simulation_movement_getProperty = simulation_movement.getMappedProperty
     for tested_property_id, tested_property_title in \
                        self._splitStringList(tested_property):
-      delivery_mvt_property = delivery_mvt.getProperty(tested_property_id)
-      simulation_mvt_property = simulation_movement.getProperty(tested_property_id)
+      delivery_mvt_property = delivery_mvt_getProperty(tested_property_id)
+      simulation_mvt_property = simulation_movement_getProperty(tested_property_id)
       if delivery_mvt_property != simulation_mvt_property:
         message = DivergenceMessage(
                    divergence_scope='property',