[Erp5-report] r15528 - in /erp5/trunk/bt5/erp5_banking_core: SkinTemplateItem/portal_skins/...

[nobody at svn.erp5.org]

Author: vincent
Date: Tue Aug  7 15:11:33 2007
New Revision: 15528

URL: http://svn.erp5.org?rev=15528&view=rev
Log:
Inventory input parameters and output values do not use consistent names, so 2 distinct lists must be used - but they must b sorted in a consistent way.

Modified:
    erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDelivery_checkCounterInventory.xml
    erp5/trunk/bt5/erp5_banking_core/bt/revision

Modified: erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDelivery_checkCounterInventory.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDelivery_checkCounterInventory.xml?rev=15528&r1=15527&r2=15528&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDelivery_checkCounterInventory.xml (original)
+++ erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDelivery_checkCounterInventory.xml Tue Aug  7 15:11:33 2007
@@ -130,13 +130,14 @@
                    variation_text=variation_text_dict.keys())\n
 \n
 inventory_dict = {}\n
-inventory_key_order = [\'node\', \'resource\', \'variation_text\']\n
+inventory_column_id_order = [\'node_relative_url\', \'resource_relative_url\', \'variation_text\']\n
+inventory_parameter_id_order = [\'node\', \'resource\', \'variation_text\']\n
 for inventory_line in inventory_list:\n
-  inventory_key = tuple([inventory_line[x] for x in inventory_key_order])\n
+  inventory_key = tuple([inventory_line[x] for x in inventory_column_id_order])\n
   inventory_dict[inventory_key] = inventory_line[\'inventory\']\n
 \n
 def getCurrentInventory(**criterion_dict):\n
-  inventory_key = tuple([criterion_dict[x] for x in inventory_key_order])\n
+  inventory_key = tuple([criterion_dict[x] for x in inventory_parameter_id_order])\n
   return inventory_dict.get(inventory_key, 0)\n
 \n
 for line in line_list :\n
@@ -266,7 +267,8 @@
                             <string>activity_tool</string>
                             <string>checkActivities</string>
                             <string>inventory_list</string>
-                            <string>inventory_key_order</string>
+                            <string>inventory_column_id_order</string>
+                            <string>inventory_parameter_id_order</string>
                             <string>inventory_line</string>
                             <string>tuple</string>
                             <string>append</string>

Modified: erp5/trunk/bt5/erp5_banking_core/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/bt/revision?rev=15528&r1=15527&r2=15528&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/bt/revision (original)
+++ erp5/trunk/bt5/erp5_banking_core/bt/revision Tue Aug  7 15:11:33 2007
@@ -1,1 +1,1 @@
-335
+337