Skip to content

erp5
erp5
Commit b454243c authored by Jérome Perrin's avatar Jérome Perrin
Browse files
Options 

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
parent d8b06d91
Show whitespace changes
Inline Side-by-side
Showing with 193 additions and 131 deletions
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventory.xml
View file @ b454243c
...@@ -78,12 +78,6 @@ ...@@ -78,12 +78,6 @@
<dictionary/> <dictionary/>
</value> </value>
</item> </item>
<item>
<key> <string>omit_simulation</string> </key>
<value>
<dictionary/>
</value>
</item>
<item> <item>
<key> <string>order_by_expression</string> </key> <key> <string>order_by_expression</string> </key>
<value> <value>
...@@ -132,19 +126,18 @@ ...@@ -132,19 +126,18 @@
<key> <string>_keys</string> </key> <key> <string>_keys</string> </key>
<value> <value>
<list> <list>
<string>from_table_list</string> <string>from_table_list</string>
<string>where_expression</string> <string>where_expression</string>
<string>order_by_expression</string> <string>order_by_expression</string>
<string>selection_domain</string> <string>selection_domain</string>
<string>selection_report</string> <string>selection_report</string>
<string>ignore_variation</string> <string>ignore_variation</string>
<string>standardize</string> <string>standardize</string>
<string>omit_simulation</string> <string>omit_input</string>
<string>omit_input</string> <string>omit_output</string>
<string>omit_output</string> <string>input_simulation_state</string>
<string>input_simulation_state</string> <string>output_simulation_state</string>
<string>output_simulation_state</string> <string>group_by_expression</string>
<string>group_by_expression</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -153,6 +146,18 @@ ...@@ -153,6 +146,18 @@
</object> </object>
</value> </value>
</item> </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> <item>
<key> <string>arguments_src</string> </key> <key> <string>arguments_src</string> </key>
<value> <string>from_table_list:list\r\n <value> <string>from_table_list:list\r\n
...@@ -162,13 +167,30 @@ selection_domain\r\n ...@@ -162,13 +167,30 @@ selection_domain\r\n
selection_report\r\n selection_report\r\n
ignore_variation\r\n ignore_variation\r\n
standardize\r\n standardize\r\n
omit_simulation\r\n
omit_input\r\n omit_input\r\n
omit_output\r\n omit_output\r\n
input_simulation_state:list\r\n input_simulation_state:list\r\n
output_simulation_state:list\r\n output_simulation_state:list\r\n
group_by_expression</string> </value> group_by_expression</string> </value>
</item> </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> <item>
<key> <string>connection_id</string> </key> <key> <string>connection_id</string> </key>
<value> <string>erp5_sql_connection</string> </value> <value> <string>erp5_sql_connection</string> </value>
...@@ -177,6 +199,14 @@ group_by_expression</string> </value> ...@@ -177,6 +199,14 @@ group_by_expression</string> </value>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>Resource_zGetInventory</string> </value> <value> <string>Resource_zGetInventory</string> </value>
</item> </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> <item>
<key> <string>src</string> </key> <key> <string>src</string> </key>
<value> <string encoding="cdata"><![CDATA[ <value> <string encoding="cdata"><![CDATA[
...@@ -204,8 +234,10 @@ FROM\n ...@@ -204,8 +234,10 @@ FROM\n
, <dtml-var table_item> AS <dtml-var table_key>\n , <dtml-var table_item> AS <dtml-var table_key>\n
</dtml-if>\n </dtml-if>\n
</dtml-in>\n </dtml-in>\n
<dtml-if selection_domain>, <dtml-var "selection_domain.asSqlJoinExpression()"> </dtml-if>\n <dtml-if selection_domain>,\n
<dtml-if selection_report>, <dtml-var "selection_report.asSqlJoinExpression()"> </dtml-if>\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 , catalog as node, catalog as resource\n
\n \n
WHERE\n WHERE\n
...@@ -217,17 +249,6 @@ WHERE\n ...@@ -217,17 +249,6 @@ WHERE\n
AND node.uid = stock.node_uid\n AND node.uid = stock.node_uid\n
AND resource.uid = stock.resource_uid\n AND resource.uid = stock.resource_uid\n
\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 <dtml-if omit_input>\n
AND stock.quantity < 0\n AND stock.quantity < 0\n
AND ( stock.node_uid <> stock.mirror_node_uid\n AND ( stock.node_uid <> stock.mirror_node_uid\n
...@@ -339,8 +360,10 @@ FROM\n ...@@ -339,8 +360,10 @@ FROM\n
, <dtml-var table_item> AS <dtml-var table_key>\n , <dtml-var table_item> AS <dtml-var table_key>\n
</dtml-if>\n </dtml-if>\n
</dtml-in>\n </dtml-in>\n
<dtml-if selection_domain>, <dtml-var "selection_domain.asSqlJoinExpression()"> </dtml-if>\n <dtml-if selection_domain>,\n
<dtml-if selection_report>, <dtml-var "selection_report.asSqlJoinExpression()"> </dtml-if>\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 , catalog as node, catalog as resource\n
\n \n
WHERE\n WHERE\n
...@@ -352,17 +375,6 @@ WHERE\n ...@@ -352,17 +375,6 @@ WHERE\n
AND node.uid = stock.node_uid\n AND node.uid = stock.node_uid\n
AND resource.uid = stock.resource_uid\n AND resource.uid = stock.resource_uid\n
\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 <dtml-if omit_input>\n
AND stock.quantity < 0\n AND stock.quantity < 0\n
AND ( stock.node_uid <> stock.mirror_node_uid\n AND ( stock.node_uid <> stock.mirror_node_uid\n
...@@ -429,4 +441,25 @@ ORDER BY\n ...@@ -429,4 +441,25 @@ ORDER BY\n
</dictionary> </dictionary>
</pickle> </pickle>
</record> </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> </ZopeData>
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventoryList.xml
View file @ b454243c
...@@ -86,12 +86,6 @@ ...@@ -86,12 +86,6 @@
<dictionary/> <dictionary/>
</value> </value>
</item> </item>
<item>
<key> <string>omit_simulation</string> </key>
<value>
<dictionary/>
</value>
</item>
<item> <item>
<key> <string>order_by_expression</string> </key> <key> <string>order_by_expression</string> </key>
<value> <value>
...@@ -140,19 +134,18 @@ ...@@ -140,19 +134,18 @@
<key> <string>_keys</string> </key> <key> <string>_keys</string> </key>
<value> <value>
<list> <list>
<string>from_table_list</string> <string>from_table_list</string>
<string>where_expression</string> <string>where_expression</string>
<string>order_by_expression</string> <string>order_by_expression</string>
<string>group_by_expression</string> <string>group_by_expression</string>
<string>selection_domain</string> <string>selection_domain</string>
<string>selection_report</string> <string>selection_report</string>
<string>ignore_variation</string> <string>ignore_variation</string>
<string>standardize</string> <string>standardize</string>
<string>omit_simulation</string> <string>omit_input</string>
<string>omit_input</string> <string>omit_output</string>
<string>omit_output</string> <string>input_simulation_state</string>
<string>input_simulation_state</string> <string>output_simulation_state</string>
<string>output_simulation_state</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -161,6 +154,12 @@ ...@@ -161,6 +154,12 @@
</object> </object>
</value> </value>
</item> </item>
<item>
<key> <string>_dav_writelocks</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item> <item>
<key> <string>allow_simple_one_argument_traversal</string> </key> <key> <string>allow_simple_one_argument_traversal</string> </key>
<value> <value>
...@@ -177,7 +176,6 @@ selection_domain\r\n ...@@ -177,7 +176,6 @@ selection_domain\r\n
selection_report\r\n selection_report\r\n
ignore_variation\r\n ignore_variation\r\n
standardize\r\n standardize\r\n
omit_simulation\r\n
omit_input\r\n omit_input\r\n
omit_output\r\n omit_output\r\n
input_simulation_state:list\r\n input_simulation_state:list\r\n
...@@ -197,7 +195,9 @@ output_simulation_state:list</string> </value> ...@@ -197,7 +195,9 @@ output_simulation_state:list</string> </value>
</item> </item>
<item> <item>
<key> <string>connection_hook</string> </key> <key> <string>connection_hook</string> </key>
<value> <string></string> </value> <value>
<none/>
</value>
</item> </item>
<item> <item>
<key> <string>connection_id</string> </key> <key> <string>connection_id</string> </key>
...@@ -463,4 +463,25 @@ ORDER BY\n ...@@ -463,4 +463,25 @@ ORDER BY\n
</dictionary> </dictionary>
</pickle> </pickle>
</record> </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> </ZopeData>
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetMovementHistoryList.xml
View file @ b454243c
...@@ -78,12 +78,6 @@ ...@@ -78,12 +78,6 @@
<dictionary/> <dictionary/>
</value> </value>
</item> </item>
<item>
<key> <string>omit_simulation</string> </key>
<value>
<dictionary/>
</value>
</item>
<item> <item>
<key> <string>order_by_expression</string> </key> <key> <string>order_by_expression</string> </key>
<value> <value>
...@@ -132,19 +126,18 @@ ...@@ -132,19 +126,18 @@
<key> <string>_keys</string> </key> <key> <string>_keys</string> </key>
<value> <value>
<list> <list>
<string>from_table_list</string> <string>from_table_list</string>
<string>where_expression</string> <string>where_expression</string>
<string>order_by_expression</string> <string>order_by_expression</string>
<string>group_by_expression</string> <string>group_by_expression</string>
<string>selection_domain</string> <string>selection_domain</string>
<string>selection_report</string> <string>selection_report</string>
<string>ignore_variation</string> <string>ignore_variation</string>
<string>standardize</string> <string>standardize</string>
<string>omit_simulation</string> <string>omit_input</string>
<string>omit_input</string> <string>omit_output</string>
<string>omit_output</string> <string>input_simulation_state</string>
<string>input_simulation_state</string> <string>output_simulation_state</string>
<string>output_simulation_state</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -584,7 +577,6 @@ selection_domain\r\n ...@@ -584,7 +577,6 @@ selection_domain\r\n
selection_report\r\n selection_report\r\n
ignore_variation\r\n ignore_variation\r\n
standardize\r\n standardize\r\n
omit_simulation\r\n
omit_input\r\n omit_input\r\n
omit_output\r\n omit_output\r\n
input_simulation_state:list\r\n input_simulation_state:list\r\n
......
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetTrackingList.xml
View file @ b454243c
...@@ -141,20 +141,20 @@ ...@@ -141,20 +141,20 @@
<key> <string>_keys</string> </key> <key> <string>_keys</string> </key>
<value> <value>
<list> <list>
<string>from_date</string> <string>from_date</string>
<string>at_date</string> <string>at_date</string>
<string>to_date</string> <string>to_date</string>
<string>input</string> <string>input</string>
<string>output</string> <string>output</string>
<string>from_table_list</string> <string>from_table_list</string>
<string>where_expression</string> <string>where_expression</string>
<string>selection_domain</string> <string>selection_domain</string>
<string>selection_report</string> <string>selection_report</string>
<string>order_by_expression</string> <string>order_by_expression</string>
<string>group_by_expression</string> <string>group_by_expression</string>
<string>join_on_item</string> <string>join_on_item</string>
<string>date_condition_in_join</string> <string>date_condition_in_join</string>
<string>simulation_state_list</string> <string>simulation_state_list</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -332,6 +332,12 @@ ...@@ -332,6 +332,12 @@
</list> </list>
</value> </value>
</item> </item>
<item>
<key> <string>_dav_writelocks</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item> <item>
<key> <string>allow_simple_one_argument_traversal</string> </key> <key> <string>allow_simple_one_argument_traversal</string> </key>
<value> <value>
...@@ -607,4 +613,25 @@ ORDER BY item.date DESC\n ...@@ -607,4 +613,25 @@ ORDER BY item.date DESC\n
</dictionary> </dictionary>
</pickle> </pickle>
</record> </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> </ZopeData>
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zStatInventory.xml
View file @ b454243c
...@@ -76,12 +76,6 @@ ...@@ -76,12 +76,6 @@
<dictionary/> <dictionary/>
</value> </value>
</item> </item>
<item>
<key> <string>omit_simulation</string> </key>
<value>
<dictionary/>
</value>
</item>
<item> <item>
<key> <string>query</string> </key> <key> <string>query</string> </key>
<value> <value>
...@@ -158,22 +152,21 @@ ...@@ -158,22 +152,21 @@
<key> <string>_keys</string> </key> <key> <string>_keys</string> </key>
<value> <value>
<list> <list>
<string>query</string> <string>query</string>
<string>resource_uid</string> <string>resource_uid</string>
<string>from_date</string> <string>from_date</string>
<string>at_date</string> <string>at_date</string>
<string>to_date</string> <string>to_date</string>
<string>omit_simulation</string> <string>omit_input</string>
<string>omit_input</string> <string>omit_output</string>
<string>omit_output</string> <string>simulation_state</string>
<string>simulation_state</string> <string>section_category</string>
<string>section_category</string> <string>selection_domain</string>
<string>selection_domain</string> <string>selection_report</string>
<string>selection_report</string> <string>closed_summary</string>
<string>closed_summary</string> <string>where_expression</string>
<string>where_expression</string> <string>from_table_list</string>
<string>from_table_list</string> <string>selection_uids</string>
<string>selection_uids</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -201,7 +194,6 @@ resource_uid:list\r\n ...@@ -201,7 +194,6 @@ resource_uid:list\r\n
from_date\r\n from_date\r\n
at_date\r\n at_date\r\n
to_date\r\n to_date\r\n
omit_simulation\r\n
omit_input\r\n omit_input\r\n
omit_output\r\n omit_output\r\n
simulation_state:list\r\n simulation_state:list\r\n
...@@ -303,9 +295,6 @@ WHERE\n ...@@ -303,9 +295,6 @@ WHERE\n
<dtml-if to_date>\n <dtml-if to_date>\n
AND stock.date < <dtml-sqlvar to_date type="datetime">\n AND stock.date < <dtml-sqlvar to_date type="datetime">\n
</dtml-if>\n </dtml-if>\n
<dtml-if omit_simulation>\n
AND child.portal_type != "Simulation Movement"\n
</dtml-if>\n
<dtml-if omit_input>\n <dtml-if omit_input>\n
AND stock.quantity < 0\n AND stock.quantity < 0\n
AND (stock.node_uid <> stock.mirror_node_uid\n AND (stock.node_uid <> stock.mirror_node_uid\n
...@@ -446,9 +435,6 @@ WHERE\n ...@@ -446,9 +435,6 @@ WHERE\n
<dtml-if to_date>\n <dtml-if to_date>\n
AND stock.date < <dtml-sqlvar to_date type="datetime">\n AND stock.date < <dtml-sqlvar to_date type="datetime">\n
</dtml-if>\n </dtml-if>\n
<dtml-if omit_simulation>\n
AND child.portal_type != "Simulation Movement"\n
</dtml-if>\n
<dtml-if omit_input>\n <dtml-if omit_input>\n
AND stock.quantity < 0\n AND stock.quantity < 0\n
AND (stock.node_uid <> stock.mirror_node_uid\n AND (stock.node_uid <> stock.mirror_node_uid\n
......
product/ERP5/bootstrap/erp5_core/bt/change_log
View file @ b454243c
2006-09-04 jerome
* remove omit_simulation parameter in all inventory API ZSQLMethods.
2006-08-25 Stefan 2006-08-25 Stefan
* Update naming convention script. * Update naming convention script.
......
product/ERP5/bootstrap/erp5_core/bt/revision
View file @ b454243c
47 50
\ No newline at end of file \ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7