Commit f9cd31cc authored by Aurel's avatar Aurel

many catalog optimisations

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@18475 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 99fe51b4
...@@ -135,12 +135,6 @@ ...@@ -135,12 +135,6 @@
</object> </object>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>allow_simple_one_argument_traversal</string> </key> <key> <string>allow_simple_one_argument_traversal</string> </key>
<value> <value>
......
...@@ -96,16 +96,16 @@ ...@@ -96,16 +96,16 @@
<key> <string>_keys</string> </key> <key> <string>_keys</string> </key>
<value> <value>
<list> <list>
<string>isMovement</string> <string>isMovement</string>
<string>isAccountable</string> <string>isAccountable</string>
<string>uid</string> <string>uid</string>
<string>getStopDate</string> <string>getStopDate</string>
<string>getBaobabDestinationUid</string> <string>getBaobabDestinationUid</string>
<string>getBaobabDestinationSectionUid</string> <string>getBaobabDestinationSectionUid</string>
<string>getResourceUid</string> <string>getResourceUid</string>
<string>getVariationText</string> <string>getVariationText</string>
<string>getSimulationState</string> <string>getSimulationState</string>
<string>getAggregateUidList</string> <string>getAggregateUidList</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -114,12 +114,6 @@ ...@@ -114,12 +114,6 @@
</object> </object>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>allow_simple_one_argument_traversal</string> </key> <key> <string>allow_simple_one_argument_traversal</string> </key>
<value> <value>
......
<catalog_method>
<item key="sql_catalog_object_list" type="int">
<value>1</value>
</item>
<item key="_is_filtered_archive" type="int">
<value>1</value>
</item>
<item key="_filter_expression_archive" type="str">
<value>python: isMovement</value>
</item>
<item key="_filter_type_archive" type="tuple">
</item>
</catalog_method>
\ No newline at end of file
...@@ -29,12 +29,6 @@ ...@@ -29,12 +29,6 @@
<key> <string>_data</string> </key> <key> <string>_data</string> </key>
<value> <value>
<dictionary> <dictionary>
<item>
<key> <string>event_state</string> </key>
<value>
<dictionary/>
</value>
</item>
<item> <item>
<key> <string>getCreationDate</string> </key> <key> <string>getCreationDate</string> </key>
<value> <value>
...@@ -47,18 +41,6 @@ ...@@ -47,18 +41,6 @@
<dictionary/> <dictionary/>
</value> </value>
</item> </item>
<item>
<key> <string>getDestinationReference</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
<key> <string>getFloatIndex</string> </key>
<value>
<dictionary/>
</value>
</item>
<item> <item>
<key> <string>getIntIndex</string> </key> <key> <string>getIntIndex</string> </key>
<value> <value>
...@@ -107,12 +89,6 @@ ...@@ -107,12 +89,6 @@
<dictionary/> <dictionary/>
</value> </value>
</item> </item>
<item>
<key> <string>getSimulationStateTitle</string> </key>
<value>
<dictionary/>
</value>
</item>
<item> <item>
<key> <string>getSourceReference</string> </key> <key> <string>getSourceReference</string> </key>
<value> <value>
...@@ -150,7 +126,7 @@ ...@@ -150,7 +126,7 @@
</value> </value>
</item> </item>
<item> <item>
<key> <string>getValidationStateTitle</string> </key> <key> <string>getViewPermissionOwner</string> </key>
<value> <value>
<dictionary/> <dictionary/>
</value> </value>
...@@ -167,18 +143,6 @@ ...@@ -167,18 +143,6 @@
<dictionary/> <dictionary/>
</value> </value>
</item> </item>
<item>
<key> <string>meta_type</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
<key> <string>payment_state</string> </key>
<value>
<dictionary/>
</value>
</item>
<item> <item>
<key> <string>security_uid</string> </key> <key> <string>security_uid</string> </key>
<value> <value>
...@@ -200,26 +164,20 @@ ...@@ -200,26 +164,20 @@
<list> <list>
<string>uid</string> <string>uid</string>
<string>security_uid</string> <string>security_uid</string>
<string>getViewPermissionOwner</string>
<string>getPath</string> <string>getPath</string>
<string>getRelativeUrl</string> <string>getRelativeUrl</string>
<string>getParentUid</string> <string>getParentUid</string>
<string>id</string> <string>id</string>
<string>getDescription</string> <string>getDescription</string>
<string>getTitle</string> <string>getTitle</string>
<string>meta_type</string>
<string>getPortalType</string> <string>getPortalType</string>
<string>getSimulationState</string> <string>getSimulationState</string>
<string>getSimulationStateTitle</string>
<string>getValidationState</string> <string>getValidationState</string>
<string>getValidationStateTitle</string>
<string>payment_state</string>
<string>event_state</string>
<string>getReference</string> <string>getReference</string>
<string>getSourceReference</string> <string>getSourceReference</string>
<string>getDestinationReference</string>
<string>getStringIndex</string> <string>getStringIndex</string>
<string>getIntIndex</string> <string>getIntIndex</string>
<string>getFloatIndex</string>
<string>hasCellContent</string> <string>hasCellContent</string>
<string>getCreationDate</string> <string>getCreationDate</string>
<string>getModificationDate</string> <string>getModificationDate</string>
...@@ -233,12 +191,6 @@ ...@@ -233,12 +191,6 @@
</object> </object>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>allow_simple_one_argument_traversal</string> </key> <key> <string>allow_simple_one_argument_traversal</string> </key>
<value> <value>
...@@ -249,26 +201,20 @@ ...@@ -249,26 +201,20 @@
<key> <string>arguments_src</string> </key> <key> <string>arguments_src</string> </key>
<value> <string>uid\r\n <value> <string>uid\r\n
security_uid\r\n security_uid\r\n
getViewPermissionOwner\r\n
getPath\r\n getPath\r\n
getRelativeUrl\r\n getRelativeUrl\r\n
getParentUid\r\n getParentUid\r\n
id\r\n id\r\n
getDescription\r\n getDescription\r\n
getTitle\r\n getTitle\r\n
meta_type\r\n
getPortalType\r\n getPortalType\r\n
getSimulationState\r\n getSimulationState\r\n
getSimulationStateTitle\r\n
getValidationState\r\n getValidationState\r\n
getValidationStateTitle\r\n
payment_state\r\n
event_state\r\n
getReference\r\n getReference\r\n
getSourceReference\r\n getSourceReference\r\n
getDestinationReference\r\n
getStringIndex\r\n getStringIndex\r\n
getIntIndex\r\n getIntIndex\r\n
getFloatIndex\r\n
hasCellContent\r\n hasCellContent\r\n
getCreationDate\r\n getCreationDate\r\n
getModificationDate\r\n getModificationDate\r\n
...@@ -315,12 +261,18 @@ getStopDate</string> </value> ...@@ -315,12 +261,18 @@ getStopDate</string> </value>
REPLACE INTO\n REPLACE INTO\n
catalog\n catalog\n
(`uid`, `security_uid`, `path`, `owner`, `relative_url`, `parent_uid`, `id`, `description`, `title`,\n
`portal_type`, `validation_state`, `simulation_state`,\n
`reference`,\n
`source_reference`, `string_index`, `int_index`, `has_cell_content`, `creation_date`,\n
`modification_date`, `start_date`, `stop_date`, `indexation_date`)\n
VALUES\n VALUES\n
<dtml-in prefix="loop" expr="_.range(_.len(uid))">\n <dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
(\n (\n
<dtml-sqlvar expr="uid[loop_item]" type="int">, \n <dtml-sqlvar expr="uid[loop_item]" type="int">, \n
<dtml-sqlvar expr="security_uid[loop_item]" type="int">,\n <dtml-sqlvar expr="security_uid[loop_item]" type="int">,\n
<dtml-sqlvar expr="getPath[loop_item]" type="string">,\n <dtml-sqlvar expr="getPath[loop_item]" type="string">,\n
<dtml-sqlvar expr="getViewPermissionOwner[loop_item]" type="string" optional>,\n
<dtml-sqlvar expr="getRelativeUrl[loop_item]" type="string">,\n <dtml-sqlvar expr="getRelativeUrl[loop_item]" type="string">,\n
<dtml-sqlvar expr="getParentUid[loop_item]" type="int">,\n <dtml-sqlvar expr="getParentUid[loop_item]" type="int">,\n
<dtml-sqlvar expr="id[loop_item]" type="string" optional>,\n <dtml-sqlvar expr="id[loop_item]" type="string" optional>,\n
...@@ -329,7 +281,6 @@ VALUES\n ...@@ -329,7 +281,6 @@ VALUES\n
<dtml-sqlvar expr="getPortalType[loop_item]" type="string" optional>,\n <dtml-sqlvar expr="getPortalType[loop_item]" type="string" optional>,\n
<dtml-sqlvar expr="getValidationState[loop_item]" type="string" optional>,\n <dtml-sqlvar expr="getValidationState[loop_item]" type="string" optional>,\n
<dtml-sqlvar expr="getSimulationState[loop_item]" type="string" optional>,\n <dtml-sqlvar expr="getSimulationState[loop_item]" type="string" optional>,\n
<dtml-sqlvar expr="getSimulationStateTitle[loop_item]" type="string" optional>,\n
<dtml-sqlvar expr="getReference[loop_item]" type="string" optional>,\n <dtml-sqlvar expr="getReference[loop_item]" type="string" optional>,\n
<dtml-sqlvar expr="getSourceReference[loop_item]" type="string" optional>,\n <dtml-sqlvar expr="getSourceReference[loop_item]" type="string" optional>,\n
<dtml-sqlvar expr="getStringIndex[loop_item]" type="string" optional>,\n <dtml-sqlvar expr="getStringIndex[loop_item]" type="string" optional>,\n
...@@ -338,7 +289,8 @@ VALUES\n ...@@ -338,7 +289,8 @@ VALUES\n
<dtml-sqlvar expr="getCreationDate[loop_item]" type="datetime" optional>,\n <dtml-sqlvar expr="getCreationDate[loop_item]" type="datetime" optional>,\n
<dtml-sqlvar expr="getModificationDate[loop_item]" type="datetime" optional>,\n <dtml-sqlvar expr="getModificationDate[loop_item]" type="datetime" optional>,\n
<dtml-sqlvar expr="getStartDate[loop_item]" type="datetime" optional>,\n <dtml-sqlvar expr="getStartDate[loop_item]" type="datetime" optional>,\n
<dtml-sqlvar expr="getStopDate[loop_item]" type="datetime" optional>\n <dtml-sqlvar expr="getStopDate[loop_item]" type="datetime" optional>,\n
null\n
)\n )\n
<dtml-if sequence-end><dtml-else>,</dtml-if>\n <dtml-if sequence-end><dtml-else>,</dtml-if>\n
</dtml-in> </dtml-in>
...@@ -383,12 +335,18 @@ VALUES\n ...@@ -383,12 +335,18 @@ VALUES\n
REPLACE INTO\n REPLACE INTO\n
catalog\n catalog\n
(`uid`, `security_uid`, `path`, `owner`, `relative_url`, `parent_uid`, `id`, `description`, `title`,\n
`portal_type`, `validation_state`, `simulation_state`,\n
`reference`,\n
`source_reference`, `string_index`, `int_index`, `has_cell_content`, `creation_date`,\n
`modification_date`, `start_date`, `stop_date`, `indexation_date`)\n
VALUES\n VALUES\n
<dtml-in prefix="loop" expr="_.range(_.len(uid))">\n <dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
(\n (\n
<dtml-sqlvar expr="uid[loop_item]" type="int">, \n <dtml-sqlvar expr="uid[loop_item]" type="int">, \n
<dtml-sqlvar expr="security_uid[loop_item]" type="int">,\n <dtml-sqlvar expr="security_uid[loop_item]" type="int">,\n
<dtml-sqlvar expr="getPath[loop_item]" type="string">,\n <dtml-sqlvar expr="getPath[loop_item]" type="string">,\n
<dtml-sqlvar expr="getViewPermissionOwner[loop_item]" type="string" optional>,\n
<dtml-sqlvar expr="getRelativeUrl[loop_item]" type="string">,\n <dtml-sqlvar expr="getRelativeUrl[loop_item]" type="string">,\n
<dtml-sqlvar expr="getParentUid[loop_item]" type="int">,\n <dtml-sqlvar expr="getParentUid[loop_item]" type="int">,\n
<dtml-sqlvar expr="id[loop_item]" type="string" optional>,\n <dtml-sqlvar expr="id[loop_item]" type="string" optional>,\n
...@@ -397,7 +355,6 @@ VALUES\n ...@@ -397,7 +355,6 @@ VALUES\n
<dtml-sqlvar expr="getPortalType[loop_item]" type="string" optional>,\n <dtml-sqlvar expr="getPortalType[loop_item]" type="string" optional>,\n
<dtml-sqlvar expr="getValidationState[loop_item]" type="string" optional>,\n <dtml-sqlvar expr="getValidationState[loop_item]" type="string" optional>,\n
<dtml-sqlvar expr="getSimulationState[loop_item]" type="string" optional>,\n <dtml-sqlvar expr="getSimulationState[loop_item]" type="string" optional>,\n
<dtml-sqlvar expr="getSimulationStateTitle[loop_item]" type="string" optional>,\n
<dtml-sqlvar expr="getReference[loop_item]" type="string" optional>,\n <dtml-sqlvar expr="getReference[loop_item]" type="string" optional>,\n
<dtml-sqlvar expr="getSourceReference[loop_item]" type="string" optional>,\n <dtml-sqlvar expr="getSourceReference[loop_item]" type="string" optional>,\n
<dtml-sqlvar expr="getStringIndex[loop_item]" type="string" optional>,\n <dtml-sqlvar expr="getStringIndex[loop_item]" type="string" optional>,\n
...@@ -406,7 +363,8 @@ VALUES\n ...@@ -406,7 +363,8 @@ VALUES\n
<dtml-sqlvar expr="getCreationDate[loop_item]" type="datetime" optional>,\n <dtml-sqlvar expr="getCreationDate[loop_item]" type="datetime" optional>,\n
<dtml-sqlvar expr="getModificationDate[loop_item]" type="datetime" optional>,\n <dtml-sqlvar expr="getModificationDate[loop_item]" type="datetime" optional>,\n
<dtml-sqlvar expr="getStartDate[loop_item]" type="datetime" optional>,\n <dtml-sqlvar expr="getStartDate[loop_item]" type="datetime" optional>,\n
<dtml-sqlvar expr="getStopDate[loop_item]" type="datetime" optional>\n <dtml-sqlvar expr="getStopDate[loop_item]" type="datetime" optional>,\n
null\n
)\n )\n
<dtml-if sequence-end><dtml-else>,</dtml-if>\n <dtml-if sequence-end><dtml-else>,</dtml-if>\n
</dtml-in> </dtml-in>
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<value>1</value> <value>1</value>
</item> </item>
<item key="_filter_expression_archive" type="str"> <item key="_filter_expression_archive" type="str">
<value>python: isMovement</value> <value>python: isMovement and not isInventoryMovement</value>
</item> </item>
<item key="_filter_type_archive" type="tuple"> <item key="_filter_type_archive" type="tuple">
</item> </item>
......
...@@ -29,24 +29,12 @@ ...@@ -29,24 +29,12 @@
<key> <string>_data</string> </key> <key> <string>_data</string> </key>
<value> <value>
<dictionary> <dictionary>
<item>
<key> <string>getBaobabDestinationFunctionUid</string> </key>
<value>
<dictionary/>
</value>
</item>
<item> <item>
<key> <string>getBaobabDestinationPaymentUid</string> </key> <key> <string>getBaobabDestinationPaymentUid</string> </key>
<value> <value>
<dictionary/> <dictionary/>
</value> </value>
</item> </item>
<item>
<key> <string>getBaobabDestinationProjectUid</string> </key>
<value>
<dictionary/>
</value>
</item>
<item> <item>
<key> <string>getBaobabDestinationSectionUid</string> </key> <key> <string>getBaobabDestinationSectionUid</string> </key>
<value> <value>
...@@ -65,12 +53,6 @@ ...@@ -65,12 +53,6 @@
<dictionary/> <dictionary/>
</value> </value>
</item> </item>
<item>
<key> <string>getBaobabSourceFunctionUid</string> </key>
<value>
<dictionary/>
</value>
</item>
<item> <item>
<key> <string>getBaobabSourcePaymentUid</string> </key> <key> <string>getBaobabSourcePaymentUid</string> </key>
<value> <value>
...@@ -78,31 +60,31 @@ ...@@ -78,31 +60,31 @@
</value> </value>
</item> </item>
<item> <item>
<key> <string>getBaobabSourceProjectUid</string> </key> <key> <string>getBaobabSourceSectionUid</string> </key>
<value> <value>
<dictionary/> <dictionary/>
</value> </value>
</item> </item>
<item> <item>
<key> <string>getBaobabSourceSectionUid</string> </key> <key> <string>getBaobabSourceUid</string> </key>
<value> <value>
<dictionary/> <dictionary/>
</value> </value>
</item> </item>
<item> <item>
<key> <string>getBaobabSourceUid</string> </key> <key> <string>getBaobabSourceVariationText</string> </key>
<value> <value>
<dictionary/> <dictionary/>
</value> </value>
</item> </item>
<item> <item>
<key> <string>getBaobabSourceVariationText</string> </key> <key> <string>getDestinationInventoriatedTotalAssetPrice</string> </key>
<value> <value>
<dictionary/> <dictionary/>
</value> </value>
</item> </item>
<item> <item>
<key> <string>getDestinationInventoriatedTotalAssetPrice</string> </key> <key> <string>getExplanationUid</string> </key>
<value> <value>
<dictionary/> <dictionary/>
</value> </value>
...@@ -161,6 +143,12 @@ ...@@ -161,6 +143,12 @@
<dictionary/> <dictionary/>
</value> </value>
</item> </item>
<item>
<key> <string>isInventoryMovement</string> </key>
<value>
<dictionary/>
</value>
</item>
<item> <item>
<key> <string>isMovement</string> </key> <key> <string>isMovement</string> </key>
<value> <value>
...@@ -188,12 +176,10 @@ ...@@ -188,12 +176,10 @@
<string>getBaobabSourceSectionUid</string> <string>getBaobabSourceSectionUid</string>
<string>getBaobabDestinationSectionUid</string> <string>getBaobabDestinationSectionUid</string>
<string>isMovement</string> <string>isMovement</string>
<string>isInventoryMovement</string>
<string>getBaobabSourcePaymentUid</string> <string>getBaobabSourcePaymentUid</string>
<string>getBaobabDestinationPaymentUid</string> <string>getBaobabDestinationPaymentUid</string>
<string>getBaobabSourceFunctionUid</string> <string>getExplanationUid</string>
<string>getBaobabDestinationFunctionUid</string>
<string>getBaobabSourceProjectUid</string>
<string>getBaobabDestinationProjectUid</string>
<string>getSimulationState</string> <string>getSimulationState</string>
<string>getSourceInventoriatedTotalAssetPrice</string> <string>getSourceInventoriatedTotalAssetPrice</string>
<string>getDestinationInventoriatedTotalAssetPrice</string> <string>getDestinationInventoriatedTotalAssetPrice</string>
...@@ -212,12 +198,6 @@ ...@@ -212,12 +198,6 @@
</object> </object>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>allow_simple_one_argument_traversal</string> </key> <key> <string>allow_simple_one_argument_traversal</string> </key>
<value> <value>
...@@ -234,12 +214,10 @@ getBaobabDestinationUid\r\n ...@@ -234,12 +214,10 @@ getBaobabDestinationUid\r\n
getBaobabSourceSectionUid\r\n getBaobabSourceSectionUid\r\n
getBaobabDestinationSectionUid\r\n getBaobabDestinationSectionUid\r\n
isMovement\r\n isMovement\r\n
isInventoryMovement\r\n
getBaobabSourcePaymentUid\r\n getBaobabSourcePaymentUid\r\n
getBaobabDestinationPaymentUid\r\n getBaobabDestinationPaymentUid\r\n
getBaobabSourceFunctionUid\r\n getExplanationUid\r\n
getBaobabDestinationFunctionUid\r\n
getBaobabSourceProjectUid\r\n
getBaobabDestinationProjectUid\r\n
getSimulationState\r\n getSimulationState\r\n
getSourceInventoriatedTotalAssetPrice\r\n getSourceInventoriatedTotalAssetPrice\r\n
getDestinationInventoriatedTotalAssetPrice\r\n getDestinationInventoriatedTotalAssetPrice\r\n
...@@ -302,13 +280,15 @@ WHERE\n ...@@ -302,13 +280,15 @@ WHERE\n
<dtml-let row_list="[]">\n <dtml-let row_list="[]">\n
<dtml-in prefix="loop" expr="_.range(_.len(uid))">\n <dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
<dtml-if "isMovement[loop_item]">\n <dtml-if "isMovement[loop_item]">\n
<dtml-if "not isInventoryMovement[loop_item]">\n
<dtml-if "isAccountable[loop_item]">\n <dtml-if "isAccountable[loop_item]">\n
<dtml-if "getResourceUid[loop_item]">\n <dtml-if "getResourceUid[loop_item]">\n
<dtml-if "getBaobabDestinationUid[loop_item]">\n <dtml-if "getBaobabDestinationUid[loop_item]">\n
<dtml-call expr="row_list.append([uid[loop_item], getBaobabDestinationUid[loop_item], getBaobabDestinationSectionUid[loop_item], getBaobabDestinationPaymentUid[loop_item], getBaobabDestinationFunctionUid[loop_item], getBaobabDestinationProjectUid[loop_item], getBaobabSourceSectionUid[loop_item], getBaobabSourceUid[loop_item], getResourceUid[loop_item], getInventoriatedQuantity[loop_item], getStopDate[loop_item], getDestinationInventoriatedTotalAssetPrice[loop_item], getPortalType[loop_item], getSimulationState[loop_item], getBaobabDestinationVariationText[loop_item],getSubVariationText[loop_item]])">\n <dtml-call expr="row_list.append([uid[loop_item], getBaobabDestinationUid[loop_item], getBaobabDestinationSectionUid[loop_item], getBaobabDestinationPaymentUid[loop_item], getExplanationUid[loop_item], getBaobabSourceSectionUid[loop_item], getBaobabSourceUid[loop_item], getResourceUid[loop_item], getInventoriatedQuantity[loop_item], getStopDate[loop_item], getDestinationInventoriatedTotalAssetPrice[loop_item], getPortalType[loop_item], getSimulationState[loop_item], getBaobabDestinationVariationText[loop_item],getSubVariationText[loop_item]])">\n
</dtml-if>\n </dtml-if>\n
<dtml-if "getBaobabSourceUid[loop_item]">\n <dtml-if "getBaobabSourceUid[loop_item]">\n
<dtml-call expr="row_list.append([uid[loop_item], getBaobabSourceUid[loop_item], getBaobabSourceSectionUid[loop_item], getBaobabSourcePaymentUid[loop_item], getBaobabSourceFunctionUid[loop_item], getBaobabSourceProjectUid[loop_item], getBaobabDestinationSectionUid[loop_item], getBaobabDestinationUid[loop_item], getResourceUid[loop_item], -(getInventoriatedQuantity[loop_item] or 0), getStartDate[loop_item], getSourceInventoriatedTotalAssetPrice[loop_item], getPortalType[loop_item], getSimulationState[loop_item], getBaobabSourceVariationText[loop_item], getSubVariationText[loop_item]])">\n <dtml-call expr="row_list.append([uid[loop_item], getBaobabSourceUid[loop_item], getBaobabSourceSectionUid[loop_item], getBaobabSourcePaymentUid[loop_item], getExplanationUid[loop_item], getBaobabDestinationSectionUid[loop_item], getBaobabDestinationUid[loop_item], getResourceUid[loop_item], -(getInventoriatedQuantity[loop_item] or 0), getStartDate[loop_item], getSourceInventoriatedTotalAssetPrice[loop_item], getPortalType[loop_item], getSimulationState[loop_item], getBaobabSourceVariationText[loop_item],getSubVariationText[loop_item]])">\n
</dtml-if>\n
</dtml-if>\n </dtml-if>\n
</dtml-if>\n </dtml-if>\n
</dtml-if>\n </dtml-if>\n
...@@ -324,19 +304,18 @@ VALUES\n ...@@ -324,19 +304,18 @@ VALUES\n
<dtml-sqlvar expr="row_item[0]" type="int">,\n <dtml-sqlvar expr="row_item[0]" type="int">,\n
<dtml-sqlvar expr="row_item[1]" type="int">, \n <dtml-sqlvar expr="row_item[1]" type="int">, \n
<dtml-sqlvar expr="row_item[2]" type="int" optional>, \n <dtml-sqlvar expr="row_item[2]" type="int" optional>, \n
<dtml-sqlvar expr="row_item[3]" type="int" optional>, \n <dtml-sqlvar expr="row_item[3]" type="int" optional>,\n
<dtml-sqlvar expr="row_item[4]" type="int" optional>,\n <dtml-sqlvar expr="row_item[4]" type="int" optional>,\n
<dtml-sqlvar expr="row_item[5]" type="int" optional>,\n <dtml-sqlvar expr="row_item[5]" type="int" optional>,\n
<dtml-sqlvar expr="row_item[6]" type="int" optional>,\n <dtml-sqlvar expr="row_item[6]" type="int" optional>,\n
<dtml-sqlvar expr="row_item[7]" type="int" optional>,\n <dtml-sqlvar expr="row_item[7]" type="int">, \n
<dtml-sqlvar expr="row_item[8]" type="int">, \n <dtml-sqlvar expr="row_item[8]" type="float" optional>,\n
<dtml-sqlvar expr="row_item[9]" type="float" optional>,\n <dtml-sqlvar expr="row_item[9]" type="datetime" optional>,\n
<dtml-sqlvar expr="row_item[10]" type="datetime" optional>,\n <dtml-sqlvar expr="row_item[10]" type="float" optional>,\n
<dtml-sqlvar expr="row_item[11]" type="float" optional>,\n <dtml-sqlvar expr="row_item[11]" type="string" optional>,\n
<dtml-sqlvar expr="row_item[12]" type="string" optional>,\n <dtml-sqlvar expr="row_item[12]" type="string" optional>,\n
<dtml-sqlvar expr="row_item[13]" type="string" optional>,\n <dtml-sqlvar expr="row_item[13]" type="string" optional>,\n
<dtml-sqlvar expr="row_item[14]" type="string" optional>,\n <dtml-sqlvar expr="row_item[14]" type="string" optional>\n
<dtml-sqlvar expr="row_item[15]" type="string" optional>\n
)\n )\n
<dtml-if sequence-end><dtml-else>,</dtml-if>\n <dtml-if sequence-end><dtml-else>,</dtml-if>\n
</dtml-in>\n </dtml-in>\n
...@@ -395,13 +374,15 @@ WHERE\n ...@@ -395,13 +374,15 @@ WHERE\n
<dtml-let row_list="[]">\n <dtml-let row_list="[]">\n
<dtml-in prefix="loop" expr="_.range(_.len(uid))">\n <dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
<dtml-if "isMovement[loop_item]">\n <dtml-if "isMovement[loop_item]">\n
<dtml-if "not isInventoryMovement[loop_item]">\n
<dtml-if "isAccountable[loop_item]">\n <dtml-if "isAccountable[loop_item]">\n
<dtml-if "getResourceUid[loop_item]">\n <dtml-if "getResourceUid[loop_item]">\n
<dtml-if "getBaobabDestinationUid[loop_item]">\n <dtml-if "getBaobabDestinationUid[loop_item]">\n
<dtml-call expr="row_list.append([uid[loop_item], getBaobabDestinationUid[loop_item], getBaobabDestinationSectionUid[loop_item], getBaobabDestinationPaymentUid[loop_item], getBaobabDestinationFunctionUid[loop_item], getBaobabDestinationProjectUid[loop_item], getBaobabSourceSectionUid[loop_item], getBaobabSourceUid[loop_item], getResourceUid[loop_item], getInventoriatedQuantity[loop_item], getStopDate[loop_item], getDestinationInventoriatedTotalAssetPrice[loop_item], getPortalType[loop_item], getSimulationState[loop_item], getBaobabDestinationVariationText[loop_item],getSubVariationText[loop_item]])">\n <dtml-call expr="row_list.append([uid[loop_item], getBaobabDestinationUid[loop_item], getBaobabDestinationSectionUid[loop_item], getBaobabDestinationPaymentUid[loop_item], getExplanationUid[loop_item], getBaobabSourceSectionUid[loop_item], getBaobabSourceUid[loop_item], getResourceUid[loop_item], getInventoriatedQuantity[loop_item], getStopDate[loop_item], getDestinationInventoriatedTotalAssetPrice[loop_item], getPortalType[loop_item], getSimulationState[loop_item], getBaobabDestinationVariationText[loop_item],getSubVariationText[loop_item]])">\n
</dtml-if>\n </dtml-if>\n
<dtml-if "getBaobabSourceUid[loop_item]">\n <dtml-if "getBaobabSourceUid[loop_item]">\n
<dtml-call expr="row_list.append([uid[loop_item], getBaobabSourceUid[loop_item], getBaobabSourceSectionUid[loop_item], getBaobabSourcePaymentUid[loop_item], getBaobabSourceFunctionUid[loop_item], getBaobabSourceProjectUid[loop_item], getBaobabDestinationSectionUid[loop_item], getBaobabDestinationUid[loop_item], getResourceUid[loop_item], -(getInventoriatedQuantity[loop_item] or 0), getStartDate[loop_item], getSourceInventoriatedTotalAssetPrice[loop_item], getPortalType[loop_item], getSimulationState[loop_item], getBaobabSourceVariationText[loop_item], getSubVariationText[loop_item]])">\n <dtml-call expr="row_list.append([uid[loop_item], getBaobabSourceUid[loop_item], getBaobabSourceSectionUid[loop_item], getBaobabSourcePaymentUid[loop_item], getExplanationUid[loop_item], getBaobabDestinationSectionUid[loop_item], getBaobabDestinationUid[loop_item], getResourceUid[loop_item], -(getInventoriatedQuantity[loop_item] or 0), getStartDate[loop_item], getSourceInventoriatedTotalAssetPrice[loop_item], getPortalType[loop_item], getSimulationState[loop_item], getBaobabSourceVariationText[loop_item],getSubVariationText[loop_item]])">\n
</dtml-if>\n
</dtml-if>\n </dtml-if>\n
</dtml-if>\n </dtml-if>\n
</dtml-if>\n </dtml-if>\n
...@@ -417,19 +398,18 @@ VALUES\n ...@@ -417,19 +398,18 @@ VALUES\n
<dtml-sqlvar expr="row_item[0]" type="int">,\n <dtml-sqlvar expr="row_item[0]" type="int">,\n
<dtml-sqlvar expr="row_item[1]" type="int">, \n <dtml-sqlvar expr="row_item[1]" type="int">, \n
<dtml-sqlvar expr="row_item[2]" type="int" optional>, \n <dtml-sqlvar expr="row_item[2]" type="int" optional>, \n
<dtml-sqlvar expr="row_item[3]" type="int" optional>, \n <dtml-sqlvar expr="row_item[3]" type="int" optional>,\n
<dtml-sqlvar expr="row_item[4]" type="int" optional>,\n <dtml-sqlvar expr="row_item[4]" type="int" optional>,\n
<dtml-sqlvar expr="row_item[5]" type="int" optional>,\n <dtml-sqlvar expr="row_item[5]" type="int" optional>,\n
<dtml-sqlvar expr="row_item[6]" type="int" optional>,\n <dtml-sqlvar expr="row_item[6]" type="int" optional>,\n
<dtml-sqlvar expr="row_item[7]" type="int" optional>,\n <dtml-sqlvar expr="row_item[7]" type="int">, \n
<dtml-sqlvar expr="row_item[8]" type="int">, \n <dtml-sqlvar expr="row_item[8]" type="float" optional>,\n
<dtml-sqlvar expr="row_item[9]" type="float" optional>,\n <dtml-sqlvar expr="row_item[9]" type="datetime" optional>,\n
<dtml-sqlvar expr="row_item[10]" type="datetime" optional>,\n <dtml-sqlvar expr="row_item[10]" type="float" optional>,\n
<dtml-sqlvar expr="row_item[11]" type="float" optional>,\n <dtml-sqlvar expr="row_item[11]" type="string" optional>,\n
<dtml-sqlvar expr="row_item[12]" type="string" optional>,\n <dtml-sqlvar expr="row_item[12]" type="string" optional>,\n
<dtml-sqlvar expr="row_item[13]" type="string" optional>,\n <dtml-sqlvar expr="row_item[13]" type="string" optional>,\n
<dtml-sqlvar expr="row_item[14]" type="string" optional>,\n <dtml-sqlvar expr="row_item[14]" type="string" optional>\n
<dtml-sqlvar expr="row_item[15]" type="string" optional>\n
)\n )\n
<dtml-if sequence-end><dtml-else>,</dtml-if>\n <dtml-if sequence-end><dtml-else>,</dtml-if>\n
</dtml-in>\n </dtml-in>\n
......
...@@ -42,12 +42,6 @@ ...@@ -42,12 +42,6 @@
</object> </object>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>allow_simple_one_argument_traversal</string> </key> <key> <string>allow_simple_one_argument_traversal</string> </key>
<value> <value>
...@@ -102,6 +96,7 @@ CREATE TABLE `catalog` (\n ...@@ -102,6 +96,7 @@ CREATE TABLE `catalog` (\n
`uid` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,\n `uid` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,\n
`security_uid` INT UNSIGNED,\n `security_uid` INT UNSIGNED,\n
`path` varchar(255) NOT NULL default \'\',\n `path` varchar(255) NOT NULL default \'\',\n
`owner` varchar(32) default \'\',\n
`relative_url` varchar(255) NOT NULL default \'\',\n `relative_url` varchar(255) NOT NULL default \'\',\n
`parent_uid` BIGINT UNSIGNED default \'0\',\n `parent_uid` BIGINT UNSIGNED default \'0\',\n
`id` varchar(255) default \'\',\n `id` varchar(255) default \'\',\n
...@@ -110,7 +105,6 @@ CREATE TABLE `catalog` (\n ...@@ -110,7 +105,6 @@ CREATE TABLE `catalog` (\n
`portal_type` varchar(255) default \'\',\n `portal_type` varchar(255) default \'\',\n
`validation_state` varchar(255) default \'\',\n `validation_state` varchar(255) default \'\',\n
`simulation_state` varchar(255) default \'\',\n `simulation_state` varchar(255) default \'\',\n
`simulation_state_title` varchar(255) default \'\',\n
`reference` varchar(255) default \'\',\n `reference` varchar(255) default \'\',\n
`source_reference` varchar(255) default \'\',\n `source_reference` varchar(255) default \'\',\n
`string_index` varchar(255),\n `string_index` varchar(255),\n
...@@ -120,18 +114,20 @@ CREATE TABLE `catalog` (\n ...@@ -120,18 +114,20 @@ CREATE TABLE `catalog` (\n
`modification_date` datetime,\n `modification_date` datetime,\n
`start_date` datetime,\n `start_date` datetime,\n
`stop_date` datetime,\n `stop_date` datetime,\n
`indexation_date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,\n
PRIMARY KEY (`uid`),\n PRIMARY KEY (`uid`),\n
KEY `security_uid` (`security_uid`),\n KEY `owner` (`owner`),\n
KEY `Parent` (`parent_uid`, `portal_type`, `security_uid`),\n KEY `Parent` (`parent_uid`, `security_uid`),\n
KEY `Type1` (`portal_type`),\n KEY `parent_simulation_security` (`parent_uid`, `simulation_state`, `security_uid`),\n
KEY `validation_state` (`validation_state`, `portal_type`, `security_uid`),\n KEY `validation_state` (`validation_state`, `portal_type`, `security_uid`),\n
KEY `simulation_state` (`simulation_state`, `portal_type`, `security_uid`),\n KEY `simulation_state` (`simulation_state`, `portal_type`, `security_uid`),\n
KEY `simulation_state_title` (`simulation_state_title`, `portal_type`, `security_uid`),\n
KEY `source_reference` (`parent_uid`, `source_reference`),\n KEY `source_reference` (`parent_uid`, `source_reference`),\n
KEY `type_source_reference` (`portal_type`, `source_reference`),\n
KEY `start_date` (`parent_uid`, `start_date`),\n KEY `start_date` (`parent_uid`, `start_date`),\n
KEY `reference` (`portal_type`, `reference`),\n KEY `reference` (`portal_type`, `reference`),\n
KEY `Path` (`path`),\n KEY `Path` (`path`),\n
KEY `relative_url` (`relative_url`)\n KEY `relative_url` (`relative_url`),\n
KEY `indexation_date` (`indexation_date`)\n
) TYPE=InnoDB;\n ) TYPE=InnoDB;\n
</string> </value> </string> </value>
</item> </item>
...@@ -177,6 +173,7 @@ CREATE TABLE `catalog` (\n ...@@ -177,6 +173,7 @@ CREATE TABLE `catalog` (\n
`uid` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,\n `uid` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,\n
`security_uid` INT UNSIGNED,\n `security_uid` INT UNSIGNED,\n
`path` varchar(255) NOT NULL default \'\',\n `path` varchar(255) NOT NULL default \'\',\n
`owner` varchar(32) default \'\',\n
`relative_url` varchar(255) NOT NULL default \'\',\n `relative_url` varchar(255) NOT NULL default \'\',\n
`parent_uid` BIGINT UNSIGNED default \'0\',\n `parent_uid` BIGINT UNSIGNED default \'0\',\n
`id` varchar(255) default \'\',\n `id` varchar(255) default \'\',\n
...@@ -185,7 +182,6 @@ CREATE TABLE `catalog` (\n ...@@ -185,7 +182,6 @@ CREATE TABLE `catalog` (\n
`portal_type` varchar(255) default \'\',\n `portal_type` varchar(255) default \'\',\n
`validation_state` varchar(255) default \'\',\n `validation_state` varchar(255) default \'\',\n
`simulation_state` varchar(255) default \'\',\n `simulation_state` varchar(255) default \'\',\n
`simulation_state_title` varchar(255) default \'\',\n
`reference` varchar(255) default \'\',\n `reference` varchar(255) default \'\',\n
`source_reference` varchar(255) default \'\',\n `source_reference` varchar(255) default \'\',\n
`string_index` varchar(255),\n `string_index` varchar(255),\n
...@@ -195,18 +191,20 @@ CREATE TABLE `catalog` (\n ...@@ -195,18 +191,20 @@ CREATE TABLE `catalog` (\n
`modification_date` datetime,\n `modification_date` datetime,\n
`start_date` datetime,\n `start_date` datetime,\n
`stop_date` datetime,\n `stop_date` datetime,\n
`indexation_date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,\n
PRIMARY KEY (`uid`),\n PRIMARY KEY (`uid`),\n
KEY `security_uid` (`security_uid`),\n KEY `owner` (`owner`),\n
KEY `Parent` (`parent_uid`, `portal_type`, `security_uid`),\n KEY `Parent` (`parent_uid`, `security_uid`),\n
KEY `Type1` (`portal_type`),\n KEY `parent_simulation_security` (`parent_uid`, `simulation_state`, `security_uid`),\n
KEY `validation_state` (`validation_state`, `portal_type`, `security_uid`),\n KEY `validation_state` (`validation_state`, `portal_type`, `security_uid`),\n
KEY `simulation_state` (`simulation_state`, `portal_type`, `security_uid`),\n KEY `simulation_state` (`simulation_state`, `portal_type`, `security_uid`),\n
KEY `simulation_state_title` (`simulation_state_title`, `portal_type`, `security_uid`),\n
KEY `source_reference` (`parent_uid`, `source_reference`),\n KEY `source_reference` (`parent_uid`, `source_reference`),\n
KEY `type_source_reference` (`portal_type`, `source_reference`),\n
KEY `start_date` (`parent_uid`, `start_date`),\n KEY `start_date` (`parent_uid`, `start_date`),\n
KEY `reference` (`portal_type`, `reference`),\n KEY `reference` (`portal_type`, `reference`),\n
KEY `Path` (`path`),\n KEY `Path` (`path`),\n
KEY `relative_url` (`relative_url`)\n KEY `relative_url` (`relative_url`),\n
KEY `indexation_date` (`indexation_date`)\n
) TYPE=InnoDB;\n ) TYPE=InnoDB;\n
</string> </value> </string> </value>
</item> </item>
......
...@@ -48,12 +48,6 @@ ...@@ -48,12 +48,6 @@
<tuple/> <tuple/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>allow_simple_one_argument_traversal</string> </key> <key> <string>allow_simple_one_argument_traversal</string> </key>
<value> <value>
......
...@@ -48,12 +48,6 @@ ...@@ -48,12 +48,6 @@
<tuple/> <tuple/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>allow_simple_one_argument_traversal</string> </key> <key> <string>allow_simple_one_argument_traversal</string> </key>
<value> <value>
......
<catalog_method>
<item key="sql_clear_catalog" type="int">
<value>1</value>
</item>
</catalog_method>
\ No newline at end of file
...@@ -27,121 +27,14 @@ ...@@ -27,121 +27,14 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>_data</string> </key> <key> <string>_data</string> </key>
<value>
<dictionary>
<item>
<key> <string>getBaobabDestinationUid</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
<key> <string>getBaobabSourceUid</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
<key> <string>getExplanationUid</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
<key> <string>getInventoriatedQuantity</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
<key> <string>getPrice</string> </key>
<value> <value>
<dictionary/> <dictionary/>
</value> </value>
</item> </item>
<item>
<key> <string>getResourceUid</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
<key> <string>getStartDate</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
<key> <string>getStopDate</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
<key> <string>getVariationText</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
<key> <string>isAccountable</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
<key> <string>isDeliverable</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
<key> <string>isDivergent</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
<key> <string>isMovement</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
<key> <string>isOrderable</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
<key> <string>uid</string> </key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</value>
</item>
<item> <item>
<key> <string>_keys</string> </key> <key> <string>_keys</string> </key>
<value> <value>
<list> <list/>
<string>isMovement</string>
<string>uid</string>
<string>getExplanationUid</string>
<string>getBaobabSourceUid</string>
<string>getBaobabDestinationUid</string>
<string>getResourceUid</string>
<string>getInventoriatedQuantity</string>
<string>getStartDate</string>
<string>getStopDate</string>
<string>getPrice</string>
<string>isAccountable</string>
<string>isOrderable</string>
<string>isDeliverable</string>
<string>isDivergent</string>
<string>getVariationText</string>
</list>
</value> </value>
</item> </item>
</dictionary> </dictionary>
...@@ -150,9 +43,9 @@ ...@@ -150,9 +43,9 @@
</value> </value>
</item> </item>
<item> <item>
<key> <string>_owner</string> </key> <key> <string>_col</string> </key>
<value> <value>
<none/> <tuple/>
</value> </value>
</item> </item>
<item> <item>
...@@ -163,21 +56,7 @@ ...@@ -163,21 +56,7 @@
</item> </item>
<item> <item>
<key> <string>arguments_src</string> </key> <key> <string>arguments_src</string> </key>
<value> <string>isMovement\r\n <value> <string></string> </value>
uid\r\n
getExplanationUid\r\n
getBaobabSourceUid\r\n
getBaobabDestinationUid\r\n
getResourceUid\r\n
getInventoriatedQuantity\r\n
getStartDate\r\n
getStopDate\r\n
getPrice\r\n
isAccountable\r\n
isOrderable\r\n
isDeliverable\r\n
isDivergent\r\n
getVariationText</string> </value>
</item> </item>
<item> <item>
<key> <string>cache_time_</string> </key> <key> <string>cache_time_</string> </key>
...@@ -203,7 +82,7 @@ getVariationText</string> </value> ...@@ -203,7 +82,7 @@ getVariationText</string> </value>
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>z_catalog_movement_list</string> </value> <value> <string>z_create_item</string> </value>
</item> </item>
<item> <item>
<key> <string>max_cache_</string> </key> <key> <string>max_cache_</string> </key>
...@@ -215,42 +94,28 @@ getVariationText</string> </value> ...@@ -215,42 +94,28 @@ getVariationText</string> </value>
</item> </item>
<item> <item>
<key> <string>src</string> </key> <key> <string>src</string> </key>
<value> <string encoding="cdata"><![CDATA[ <value> <string># Host:\n
# Database: test\n
<dtml-let movement_list="[]">\n # Table: \'item\'\n
<dtml-in prefix="loop" expr="_.range(_.len(uid))">\n #\n
<dtml-if "isMovement[loop_item]">\n CREATE TABLE `item` (\n
<dtml-call expr="movement_list.append(loop_item)">\n `uid` BIGINT UNSIGNED NOT NULL,\n
</dtml-if>\n `date` datetime,\n
</dtml-in>\n `node_uid` BIGINT UNSIGNED default \'0\',\n
<dtml-if expr="_.len(movement_list) > 0">\n `section_uid` BIGINT UNSIGNED default \'0\',\n
REPLACE INTO\n `resource_uid` BIGINT UNSIGNED default \'0\',\n
movement\n `aggregate_uid` BIGINT UNSIGNED default \'0\',\n
VALUES\n `variation_text` VARCHAR(255),\n
<dtml-in prefix="loop" expr="movement_list">\n `simulation_state` VARCHAR(255) default \'\',\n
( \n KEY `uid` (`uid`),\n
<dtml-sqlvar expr="uid[loop_item]" type="int">,\n KEY `section_uid` (`section_uid`),\n
<dtml-sqlvar expr="getExplanationUid[loop_item]" type="int" optional>,\n KEY `resource_uid` (`resource_uid`),\n
<dtml-sqlvar expr="getBaobabSourceUid[loop_item]" type="int" optional>,\n KEY `variation_text` (`variation_text`),\n
<dtml-sqlvar expr="getBaobabDestinationUid[loop_item]" type="int" optional>,\n KEY `aggregate_simulation_state_date` (`aggregate_uid`,`simulation_state`,`date`),\n
<dtml-sqlvar expr="getResourceUid[loop_item]" type="int" optional>,\n KEY `node_simulation_state_date` (`node_uid`,`simulation_state`,`date`)\n
<dtml-sqlvar expr="getInventoriatedQuantity[loop_item]" type="float" optional>,\n ) TYPE=InnoDB;\n
<dtml-sqlvar expr="getStartDate[loop_item]" type="datetime" optional>,\n \n
<dtml-sqlvar expr="getStopDate[loop_item]" type="datetime" optional>,\n </string> </value>
<dtml-sqlvar expr="getPrice[loop_item]" type="float" optional>,\n
<dtml-sqlvar expr="isAccountable[loop_item]" type="int" optional>,\n
<dtml-sqlvar expr="isOrderable[loop_item]" type="int" optional>,\n
<dtml-sqlvar expr="isDeliverable[loop_item]" type="int" optional>,\n
<dtml-sqlvar expr="isDivergent[loop_item]" type="int" optional>,\n
<dtml-sqlvar expr="getVariationText[loop_item]" type="string" optional>\n
)\n
<dtml-if sequence-end><dtml-else>,</dtml-if>\n
</dtml-in>\n
</dtml-if>\n
</dtml-let>\n
]]></string> </value>
</item> </item>
<item> <item>
<key> <string>template</string> </key> <key> <string>template</string> </key>
...@@ -286,42 +151,28 @@ VALUES\n ...@@ -286,42 +151,28 @@ VALUES\n
</item> </item>
<item> <item>
<key> <string>raw</string> </key> <key> <string>raw</string> </key>
<value> <string encoding="cdata"><![CDATA[ <value> <string># Host:\n
# Database: test\n
<dtml-let movement_list="[]">\n # Table: \'item\'\n
<dtml-in prefix="loop" expr="_.range(_.len(uid))">\n #\n
<dtml-if "isMovement[loop_item]">\n CREATE TABLE `item` (\n
<dtml-call expr="movement_list.append(loop_item)">\n `uid` BIGINT UNSIGNED NOT NULL,\n
</dtml-if>\n `date` datetime,\n
</dtml-in>\n `node_uid` BIGINT UNSIGNED default \'0\',\n
<dtml-if expr="_.len(movement_list) > 0">\n `section_uid` BIGINT UNSIGNED default \'0\',\n
REPLACE INTO\n `resource_uid` BIGINT UNSIGNED default \'0\',\n
movement\n `aggregate_uid` BIGINT UNSIGNED default \'0\',\n
VALUES\n `variation_text` VARCHAR(255),\n
<dtml-in prefix="loop" expr="movement_list">\n `simulation_state` VARCHAR(255) default \'\',\n
( \n KEY `uid` (`uid`),\n
<dtml-sqlvar expr="uid[loop_item]" type="int">,\n KEY `section_uid` (`section_uid`),\n
<dtml-sqlvar expr="getExplanationUid[loop_item]" type="int" optional>,\n KEY `resource_uid` (`resource_uid`),\n
<dtml-sqlvar expr="getBaobabSourceUid[loop_item]" type="int" optional>,\n KEY `variation_text` (`variation_text`),\n
<dtml-sqlvar expr="getBaobabDestinationUid[loop_item]" type="int" optional>,\n KEY `aggregate_simulation_state_date` (`aggregate_uid`,`simulation_state`,`date`),\n
<dtml-sqlvar expr="getResourceUid[loop_item]" type="int" optional>,\n KEY `node_simulation_state_date` (`node_uid`,`simulation_state`,`date`)\n
<dtml-sqlvar expr="getInventoriatedQuantity[loop_item]" type="float" optional>,\n ) TYPE=InnoDB;\n
<dtml-sqlvar expr="getStartDate[loop_item]" type="datetime" optional>,\n \n
<dtml-sqlvar expr="getStopDate[loop_item]" type="datetime" optional>,\n </string> </value>
<dtml-sqlvar expr="getPrice[loop_item]" type="float" optional>,\n
<dtml-sqlvar expr="isAccountable[loop_item]" type="int" optional>,\n
<dtml-sqlvar expr="isOrderable[loop_item]" type="int" optional>,\n
<dtml-sqlvar expr="isDeliverable[loop_item]" type="int" optional>,\n
<dtml-sqlvar expr="isDivergent[loop_item]" type="int" optional>,\n
<dtml-sqlvar expr="getVariationText[loop_item]" type="string" optional>\n
)\n
<dtml-if sequence-end><dtml-else>,</dtml-if>\n
</dtml-in>\n
</dtml-if>\n
</dtml-let>\n
]]></string> </value>
</item> </item>
</dictionary> </dictionary>
</state> </state>
......
...@@ -42,12 +42,6 @@ ...@@ -42,12 +42,6 @@
</object> </object>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>allow_simple_one_argument_traversal</string> </key> <key> <string>allow_simple_one_argument_traversal</string> </key>
<value> <value>
......
...@@ -42,12 +42,6 @@ ...@@ -42,12 +42,6 @@
</object> </object>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>allow_simple_one_argument_traversal</string> </key> <key> <string>allow_simple_one_argument_traversal</string> </key>
<value> <value>
...@@ -103,8 +97,7 @@ CREATE TABLE `stock` (\n ...@@ -103,8 +97,7 @@ CREATE TABLE `stock` (\n
`node_uid` BIGINT UNSIGNED,\n `node_uid` BIGINT UNSIGNED,\n
`section_uid` BIGINT UNSIGNED,\n `section_uid` BIGINT UNSIGNED,\n
`payment_uid` BIGINT UNSIGNED,\n `payment_uid` BIGINT UNSIGNED,\n
`function_uid` BIGINT UNSIGNED,\n `explanation_uid` BIGINT UNSIGNED,\n
`project_uid` BIGINT UNSIGNED,\n
`mirror_section_uid` BIGINT UNSIGNED,\n `mirror_section_uid` BIGINT UNSIGNED,\n
`mirror_node_uid` BIGINT UNSIGNED,\n `mirror_node_uid` BIGINT UNSIGNED,\n
`resource_uid` BIGINT UNSIGNED,\n `resource_uid` BIGINT UNSIGNED,\n
...@@ -118,19 +111,17 @@ CREATE TABLE `stock` (\n ...@@ -118,19 +111,17 @@ CREATE TABLE `stock` (\n
KEY `uid` (`uid`),\n KEY `uid` (`uid`),\n
KEY `quantity` (`quantity`),\n KEY `quantity` (`quantity`),\n
KEY `section_uid` (`section_uid`),\n KEY `section_uid` (`section_uid`),\n
KEY `mirror_section_uid` (`mirror_section_uid`),\n
KEY `mirror_node_uid` (`mirror_node_uid`),\n
KEY `node_uid` (`node_uid`),\n KEY `node_uid` (`node_uid`),\n
KEY `payment_uid` (`payment_uid`),\n KEY `payment_uid` (`payment_uid`),\n
KEY `function_uid` (`function_uid`),\n KEY `explanation_uid` (`explanation_uid`),\n
KEY `project_uid` (`project_uid`),\n
KEY `resource_uid` (`resource_uid`),\n KEY `resource_uid` (`resource_uid`),\n
KEY `simulation_state` (`simulation_state`),\n KEY `simulation_state` (`simulation_state`),\n
KEY `resource_node_uid` (`resource_uid`, `node_uid`),\n KEY `resource_node_uid` (`resource_uid`, `node_uid`),\n
KEY `resource_section_node_uid` (`resource_uid`, `section_uid`, `node_uid`, `simulation_state`),\n KEY `resource_section_node_uid_state` (`resource_uid`, `section_uid`, `node_uid`, `simulation_state`),\n
KEY `resource_payment_state` (`resource_uid`, `payment_uid`, `simulation_state`),\n KEY `resource_payment_state` (`resource_uid`, `payment_uid`, `simulation_state`),\n
KEY `resource_payment` (`resource_uid`, `payment_uid`),\n KEY `resource_payment_uid` (`resource_uid`, `payment_uid`),\n
KEY `resource_payment_state_date` (`resource_uid`, `payment_uid`, `simulation_state`, `date`)\n KEY `resource_payment_state_date` (`resource_uid`, `payment_uid`, `simulation_state`, `date`),\n
KEY `node_resource_variation_state_date` (`node_uid`, `resource_uid`, `variation_text`, `simulation_state`, `date`)\n
) TYPE = InnoDB;\n ) TYPE = InnoDB;\n
</string> </value> </string> </value>
</item> </item>
...@@ -177,8 +168,7 @@ CREATE TABLE `stock` (\n ...@@ -177,8 +168,7 @@ CREATE TABLE `stock` (\n
`node_uid` BIGINT UNSIGNED,\n `node_uid` BIGINT UNSIGNED,\n
`section_uid` BIGINT UNSIGNED,\n `section_uid` BIGINT UNSIGNED,\n
`payment_uid` BIGINT UNSIGNED,\n `payment_uid` BIGINT UNSIGNED,\n
`function_uid` BIGINT UNSIGNED,\n `explanation_uid` BIGINT UNSIGNED,\n
`project_uid` BIGINT UNSIGNED,\n
`mirror_section_uid` BIGINT UNSIGNED,\n `mirror_section_uid` BIGINT UNSIGNED,\n
`mirror_node_uid` BIGINT UNSIGNED,\n `mirror_node_uid` BIGINT UNSIGNED,\n
`resource_uid` BIGINT UNSIGNED,\n `resource_uid` BIGINT UNSIGNED,\n
...@@ -192,19 +182,17 @@ CREATE TABLE `stock` (\n ...@@ -192,19 +182,17 @@ CREATE TABLE `stock` (\n
KEY `uid` (`uid`),\n KEY `uid` (`uid`),\n
KEY `quantity` (`quantity`),\n KEY `quantity` (`quantity`),\n
KEY `section_uid` (`section_uid`),\n KEY `section_uid` (`section_uid`),\n
KEY `mirror_section_uid` (`mirror_section_uid`),\n
KEY `mirror_node_uid` (`mirror_node_uid`),\n
KEY `node_uid` (`node_uid`),\n KEY `node_uid` (`node_uid`),\n
KEY `payment_uid` (`payment_uid`),\n KEY `payment_uid` (`payment_uid`),\n
KEY `function_uid` (`function_uid`),\n KEY `explanation_uid` (`explanation_uid`),\n
KEY `project_uid` (`project_uid`),\n
KEY `resource_uid` (`resource_uid`),\n KEY `resource_uid` (`resource_uid`),\n
KEY `simulation_state` (`simulation_state`),\n KEY `simulation_state` (`simulation_state`),\n
KEY `resource_node_uid` (`resource_uid`, `node_uid`),\n KEY `resource_node_uid` (`resource_uid`, `node_uid`),\n
KEY `resource_section_node_uid` (`resource_uid`, `section_uid`, `node_uid`, `simulation_state`),\n KEY `resource_section_node_uid_state` (`resource_uid`, `section_uid`, `node_uid`, `simulation_state`),\n
KEY `resource_payment_state` (`resource_uid`, `payment_uid`, `simulation_state`),\n KEY `resource_payment_state` (`resource_uid`, `payment_uid`, `simulation_state`),\n
KEY `resource_payment` (`resource_uid`, `payment_uid`),\n KEY `resource_payment_uid` (`resource_uid`, `payment_uid`),\n
KEY `resource_payment_state_date` (`resource_uid`, `payment_uid`, `simulation_state`, `date`)\n KEY `resource_payment_state_date` (`resource_uid`, `payment_uid`, `simulation_state`, `date`),\n
KEY `node_resource_variation_state_date` (`node_uid`, `resource_uid`, `variation_text`, `simulation_state`, `date`)\n
) TYPE = InnoDB;\n ) TYPE = InnoDB;\n
</string> </value> </string> </value>
</item> </item>
......
...@@ -51,12 +51,6 @@ ...@@ -51,12 +51,6 @@
</object> </object>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>allow_simple_one_argument_traversal</string> </key> <key> <string>allow_simple_one_argument_traversal</string> </key>
<value> <value>
......
...@@ -208,6 +208,9 @@ ...@@ -208,6 +208,9 @@
<name>Add Formulator Forms</name> <name>Add Formulator Forms</name>
<role>Manager</role> <role>Manager</role>
</permission> </permission>
<permission type='list'>
<name>Add HBTreeFolder2s</name>
</permission>
<permission type='tuple'> <permission type='tuple'>
<name>Add LocalContents</name> <name>Add LocalContents</name>
<role>Manager</role> <role>Manager</role>
...@@ -312,6 +315,9 @@ ...@@ -312,6 +315,9 @@
<name>Add Zope Tutorials</name> <name>Add Zope Tutorials</name>
<role>Manager</role> <role>Manager</role>
</permission> </permission>
<permission type='list'>
<name>Add old_CMFActivity Tools</name>
</permission>
<permission type='tuple'> <permission type='tuple'>
<name>Add portal content</name> <name>Add portal content</name>
<role>Assignor</role> <role>Assignor</role>
...@@ -466,10 +472,6 @@ ...@@ -466,10 +472,6 @@
<name>Edit Factories</name> <name>Edit Factories</name>
<role>Manager</role> <role>Manager</role>
</permission> </permission>
<permission type='tuple'>
<name>Edit ParsedXML</name>
<role>Manager</role>
</permission>
<permission type='tuple'> <permission type='tuple'>
<name>Edit ReStructuredText</name> <name>Edit ReStructuredText</name>
<role>Manager</role> <role>Manager</role>
...@@ -673,10 +675,6 @@ ...@@ -673,10 +675,6 @@
<role>Author</role> <role>Author</role>
<role>Manager</role> <role>Manager</role>
</permission> </permission>
<permission type='tuple'>
<name>View DOM hierarchy</name>
<role>Manager</role>
</permission>
<permission type='tuple'> <permission type='tuple'>
<name>View History</name> <name>View History</name>
<role>Assignee</role> <role>Assignee</role>
......
397 399
\ No newline at end of file \ No newline at end of file
erp5_mysql_innodb/z_catalog_delivery_list erp5_mysql_innodb/z_catalog_delivery_list
erp5_mysql_innodb/z_catalog_item_list erp5_mysql_innodb/z_catalog_item_list
erp5_mysql_innodb/z_catalog_movement_list
erp5_mysql_innodb/z_catalog_object_list erp5_mysql_innodb/z_catalog_object_list
erp5_mysql_innodb/z_catalog_stock_list erp5_mysql_innodb/z_catalog_stock_list
erp5_mysql_innodb/z_create_catalog erp5_mysql_innodb/z_create_catalog
erp5_mysql_innodb/z_create_category erp5_mysql_innodb/z_create_category
erp5_mysql_innodb/z_create_delivery erp5_mysql_innodb/z_create_delivery
erp5_mysql_innodb/z_create_item
erp5_mysql_innodb/z_create_roles_and_users erp5_mysql_innodb/z_create_roles_and_users
erp5_mysql_innodb/z_create_stock erp5_mysql_innodb/z_create_stock
erp5_mysql_innodb/z_related_default_site erp5_mysql_innodb/z_related_default_site
......
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