[Erp5-report] r27164 - in /erp5/trunk/bt5/erp5_item: ActionTemplateItem/portal_types/Intern...
nobody at svn.erp5.org
nobody at svn.erp5.org
Mon May 25 19:47:25 CEST 2009
Author: mame
Date: Mon May 25 19:47:24 2009
New Revision: 27164
URL: http://svn.erp5.org?rev=27164&view=rev
Log:
2009-05-25 mame
*rename actions
*add new script to get variation title defined on item
*modified scripts used for fast input selection
Added:
erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getVariationCategoryTitleList.xml
Modified:
erp5/trunk/bt5/erp5_item/ActionTemplateItem/portal_types/Internal%20Packing%20List/aggregate_item.xml
erp5/trunk/bt5/erp5_item/ActionTemplateItem/portal_types/Purchase%20Order/aggregate_item.xml
erp5/trunk/bt5/erp5_item/ActionTemplateItem/portal_types/Purchase%20Packing%20List/aggregate_item.xml
erp5/trunk/bt5/erp5_item/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List/aggregate_item.xml
erp5/trunk/bt5/erp5_item/ActionTemplateItem/portal_types/Sale%20Order/aggregate_item.xml
erp5/trunk/bt5/erp5_item/ActionTemplateItem/portal_types/Sale%20Packing%20List/aggregate_item.xml
erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_getSelectableItemList.xml
erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_selectItemList.xml
erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_updateSelectItemListDialog.xml
erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewSelectItemListDialog/listbox.xml
erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewSelectItemListDialog/listbox_variation_category_list.xml
erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Delivery_viewAggregatedItemList/listbox_variation_category_item_list.xml
erp5/trunk/bt5/erp5_item/bt/revision
Modified: erp5/trunk/bt5/erp5_item/ActionTemplateItem/portal_types/Internal%20Packing%20List/aggregate_item.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/ActionTemplateItem/portal_types/Internal%2520Packing%2520List/aggregate_item.xml?rev=27164&r1=27163&r2=27164&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/ActionTemplateItem/portal_types/Internal%20Packing%20List/aggregate_item.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_item/ActionTemplateItem/portal_types/Internal%20Packing%20List/aggregate_item.xml [utf8] Mon May 25 19:47:24 2009
@@ -69,7 +69,7 @@
<dictionary>
<item>
<key> <string>text</string> </key>
- <value> <string>string:${object_url}/Order_viewAggregatedItemList</string> </value>
+ <value> <string>string:${object_url}/Delivery_viewAggregatedItemList</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_item/ActionTemplateItem/portal_types/Purchase%20Order/aggregate_item.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/ActionTemplateItem/portal_types/Purchase%2520Order/aggregate_item.xml?rev=27164&r1=27163&r2=27164&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/ActionTemplateItem/portal_types/Purchase%20Order/aggregate_item.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_item/ActionTemplateItem/portal_types/Purchase%20Order/aggregate_item.xml [utf8] Mon May 25 19:47:24 2009
@@ -69,7 +69,7 @@
<dictionary>
<item>
<key> <string>text</string> </key>
- <value> <string>string:${object_url}/Order_viewAggregatedItemList</string> </value>
+ <value> <string>string:${object_url}/Delivery_viewAggregatedItemList</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_item/ActionTemplateItem/portal_types/Purchase%20Packing%20List/aggregate_item.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/ActionTemplateItem/portal_types/Purchase%2520Packing%2520List/aggregate_item.xml?rev=27164&r1=27163&r2=27164&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/ActionTemplateItem/portal_types/Purchase%20Packing%20List/aggregate_item.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_item/ActionTemplateItem/portal_types/Purchase%20Packing%20List/aggregate_item.xml [utf8] Mon May 25 19:47:24 2009
@@ -69,7 +69,7 @@
<dictionary>
<item>
<key> <string>text</string> </key>
- <value> <string>string:${object_url}/Order_viewAggregatedItemList</string> </value>
+ <value> <string>string:${object_url}/Delivery_viewAggregatedItemList</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_item/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List/aggregate_item.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/ActionTemplateItem/portal_types/Returned%2520Sale%2520Packing%2520List/aggregate_item.xml?rev=27164&r1=27163&r2=27164&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List/aggregate_item.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_item/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List/aggregate_item.xml [utf8] Mon May 25 19:47:24 2009
@@ -69,7 +69,7 @@
<dictionary>
<item>
<key> <string>text</string> </key>
- <value> <string>string:${object_url}/Order_viewAggregatedItemList</string> </value>
+ <value> <string>string:${object_url}/Delivery_viewAggregatedItemList</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_item/ActionTemplateItem/portal_types/Sale%20Order/aggregate_item.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/ActionTemplateItem/portal_types/Sale%2520Order/aggregate_item.xml?rev=27164&r1=27163&r2=27164&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/ActionTemplateItem/portal_types/Sale%20Order/aggregate_item.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_item/ActionTemplateItem/portal_types/Sale%20Order/aggregate_item.xml [utf8] Mon May 25 19:47:24 2009
@@ -69,7 +69,7 @@
<dictionary>
<item>
<key> <string>text</string> </key>
- <value> <string>string:${object_url}/Order_viewAggregatedItemList</string> </value>
+ <value> <string>string:${object_url}/Delivery_viewAggregatedItemList</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_item/ActionTemplateItem/portal_types/Sale%20Packing%20List/aggregate_item.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/ActionTemplateItem/portal_types/Sale%2520Packing%2520List/aggregate_item.xml?rev=27164&r1=27163&r2=27164&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/ActionTemplateItem/portal_types/Sale%20Packing%20List/aggregate_item.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_item/ActionTemplateItem/portal_types/Sale%20Packing%20List/aggregate_item.xml [utf8] Mon May 25 19:47:24 2009
@@ -69,7 +69,7 @@
<dictionary>
<item>
<key> <string>text</string> </key>
- <value> <string>string:${object_url}/Order_viewAggregatedItemList</string> </value>
+ <value> <string>string:${object_url}/Delivery_viewAggregatedItemList</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_getSelectableItemList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_getSelectableItemList.xml?rev=27164&r1=27163&r2=27164&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_getSelectableItemList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_getSelectableItemList.xml [utf8] Mon May 25 19:47:24 2009
@@ -68,6 +68,7 @@
result)\n
\n
splc_list= context.contentValues(portal_type=cell_portal_type)\n
+\n
if not splc_list:\n
return new_list\n
for splc in splc_list:\n
@@ -75,6 +76,7 @@
lambda x :(x.Item_getVariationCategoryList()==splc.getVariationCategoryList()),\n
new_list)\n
result_list.extend(item_list)\n
+\n
len_res_list = len(result_list)\n
\n
\n
Modified: erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_selectItemList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_selectItemList.xml?rev=27164&r1=27163&r2=27164&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_selectItemList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_selectItemList.xml [utf8] Mon May 25 19:47:24 2009
@@ -75,7 +75,7 @@
item_list.append(item)\n
variation_dict = {} \n
for item in item_list: \n
- variation_list = item.Item_getVariationOnDefinedOnItem()\n
+ variation_list = item.Item_getVariationCategoryTitleList()\n
if variation_list not in variation_dict:\n
variation_dict[variation_list] = 0.0 \n
variation_dict[variation_list] = variation_dict[variation_list] + item.getQuantity()\n
Modified: erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_updateSelectItemListDialog.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_updateSelectItemListDialog.xml?rev=27164&r1=27163&r2=27164&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_updateSelectItemListDialog.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_updateSelectItemListDialog.xml [utf8] Mon May 25 19:47:24 2009
@@ -67,7 +67,7 @@
cell_portal_type = \'Inventory Cell\'\n
elif context.getPortalType()==\'Internal Packing List Line\':\n
cell_portal_type = \'Internal Packing List Cell\'\n
-context.Base_updateDialogForm(listbox=listbox)\n
+\n
\n
for line in listbox: \n
if line["selection_check"]==1:\n
@@ -76,7 +76,7 @@
item_list.append(item)\n
variation_dict = {} \n
for item in item_list: \n
- variation_list = item.Item_getVariationOnDefinedOnItem()\n
+ variation_list = item.Item_getVariationCategoryTitleList()\n
if variation_list not in variation_dict:\n
variation_dict[variation_list] = 0.0 \n
variation_dict[variation_list] = variation_dict[variation_list] + item.getQuantity()\n
@@ -87,16 +87,17 @@
variation_cell_list = \',\'.join([x[0] for x in splc.getVariationCategoryItemList()])\n
variation_cell_dict[variation_cell_list]= splc.getQuantity()\n
final_variation_dict={}\n
-for key in variation_cell_dict:\n
- final_variation_dict[key] = "%s/%s"%(variation_cell_dict[key],variation_dict[key])\n
\n
- \n
+for key in variation_dict:\n
+ final_variation_dict[key] = "%s/%s"%(variation_cell_dict[key],variation_dict[key])\n
+\n
\n
request.set(\'portal_status_message\',\n
Base_translateString(\n
\'Quantity Defined On Packing List %s\' %(final_variation_dict)))\n
\n
-return context.SalePackingList_viewSelectItemFastInputDialog(**kw)\n
+context.Base_updateDialogForm(listbox=listbox)\n
+return context.DeliveryLine_viewSelectItemListDialog(**kw)\n
</string> </value>
</item>
<item>
Modified: erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewSelectItemListDialog/listbox.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewSelectItemListDialog/listbox.xml?rev=27164&r1=27163&r2=27164&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewSelectItemListDialog/listbox.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewSelectItemListDialog/listbox.xml [utf8] Mon May 25 19:47:24 2009
@@ -163,7 +163,7 @@
<string>Quantity</string>
</tuple>
<tuple>
- <string>Item_getVariationOnDefinedOnItem</string>
+ <string>Item_getVariationCategoryTitleList</string>
<string>Variation</string>
</tuple>
</list>
@@ -184,7 +184,7 @@
<string>Select</string>
</tuple>
<tuple>
- <string>Item_getVariationOnDefinedOnItem</string>
+ <string>Item_getVariationCategoryTitleList</string>
<string>Variation</string>
</tuple>
</list>
Modified: erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewSelectItemListDialog/listbox_variation_category_list.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewSelectItemListDialog/listbox_variation_category_list.xml?rev=27164&r1=27163&r2=27164&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewSelectItemListDialog/listbox_variation_category_list.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewSelectItemListDialog/listbox_variation_category_list.xml [utf8] Mon May 25 19:47:24 2009
@@ -273,7 +273,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python : cell.Item_getVariationOnDefinedOnItem()</string> </value>
+ <value> <string>python: cell.Item_getVariationCategoryList()</string> </value>
</item>
</dictionary>
</pickle>
@@ -289,7 +289,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python: here.getVariationRangeCategoryItemList(display_base_category = 0)</string> </value>
+ <value> <string>python: cell.getAggregateRelatedValue().getVariationRangeCategoryItemList(display_base_category = 0)</string> </value>
</item>
</dictionary>
</pickle>
@@ -305,7 +305,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python: here.getVariationRangeCategoryItemList(display_base_category = 0)</string> </value>
+ <value> <string>python: cell.getAggregateRelatedValue().getVariationRangeCategoryItemList(display_base_category = 0)</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Delivery_viewAggregatedItemList/listbox_variation_category_item_list.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Delivery_viewAggregatedItemList/listbox_variation_category_item_list.xml?rev=27164&r1=27163&r2=27164&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Delivery_viewAggregatedItemList/listbox_variation_category_item_list.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Delivery_viewAggregatedItemList/listbox_variation_category_item_list.xml [utf8] Mon May 25 19:47:24 2009
@@ -311,7 +311,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>cell/Item_getVariationCategoryList</string> </value>
+ <value> <string>cell/Item_getVariationCategoryTitleList</string> </value>
</item>
</dictionary>
</pickle>
Added: erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getVariationCategoryTitleList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getVariationCategoryTitleList.xml?rev=27164&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getVariationCategoryTitleList.xml (added)
+++ erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getVariationCategoryTitleList.xml [utf8] Mon May 25 19:47:24 2009
@@ -1,0 +1,158 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>Script_magic</string> </key>
+ <value> <int>3</int> </value>
+ </item>
+ <item>
+ <key> <string>_bind_names</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>_asgns</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>name_container</string> </key>
+ <value> <string>container</string> </value>
+ </item>
+ <item>
+ <key> <string>name_context</string> </key>
+ <value> <string>context</string> </value>
+ </item>
+ <item>
+ <key> <string>name_m_self</string> </key>
+ <value> <string>script</string> </value>
+ </item>
+ <item>
+ <key> <string>name_subpath</string> </key>
+ <value> <string>traverse_subpath</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>_body</string> </key>
+ <value> <string>from DateTime import DateTime\n
+\n
+kw[\'at_date\'] = DateTime()\n
+kw[\'item\'] = context.getRelativeUrl()\n
+\n
+last_affectation_list = context.portal_simulation.getCurrentTrackingList(**kw)\n
+\n
+if kw.get(\'src__\',0):\n
+ return last_affectation_list\n
+if len(last_affectation_list):\n
+ last_affectation = last_affectation_list[0]\n
+ if last_affectation.delivery_uid is not None:\n
+ movement = context.portal_catalog.getObject(last_affectation.delivery_uid)\n
+ variation_list = [x[0] for x in movement.getVariationCategoryItemList()]\n
+ variation = \',\'.join(variation_list)\n
+ return variation\n
+\n
+return []\n
+</string> </value>
+ </item>
+ <item>
+ <key> <string>_code</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_params</string> </key>
+ <value> <string>current=1,**kw</string> </value>
+ </item>
+ <item>
+ <key> <string>errors</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ <item>
+ <key> <string>func_code</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>co_argcount</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ <item>
+ <key> <string>co_varnames</string> </key>
+ <value>
+ <tuple>
+ <string>current</string>
+ <string>kw</string>
+ <string>DateTime</string>
+ <string>_write_</string>
+ <string>_getattr_</string>
+ <string>context</string>
+ <string>_apply_</string>
+ <string>last_affectation_list</string>
+ <string>len</string>
+ <string>_getitem_</string>
+ <string>last_affectation</string>
+ <string>None</string>
+ <string>movement</string>
+ <string>append</string>
+ <string>$append0</string>
+ <string>_getiter_</string>
+ <string>x</string>
+ <string>variation_list</string>
+ <string>variation</string>
+ </tuple>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>func_defaults</string> </key>
+ <value>
+ <tuple>
+ <int>1</int>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>Item_getVariationCategoryTitleList</string> </value>
+ </item>
+ <item>
+ <key> <string>warnings</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Modified: erp5/trunk/bt5/erp5_item/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/bt/revision?rev=27164&r1=27163&r2=27164&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_item/bt/revision [utf8] Mon May 25 19:47:24 2009
@@ -1,1 +1,1 @@
-103
+108
More information about the Erp5-report
mailing list