ERP5Site_checkNamingConventions.xml: resolve conflicts.

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_checkNamingConventions.xml

@@ -64,11 +64,11 @@
 # - Check script names (from skin folders and workflows).\n
 import re\n
 ABBREVIATION_WORD_SET = ((\n
-  "BBAN", "BIC", "BOM", "CAD", "CRM", "CSS", "CSV", "CTX", "DMS", "DNS",\n
-  "EAN", "ERP5", "FAX", "GAP", "GID", "GPG", "HTML", "HTTP", "IBAN", "ID",\n
+  "BBAN", "BIC", "BOM",  "BT", "BT5", "CAD", "CRM", "CSS","CSV", "CTX", "DMS", "DNS", \n
+  "EAN", "ERP5", "FAX", "GAP","GID", "GPG", "HTML", "HTTP", "IBAN", "ID",\n
   "IMAP", "IP", "KM", "MIME", "MRP", "NVP", "ODT", "PDF", "PDM", "PO",\n
   "RAM", "RSS", "SMS", "SOAP", "SQL", "SVN", "TALES", "TCP", "TSV", "UBM",\n
-  "UID", "UOM", "URI", "URL", "VADS", "VAT", "VCS", "VPN", "XML", "ZODB",\n
+  "UID", "UNG", "UOM", "URI", "URL", "VADS", "VAT", "VCS", "VPN", "XML", "ZODB",\n
 ))\n
 \n
 # List of words that do not need to be titlecased\n
@@ -126,9 +126,9 @@ def checkField(folder, form, field):\n
   template_field = getFieldFromProxyField(field)\n
   if path.endswith("FieldLibrary"):\n
     if not(template_field is field):\n
-      if not(1 in [field.id.startswith(x) for x in (\'my_view_mode_\',\n
-                           \'my_core_mode_\', \'my_report_mode_\', \'my_list_mode_\', \'my_dialog_mode_\')]):\n
-        error_message += "%s: %s : Bad ID for a Field Library Field" % (path, field.id)\n
+      if not(1 in [field.id.startswith(x) for x in (\'my_view_mode\',\n
+                            \'my_core_mode_\', \'my_report_mode_\', \'my_list_mode_\', \'my_dialog_mode_\')]):\n
+        error_message += "%s: %s : Bad ID for a Field Library Field" %(path, field.id)\n
   if template_field is None:\n
     if field.get_value(\'enabled\'):\n
       error_message += "Could not get a field from a proxy field %s" % field.id\n