[Erp5-report] r19527 - in /erp5/trunk/bt5/erp5_banking_core: CatalogMethodTemplateItem/port...
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Feb 26 17:49:07 CET 2008
Author: vincent
Date: Tue Feb 26 17:49:07 2008
New Revision: 19527
URL: http://svn.erp5.org?rev=19527&view=rev
Log:
Update ZSQLMethods to use new catalog layout (new primary keys).
Modified:
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_category.xml
erp5/trunk/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_item.xml
erp5/trunk/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_stock.xml
erp5/trunk/bt5/erp5_banking_core/bt/revision
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=19527&r1=19526&r2=19527&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 Tue Feb 26 17:49:07 2008
@@ -277,21 +277,17 @@
\n
<dtml-var "\'\\0\'">\n
\n
-<dtml-let row_list="[]">\n
+<dtml-let row_list="[]" uid_dict="{}">\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], 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], 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 "not isInventoryMovement[loop_item] and isMovement[loop_item] and isAccountable[loop_item] and getResourceUid[loop_item]">\n
+ <dtml-if "getBaobabDestinationUid[loop_item]">\n
+ <dtml-call expr="uid_dict.update({uid[loop_item]: uid_dict.get(uid[loop_item], -1) + 1})">\n
+ <dtml-call expr="row_list.append([uid[loop_item], uid_dict[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-call expr="uid_dict.update({uid[loop_item]: uid_dict.get(uid[loop_item], -1) + 1})">\n
+ <dtml-call expr="row_list.append([uid[loop_item], uid_dict[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-in> \n
\n
@@ -302,20 +298,21 @@
<dtml-in prefix="row" expr="row_list">\n
(\n
<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[1]" type="int">,\n
+ <dtml-sqlvar expr="row_item[2]" type="int">, \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">, \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[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[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[14]" type="string" optional>,\n
+ <dtml-sqlvar expr="row_item[15]" type="string" optional>\n
)\n
<dtml-if sequence-end><dtml-else>,</dtml-if>\n
</dtml-in>\n
@@ -371,21 +368,17 @@
\n
<dtml-var "\'\\0\'">\n
\n
-<dtml-let row_list="[]">\n
+<dtml-let row_list="[]" uid_dict="{}">\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], 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], 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 "not isInventoryMovement[loop_item] and isMovement[loop_item] and isAccountable[loop_item] and getResourceUid[loop_item]">\n
+ <dtml-if "getBaobabDestinationUid[loop_item]">\n
+ <dtml-call expr="uid_dict.update({uid[loop_item]: uid_dict.get(uid[loop_item], -1) + 1})">\n
+ <dtml-call expr="row_list.append([uid[loop_item], uid_dict[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-call expr="uid_dict.update({uid[loop_item]: uid_dict.get(uid[loop_item], -1) + 1})">\n
+ <dtml-call expr="row_list.append([uid[loop_item], uid_dict[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-in> \n
\n
@@ -396,20 +389,21 @@
<dtml-in prefix="row" expr="row_list">\n
(\n
<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[1]" type="int">,\n
+ <dtml-sqlvar expr="row_item[2]" type="int">, \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">, \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[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[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[14]" type="string" optional>,\n
+ <dtml-sqlvar expr="row_item[15]" 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_category.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_category.xml?rev=19527&r1=19526&r2=19527&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 Tue Feb 26 17:49:07 2008
@@ -99,7 +99,7 @@
`category_uid` BIGINT UNSIGNED default \'0\',\n
`base_category_uid` BIGINT UNSIGNED default \'0\',\n
`category_strict_membership` tinyint(1) default \'0\',\n
- KEY `uid` (`uid`),\n
+ PRIMARY KEY (`uid`, `category_uid`, `base_category_uid`, `category_strict_membership`),\n
KEY `Membership` (`category_uid`,`base_category_uid`)\n
) TYPE = InnoDB;</string> </value>
</item>
@@ -142,7 +142,7 @@
`category_uid` BIGINT UNSIGNED default \'0\',\n
`base_category_uid` BIGINT UNSIGNED default \'0\',\n
`category_strict_membership` tinyint(1) default \'0\',\n
- KEY `uid` (`uid`),\n
+ PRIMARY KEY (`uid`, `category_uid`, `base_category_uid`, `category_strict_membership`),\n
KEY `Membership` (`category_uid`,`base_category_uid`)\n
) TYPE = InnoDB;</string> </value>
</item>
Modified: 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=19527&r1=19526&r2=19527&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_item.xml (original)
+++ erp5/trunk/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_item.xml Tue Feb 26 17:49:07 2008
@@ -107,7 +107,7 @@
`aggregate_uid` BIGINT UNSIGNED default \'0\',\n
`variation_text` VARCHAR(255),\n
`simulation_state` VARCHAR(255) default \'\',\n
- KEY `uid` (`uid`),\n
+ PRIMARY KEY (`uid`, `aggregate_uid`),\n
KEY `section_uid` (`section_uid`),\n
KEY `resource_uid` (`resource_uid`),\n
KEY `variation_text` (`variation_text`),\n
@@ -164,7 +164,7 @@
`aggregate_uid` BIGINT UNSIGNED default \'0\',\n
`variation_text` VARCHAR(255),\n
`simulation_state` VARCHAR(255) default \'\',\n
- KEY `uid` (`uid`),\n
+ PRIMARY KEY (`uid`, `aggregate_uid`),\n
KEY `section_uid` (`section_uid`),\n
KEY `resource_uid` (`resource_uid`),\n
KEY `variation_text` (`variation_text`),\n
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=19527&r1=19526&r2=19527&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 Tue Feb 26 17:49:07 2008
@@ -94,6 +94,7 @@
#\n
CREATE TABLE `stock` (\n
`uid` BIGINT UNSIGNED NOT NULL,\n
+ `order_id` TINYINT UNSIGNED NOT NULL,\n
`node_uid` BIGINT UNSIGNED,\n
`section_uid` BIGINT UNSIGNED,\n
`payment_uid` BIGINT UNSIGNED,\n
@@ -108,7 +109,7 @@
`simulation_state` varchar(255) default \'\',\n
`variation_text` VARCHAR(255),\n
`sub_variation_text` VARCHAR(255),\n
- KEY `uid` (`uid`),\n
+ PRIMARY KEY (`uid`, `order_id`),\n
KEY `quantity` (`quantity`),\n
KEY `section_uid` (`section_uid`),\n
KEY `node_uid` (`node_uid`),\n
@@ -165,6 +166,7 @@
#\n
CREATE TABLE `stock` (\n
`uid` BIGINT UNSIGNED NOT NULL,\n
+ `order_id` TINYINT UNSIGNED NOT NULL,\n
`node_uid` BIGINT UNSIGNED,\n
`section_uid` BIGINT UNSIGNED,\n
`payment_uid` BIGINT UNSIGNED,\n
@@ -179,7 +181,7 @@
`simulation_state` varchar(255) default \'\',\n
`variation_text` VARCHAR(255),\n
`sub_variation_text` VARCHAR(255),\n
- KEY `uid` (`uid`),\n
+ PRIMARY KEY (`uid`, `order_id`),\n
KEY `quantity` (`quantity`),\n
KEY `section_uid` (`section_uid`),\n
KEY `node_uid` (`node_uid`),\n
Modified: erp5/trunk/bt5/erp5_banking_core/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/bt/revision?rev=19527&r1=19526&r2=19527&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/bt/revision (original)
+++ erp5/trunk/bt5/erp5_banking_core/bt/revision Tue Feb 26 17:49:07 2008
@@ -1,1 +1,1 @@
-421
+422
More information about the Erp5-report
mailing list