[Erp5-report] r38555 jm - in /erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog:...
nobody at svn.erp5.org
nobody at svn.erp5.org
Wed Sep 22 18:04:10 CEST 2010
Author: jm
Date: Wed Sep 22 18:04:09 2010
New Revision: 38555
URL: http://svn.erp5.org?rev=38555&view=rev
Log:
Add filter to z_catalog_stock_list to fix isAccountable errors in logs
Modified:
erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_inventory_stock.catalog_keys.xml
erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_inventory_stock_list.xml
erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_stock_list.catalog_keys.xml
erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_inventory_stock.catalog_keys.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_inventory_stock.catalog_keys.xml?rev=38555&r1=38554&r2=38555&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_inventory_stock.catalog_keys.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_inventory_stock.catalog_keys.xml [utf8] Wed Sep 22 18:04:09 2010
@@ -6,7 +6,7 @@
<value>1</value>
</item>
<item key="_filter_expression_archive" type="str">
- <value>python: context.isInventoryMovement()</value>
+ <value>python: context.isInventoryMovementType()</value>
</item>
<item key="_filter_expression_cache_key_archive" type="tuple">
<value>portal_type</value>
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_inventory_stock_list.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_inventory_stock_list.xml?rev=38555&r1=38554&r2=38555&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_inventory_stock_list.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_inventory_stock_list.xml [utf8] Wed Sep 22 18:04:09 2010
@@ -147,18 +147,6 @@
</value>
</item>
<item>
- <key> <string>isInventoryMovement</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>isMovement</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
<key> <string>uid</string> </key>
<value>
<dictionary/>
@@ -178,7 +166,6 @@
<string>getDestinationUid</string>
<string>getSourceSectionUid</string>
<string>getDestinationSectionUid</string>
- <string>isMovement</string>
<string>getSourcePaymentUid</string>
<string>getDestinationPaymentUid</string>
<string>getSourceFunctionUid</string>
@@ -194,7 +181,6 @@
<string>getPortalType</string>
<string>getVariationText</string>
<string>getSubVariationText</string>
- <string>isInventoryMovement</string>
</list>
</value>
</item>
@@ -212,7 +198,6 @@ getSourceUid\r\n
getDestinationUid\r\n
getSourceSectionUid\r\n
getDestinationSectionUid\r\n
-isMovement\r\n
getSourcePaymentUid\r\n
getDestinationPaymentUid\r\n
getSourceFunctionUid\r\n
@@ -227,8 +212,7 @@ getStopDate\r\n
isAccountable\r\n
getPortalType\r\n
getVariationText\r\n
-getSubVariationText\r\n
-isInventoryMovement</string> </value>
+getSubVariationText</string> </value>
</item>
<item>
<key> <string>connection_id</string> </key>
@@ -248,13 +232,12 @@ WHERE\n
<dtml-in uid>\n
uid=<dtml-sqlvar sequence-item type="int"><dtml-if sequence-end><dtml-else> OR </dtml-if>\n
</dtml-in>\n
-;\n
\n
-<dtml-var "\'\\0\'">\n
+<dtml-var sql_delimiter>\n
\n
<dtml-let row_list="[]" uid_dict="{}">\n
<dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
- <dtml-if "isInventoryMovement[loop_item] and isMovement[loop_item] and isAccountable[loop_item] and getResourceUid[loop_item]">\n
+ <dtml-if "isAccountable[loop_item] and getResourceUid[loop_item]">\n
<dtml-if "getDestinationUid[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([\n
@@ -377,13 +360,12 @@ WHERE\n
<dtml-in uid>\n
uid=<dtml-sqlvar sequence-item type="int"><dtml-if sequence-end><dtml-else> OR </dtml-if>\n
</dtml-in>\n
-;\n
\n
-<dtml-var "\'\\0\'">\n
+<dtml-var sql_delimiter>\n
\n
<dtml-let row_list="[]" uid_dict="{}">\n
<dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
- <dtml-if "isInventoryMovement[loop_item] and isMovement[loop_item] and isAccountable[loop_item] and getResourceUid[loop_item]">\n
+ <dtml-if "isAccountable[loop_item] and getResourceUid[loop_item]">\n
<dtml-if "getDestinationUid[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([\n
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_stock_list.catalog_keys.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_stock_list.catalog_keys.xml?rev=38555&r1=38554&r2=38555&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_stock_list.catalog_keys.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_stock_list.catalog_keys.xml [utf8] Wed Sep 22 18:04:09 2010
@@ -6,7 +6,7 @@
<value>1</value>
</item>
<item key="_filter_expression_archive" type="str">
- <value>python: context.providesIMovement() and not context.isInventoryMovement()</value>
+ <value>python: context.providesIMovement() and not context.isInventoryMovementType()</value>
</item>
<item key="_filter_expression_cache_key_archive" type="tuple">
<value>portal_type</value>
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision?rev=38555&r1=38554&r2=38555&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision [utf8] Wed Sep 22 18:04:09 2010
@@ -1 +1 @@
-199
\ No newline at end of file
+200
\ No newline at end of file
More information about the Erp5-report
mailing list