[Erp5-report] r28472 - in /erp5/trunk/bt5/erp5_trade: SkinTemplateItem/portal_skins/erp5_tr...
nobody at svn.erp5.org
nobody at svn.erp5.org
Wed Aug 19 19:47:33 CEST 2009
Author: mame
Date: Wed Aug 19 19:47:31 2009
New Revision: 28472
URL: http://svn.erp5.org?rev=28472&view=rev
Log:
2009-08-19 mame
*remove aggregate_quantity_list and only one field is made for item and quantity
*script to get items modified and renamed
Added:
erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Inventory_getAggregatedItemList.xml
Modified:
erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewStockReportBySite.xml
erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewStockReportBySite/listbox.xml
erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewStockReportBySite/listbox_aggregate_title_list.xml
erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Inventory_getStockReportBySiteDialogListboxColumnList.xml
erp5/trunk/bt5/erp5_trade/bt/revision
Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewStockReportBySite.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewStockReportBySite.xml?rev=28472&r1=28471&r2=28472&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewStockReportBySite.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewStockReportBySite.xml [utf8] Wed Aug 19 19:47:31 2009
@@ -94,7 +94,6 @@
<list>
<string>listbox_quantity_unit</string>
<string>listbox_variation_category_item_list</string>
- <string>listbox_aggregate_quantity_list</string>
</list>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewStockReportBySite/listbox.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewStockReportBySite/listbox.xml?rev=28472&r1=28471&r2=28472&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewStockReportBySite/listbox.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewStockReportBySite/listbox.xml [utf8] Wed Aug 19 19:47:31 2009
@@ -137,10 +137,6 @@
<string>Items aggregated</string>
</tuple>
<tuple>
- <string>aggregate_quantity_list</string>
- <string>Items Quantity List</string>
- </tuple>
- <tuple>
<string>getInventory</string>
<string>Stock</string>
</tuple>
Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewStockReportBySite/listbox_aggregate_title_list.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewStockReportBySite/listbox_aggregate_title_list.xml?rev=28472&r1=28471&r2=28472&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewStockReportBySite/listbox_aggregate_title_list.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewStockReportBySite/listbox_aggregate_title_list.xml [utf8] Wed Aug 19 19:47:31 2009
@@ -151,9 +151,7 @@
</item>
<item>
<key> <string>enabled</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
- </value>
+ <value> <string></string> </value>
</item>
<item>
<key> <string>external_validator</string> </key>
@@ -313,23 +311,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python: cell.Inventory_getAggregatedItems()</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
- <record id="3" aka="AAAAAAAAAAM=">
- <pickle>
- <tuple>
- <global name="TALESMethod" module="Products.Formulator.TALESField"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>_text</string> </key>
- <value> <string>python: context.REQUEST.form["item_stock"]==1</string> </value>
+ <value> <string>python: cell.Inventory_getAggregatedItemList()</string> </value>
</item>
</dictionary>
</pickle>
Added: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Inventory_getAggregatedItemList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Inventory_getAggregatedItemList.xml?rev=28472&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Inventory_getAggregatedItemList.xml (added)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Inventory_getAggregatedItemList.xml [utf8] Wed Aug 19 19:47:31 2009
@@ -1,0 +1,185 @@
+<?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 Products.ERP5Type.Document import newTempBase\n
+from Products.ERP5Type.Utils import cartesianProduct\n
+from DateTime import DateTime\n
+portal = context.getPortalObject()\n
+request = portal.REQUEST\n
+at_date = request.form["at_date"].Date()\n
+at_date = DateTime().Date()\n
+\n
+tracking_parameters = {\n
+ \'node_uid\': context.node_uid,\n
+ \'resource_uid\': context.getResourceUid(),\n
+ \'section_uid\' : context.section_uid,\n
+ \'at_date\': context.getStartDate(),\n
+ \'output\': 0,\n
+}\n
+result_list = []\n
+item_dict ={}\n
+check_variation = bool(context.getVariationCategoryList())\n
+if check_variation==True and context.getPortalType()!=\'Simulation Movement\':\n
+ acceptable_variation_category_list = \\\n
+ cartesianProduct(context.getObject().getCellRange(base_id=\'movement\'))\n
+\n
+ for tracking_brain in portal.portal_simulation.getTrackingList(\n
+ **tracking_parameters):\n
+ item = tracking_brain.getObject()\n
+ \n
+ if check_variation and \\\n
+ item.Item_getVariationCategoryList(at_date=context.getStartDate())\\\n
+ not in acceptable_variation_category_list:\n
+ continue\n
+ item_dict = "%s : %s"%(item.getTitle(),item.getQuantity(at_date=at_date))\n
+ result_list.append(item_dict)\n
+return result_list\n
+</string> </value>
+ </item>
+ <item>
+ <key> <string>_code</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_params</string> </key>
+ <value> <string>at_date=None, site=None,positive_stock,negative_stock,zero_stock, **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>5</int> </value>
+ </item>
+ <item>
+ <key> <string>co_varnames</string> </key>
+ <value>
+ <tuple>
+ <string>at_date</string>
+ <string>site</string>
+ <string>positive_stock</string>
+ <string>negative_stock</string>
+ <string>zero_stock</string>
+ <string>kw</string>
+ <string>Products.ERP5Type.Document</string>
+ <string>newTempBase</string>
+ <string>Products.ERP5Type.Utils</string>
+ <string>cartesianProduct</string>
+ <string>DateTime</string>
+ <string>_getattr_</string>
+ <string>context</string>
+ <string>portal</string>
+ <string>request</string>
+ <string>_getitem_</string>
+ <string>tracking_parameters</string>
+ <string>result_list</string>
+ <string>item_dict</string>
+ <string>bool</string>
+ <string>check_variation</string>
+ <string>True</string>
+ <string>acceptable_variation_category_list</string>
+ <string>_getiter_</string>
+ <string>_apply_</string>
+ <string>tracking_brain</string>
+ <string>item</string>
+ </tuple>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>func_defaults</string> </key>
+ <value>
+ <tuple>
+ <none/>
+ <none/>
+ <none/>
+ <none/>
+ <none/>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>Inventory_getAggregatedItemList</string> </value>
+ </item>
+ <item>
+ <key> <string>warnings</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Inventory_getStockReportBySiteDialogListboxColumnList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Inventory_getStockReportBySiteDialogListboxColumnList.xml?rev=28472&r1=28471&r2=28472&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Inventory_getStockReportBySiteDialogListboxColumnList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Inventory_getStockReportBySiteDialogListboxColumnList.xml [utf8] Wed Aug 19 19:47:31 2009
@@ -64,9 +64,6 @@
if item_stock==1:\n
column_item_list.append((\'aggregate_title_list\',\n
\'Items aggregated\'))\n
-\n
- column_item_list.append((\'aggregate_quantity_list\',\n
- \'Items Quantity List\'))\n
\n
\n
return column_item_list\n
Modified: erp5/trunk/bt5/erp5_trade/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/bt/revision?rev=28472&r1=28471&r2=28472&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/bt/revision [utf8] Wed Aug 19 19:47:31 2009
@@ -1,1 +1,1 @@
-719
+720
More information about the Erp5-report
mailing list