[Erp5-report] r18474 - in /erp5/trunk/bt5/erp5_banking_core: CatalogMethodTemplateItem/port...
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri Dec 21 17:24:37 CET 2007
Author: aurel
Date: Fri Dec 21 17:24:36 2007
New Revision: 18474
URL: http://svn.erp5.org?rev=18474&view=rev
Log:
many catalog optimisations
Added:
erp5/trunk/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_item.catalog_keys.xml
erp5/trunk/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_item.xml
erp5/trunk/bt5/erp5_banking_core/bt/template_tool_id_list
Modified:
erp5/trunk/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_delivery_list.xml
erp5/trunk/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_item_list.xml
erp5/trunk/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_object_list.xml
erp5/trunk/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_stock_list.catalog_keys.xml
erp5/trunk/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_stock_list.xml
erp5/trunk/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_catalog.xml
erp5/trunk/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_category.xml
erp5/trunk/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_delivery.xml
erp5/trunk/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_roles_and_users.xml
erp5/trunk/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_stock.xml
erp5/trunk/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_translated_simulation_state_title.xml
erp5/trunk/bt5/erp5_banking_core/ModuleTemplateItem/accounting_cancellation_module.xml
erp5/trunk/bt5/erp5_banking_core/bt/revision
erp5/trunk/bt5/erp5_banking_core/bt/template_catalog_method_id_list
Modified: erp5/trunk/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_delivery_list.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_delivery_list.xml?rev=18474&r1=18473&r2=18474&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_delivery_list.xml (original)
+++ erp5/trunk/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_delivery_list.xml Fri Dec 21 17:24:36 2007
@@ -133,12 +133,6 @@
</dictionary>
</state>
</object>
- </value>
- </item>
- <item>
- <key> <string>_owner</string> </key>
- <value>
- <none/>
</value>
</item>
<item>
Modified: erp5/trunk/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_item_list.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_item_list.xml?rev=18474&r1=18473&r2=18474&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_item_list.xml (original)
+++ erp5/trunk/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_item_list.xml Fri Dec 21 17:24:36 2007
@@ -96,28 +96,22 @@
<key> <string>_keys</string> </key>
<value>
<list>
-<string>isMovement</string>
-<string>isAccountable</string>
-<string>uid</string>
-<string>getStopDate</string>
-<string>getBaobabDestinationUid</string>
-<string>getBaobabDestinationSectionUid</string>
-<string>getResourceUid</string>
-<string>getVariationText</string>
-<string>getSimulationState</string>
-<string>getAggregateUidList</string>
+ <string>isMovement</string>
+ <string>isAccountable</string>
+ <string>uid</string>
+ <string>getStopDate</string>
+ <string>getBaobabDestinationUid</string>
+ <string>getBaobabDestinationSectionUid</string>
+ <string>getResourceUid</string>
+ <string>getVariationText</string>
+ <string>getSimulationState</string>
+ <string>getAggregateUidList</string>
</list>
</value>
</item>
</dictionary>
</state>
</object>
- </value>
- </item>
- <item>
- <key> <string>_owner</string> </key>
- <value>
- <none/>
</value>
</item>
<item>
Modified: erp5/trunk/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_object_list.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_object_list.xml?rev=18474&r1=18473&r2=18474&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_object_list.xml (original)
+++ erp5/trunk/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_object_list.xml Fri Dec 21 17:24:36 2007
@@ -30,12 +30,6 @@
<value>
<dictionary>
<item>
- <key> <string>event_state</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
<key> <string>getCreationDate</string> </key>
<value>
<dictionary/>
@@ -48,18 +42,6 @@
</value>
</item>
<item>
- <key> <string>getDestinationReference</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>getFloatIndex</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
<key> <string>getIntIndex</string> </key>
<value>
<dictionary/>
@@ -108,12 +90,6 @@
</value>
</item>
<item>
- <key> <string>getSimulationStateTitle</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
<key> <string>getSourceReference</string> </key>
<value>
<dictionary/>
@@ -150,7 +126,7 @@
</value>
</item>
<item>
- <key> <string>getValidationStateTitle</string> </key>
+ <key> <string>getViewPermissionOwner</string> </key>
<value>
<dictionary/>
</value>
@@ -163,18 +139,6 @@
</item>
<item>
<key> <string>id</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>meta_type</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>payment_state</string> </key>
<value>
<dictionary/>
</value>
@@ -200,26 +164,20 @@
<list>
<string>uid</string>
<string>security_uid</string>
+<string>getViewPermissionOwner</string>
<string>getPath</string>
<string>getRelativeUrl</string>
<string>getParentUid</string>
<string>id</string>
<string>getDescription</string>
<string>getTitle</string>
-<string>meta_type</string>
<string>getPortalType</string>
<string>getSimulationState</string>
-<string>getSimulationStateTitle</string>
<string>getValidationState</string>
-<string>getValidationStateTitle</string>
-<string>payment_state</string>
-<string>event_state</string>
<string>getReference</string>
<string>getSourceReference</string>
-<string>getDestinationReference</string>
<string>getStringIndex</string>
<string>getIntIndex</string>
-<string>getFloatIndex</string>
<string>hasCellContent</string>
<string>getCreationDate</string>
<string>getModificationDate</string>
@@ -234,12 +192,6 @@
</value>
</item>
<item>
- <key> <string>_owner</string> </key>
- <value>
- <none/>
- </value>
- </item>
- <item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
<none/>
@@ -249,26 +201,20 @@
<key> <string>arguments_src</string> </key>
<value> <string>uid\r\n
security_uid\r\n
+getViewPermissionOwner\r\n
getPath\r\n
getRelativeUrl\r\n
getParentUid\r\n
id\r\n
getDescription\r\n
getTitle\r\n
-meta_type\r\n
getPortalType\r\n
getSimulationState\r\n
-getSimulationStateTitle\r\n
getValidationState\r\n
-getValidationStateTitle\r\n
-payment_state\r\n
-event_state\r\n
getReference\r\n
getSourceReference\r\n
-getDestinationReference\r\n
getStringIndex\r\n
getIntIndex\r\n
-getFloatIndex\r\n
hasCellContent\r\n
getCreationDate\r\n
getModificationDate\r\n
@@ -315,12 +261,18 @@
REPLACE INTO\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
<dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
(\n
<dtml-sqlvar expr="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="getViewPermissionOwner[loop_item]" type="string" optional>,\n
<dtml-sqlvar expr="getRelativeUrl[loop_item]" type="string">,\n
<dtml-sqlvar expr="getParentUid[loop_item]" type="int">,\n
<dtml-sqlvar expr="id[loop_item]" type="string" optional>,\n
@@ -329,7 +281,6 @@
<dtml-sqlvar expr="getPortalType[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="getSimulationStateTitle[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="getStringIndex[loop_item]" type="string" optional>,\n
@@ -338,7 +289,8 @@
<dtml-sqlvar expr="getCreationDate[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="getStopDate[loop_item]" type="datetime" optional>\n
+ <dtml-sqlvar expr="getStopDate[loop_item]" type="datetime" optional>,\n
+ null\n
)\n
<dtml-if sequence-end><dtml-else>,</dtml-if>\n
</dtml-in>
@@ -383,12 +335,18 @@
REPLACE INTO\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
<dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
(\n
<dtml-sqlvar expr="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="getViewPermissionOwner[loop_item]" type="string" optional>,\n
<dtml-sqlvar expr="getRelativeUrl[loop_item]" type="string">,\n
<dtml-sqlvar expr="getParentUid[loop_item]" type="int">,\n
<dtml-sqlvar expr="id[loop_item]" type="string" optional>,\n
@@ -397,7 +355,6 @@
<dtml-sqlvar expr="getPortalType[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="getSimulationStateTitle[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="getStringIndex[loop_item]" type="string" optional>,\n
@@ -406,7 +363,8 @@
<dtml-sqlvar expr="getCreationDate[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="getStopDate[loop_item]" type="datetime" optional>\n
+ <dtml-sqlvar expr="getStopDate[loop_item]" type="datetime" optional>,\n
+ null\n
)\n
<dtml-if sequence-end><dtml-else>,</dtml-if>\n
</dtml-in>
Modified: erp5/trunk/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_stock_list.catalog_keys.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_stock_list.catalog_keys.xml?rev=18474&r1=18473&r2=18474&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_stock_list.catalog_keys.xml (original)
+++ erp5/trunk/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_stock_list.catalog_keys.xml Fri Dec 21 17:24:36 2007
@@ -6,7 +6,7 @@
<value>1</value>
</item>
<item key="_filter_expression_archive" type="str">
- <value>python: isMovement</value>
+ <value>python: isMovement and not isInventoryMovement</value>
</item>
<item key="_filter_type_archive" type="tuple">
</item>
Modified: erp5/trunk/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_stock_list.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_stock_list.xml?rev=18474&r1=18473&r2=18474&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_stock_list.xml (original)
+++ erp5/trunk/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_stock_list.xml Fri Dec 21 17:24:36 2007
@@ -30,24 +30,12 @@
<value>
<dictionary>
<item>
- <key> <string>getBaobabDestinationFunctionUid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
<key> <string>getBaobabDestinationPaymentUid</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
- <key> <string>getBaobabDestinationProjectUid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
<key> <string>getBaobabDestinationSectionUid</string> </key>
<value>
<dictionary/>
@@ -66,24 +54,12 @@
</value>
</item>
<item>
- <key> <string>getBaobabSourceFunctionUid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
<key> <string>getBaobabSourcePaymentUid</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
- <key> <string>getBaobabSourceProjectUid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
<key> <string>getBaobabSourceSectionUid</string> </key>
<value>
<dictionary/>
@@ -108,6 +84,12 @@
</value>
</item>
<item>
+ <key> <string>getExplanationUid</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
<key> <string>getInventoriatedQuantity</string> </key>
<value>
<dictionary/>
@@ -157,6 +139,12 @@
</item>
<item>
<key> <string>isAccountable</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>isInventoryMovement</string> </key>
<value>
<dictionary/>
</value>
@@ -188,12 +176,10 @@
<string>getBaobabSourceSectionUid</string>
<string>getBaobabDestinationSectionUid</string>
<string>isMovement</string>
+<string>isInventoryMovement</string>
<string>getBaobabSourcePaymentUid</string>
<string>getBaobabDestinationPaymentUid</string>
-<string>getBaobabSourceFunctionUid</string>
-<string>getBaobabDestinationFunctionUid</string>
-<string>getBaobabSourceProjectUid</string>
-<string>getBaobabDestinationProjectUid</string>
+<string>getExplanationUid</string>
<string>getSimulationState</string>
<string>getSourceInventoriatedTotalAssetPrice</string>
<string>getDestinationInventoriatedTotalAssetPrice</string>
@@ -213,12 +199,6 @@
</value>
</item>
<item>
- <key> <string>_owner</string> </key>
- <value>
- <none/>
- </value>
- </item>
- <item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
<none/>
@@ -234,12 +214,10 @@
getBaobabSourceSectionUid\r\n
getBaobabDestinationSectionUid\r\n
isMovement\r\n
+isInventoryMovement\r\n
getBaobabSourcePaymentUid\r\n
getBaobabDestinationPaymentUid\r\n
-getBaobabSourceFunctionUid\r\n
-getBaobabDestinationFunctionUid\r\n
-getBaobabSourceProjectUid\r\n
-getBaobabDestinationProjectUid\r\n
+getExplanationUid\r\n
getSimulationState\r\n
getSourceInventoriatedTotalAssetPrice\r\n
getDestinationInventoriatedTotalAssetPrice\r\n
@@ -302,16 +280,18 @@
<dtml-let row_list="[]">\n
<dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
<dtml-if "isMovement[loop_item]">\n
+ <dtml-if "not isInventoryMovement[loop_item]">\n
<dtml-if "isAccountable[loop_item]">\n
<dtml-if "getResourceUid[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 "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-in> \n
\n
@@ -324,19 +304,18 @@
<dtml-sqlvar expr="row_item[0]" 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[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[5]" 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[8]" type="int">, \n
- <dtml-sqlvar expr="row_item[9]" type="float" optional>,\n
- <dtml-sqlvar expr="row_item[10]" type="datetime" optional>,\n
- <dtml-sqlvar expr="row_item[11]" type="float" optional>,\n
+ <dtml-sqlvar expr="row_item[7]" type="int">, \n
+ <dtml-sqlvar expr="row_item[8]" type="float" optional>,\n
+ <dtml-sqlvar expr="row_item[9]" type="datetime" optional>,\n
+ <dtml-sqlvar expr="row_item[10]" 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[13]" type="string" optional>,\n
- <dtml-sqlvar expr="row_item[14]" type="string" optional>,\n
- <dtml-sqlvar expr="row_item[15]" type="string" optional>\n
+ <dtml-sqlvar expr="row_item[14]" type="string" optional>\n
)\n
<dtml-if sequence-end><dtml-else>,</dtml-if>\n
</dtml-in>\n
@@ -395,16 +374,18 @@
<dtml-let row_list="[]">\n
<dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
<dtml-if "isMovement[loop_item]">\n
+ <dtml-if "not isInventoryMovement[loop_item]">\n
<dtml-if "isAccountable[loop_item]">\n
<dtml-if "getResourceUid[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 "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-in> \n
\n
@@ -417,19 +398,18 @@
<dtml-sqlvar expr="row_item[0]" 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[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[5]" 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[8]" type="int">, \n
- <dtml-sqlvar expr="row_item[9]" type="float" optional>,\n
- <dtml-sqlvar expr="row_item[10]" type="datetime" optional>,\n
- <dtml-sqlvar expr="row_item[11]" type="float" optional>,\n
+ <dtml-sqlvar expr="row_item[7]" type="int">, \n
+ <dtml-sqlvar expr="row_item[8]" type="float" optional>,\n
+ <dtml-sqlvar expr="row_item[9]" type="datetime" optional>,\n
+ <dtml-sqlvar expr="row_item[10]" 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[13]" type="string" optional>,\n
- <dtml-sqlvar expr="row_item[14]" type="string" optional>,\n
- <dtml-sqlvar expr="row_item[15]" type="string" optional>\n
+ <dtml-sqlvar expr="row_item[14]" type="string" optional>\n
)\n
<dtml-if sequence-end><dtml-else>,</dtml-if>\n
</dtml-in>\n
Modified: erp5/trunk/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_catalog.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_catalog.xml?rev=18474&r1=18473&r2=18474&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_catalog.xml (original)
+++ erp5/trunk/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_catalog.xml Fri Dec 21 17:24:36 2007
@@ -43,12 +43,6 @@
</value>
</item>
<item>
- <key> <string>_owner</string> </key>
- <value>
- <none/>
- </value>
- </item>
- <item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
<none/>
@@ -102,6 +96,7 @@
`uid` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,\n
`security_uid` INT UNSIGNED,\n
`path` varchar(255) NOT NULL default \'\',\n
+ `owner` varchar(32) default \'\',\n
`relative_url` varchar(255) NOT NULL default \'\',\n
`parent_uid` BIGINT UNSIGNED default \'0\',\n
`id` varchar(255) default \'\',\n
@@ -110,7 +105,6 @@
`portal_type` varchar(255) default \'\',\n
`validation_state` varchar(255) default \'\',\n
`simulation_state` varchar(255) default \'\',\n
- `simulation_state_title` varchar(255) default \'\',\n
`reference` varchar(255) default \'\',\n
`source_reference` varchar(255) default \'\',\n
`string_index` varchar(255),\n
@@ -120,18 +114,20 @@
`modification_date` datetime,\n
`start_date` datetime,\n
`stop_date` datetime,\n
+ `indexation_date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,\n
PRIMARY KEY (`uid`),\n
- KEY `security_uid` (`security_uid`),\n
- KEY `Parent` (`parent_uid`, `portal_type`, `security_uid`),\n
- KEY `Type1` (`portal_type`),\n
+ KEY `owner` (`owner`),\n
+ KEY `Parent` (`parent_uid`, `security_uid`),\n
+ KEY `parent_simulation_security` (`parent_uid`, `simulation_state`, `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_title` (`simulation_state_title`, `portal_type`, `security_uid`),\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 `reference` (`portal_type`, `reference`),\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
</string> </value>
</item>
@@ -177,6 +173,7 @@
`uid` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,\n
`security_uid` INT UNSIGNED,\n
`path` varchar(255) NOT NULL default \'\',\n
+ `owner` varchar(32) default \'\',\n
`relative_url` varchar(255) NOT NULL default \'\',\n
`parent_uid` BIGINT UNSIGNED default \'0\',\n
`id` varchar(255) default \'\',\n
@@ -185,7 +182,6 @@
`portal_type` varchar(255) default \'\',\n
`validation_state` varchar(255) default \'\',\n
`simulation_state` varchar(255) default \'\',\n
- `simulation_state_title` varchar(255) default \'\',\n
`reference` varchar(255) default \'\',\n
`source_reference` varchar(255) default \'\',\n
`string_index` varchar(255),\n
@@ -195,18 +191,20 @@
`modification_date` datetime,\n
`start_date` datetime,\n
`stop_date` datetime,\n
+ `indexation_date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,\n
PRIMARY KEY (`uid`),\n
- KEY `security_uid` (`security_uid`),\n
- KEY `Parent` (`parent_uid`, `portal_type`, `security_uid`),\n
- KEY `Type1` (`portal_type`),\n
+ KEY `owner` (`owner`),\n
+ KEY `Parent` (`parent_uid`, `security_uid`),\n
+ KEY `parent_simulation_security` (`parent_uid`, `simulation_state`, `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_title` (`simulation_state_title`, `portal_type`, `security_uid`),\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 `reference` (`portal_type`, `reference`),\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
</string> </value>
</item>
Modified: erp5/trunk/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_category.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_category.xml?rev=18474&r1=18473&r2=18474&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_category.xml (original)
+++ erp5/trunk/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_category.xml Fri Dec 21 17:24:36 2007
@@ -46,12 +46,6 @@
<key> <string>_col</string> </key>
<value>
<tuple/>
- </value>
- </item>
- <item>
- <key> <string>_owner</string> </key>
- <value>
- <none/>
</value>
</item>
<item>
Modified: erp5/trunk/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_delivery.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_delivery.xml?rev=18474&r1=18473&r2=18474&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_delivery.xml (original)
+++ erp5/trunk/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_delivery.xml Fri Dec 21 17:24:36 2007
@@ -46,12 +46,6 @@
<key> <string>_col</string> </key>
<value>
<tuple/>
- </value>
- </item>
- <item>
- <key> <string>_owner</string> </key>
- <value>
- <none/>
</value>
</item>
<item>
Added: erp5/trunk/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_item.catalog_keys.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_item.catalog_keys.xml?rev=18474&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_item.catalog_keys.xml (added)
+++ erp5/trunk/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_item.catalog_keys.xml Fri Dec 21 17:24:36 2007
@@ -1,0 +1,5 @@
+<catalog_method>
+ <item key="sql_clear_catalog" type="int">
+ <value>1</value>
+ </item>
+</catalog_method>
Added: erp5/trunk/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_item.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_item.xml?rev=18474&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_item.xml (added)
+++ erp5/trunk/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_item.xml Fri Dec 21 17:24:36 2007
@@ -1,0 +1,189 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="SQL" module="Products.ZSQLMethods.SQL"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>__ac_local_roles__</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_arg</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>_data</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_keys</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>_col</string> </key>
+ <value>
+ <tuple/>
+ </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></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>z_create_item</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># Host:\n
+# Database: test\n
+# Table: \'item\'\n
+#\n
+CREATE TABLE `item` (\n
+ `uid` BIGINT UNSIGNED NOT NULL,\n
+ `date` datetime,\n
+ `node_uid` BIGINT UNSIGNED default \'0\',\n
+ `section_uid` BIGINT UNSIGNED default \'0\',\n
+ `resource_uid` BIGINT UNSIGNED default \'0\',\n
+ `aggregate_uid` BIGINT UNSIGNED default \'0\',\n
+ `variation_text` VARCHAR(255),\n
+ `simulation_state` VARCHAR(255) default \'\',\n
+ KEY `uid` (`uid`),\n
+ KEY `section_uid` (`section_uid`),\n
+ KEY `resource_uid` (`resource_uid`),\n
+ KEY `variation_text` (`variation_text`),\n
+ KEY `aggregate_simulation_state_date` (`aggregate_uid`,`simulation_state`,`date`),\n
+ KEY `node_simulation_state_date` (`node_uid`,`simulation_state`,`date`)\n
+) TYPE=InnoDB;\n
+\n
+</string> </value>
+ </item>
+ <item>
+ <key> <string>template</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="__newobj__" module="copy_reg"/>
+ </klass>
+ <tuple>
+ <global name="SQL" module="Shared.DC.ZRDB.DA"/>
+ </tuple>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>__name__</string> </key>
+ <value> <string encoding="cdata"><![CDATA[
+
+<string>
+
+]]></string> </value>
+ </item>
+ <item>
+ <key> <string>_vars</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>globals</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>raw</string> </key>
+ <value> <string># Host:\n
+# Database: test\n
+# Table: \'item\'\n
+#\n
+CREATE TABLE `item` (\n
+ `uid` BIGINT UNSIGNED NOT NULL,\n
+ `date` datetime,\n
+ `node_uid` BIGINT UNSIGNED default \'0\',\n
+ `section_uid` BIGINT UNSIGNED default \'0\',\n
+ `resource_uid` BIGINT UNSIGNED default \'0\',\n
+ `aggregate_uid` BIGINT UNSIGNED default \'0\',\n
+ `variation_text` VARCHAR(255),\n
+ `simulation_state` VARCHAR(255) default \'\',\n
+ KEY `uid` (`uid`),\n
+ KEY `section_uid` (`section_uid`),\n
+ KEY `resource_uid` (`resource_uid`),\n
+ KEY `variation_text` (`variation_text`),\n
+ KEY `aggregate_simulation_state_date` (`aggregate_uid`,`simulation_state`,`date`),\n
+ KEY `node_simulation_state_date` (`node_uid`,`simulation_state`,`date`)\n
+) TYPE=InnoDB;\n
+\n
+</string> </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Modified: erp5/trunk/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_roles_and_users.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_roles_and_users.xml?rev=18474&r1=18473&r2=18474&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_roles_and_users.xml (original)
+++ erp5/trunk/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_roles_and_users.xml Fri Dec 21 17:24:36 2007
@@ -40,12 +40,6 @@
</dictionary>
</state>
</object>
- </value>
- </item>
- <item>
- <key> <string>_owner</string> </key>
- <value>
- <none/>
</value>
</item>
<item>
Modified: erp5/trunk/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_stock.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_stock.xml?rev=18474&r1=18473&r2=18474&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_stock.xml (original)
+++ erp5/trunk/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_stock.xml Fri Dec 21 17:24:36 2007
@@ -43,12 +43,6 @@
</value>
</item>
<item>
- <key> <string>_owner</string> </key>
- <value>
- <none/>
- </value>
- </item>
- <item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
<none/>
@@ -103,8 +97,7 @@
`node_uid` BIGINT UNSIGNED,\n
`section_uid` BIGINT UNSIGNED,\n
`payment_uid` BIGINT UNSIGNED,\n
- `function_uid` BIGINT UNSIGNED,\n
- `project_uid` BIGINT UNSIGNED,\n
+ `explanation_uid` BIGINT UNSIGNED,\n
`mirror_section_uid` BIGINT UNSIGNED,\n
`mirror_node_uid` BIGINT UNSIGNED,\n
`resource_uid` BIGINT UNSIGNED,\n
@@ -118,19 +111,17 @@
KEY `uid` (`uid`),\n
KEY `quantity` (`quantity`),\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 `payment_uid` (`payment_uid`),\n
- KEY `function_uid` (`function_uid`),\n
- KEY `project_uid` (`project_uid`),\n
+ KEY `explanation_uid` (`explanation_uid`),\n
KEY `resource_uid` (`resource_uid`),\n
KEY `simulation_state` (`simulation_state`),\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` (`resource_uid`, `payment_uid`),\n
- KEY `resource_payment_state_date` (`resource_uid`, `payment_uid`, `simulation_state`, `date`)\n
+ KEY `resource_payment_uid` (`resource_uid`, `payment_uid`),\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
</string> </value>
</item>
@@ -177,8 +168,7 @@
`node_uid` BIGINT UNSIGNED,\n
`section_uid` BIGINT UNSIGNED,\n
`payment_uid` BIGINT UNSIGNED,\n
- `function_uid` BIGINT UNSIGNED,\n
- `project_uid` BIGINT UNSIGNED,\n
+ `explanation_uid` BIGINT UNSIGNED,\n
`mirror_section_uid` BIGINT UNSIGNED,\n
`mirror_node_uid` BIGINT UNSIGNED,\n
`resource_uid` BIGINT UNSIGNED,\n
@@ -192,19 +182,17 @@
KEY `uid` (`uid`),\n
KEY `quantity` (`quantity`),\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 `payment_uid` (`payment_uid`),\n
- KEY `function_uid` (`function_uid`),\n
- KEY `project_uid` (`project_uid`),\n
+ KEY `explanation_uid` (`explanation_uid`),\n
KEY `resource_uid` (`resource_uid`),\n
KEY `simulation_state` (`simulation_state`),\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` (`resource_uid`, `payment_uid`),\n
- KEY `resource_payment_state_date` (`resource_uid`, `payment_uid`, `simulation_state`, `date`)\n
+ KEY `resource_payment_uid` (`resource_uid`, `payment_uid`),\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
</string> </value>
</item>
Modified: erp5/trunk/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_translated_simulation_state_title.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_translated_simulation_state_title.xml?rev=18474&r1=18473&r2=18474&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_translated_simulation_state_title.xml (original)
+++ erp5/trunk/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_translated_simulation_state_title.xml Fri Dec 21 17:24:36 2007
@@ -49,12 +49,6 @@
</dictionary>
</state>
</object>
- </value>
- </item>
- <item>
- <key> <string>_owner</string> </key>
- <value>
- <none/>
</value>
</item>
<item>
Modified: erp5/trunk/bt5/erp5_banking_core/ModuleTemplateItem/accounting_cancellation_module.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/ModuleTemplateItem/accounting_cancellation_module.xml?rev=18474&r1=18473&r2=18474&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/ModuleTemplateItem/accounting_cancellation_module.xml (original)
+++ erp5/trunk/bt5/erp5_banking_core/ModuleTemplateItem/accounting_cancellation_module.xml Fri Dec 21 17:24:36 2007
@@ -208,6 +208,9 @@
<name>Add Formulator Forms</name>
<role>Manager</role>
</permission>
+ <permission type='list'>
+ <name>Add HBTreeFolder2s</name>
+ </permission>
<permission type='tuple'>
<name>Add LocalContents</name>
<role>Manager</role>
@@ -312,6 +315,9 @@
<name>Add Zope Tutorials</name>
<role>Manager</role>
</permission>
+ <permission type='list'>
+ <name>Add old_CMFActivity Tools</name>
+ </permission>
<permission type='tuple'>
<name>Add portal content</name>
<role>Assignor</role>
@@ -464,10 +470,6 @@
</permission>
<permission type='tuple'>
<name>Edit Factories</name>
- <role>Manager</role>
- </permission>
- <permission type='tuple'>
- <name>Edit ParsedXML</name>
<role>Manager</role>
</permission>
<permission type='tuple'>
@@ -671,10 +673,6 @@
<role>Associate</role>
<role>Auditor</role>
<role>Author</role>
- <role>Manager</role>
- </permission>
- <permission type='tuple'>
- <name>View DOM hierarchy</name>
<role>Manager</role>
</permission>
<permission type='tuple'>
Modified: erp5/trunk/bt5/erp5_banking_core/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/bt/revision?rev=18474&r1=18473&r2=18474&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/bt/revision (original)
+++ erp5/trunk/bt5/erp5_banking_core/bt/revision Fri Dec 21 17:24:36 2007
@@ -1,1 +1,1 @@
-397
+399
Modified: erp5/trunk/bt5/erp5_banking_core/bt/template_catalog_method_id_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/bt/template_catalog_method_id_list?rev=18474&r1=18473&r2=18474&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/bt/template_catalog_method_id_list (original)
+++ erp5/trunk/bt5/erp5_banking_core/bt/template_catalog_method_id_list Fri Dec 21 17:24:36 2007
@@ -1,11 +1,11 @@
erp5_mysql_innodb/z_catalog_delivery_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_stock_list
erp5_mysql_innodb/z_create_catalog
erp5_mysql_innodb/z_create_category
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_stock
erp5_mysql_innodb/z_related_default_site
Added: erp5/trunk/bt5/erp5_banking_core/bt/template_tool_id_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/bt/template_tool_id_list?rev=18474&view=auto
==============================================================================
(empty)
More information about the Erp5-report
mailing list