[Erp5-report] r27096 - in /erp5/trunk/bt5/erp5_item: SkinTemplateItem/portal_skins/erp5_ite...
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri May 22 15:00:35 CEST 2009
Author: jerome
Date: Fri May 22 15:00:34 2009
New Revision: 27096
URL: http://svn.erp5.org?rev=27096&view=rev
Log:
rename Item_getVariationOnMovement into Item_getVariationCategoryList and introduce Item_getVariationRangeCategoryItemList.
Added:
erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getVariationCategoryList.xml
erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getVariationRangeCategoryItemList.xml
Modified:
erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ItemModule_createDeliveryLine.xml
erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_createDeliveryLine.xml
erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_variation_category_list.xml
erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/SalePackingList_getSelectFastInputItemList.xml
erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/SalePackingList_setItemForSelectFastInputList.xml
erp5/trunk/bt5/erp5_item/bt/revision
Modified: erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ItemModule_createDeliveryLine.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ItemModule_createDeliveryLine.xml?rev=27096&r1=27095&r2=27096&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ItemModule_createDeliveryLine.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ItemModule_createDeliveryLine.xml [utf8] Fri May 22 15:00:34 2009
@@ -119,10 +119,11 @@
pl_line_dict[\'resource_value\'] = resource\n
pl_line_dict[\'source_value\'] = source\n
pl_line_value = pl_value.newContent(**pl_line_dict)\n
- if item.Item_getVariationOnMovement()==[]:\n
+ variation_category_list = item.Item_getVariationCategoryList()\n
+ if not variation_category_list:\n
pl_line_value.setAggregateValue(item)\n
else:\n
- pl_line_value.setVariationCategoryList(item.Item_getVariationOnMovement(current=1))\n
+ pl_line_value.setVariationCategoryList(variation_category_list)\n
base_id = \'movement\'\n
cell_key_list = list(pl_line_value.getCellKeyList(base_id=base_id))\n
cell_key_list.sort()\n
@@ -220,6 +221,7 @@
<string>resource</string>
<string>pl_line_dict</string>
<string>pl_line_value</string>
+ <string>variation_category_list</string>
<string>base_id</string>
<string>list</string>
<string>cell_key_list</string>
Modified: erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_createDeliveryLine.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_createDeliveryLine.xml?rev=27096&r1=27095&r2=27096&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_createDeliveryLine.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_createDeliveryLine.xml [utf8] Fri May 22 15:00:34 2009
@@ -82,10 +82,11 @@
\n
pl_line_value = pl_value.newContent(**pl_line_dict)\n
pl_line_value.setResourceValue(context.Item_getResourceValue())\n
-if context.Item_getVariationOnMovement()==[]:\n
+variation_category_list = context.Item_getVariationCategoryList()\n
+if not variation_category_list:\n
pl_line_value.setAggregateValue(context)\n
else:\n
- pl_line_value.setVariationCategoryList(context.Item_getVariationOnMovement(current=1))\n
+ pl_line_value.setVariationCategoryList(variation_category_list)\n
base_id = \'movement\'\n
cell_key_list = list(pl_line_value.getCellKeyList(base_id=base_id))\n
cell_key_list.sort()\n
@@ -166,6 +167,7 @@
<string>_apply_</string>
<string>pl_value</string>
<string>pl_line_value</string>
+ <string>variation_category_list</string>
<string>base_id</string>
<string>list</string>
<string>cell_key_list</string>
Added: erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getVariationCategoryList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getVariationCategoryList.xml?rev=27096&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getVariationCategoryList.xml (added)
+++ erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getVariationCategoryList.xml [utf8] Fri May 22 15:00:34 2009
@@ -1,0 +1,148 @@
+<?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
+\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
+ return movement.getVariationCategoryList()\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>**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>0</int> </value>
+ </item>
+ <item>
+ <key> <string>co_varnames</string> </key>
+ <value>
+ <tuple>
+ <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>
+ </tuple>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>func_defaults</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>Item_getVariationCategoryList</string> </value>
+ </item>
+ <item>
+ <key> <string>warnings</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Added: erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getVariationRangeCategoryItemList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getVariationRangeCategoryItemList.xml?rev=27096&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getVariationRangeCategoryItemList.xml (added)
+++ erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getVariationRangeCategoryItemList.xml [utf8] Fri May 22 15:00:34 2009
@@ -1,0 +1,147 @@
+<?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
+ return movement.getVariationRangeCategoryItemList(display_base_category=0)\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>**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>0</int> </value>
+ </item>
+ <item>
+ <key> <string>co_varnames</string> </key>
+ <value>
+ <tuple>
+ <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>
+ </tuple>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>func_defaults</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>Item_getVariationRangeCategoryItemList</string> </value>
+ </item>
+ <item>
+ <key> <string>warnings</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Modified: erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_variation_category_list.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_variation_category_list.xml?rev=27096&r1=27095&r2=27096&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_variation_category_list.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_variation_category_list.xml [utf8] Fri May 22 15:00:34 2009
@@ -295,7 +295,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python: here.Item_getVariationOnMovement()</string> </value>
+ <value> <string>here/Item_getVariationCategoryList</string> </value>
</item>
</dictionary>
</pickle>
@@ -311,7 +311,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python: here.getAggregateRelatedValue().getVariationRangeCategoryItemList(display_base_category = 0)</string> </value>
+ <value> <string>here/Item_getVariationRangeCategoryItemList</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/SalePackingList_getSelectFastInputItemList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/SalePackingList_getSelectFastInputItemList.xml?rev=27096&r1=27095&r2=27096&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/SalePackingList_getSelectFastInputItemList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/SalePackingList_getSelectFastInputItemList.xml [utf8] Fri May 22 15:00:34 2009
@@ -68,9 +68,11 @@
result)\n
\n
splc_list= context.contentValues(portal_type=cell_portal_type)\n
+if not splc_list:\n
+ return new_list\n
for splc in splc_list:\n
item_list = filter(\n
- lambda x :(x.Item_getVariationOnMovement()==splc.getVariationCategoryList()),\n
+ lambda x :(x.Item_getVariationCategoryList()==splc.getVariationCategoryList()),\n
new_list)\n
result_list.extend(item_list)\n
len_res_list = len(result_list)\n
@@ -80,7 +82,7 @@
\n
return result_list\n
for item in result_list:\n
- variation_list = item.Item_getVariationOnMovement()\n
+ variation_list = item.Item_getVariationCategoryList()\n
if variation_list !=[]:\n
obj = newTempBase(portal,id="tmp_item_%s" % item.getId(), uid="new_item_%s" % item.getId())\n
obj.edit(title=item.Item_getResourceTitle(),\n
Modified: erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/SalePackingList_setItemForSelectFastInputList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/SalePackingList_setItemForSelectFastInputList.xml?rev=27096&r1=27095&r2=27096&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/SalePackingList_setItemForSelectFastInputList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/SalePackingList_setItemForSelectFastInputList.xml [utf8] Fri May 22 15:00:34 2009
@@ -81,7 +81,7 @@
variation_dict[variation_list] = variation_dict[variation_list] + item.getQuantity()\n
for cell in splc_list:\n
for item in item_list:\n
- if item.Item_getVariationOnMovement()==cell.getVariationCategoryList():\n
+ if item.Item_getVariationCategoryList() == cell.getVariationCategoryList():\n
new_item_list=[]\n
new_item_list.append(item) \n
cell.setAggregateValueList(context.getAggregateValueList()+ new_item_list)\n
Modified: erp5/trunk/bt5/erp5_item/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/bt/revision?rev=27096&r1=27095&r2=27096&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_item/bt/revision [utf8] Fri May 22 15:00:34 2009
@@ -1,1 +1,1 @@
-78
+84
More information about the Erp5-report
mailing list