[Erp5-report] r9663 - in /erp5/trunk/products/ERP5/bootstrap/erp5_core: SkinTemplateItem/po...
nobody at svn.erp5.org
nobody at svn.erp5.org
Mon Sep 4 22:09:56 CEST 2006
Author: jerome
Date: Mon Sep 4 22:09:49 2006
New Revision: 9663
URL: http://svn.erp5.org?rev=9663&view=rev
Log:
Remove omit_simulation parameter from Inventory API ZSQLMethods parameters.
Modified:
erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventory.xml
erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventoryList.xml
erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetMovementHistoryList.xml
erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetTrackingList.xml
erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zStatInventory.xml
erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/change_log
erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventory.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventory.xml?rev=9663&r1=9662&r2=9663&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventory.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventory.xml Mon Sep 4 22:09:49 2006
@@ -79,12 +79,6 @@
</value>
</item>
<item>
- <key> <string>omit_simulation</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
<key> <string>order_by_expression</string> </key>
<value>
<dictionary/>
@@ -132,25 +126,36 @@
<key> <string>_keys</string> </key>
<value>
<list>
- <string>from_table_list</string>
- <string>where_expression</string>
- <string>order_by_expression</string>
- <string>selection_domain</string>
- <string>selection_report</string>
- <string>ignore_variation</string>
- <string>standardize</string>
- <string>omit_simulation</string>
- <string>omit_input</string>
- <string>omit_output</string>
- <string>input_simulation_state</string>
- <string>output_simulation_state</string>
- <string>group_by_expression</string>
+<string>from_table_list</string>
+<string>where_expression</string>
+<string>order_by_expression</string>
+<string>selection_domain</string>
+<string>selection_report</string>
+<string>ignore_variation</string>
+<string>standardize</string>
+<string>omit_input</string>
+<string>omit_output</string>
+<string>input_simulation_state</string>
+<string>output_simulation_state</string>
+<string>group_by_expression</string>
</list>
</value>
</item>
</dictionary>
</state>
</object>
+ </value>
+ </item>
+ <item>
+ <key> <string>_dav_writelocks</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>allow_simple_one_argument_traversal</string> </key>
+ <value>
+ <none/>
</value>
</item>
<item>
@@ -162,7 +167,6 @@
selection_report\r\n
ignore_variation\r\n
standardize\r\n
-omit_simulation\r\n
omit_input\r\n
omit_output\r\n
input_simulation_state:list\r\n
@@ -170,12 +174,38 @@
group_by_expression</string> </value>
</item>
<item>
+ <key> <string>cache_time_</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>class_file_</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>class_name_</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>connection_hook</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
<key> <string>connection_id</string> </key>
<value> <string>erp5_sql_connection</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Resource_zGetInventory</string> </value>
+ </item>
+ <item>
+ <key> <string>max_cache_</string> </key>
+ <value> <int>100</int> </value>
+ </item>
+ <item>
+ <key> <string>max_rows_</string> </key>
+ <value> <int>1000</int> </value>
</item>
<item>
<key> <string>src</string> </key>
@@ -204,8 +234,10 @@
, <dtml-var table_item> AS <dtml-var table_key>\n
</dtml-if>\n
</dtml-in>\n
- <dtml-if selection_domain>, <dtml-var "selection_domain.asSqlJoinExpression()"> </dtml-if>\n
- <dtml-if selection_report>, <dtml-var "selection_report.asSqlJoinExpression()"> </dtml-if>\n
+ <dtml-if selection_domain>,\n
+ <dtml-var "selection_domain.asSqlJoinExpression()"> </dtml-if>\n
+ <dtml-if selection_report>,\n
+ <dtml-var "selection_report.asSqlJoinExpression()"> </dtml-if>\n
, catalog as node, catalog as resource\n
\n
WHERE\n
@@ -217,17 +249,6 @@
AND node.uid = stock.node_uid\n
AND resource.uid = stock.resource_uid\n
\n
-<dtml-comment>\n
-XXX Do we want or need this ?\n
- AND inventory_movement.is_accountable = 1\n
-XXX How to deal with standardize ?\n
-</dtml-comment>\n
-\n
-<dtml-comment>\n
-<dtml-if omit_simulation>\n
- AND catalog.portal_type != "Simulation Movement"\n
-</dtml-if>\n
-</dtml-comment>\n
<dtml-if omit_input>\n
AND stock.quantity < 0\n
AND ( stock.node_uid <> stock.mirror_node_uid\n
@@ -339,8 +360,10 @@
, <dtml-var table_item> AS <dtml-var table_key>\n
</dtml-if>\n
</dtml-in>\n
- <dtml-if selection_domain>, <dtml-var "selection_domain.asSqlJoinExpression()"> </dtml-if>\n
- <dtml-if selection_report>, <dtml-var "selection_report.asSqlJoinExpression()"> </dtml-if>\n
+ <dtml-if selection_domain>,\n
+ <dtml-var "selection_domain.asSqlJoinExpression()"> </dtml-if>\n
+ <dtml-if selection_report>,\n
+ <dtml-var "selection_report.asSqlJoinExpression()"> </dtml-if>\n
, catalog as node, catalog as resource\n
\n
WHERE\n
@@ -352,17 +375,6 @@
AND node.uid = stock.node_uid\n
AND resource.uid = stock.resource_uid\n
\n
-<dtml-comment>\n
-XXX Do we want or need this ?\n
- AND inventory_movement.is_accountable = 1\n
-XXX How to deal with standardize ?\n
-</dtml-comment>\n
-\n
-<dtml-comment>\n
-<dtml-if omit_simulation>\n
- AND catalog.portal_type != "Simulation Movement"\n
-</dtml-if>\n
-</dtml-comment>\n
<dtml-if omit_input>\n
AND stock.quantity < 0\n
AND ( stock.node_uid <> stock.mirror_node_uid\n
@@ -429,4 +441,25 @@
</dictionary>
</pickle>
</record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>Persistence</string>
+ <string>PersistentMapping</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_container</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
</ZopeData>
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventoryList.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventoryList.xml?rev=9663&r1=9662&r2=9663&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventoryList.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventoryList.xml Mon Sep 4 22:09:49 2006
@@ -87,12 +87,6 @@
</value>
</item>
<item>
- <key> <string>omit_simulation</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
<key> <string>order_by_expression</string> </key>
<value>
<dictionary/>
@@ -140,25 +134,30 @@
<key> <string>_keys</string> </key>
<value>
<list>
- <string>from_table_list</string>
- <string>where_expression</string>
- <string>order_by_expression</string>
- <string>group_by_expression</string>
- <string>selection_domain</string>
- <string>selection_report</string>
- <string>ignore_variation</string>
- <string>standardize</string>
- <string>omit_simulation</string>
- <string>omit_input</string>
- <string>omit_output</string>
- <string>input_simulation_state</string>
- <string>output_simulation_state</string>
+<string>from_table_list</string>
+<string>where_expression</string>
+<string>order_by_expression</string>
+<string>group_by_expression</string>
+<string>selection_domain</string>
+<string>selection_report</string>
+<string>ignore_variation</string>
+<string>standardize</string>
+<string>omit_input</string>
+<string>omit_output</string>
+<string>input_simulation_state</string>
+<string>output_simulation_state</string>
</list>
</value>
</item>
</dictionary>
</state>
</object>
+ </value>
+ </item>
+ <item>
+ <key> <string>_dav_writelocks</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
@@ -177,7 +176,6 @@
selection_report\r\n
ignore_variation\r\n
standardize\r\n
-omit_simulation\r\n
omit_input\r\n
omit_output\r\n
input_simulation_state:list\r\n
@@ -197,7 +195,9 @@
</item>
<item>
<key> <string>connection_hook</string> </key>
- <value> <string></string> </value>
+ <value>
+ <none/>
+ </value>
</item>
<item>
<key> <string>connection_id</string> </key>
@@ -463,4 +463,25 @@
</dictionary>
</pickle>
</record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>Persistence</string>
+ <string>PersistentMapping</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_container</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
</ZopeData>
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetMovementHistoryList.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetMovementHistoryList.xml?rev=9663&r1=9662&r2=9663&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetMovementHistoryList.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetMovementHistoryList.xml Mon Sep 4 22:09:49 2006
@@ -79,12 +79,6 @@
</value>
</item>
<item>
- <key> <string>omit_simulation</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
<key> <string>order_by_expression</string> </key>
<value>
<dictionary/>
@@ -132,19 +126,18 @@
<key> <string>_keys</string> </key>
<value>
<list>
- <string>from_table_list</string>
- <string>where_expression</string>
- <string>order_by_expression</string>
- <string>group_by_expression</string>
- <string>selection_domain</string>
- <string>selection_report</string>
- <string>ignore_variation</string>
- <string>standardize</string>
- <string>omit_simulation</string>
- <string>omit_input</string>
- <string>omit_output</string>
- <string>input_simulation_state</string>
- <string>output_simulation_state</string>
+<string>from_table_list</string>
+<string>where_expression</string>
+<string>order_by_expression</string>
+<string>group_by_expression</string>
+<string>selection_domain</string>
+<string>selection_report</string>
+<string>ignore_variation</string>
+<string>standardize</string>
+<string>omit_input</string>
+<string>omit_output</string>
+<string>input_simulation_state</string>
+<string>output_simulation_state</string>
</list>
</value>
</item>
@@ -584,7 +577,6 @@
selection_report\r\n
ignore_variation\r\n
standardize\r\n
-omit_simulation\r\n
omit_input\r\n
omit_output\r\n
input_simulation_state:list\r\n
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetTrackingList.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetTrackingList.xml?rev=9663&r1=9662&r2=9663&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetTrackingList.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetTrackingList.xml Mon Sep 4 22:09:49 2006
@@ -141,20 +141,20 @@
<key> <string>_keys</string> </key>
<value>
<list>
- <string>from_date</string>
- <string>at_date</string>
- <string>to_date</string>
- <string>input</string>
- <string>output</string>
- <string>from_table_list</string>
- <string>where_expression</string>
- <string>selection_domain</string>
- <string>selection_report</string>
- <string>order_by_expression</string>
- <string>group_by_expression</string>
- <string>join_on_item</string>
- <string>date_condition_in_join</string>
- <string>simulation_state_list</string>
+<string>from_date</string>
+<string>at_date</string>
+<string>to_date</string>
+<string>input</string>
+<string>output</string>
+<string>from_table_list</string>
+<string>where_expression</string>
+<string>selection_domain</string>
+<string>selection_report</string>
+<string>order_by_expression</string>
+<string>group_by_expression</string>
+<string>join_on_item</string>
+<string>date_condition_in_join</string>
+<string>simulation_state_list</string>
</list>
</value>
</item>
@@ -330,6 +330,12 @@
</item>
</dictionary>
</list>
+ </value>
+ </item>
+ <item>
+ <key> <string>_dav_writelocks</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
@@ -607,4 +613,25 @@
</dictionary>
</pickle>
</record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>Persistence</string>
+ <string>PersistentMapping</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_container</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
</ZopeData>
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zStatInventory.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zStatInventory.xml?rev=9663&r1=9662&r2=9663&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zStatInventory.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zStatInventory.xml Mon Sep 4 22:09:49 2006
@@ -77,12 +77,6 @@
</value>
</item>
<item>
- <key> <string>omit_simulation</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
<key> <string>query</string> </key>
<value>
<dictionary/>
@@ -158,22 +152,21 @@
<key> <string>_keys</string> </key>
<value>
<list>
- <string>query</string>
- <string>resource_uid</string>
- <string>from_date</string>
- <string>at_date</string>
- <string>to_date</string>
- <string>omit_simulation</string>
- <string>omit_input</string>
- <string>omit_output</string>
- <string>simulation_state</string>
- <string>section_category</string>
- <string>selection_domain</string>
- <string>selection_report</string>
- <string>closed_summary</string>
- <string>where_expression</string>
- <string>from_table_list</string>
- <string>selection_uids</string>
+<string>query</string>
+<string>resource_uid</string>
+<string>from_date</string>
+<string>at_date</string>
+<string>to_date</string>
+<string>omit_input</string>
+<string>omit_output</string>
+<string>simulation_state</string>
+<string>section_category</string>
+<string>selection_domain</string>
+<string>selection_report</string>
+<string>closed_summary</string>
+<string>where_expression</string>
+<string>from_table_list</string>
+<string>selection_uids</string>
</list>
</value>
</item>
@@ -201,7 +194,6 @@
from_date\r\n
at_date\r\n
to_date\r\n
-omit_simulation\r\n
omit_input\r\n
omit_output\r\n
simulation_state:list\r\n
@@ -303,9 +295,6 @@
<dtml-if to_date>\n
AND stock.date < <dtml-sqlvar to_date type="datetime">\n
</dtml-if>\n
- <dtml-if omit_simulation>\n
- AND child.portal_type != "Simulation Movement"\n
- </dtml-if>\n
<dtml-if omit_input>\n
AND stock.quantity < 0\n
AND (stock.node_uid <> stock.mirror_node_uid\n
@@ -446,9 +435,6 @@
<dtml-if to_date>\n
AND stock.date < <dtml-sqlvar to_date type="datetime">\n
</dtml-if>\n
- <dtml-if omit_simulation>\n
- AND child.portal_type != "Simulation Movement"\n
- </dtml-if>\n
<dtml-if omit_input>\n
AND stock.quantity < 0\n
AND (stock.node_uid <> stock.mirror_node_uid\n
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/change_log?rev=9663&r1=9662&r2=9663&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/change_log (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/change_log Mon Sep 4 22:09:49 2006
@@ -1,3 +1,6 @@
+2006-09-04 jerome
+* remove omit_simulation parameter in all inventory API ZSQLMethods.
+
2006-08-25 Stefan
* Update naming convention script.
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision?rev=9663&r1=9662&r2=9663&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision Mon Sep 4 22:09:49 2006
@@ -1,1 +1,1 @@
-47
+50
More information about the Erp5-report
mailing list