[Erp5-report] r27236 - in /erp5/trunk/bt5/erp5_item: SkinTemplateItem/portal_skins/erp5_ite...

[nobody at svn.erp5.org]

Author: mame
Date: Thu May 28 16:55:08 2009
New Revision: 27236

URL: http://svn.erp5.org?rev=27236&view=rev
Log:
2009-05-28 mame
*improve script

Modified:
    erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_createItemList.xml
    erp5/trunk/bt5/erp5_item/bt/revision
    erp5/trunk/bt5/erp5_item/bt/template_action_path_list

Modified: erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_createItemList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_createItemList.xml?rev=27236&r1=27235&r2=27236&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_createItemList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_createItemList.xml [utf8] Thu May 28 16:55:08 2009
@@ -90,10 +90,7 @@
  \n
     if line.has_key("variation_category_list") and line[\'variation_category_list\'] not in(\'\',[]):\n
       cell_found = None\n
-      for cell in context.getCellValueList(base_id=\'movement\'):\n
-        if cell.getVariationCategoryList() == line["variation_category_list"]:\n
-          cell_found = cell\n
-          break\n
+      cell_found = context.getCell(base_id=\'movement\', *line["variation_category_list"])\n
       if cell_found is not None:\n
         movement_to_update = cell_found\n
       else:\n
@@ -118,10 +115,6 @@
       movement_to_update.setAggregateValueSet(\n
         movement_to_update.getAggregateValueList() + [item])\n
       if update_quantity:\n
-        if item.getQuantityUnit() != movement_to_update.getQuantityUnit():\n
-          raise NotImplementedError(\n
-            \'Quantity unit from the movement differs from quantity\'\n
-            \' unit on the item\')\n
         movement_to_update.setQuantity(\n
             movement_to_update.getQuantity() + item.getQuantity())\n
 \n
@@ -187,12 +180,10 @@
                             <string>module</string>
                             <string>item</string>
                             <string>cell_found</string>
-                            <string>cell</string>
+                            <string>_apply_</string>
                             <string>movement_to_update</string>
-                            <string>_apply_</string>
                             <string>variation_category_list</string>
                             <string>variation</string>
-                            <string>NotImplementedError</string>
                           </tuple>
                         </value>
                     </item>

Modified: erp5/trunk/bt5/erp5_item/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/bt/revision?rev=27236&r1=27235&r2=27236&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_item/bt/revision [utf8] Thu May 28 16:55:08 2009
@@ -1,1 +1,1 @@
-140
+143

Modified: erp5/trunk/bt5/erp5_item/bt/template_action_path_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/bt/template_action_path_list?rev=27236&r1=27235&r2=27236&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/bt/template_action_path_list [utf8] (original)
+++ erp5/trunk/bt5/erp5_item/bt/template_action_path_list [utf8] Thu May 28 16:55:08 2009
@@ -1,5 +1,4 @@
 Internal Packing List Line | item_creation
-Internal Packing List Line | pagel_item_fast_input
 Internal Packing List Line | select_item_fast_input
 Internal Packing List | aggregate_item
 Item Module | create_order