diff --git a/product/ERP5/bootstrap/erp5_core/DocumentTemplateItem/portal_components/document.erp5.ScriptConstraint.py b/product/ERP5/bootstrap/erp5_core/DocumentTemplateItem/portal_components/document.erp5.ScriptConstraint.py
index df3a7619cb823081db812e49934e28f4dd7cca44..0234e101e2bbc562a5f981fd545d94d14024b439 100644
--- a/product/ERP5/bootstrap/erp5_core/DocumentTemplateItem/portal_components/document.erp5.ScriptConstraint.py
+++ b/product/ERP5/bootstrap/erp5_core/DocumentTemplateItem/portal_components/document.erp5.ScriptConstraint.py
@@ -36,12 +36,13 @@ class ScriptConstraint(ConstraintMixin):
   meta_type = 'ERP5 Script Constraint'
   portal_type = 'Script Constraint'
 
-  def _createConsistencyMessage(self, object_relative_url, message):
-    # XXX If I put in the right place I have TypeError: 'NoneType' object is not callable
+  def _createConsistencyMessage(self, object_relative_url, message, mapping):
+    # XXX If I put in the right place I have TypeError: 'NoneType' object is not callable
     from Products.ERP5Type.ConsistencyMessage import ConsistencyMessage
     return ConsistencyMessage(self,
       object_relative_url=object_relative_url,
-      message=message)
+      message=message,
+      mapping=mapping)
 
   def _checkConsistency(self, obj, fixit=0, **kw):
     """
@@ -55,5 +56,12 @@ class ScriptConstraint(ConstraintMixin):
       raise RuntimeError('Script (%s) not found %s' % (script_id, self))
     object_relative_url = obj.getRelativeUrl()
     createConsistencyMessage = self._createConsistencyMessage
-    return [createConsistencyMessage(object_relative_url, message) \
-      for message in method(fixit=fixit, **kw)]
+    message_list = []
+    for item in method(fixit=fixit, **kw):
+      if isinstance(item, (tuple, list)) and len(item) == 2:
+        message, mapping = item
+      else:
+        message = item
+        mapping = {}
+      message_list.append(createConsistencyMessage(object_relative_url, message, mapping))
+    return message_list
\ No newline at end of file
diff --git a/product/ERP5/bootstrap/erp5_core/DocumentTemplateItem/portal_components/document.erp5.ScriptConstraint.xml b/product/ERP5/bootstrap/erp5_core/DocumentTemplateItem/portal_components/document.erp5.ScriptConstraint.xml
index 0947bc94e7aded80084382076d86405a5de2395d..5b03104714004dbabd327759a043e18bd975ac2f 100644
--- a/product/ERP5/bootstrap/erp5_core/DocumentTemplateItem/portal_components/document.erp5.ScriptConstraint.xml
+++ b/product/ERP5/bootstrap/erp5_core/DocumentTemplateItem/portal_components/document.erp5.ScriptConstraint.xml
@@ -45,10 +45,7 @@
         <item>
             <key> <string>text_content_warning_message</string> </key>
             <value>
-              <tuple>
-                <string>R: 32, 0: Too many ancestors (49/7) (too-many-ancestors)</string>
-                <string>R: 32, 0: Too many public methods (398/20) (too-many-public-methods)</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>