Merge branch 'master' of https://git.erp5.org/repos/erp5 into erp5-component

CHANGES.erp5.util.txt

 Changes
 =======
 
+0.4.31 (2013-03-01)
+-------------------
+
+ * erp5.util.testnode:
+
+  - after resetting software, retry_software_count was not resetted correctly
+    [Sebastien Robin]
+
 0.4.30 (2013-02-20)
 -------------------
 

bt5/erp5_stock_cache/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/SQLCatalog_trimInventoryCacheOnCatalog.xml

@@ -78,6 +78,14 @@ except ProgrammingError:\n
             <key> <string>_params</string> </key>
             <value> <string>uid, isMovement, isInventoryMovement, getResourceUid, getDestinationUid, getStopDate, getSourceUid, getStartDate</string> </value>
         </item>
+        <item>
+            <key> <string>_proxy_roles</string> </key>
+            <value>
+              <tuple>
+                <string>Manager</string>
+              </tuple>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>SQLCatalog_trimInventoryCacheOnCatalog</string> </value>

bt5/erp5_stock_cache/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/SQLCatalog_trimInventoryCacheOnUncatalog.catalog_keys.xml

@@ -2,4 +2,13 @@
  <item key="sql_uncatalog_object" 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: context.providesIMovement() and not context.isInventoryMovement()</value>
+ </item>
+ <item key="_filter_expression_cache_key_archive" type="tuple">
+  <value>portal_type</value>
+ </item>
 </catalog_method>

bt5/erp5_stock_cache/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/SQLCatalog_trimInventoryCacheOnUncatalog.xml

@@ -64,6 +64,14 @@ except ProgrammingError:\n
             <key> <string>_params</string> </key>
             <value> <string>uid</string> </value>
         </item>
+        <item>
+            <key> <string>_proxy_roles</string> </key>
+            <value>
+              <tuple>
+                <string>Manager</string>
+              </tuple>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>SQLCatalog_trimInventoryCacheOnUncatalog</string> </value>

bt5/erp5_stock_cache/bt/revision

-12
\ No newline at end of file
+13
\ No newline at end of file

product/ERP5/tests/testSimulationElementPerformance.py

@@ -83,12 +83,13 @@ from Products.ERP5Type.tests.Sequence import SequenceList
 
 # Define variable to chek if performance are good or not
 # XXX These variable are specific to the testing environment
-#     (pystone results: min: < 75757.6 - mean: ~ 77174.4 - max: > 78125)
+#     (pystone results: min: < 131578.9 - mean: ~ 139768.5 - max: > 147058.8)
 # Historical values are here to remember original values on this
 # specific testing environment. We must always try to stay below max
 # historical values.
 
-EXPECTED_MIN_MAX_TIME = {
+# Only for information
+HISTORICAL_EXPECTED_MIN_MAX_TIME = {
   'Creation Of New Applied Rules': (34.8, 36.8),
 
   'Expansion of Existing Applied Rules': (16.9, 19.5),
@@ -111,6 +112,29 @@ EXPECTED_MIN_MAX_TIME = {
   'Addition of New Invoices Lines': (145.1, 157.6),
 }
 
+EXPECTED_MIN_MAX_TIME = {
+  'Creation Of New Applied Rules': (5, 10),
+
+  'Expansion of Existing Applied Rules': (5, 10),
+
+  'Creation of New Sale Packing Lists': (5, 10),
+
+  'Expansion of Converged Changes': (8, 12),
+
+  'Expansion of Diverged Changes': (9, 13),
+
+  'Adoption of Previsions': (20, 25),
+
+  'Acceptance of Decisions': (20, 25),
+
+  'Creation of New Applied Rules from Partially Simulated Deliveries':
+    (12, 17),
+
+  'Creation Of New Sale Invoices': (9, 14),
+
+  'Addition of New Invoices Lines': (36, 44),
+}
+
 class TestSimulationPerformance(ERP5TypeTestCase, LogInterceptor):
 
     def getTitle(self):

product/ERP5Type/tests/testPerformance.py

@@ -52,8 +52,8 @@ MIN_OBJECT_PROXYFIELD_VIEW=0.020    # 0.199
 MAX_OBJECT_PROXYFIELD_VIEW=0.090    # 0.220
 #CURRENT_MIN_OBJECT_VIEW=0.1220
 #CURRENT_MAX_OBJECT_VIEW=0.1280
-MIN_MODULE_VIEW=0.148               # 0.125
-MAX_MODULE_VIEW=0.153               # 0.175
+MIN_MODULE_VIEW=0.020               # 0.125
+MAX_MODULE_VIEW=0.070               # 0.175
 MIN_TIC=0.0020                      # 0.260
 MAX_TIC=0.0090                      # 0.343
 MIN_OBJECT_CREATION=0.0010          # 0.0070

setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 import glob
 import os
 
-version = '0.4.30'
+version = '0.4.31'
 name = 'erp5.util'
 long_description = open("README.erp5.util.txt").read() + "\n"