From b454243c0977d76d88acf78953ad2e9077e326ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com>
Date: Mon, 4 Sep 2006 20:09:49 +0000
Subject: [PATCH] Remove omit_simulation parameter from Inventory API
ZSQLMethods parameters.
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@9663 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
.../erp5_core/Resource_zGetInventory.xml | 125 +++++++++++-------
.../erp5_core/Resource_zGetInventoryList.xml | 63 ++++++---
.../Resource_zGetMovementHistoryList.xml | 32 ++---
.../erp5_core/Resource_zGetTrackingList.xml | 55 ++++++--
.../erp5_core/Resource_zStatInventory.xml | 44 +++---
.../ERP5/bootstrap/erp5_core/bt/change_log | 3 +
product/ERP5/bootstrap/erp5_core/bt/revision | 2 +-
7 files changed, 193 insertions(+), 131 deletions(-)
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventory.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventory.xml
index 94571dcc8f..63a01c5f00 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventory.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventory.xml
@@ -78,12 +78,6 @@
<dictionary/>
</value>
</item>
- <item>
- <key> <string>omit_simulation</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
<item>
<key> <string>order_by_expression</string> </key>
<value>
@@ -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>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>
@@ -153,6 +146,18 @@
</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>
<key> <string>arguments_src</string> </key>
<value> <string>from_table_list:list\r\n
@@ -162,13 +167,30 @@ selection_domain\r\n
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
output_simulation_state:list\r\n
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>
@@ -177,6 +199,14 @@ group_by_expression</string> </value>
<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>
<value> <string encoding="cdata"><![CDATA[
@@ -204,8 +234,10 @@ FROM\n
, <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 @@ WHERE\n
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 @@ FROM\n
, <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 @@ WHERE\n
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 @@ ORDER BY\n
</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>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventoryList.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventoryList.xml
index c1bef457f9..c84e30376f 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventoryList.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventoryList.xml
@@ -86,12 +86,6 @@
<dictionary/>
</value>
</item>
- <item>
- <key> <string>omit_simulation</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
<item>
<key> <string>order_by_expression</string> </key>
<value>
@@ -140,19 +134,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>
@@ -161,6 +154,12 @@
</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>
@@ -177,7 +176,6 @@ selection_domain\r\n
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 @@ output_simulation_state:list</string> </value>
</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 @@ ORDER BY\n
</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>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetMovementHistoryList.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetMovementHistoryList.xml
index 190fd9deec..671d96fef9 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetMovementHistoryList.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetMovementHistoryList.xml
@@ -78,12 +78,6 @@
<dictionary/>
</value>
</item>
- <item>
- <key> <string>omit_simulation</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
<item>
<key> <string>order_by_expression</string> </key>
<value>
@@ -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_domain\r\n
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
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetTrackingList.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetTrackingList.xml
index f5018c9a59..ab73afbef7 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetTrackingList.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetTrackingList.xml
@@ -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>
@@ -332,6 +332,12 @@
</list>
</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>
@@ -607,4 +613,25 @@ ORDER BY item.date DESC\n
</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>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zStatInventory.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zStatInventory.xml
index e7294681eb..1abdf86c47 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zStatInventory.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zStatInventory.xml
@@ -76,12 +76,6 @@
<dictionary/>
</value>
</item>
- <item>
- <key> <string>omit_simulation</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
<item>
<key> <string>query</string> </key>
<value>
@@ -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 @@ resource_uid:list\r\n
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 @@ WHERE\n
<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 @@ WHERE\n
<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
diff --git a/product/ERP5/bootstrap/erp5_core/bt/change_log b/product/ERP5/bootstrap/erp5_core/bt/change_log
index 0f74a9aee3..ba33c97486 100644
--- a/product/ERP5/bootstrap/erp5_core/bt/change_log
+++ b/product/ERP5/bootstrap/erp5_core/bt/change_log
@@ -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.
diff --git a/product/ERP5/bootstrap/erp5_core/bt/revision b/product/ERP5/bootstrap/erp5_core/bt/revision
index 801f180102..c5b431b6cb 100644
--- a/product/ERP5/bootstrap/erp5_core/bt/revision
+++ b/product/ERP5/bootstrap/erp5_core/bt/revision
@@ -1 +1 @@
-47
\ No newline at end of file
+50
\ No newline at end of file
--
2.30.9