[cross-org] pi merge
authorAsier Lostalé <asier.lostale@openbravo.com>
Thu, 18 Feb 2016 15:23:29 +0100
changeset 29049 1d1f2738ce05
parent 29048 88863cb91edd (current diff)
parent 28747 06cd9c11c84e (diff)
child 29050 9fe7e20f3aa3
[cross-org] pi merge
modules/org.openbravo.client.application/src/org/openbravo/client/application/event/RemoveFilesEventHandler.java
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FileActionHandler.java
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-file.js
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/images/form/erase_icon.png
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/images/form/upload_icon.png
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/FileUIDefinition.java
src-db/database/model/tables/AD_COLUMN.xml
src-db/database/model/tables/AD_FILE.xml
src-db/database/sourcedata/AD_COLUMN.xml
src-db/database/sourcedata/AD_ELEMENT.xml
src-db/database/sourcedata/AD_FIELD.xml
src-wad/src/org/openbravo/wad/controls/WADFileBLOB.java
src/org/openbravo/erpCommon/info/FileInfoBLOB.java
src/org/openbravo/erpCommon/utility/GetFile.java
src/org/openbravo/reference/ui/UIFileBLOB.java
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml	Thu Feb 18 15:22:50 2016 +0100
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml	Thu Feb 18 15:23:29 2016 +0100
@@ -216,18 +216,6 @@
 <!--090A37D22ED3AFD5012ED3C5DE60001C-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--090A37D22ED3AFD5012ED3C5DE60001C--></AD_MESSAGE>
 
-<!--0AD5E850433D4DE28601474B951174FD--><AD_MESSAGE>
-<!--0AD5E850433D4DE28601474B951174FD-->  <AD_MESSAGE_ID><![CDATA[0AD5E850433D4DE28601474B951174FD]]></AD_MESSAGE_ID>
-<!--0AD5E850433D4DE28601474B951174FD-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--0AD5E850433D4DE28601474B951174FD-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--0AD5E850433D4DE28601474B951174FD-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--0AD5E850433D4DE28601474B951174FD-->  <VALUE><![CDATA[OBUIAPP_FileSelectorTitle]]></VALUE>
-<!--0AD5E850433D4DE28601474B951174FD-->  <MSGTEXT><![CDATA[Upload File]]></MSGTEXT>
-<!--0AD5E850433D4DE28601474B951174FD-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
-<!--0AD5E850433D4DE28601474B951174FD-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
-<!--0AD5E850433D4DE28601474B951174FD-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
-<!--0AD5E850433D4DE28601474B951174FD--></AD_MESSAGE>
-
 <!--0BEB24CF954E410EAFE4EF198C38A902--><AD_MESSAGE>
 <!--0BEB24CF954E410EAFE4EF198C38A902-->  <AD_MESSAGE_ID><![CDATA[0BEB24CF954E410EAFE4EF198C38A902]]></AD_MESSAGE_ID>
 <!--0BEB24CF954E410EAFE4EF198C38A902-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -422,18 +410,6 @@
 <!--26F5ED9591484A29AC2BFA3E6D56B86B-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--26F5ED9591484A29AC2BFA3E6D56B86B--></AD_MESSAGE>
 
-<!--285C9894C39A4FAB98BB22B4C0A20026--><AD_MESSAGE>
-<!--285C9894C39A4FAB98BB22B4C0A20026-->  <AD_MESSAGE_ID><![CDATA[285C9894C39A4FAB98BB22B4C0A20026]]></AD_MESSAGE_ID>
-<!--285C9894C39A4FAB98BB22B4C0A20026-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--285C9894C39A4FAB98BB22B4C0A20026-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--285C9894C39A4FAB98BB22B4C0A20026-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--285C9894C39A4FAB98BB22B4C0A20026-->  <VALUE><![CDATA[OBUIAPP_FILE_ERROR_WRONG_SIZE]]></VALUE>
-<!--285C9894C39A4FAB98BB22B4C0A20026-->  <MSGTEXT><![CDATA[The size of the file '%0' is bigger that the maximum file size allowed.]]></MSGTEXT>
-<!--285C9894C39A4FAB98BB22B4C0A20026-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
-<!--285C9894C39A4FAB98BB22B4C0A20026-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
-<!--285C9894C39A4FAB98BB22B4C0A20026-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
-<!--285C9894C39A4FAB98BB22B4C0A20026--></AD_MESSAGE>
-
 <!--2C8A8843F1E04317AD38623A3C52F978--><AD_MESSAGE>
 <!--2C8A8843F1E04317AD38623A3C52F978-->  <AD_MESSAGE_ID><![CDATA[2C8A8843F1E04317AD38623A3C52F978]]></AD_MESSAGE_ID>
 <!--2C8A8843F1E04317AD38623A3C52F978-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -629,18 +605,6 @@
 <!--42B286FCB7054BD49A7FCDE676DB736A-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--42B286FCB7054BD49A7FCDE676DB736A--></AD_MESSAGE>
 
-<!--474B38F2D43748D7AE4E1EEFAD127534--><AD_MESSAGE>
-<!--474B38F2D43748D7AE4E1EEFAD127534-->  <AD_MESSAGE_ID><![CDATA[474B38F2D43748D7AE4E1EEFAD127534]]></AD_MESSAGE_ID>
-<!--474B38F2D43748D7AE4E1EEFAD127534-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--474B38F2D43748D7AE4E1EEFAD127534-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--474B38F2D43748D7AE4E1EEFAD127534-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--474B38F2D43748D7AE4E1EEFAD127534-->  <VALUE><![CDATA[OBUIAPP_FILE_WARN_SIZE]]></VALUE>
-<!--474B38F2D43748D7AE4E1EEFAD127534-->  <MSGTEXT><![CDATA[The maximum file size allowed is %0 %1.]]></MSGTEXT>
-<!--474B38F2D43748D7AE4E1EEFAD127534-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
-<!--474B38F2D43748D7AE4E1EEFAD127534-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
-<!--474B38F2D43748D7AE4E1EEFAD127534-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
-<!--474B38F2D43748D7AE4E1EEFAD127534--></AD_MESSAGE>
-
 <!--48A6793A3C364216B184A33117EF7ED1--><AD_MESSAGE>
 <!--48A6793A3C364216B184A33117EF7ED1-->  <AD_MESSAGE_ID><![CDATA[48A6793A3C364216B184A33117EF7ED1]]></AD_MESSAGE_ID>
 <!--48A6793A3C364216B184A33117EF7ED1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -689,18 +653,6 @@
 <!--4D295B42933742CD84B42249BB6BFF3B-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--4D295B42933742CD84B42249BB6BFF3B--></AD_MESSAGE>
 
-<!--4F2AB7080BBF492E99794A0A0F83F742--><AD_MESSAGE>
-<!--4F2AB7080BBF492E99794A0A0F83F742-->  <AD_MESSAGE_ID><![CDATA[4F2AB7080BBF492E99794A0A0F83F742]]></AD_MESSAGE_ID>
-<!--4F2AB7080BBF492E99794A0A0F83F742-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--4F2AB7080BBF492E99794A0A0F83F742-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--4F2AB7080BBF492E99794A0A0F83F742-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--4F2AB7080BBF492E99794A0A0F83F742-->  <VALUE><![CDATA[OBUIAPP_FileFile]]></VALUE>
-<!--4F2AB7080BBF492E99794A0A0F83F742-->  <MSGTEXT><![CDATA[File]]></MSGTEXT>
-<!--4F2AB7080BBF492E99794A0A0F83F742-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
-<!--4F2AB7080BBF492E99794A0A0F83F742-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
-<!--4F2AB7080BBF492E99794A0A0F83F742-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
-<!--4F2AB7080BBF492E99794A0A0F83F742--></AD_MESSAGE>
-
 <!--51968FE85D8B48F68D0B5AC6716BAC12--><AD_MESSAGE>
 <!--51968FE85D8B48F68D0B5AC6716BAC12-->  <AD_MESSAGE_ID><![CDATA[51968FE85D8B48F68D0B5AC6716BAC12]]></AD_MESSAGE_ID>
 <!--51968FE85D8B48F68D0B5AC6716BAC12-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -821,18 +773,6 @@
 <!--5DE5F76ED5B4497FACDC438893037484-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--5DE5F76ED5B4497FACDC438893037484--></AD_MESSAGE>
 
-<!--5EDA4FAA7AD1444F9339AA4F90E3A24C--><AD_MESSAGE>
-<!--5EDA4FAA7AD1444F9339AA4F90E3A24C-->  <AD_MESSAGE_ID><![CDATA[5EDA4FAA7AD1444F9339AA4F90E3A24C]]></AD_MESSAGE_ID>
-<!--5EDA4FAA7AD1444F9339AA4F90E3A24C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--5EDA4FAA7AD1444F9339AA4F90E3A24C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--5EDA4FAA7AD1444F9339AA4F90E3A24C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--5EDA4FAA7AD1444F9339AA4F90E3A24C-->  <VALUE><![CDATA[OBUIAPP_FILE_ERROR_ERROR_UPLOADING]]></VALUE>
-<!--5EDA4FAA7AD1444F9339AA4F90E3A24C-->  <MSGTEXT><![CDATA[There has been an error uploading the file: %0.]]></MSGTEXT>
-<!--5EDA4FAA7AD1444F9339AA4F90E3A24C-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
-<!--5EDA4FAA7AD1444F9339AA4F90E3A24C-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
-<!--5EDA4FAA7AD1444F9339AA4F90E3A24C-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
-<!--5EDA4FAA7AD1444F9339AA4F90E3A24C--></AD_MESSAGE>
-
 <!--61D57958CEF64A7BA613DB200531AF36--><AD_MESSAGE>
 <!--61D57958CEF64A7BA613DB200531AF36-->  <AD_MESSAGE_ID><![CDATA[61D57958CEF64A7BA613DB200531AF36]]></AD_MESSAGE_ID>
 <!--61D57958CEF64A7BA613DB200531AF36-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -869,18 +809,6 @@
 <!--6504DF0738A142D599C824644653BA88-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--6504DF0738A142D599C824644653BA88--></AD_MESSAGE>
 
-<!--6680B4E8BCCF4B0FABA645002CFFB952--><AD_MESSAGE>
-<!--6680B4E8BCCF4B0FABA645002CFFB952-->  <AD_MESSAGE_ID><![CDATA[6680B4E8BCCF4B0FABA645002CFFB952]]></AD_MESSAGE_ID>
-<!--6680B4E8BCCF4B0FABA645002CFFB952-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--6680B4E8BCCF4B0FABA645002CFFB952-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--6680B4E8BCCF4B0FABA645002CFFB952-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--6680B4E8BCCF4B0FABA645002CFFB952-->  <VALUE><![CDATA[OBUIAPP_FILE_WARN_EXTENSIONS]]></VALUE>
-<!--6680B4E8BCCF4B0FABA645002CFFB952-->  <MSGTEXT><![CDATA[The file extensions allowed are '%0'.]]></MSGTEXT>
-<!--6680B4E8BCCF4B0FABA645002CFFB952-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
-<!--6680B4E8BCCF4B0FABA645002CFFB952-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
-<!--6680B4E8BCCF4B0FABA645002CFFB952-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
-<!--6680B4E8BCCF4B0FABA645002CFFB952--></AD_MESSAGE>
-
 <!--66D4232BC6894DCEB71DAB06F9757BB3--><AD_MESSAGE>
 <!--66D4232BC6894DCEB71DAB06F9757BB3-->  <AD_MESSAGE_ID><![CDATA[66D4232BC6894DCEB71DAB06F9757BB3]]></AD_MESSAGE_ID>
 <!--66D4232BC6894DCEB71DAB06F9757BB3-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1473,18 +1401,6 @@
 <!--B151C652F8204C8B896AB76BED5A273D-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--B151C652F8204C8B896AB76BED5A273D--></AD_MESSAGE>
 
-<!--B1CAD96B4D31494683AFE873B06EFD20--><AD_MESSAGE>
-<!--B1CAD96B4D31494683AFE873B06EFD20-->  <AD_MESSAGE_ID><![CDATA[B1CAD96B4D31494683AFE873B06EFD20]]></AD_MESSAGE_ID>
-<!--B1CAD96B4D31494683AFE873B06EFD20-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--B1CAD96B4D31494683AFE873B06EFD20-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--B1CAD96B4D31494683AFE873B06EFD20-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--B1CAD96B4D31494683AFE873B06EFD20-->  <VALUE><![CDATA[OBUIAPP_FILE_WARN_EXTENSION]]></VALUE>
-<!--B1CAD96B4D31494683AFE873B06EFD20-->  <MSGTEXT><![CDATA[The file extension allowed is '%0'.]]></MSGTEXT>
-<!--B1CAD96B4D31494683AFE873B06EFD20-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
-<!--B1CAD96B4D31494683AFE873B06EFD20-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
-<!--B1CAD96B4D31494683AFE873B06EFD20-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
-<!--B1CAD96B4D31494683AFE873B06EFD20--></AD_MESSAGE>
-
 <!--B355D5A55A734B61B57A6AEBF3B96863--><AD_MESSAGE>
 <!--B355D5A55A734B61B57A6AEBF3B96863-->  <AD_MESSAGE_ID><![CDATA[B355D5A55A734B61B57A6AEBF3B96863]]></AD_MESSAGE_ID>
 <!--B355D5A55A734B61B57A6AEBF3B96863-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1785,18 +1701,6 @@
 <!--DAC8C406FB1D497CAF91619E6B8A5458-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--DAC8C406FB1D497CAF91619E6B8A5458--></AD_MESSAGE>
 
-<!--DAF91EA20F404CBCA9ED1F9544ED3D00--><AD_MESSAGE>
-<!--DAF91EA20F404CBCA9ED1F9544ED3D00-->  <AD_MESSAGE_ID><![CDATA[DAF91EA20F404CBCA9ED1F9544ED3D00]]></AD_MESSAGE_ID>
-<!--DAF91EA20F404CBCA9ED1F9544ED3D00-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--DAF91EA20F404CBCA9ED1F9544ED3D00-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--DAF91EA20F404CBCA9ED1F9544ED3D00-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--DAF91EA20F404CBCA9ED1F9544ED3D00-->  <VALUE><![CDATA[OBUIAPP_FILE_ERROR_WRONG_EXTENSION]]></VALUE>
-<!--DAF91EA20F404CBCA9ED1F9544ED3D00-->  <MSGTEXT><![CDATA[The extension of the file '%0'  is not allowed.]]></MSGTEXT>
-<!--DAF91EA20F404CBCA9ED1F9544ED3D00-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
-<!--DAF91EA20F404CBCA9ED1F9544ED3D00-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
-<!--DAF91EA20F404CBCA9ED1F9544ED3D00-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
-<!--DAF91EA20F404CBCA9ED1F9544ED3D00--></AD_MESSAGE>
-
 <!--DDD348E58C614475B5207B2A5576F2FD--><AD_MESSAGE>
 <!--DDD348E58C614475B5207B2A5576F2FD-->  <AD_MESSAGE_ID><![CDATA[DDD348E58C614475B5207B2A5576F2FD]]></AD_MESSAGE_ID>
 <!--DDD348E58C614475B5207B2A5576F2FD-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java	Thu Feb 18 15:22:50 2016 +0100
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java	Thu Feb 18 15:23:29 2016 +0100
@@ -11,7 +11,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2010-2015 Openbravo SLU
+ * All portions are Copyright (C) 2010-2016 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -184,8 +184,6 @@
         "web/org.openbravo.client.application/js/form/formitem/ob-formitem-tree-filter.js", true));
     globalResources.add(createStaticResource(
         "web/org.openbravo.client.application/js/navbar/ob-quickrun-widget.js", false));
-    globalResources.add(createStaticResource(
-        "web/org.openbravo.client.application/js/form/formitem/ob-formitem-file.js", true));
 
     globalResources.add(createStaticResource(
         "web/org.openbravo.client.application/js/utilities/ob-property-store.js", false));
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/event/RemoveFilesEventHandler.java	Thu Feb 18 15:22:50 2016 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,152 +0,0 @@
-/*
- *************************************************************************
- * The contents of this file are subject to the Openbravo  Public  License
- * Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
- * Version 1.1  with a permitted attribution clause; you may not  use this
- * file except in compliance with the License. You  may  obtain  a copy of
- * the License at http://www.openbravo.com/legal/license.html
- * Software distributed under the License  is  distributed  on  an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific  language  governing  rights  and  limitations
- * under the License.
- * The Original Code is Openbravo ERP.
- * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2015 Openbravo SLU
- * All Rights Reserved.
- * Contributor(s):  ______________________________________.
- ************************************************************************
- */
-
-package org.openbravo.client.application.event;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.enterprise.event.Observes;
-
-import org.hibernate.criterion.Restrictions;
-import org.openbravo.base.model.Entity;
-import org.openbravo.base.model.ModelProvider;
-import org.openbravo.base.model.Property;
-import org.openbravo.base.provider.OBProvider;
-import org.openbravo.client.kernel.event.EntityDeleteEvent;
-import org.openbravo.client.kernel.event.EntityPersistenceEventObserver;
-import org.openbravo.client.kernel.event.EntityUpdateEvent;
-import org.openbravo.dal.core.OBContext;
-import org.openbravo.dal.service.OBCriteria;
-import org.openbravo.dal.service.OBDal;
-import org.openbravo.model.ad.utility.ADFile;
-
-public class RemoveFilesEventHandler extends EntityPersistenceEventObserver {
-
-  private static Entity[] entities = getFileEntities();
-  private static final String DUMMY_FILE_NAME = "DummyFileForDeletedRows";
-
-  @Override
-  protected Entity[] getObservedEntities() {
-    return entities;
-  }
-
-  public void onDelete(@Observes EntityDeleteEvent event) {
-    if (!isValidEvent(event)) {
-      return;
-    }
-
-    ADFile dummyFile = getDummyFile();
-    // Iterate file properties of the entity
-    for (String property : getFileProperties(event.getTargetInstance().getEntity())) {
-
-      Property fileProperty = event.getTargetInstance().getEntity().getProperty(property);
-
-      // Remove file if it exists
-      if (event.getCurrentState(fileProperty) != null) {
-
-        ADFile bob = (ADFile) event.getCurrentState(fileProperty);
-        // Replace the current file with a dummy one, just in case the file column is mandatory
-        // See issue https://issues.openbravo.com/view.php?id=30571 that describes the same
-        // situation for Image BLOB references
-        event.setCurrentState(fileProperty, dummyFile);
-        if (bob != null) {
-          OBContext.setAdminMode(true);
-          try {
-            OBDal.getInstance().remove(bob);
-          } finally {
-            OBContext.restorePreviousMode();
-          }
-        }
-      }
-    }
-  }
-
-  public void onUpdate(@Observes EntityUpdateEvent event) {
-    if (!isValidEvent(event)) {
-      return;
-    }
-
-    // Iterate file properties of the entity
-    for (String property : getFileProperties(event.getTargetInstance().getEntity())) {
-
-      Property fileProperty = event.getTargetInstance().getEntity().getProperty(property);
-
-      // If the old file is different than the new one remove the old file if exists
-      if (event.getPreviousState(fileProperty) != null
-          && event.getCurrentState(fileProperty) != event.getPreviousState(fileProperty)) {
-
-        ADFile bob = (ADFile) event.getPreviousState(fileProperty);
-        if (bob != null) {
-          OBContext.setAdminMode(true);
-          try {
-            OBDal.getInstance().remove(bob);
-          } finally {
-            OBContext.restorePreviousMode();
-          }
-        }
-      }
-    }
-  }
-
-  /**
-   * Returns a dummy File (ADFile instance) that will be named DUMMY_FILE_NAME and will not have
-   * binary data
-   *
-   * @return a dummy image
-   */
-  private ADFile getDummyFile() {
-    OBCriteria<ADFile> dummyImageCriteria = OBDal.getInstance().createCriteria(ADFile.class);
-    dummyImageCriteria.add(Restrictions.eq(ADFile.PROPERTY_NAME, DUMMY_FILE_NAME));
-    dummyImageCriteria.add(Restrictions.isNull(ADFile.PROPERTY_BINDARYDATA));
-    ADFile dummyImage = (ADFile) dummyImageCriteria.uniqueResult();
-    // If it is not already created, do it
-    if (dummyImage == null) {
-      dummyImage = createDummyFile();
-    }
-    return dummyImage;
-  }
-
-  /**
-   * Creates a dummy image, that will be called DUMMY_FILE_NAME and will not have binary data
-   * 
-   * @return the dummy file
-   */
-  private ADFile createDummyFile() {
-    ADFile dummyFile = OBProvider.getInstance().get(ADFile.class);
-    dummyFile.setName(DUMMY_FILE_NAME);
-    OBDal.getInstance().save(dummyFile);
-    return dummyFile;
-  }
-
-  private static Entity[] getFileEntities() {
-    ArrayList<Entity> entityArray = new ArrayList<Entity>();
-
-    // Create the observed entities from ModelProvider
-    for (Entity entity : ModelProvider.getInstance().getEntityWithFile().keySet()) {
-      entityArray.add(entity);
-    }
-    return entityArray.toArray(new Entity[entityArray.size()]);
-  }
-
-  private static List<String> getFileProperties(Entity entity) {
-    // Get EntitiesWithFile from ModelProvider
-    return ModelProvider.getInstance().getEntityWithFile().get(entity);
-  }
-}
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FileActionHandler.java	Thu Feb 18 15:22:50 2016 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,129 +0,0 @@
-/*
- *************************************************************************
- * The contents of this file are subject to the Openbravo  Public  License
- * Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
- * Version 1.1  with a permitted attribution clause; you may not  use this
- * file except in compliance with the License. You  may  obtain  a copy of
- * the License at http://www.openbravo.com/legal/license.html 
- * Software distributed under the License  is  distributed  on  an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific  language  governing  rights  and  limitations
- * under the License. 
- * The Original Code is Openbravo ERP. 
- * The Initial Developer of the Original Code is Openbravo SLU 
- * All portions are Copyright (C) 2015 Openbravo SLU 
- * All Rights Reserved. 
- * Contributor(s):  ______________________________________.
- ************************************************************************
- */
-package org.openbravo.client.application.window;
-
-import java.text.NumberFormat;
-import java.util.Map;
-
-import org.codehaus.jettison.json.JSONException;
-import org.codehaus.jettison.json.JSONObject;
-import org.openbravo.base.exception.OBException;
-import org.openbravo.client.kernel.BaseActionHandler;
-import org.openbravo.client.kernel.RequestContext;
-import org.openbravo.dal.core.OBContext;
-import org.openbravo.dal.service.OBDal;
-import org.openbravo.erpCommon.utility.Utility;
-import org.openbravo.model.ad.utility.ADFile;
-import org.openbravo.portal.PortalAccessible;
-
-/**
- * This ActionHandler implements the DELETE and GETSIZE actions which are used by the ImageBLOB
- * reference components in the OB3 windows.
- * 
- * The DELETE action deletes an image from the database, and its reference from the referencing
- * table
- * 
- * The GETSIZE action gets the size of an image. If the image doesn't yet have size properties, it
- * will create them and save them in the image object in the database. Also, it will compute the
- * MIME type if it hasn't yet been computed
- * 
- */
-public class FileActionHandler extends BaseActionHandler implements PortalAccessible {
-
-  @Override
-  protected JSONObject execute(Map<String, Object> parameters, String content) {
-
-    Object command = parameters.get("command");
-    if ("GETFILEINFO".equals(command)) {
-      String fileID = (String) parameters.get("inpfileId");
-      JSONObject result = new JSONObject();
-
-      OBContext.setAdminMode(true);
-      try {
-        // Check file null or invalid
-        ADFile file = OBDal.getInstance().get(ADFile.class, fileID);
-        if (file != null) {
-          result.put("name", file.getName());
-          result.put("ext", getExtension(file.getName()));
-          result.put("mimetype", file.getMimetype());
-          result.put("size", file.getFilesize());
-          result.put("displaysize", formatFileSize(file.getFilesize().intValue()));
-
-        }
-      } catch (JSONException e) {
-        throw new OBException(e);
-      } finally {
-        OBContext.restorePreviousMode();
-      }
-
-      return result;
-    } else if ("DELETE".equals(command)) {
-      String fileID = (String) parameters.get("inpfileId");
-      JSONObject result = new JSONObject();
-
-      OBContext.setAdminMode(true);
-      try {
-        // Check file null or invalid
-        ADFile file = OBDal.getInstance().get(ADFile.class, fileID);
-        if (file != null) {
-          result.put("deleted", file.getName());
-          OBDal.getInstance().remove(file);
-          OBDal.getInstance().flush();
-        }
-      } catch (JSONException e) {
-        throw new OBException(e);
-      } finally {
-        OBContext.restorePreviousMode();
-      }
-      return result;
-    } else {
-      throw new OBException("Command not found : " + command);
-    }
-  }
-
-  private String getExtension(String filename) {
-
-    if (filename == null) {
-      return "";
-    }
-
-    int i = filename.lastIndexOf(".");
-    if (i < 0) {
-      return "";
-    }
-
-    return filename.substring(i + 1);
-  }
-
-  private String formatFileSize(int size) {
-
-    NumberFormat f = Utility
-        .getFormat(RequestContext.get().getVariablesSecureApp(), "amountInform");
-
-    if (size < 1024) {
-      return f.format(size) + " B";
-    } else if (size < 1048576) {
-      return f.format(size / 1024.0) + " KB";
-    } else if (size < 1073741824) {
-      return f.format(size / 1048576.0) + " MB";
-    } else {
-      return f.format(size / 1073741824.0) + " GB";
-    }
-  }
-}
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-file.js	Thu Feb 18 15:22:50 2016 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,543 +0,0 @@
-/*
- *************************************************************************
- * The contents of this file are subject to the Openbravo  Public  License
- * Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
- * Version 1.1  with a permitted attribution clause; you may not  use. this
- * file except in compliance with the License. You  may  obtain  a copy of
- * the License at http://www.openbravo.com/legal/license.html
- * Software distributed under the License  is  distributed  on  an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific  language  governing  rights  and  limitations
- * under the License.
- * The Original Code is Openbravo ERP.
- * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2015 Openbravo SLU
- * All Rights Reserved.
- * Contributor(s):  ______________________________________.
- ************************************************************************
- */
-
-//== OBFileItemLink ==
-//This class is used for the link shown within the OBFileItemContainer
-isc.ClassFactory.defineClass('OBFileItemLink', isc.HTMLFlow);
-
-isc.OBFileItemLink.addProperties({
-  setLink: function (text, url) {
-    if (typeof text === 'string') {
-      // Remove the extension of the link text because it is already shown in the OBFileItemExt
-      text = text.substring(0, (text.lastIndexOf('.') !== -1 ? text.lastIndexOf('.') : text.length));
-    }
-    this.setContents('<a class="' + this.linkStyleName + '" href="' + url + '" id="' + this.randomId + '" target="_blank">' + text + '</a>');
-  }
-});
-
-//== OBFileItemSize ==
-//This class is used for the size label shown within the OBFileItemContainer
-isc.ClassFactory.defineClass('OBFileItemSize', isc.Label);
-
-//== OBFileItemExt ==
-//This class is used for the extension shown within the OBFileItemContainer
-isc.ClassFactory.defineClass('OBFileItemExt', isc.Label);
-
-isc.OBFileItemExt.addProperties({
-  setContents: function (ext) {
-    var baseStyle;
-    if (typeof this.baseStyle === 'string') {
-      baseStyle = this.baseStyle.substring(0, (this.baseStyle.indexOf(' ') !== -1 ? this.baseStyle.indexOf(' ') : this.baseStyle.length));
-    }
-    if (!ext) {
-      ext = '';
-    }
-    ext = ext.substring(0, 3).toUpperCase();
-    this.baseStyle = baseStyle + ' ' + baseStyle + '_' + ext;
-    return this.Super('setContents', arguments);
-  }
-});
-
-//== OBFileItemContainer ==
-//This class is used for the file name + file size + file extension container box
-isc.ClassFactory.defineClass('OBFileItemContainer', isc.HLayout);
-
-isc.OBFileItemContainer.addProperties({
-  fileItem: null,
-  initWidget: function () {
-    if (this.initWidgetStyle) {
-      this.initWidgetStyle();
-    }
-    this.Super('initWidget', arguments);
-  }
-});
-
-//== OBFileItemButton ==
-//This class is used for the buttons shown in the OBFileItem
-isc.ClassFactory.defineClass('OBFileItemButton', isc.ImgButton);
-
-isc.OBFileItemButton.addProperties({
-  initWidget: function () {
-    this.initWidgetStyle();
-    return this.Super('initWidget', arguments);
-  }
-});
-
-//== OBFileCanvas ==
-//This canvas contains the OBFileItemContainer shown in the OBFileItem, and the two buttons
-//which are used to upload and delete files.
-isc.ClassFactory.defineClass('OBFileCanvas', isc.HLayout);
-
-isc.OBFileCanvas.addProperties({
-  initWidget: function () {
-    var me = this;
-    this.Super('initWidget', arguments);
-    this.containerLayout = isc.OBFileItemContainer.create({
-      fileItem: this.creator
-    });
-    if (this.creator.required) {
-      this.containerLayout.setStyleName(this.containerLayout.styleName + 'Required');
-    }
-    if (this.creator.disabled) {
-      this.containerLayout.setStyleName(this.containerLayout.styleName + 'Disabled');
-    }
-    if (this.creator.readOnly) {
-      this.containerLayout.setStyleName(this.containerLayout.styleName + 'Disabled');
-    }
-
-    this.size = isc.OBFileItemSize.create({});
-    this.ext = isc.OBFileItemExt.create({});
-    this.link = isc.OBFileItemLink.create({
-      randomId: OB.Utilities.generateRandomString(8, true, true, false, false),
-      mouseOver: function () {
-        if (document.getElementById(this.randomId).offsetWidth < document.getElementById(this.randomId).scrollWidth) {
-          me.size.hide();
-        }
-        return this.Super('mouseOver', arguments);
-      },
-      mouseOut: function () {
-        me.size.show();
-        return this.Super('mouseOut', arguments);
-      }
-    });
-
-    this.containerLayout.addMember(this.link);
-    this.containerLayout.addMember(this.size);
-    this.containerLayout.addMember(this.ext);
-    this.containerLayout.addMember(isc.HLayout.create({
-      width: 4
-    }));
-    this.addMember(this.containerLayout);
-    var buttonLayout = isc.HLayout.create({
-      width: '1%'
-    });
-    var selectorButton = isc.OBFileItemButton.create({
-      buttonType: 'upload',
-      fileItem: this.creator,
-      action: function () {
-        var selector = isc.OBFileSelector.create({
-          columnName: this.fileItem.columnName,
-          form: this.fileItem.form,
-          fileItem: this.fileItem
-        });
-        var title = OB.I18N.getLabel('OBUIAPP_FileSelectorTitle'),
-            height = selector.height + (selector.messageBarText ? 40 : 0),
-            width = selector.width,
-            showMinimizeButton = false,
-            showMaximizeButton = false;
-        if (this.fileItem && this.fileItem.form && this.fileItem.form.view && this.fileItem.form.view.standardWindow && this.fileItem.form.view.standardWindow.openPopupInTab) {
-          this.fileItem.form.view.standardWindow.openPopupInTab(selector, title, width, height, showMaximizeButton, showMaximizeButton, true, true, this.fileItem.form);
-        } else {
-          var selectorContainer = isc.OBPopup.create({
-            showMinimizeButton: showMinimizeButton,
-            showMaximizeButton: showMaximizeButton,
-            title: title,
-            width: width,
-            height: height,
-            items: [selector]
-          });
-          selectorContainer.show();
-        }
-      },
-      updateState: function (value) {
-        if (value) {
-          this.setDisabled(false);
-        } else {
-          this.setDisabled(true);
-        }
-      }
-    });
-    var deleteButton = isc.OBFileItemButton.create({
-      buttonType: 'erase',
-      fileItem: this.creator,
-      deleteFunction: function () {
-        var fileItem = this.fileItem,
-            fileId = this.fileItem._value,
-            isNewRecord = this.fileItem.form.isNewRecord();
-        fileItem.refreshFile();
-
-        // If the record is new and the file is deleted, remove it from the database
-        if (isNewRecord) {
-          var d = {
-            inpfileId: fileId,
-            command: 'DELETE'
-          };
-          OB.RemoteCallManager.call('org.openbravo.client.application.window.FileActionHandler', {}, d);
-        }
-      },
-      click: function (form, item) {
-        this.deleteFunction();
-      },
-      updateState: function (value) {
-        if (value) {
-          this.setDisabled(false);
-          this.show();
-        } else {
-          this.setDisabled(true);
-          this.hide();
-        }
-      }
-    });
-
-    if (this.parentItem.isPreviewFormItem) {
-      selectorButton.showDisabled = false;
-      selectorButton.showDisabledIcon = false;
-    }
-
-    this.deleteButton = deleteButton;
-    this.selectorButton = selectorButton;
-    buttonLayout.addMember(selectorButton);
-    buttonLayout.addMember(deleteButton);
-    this.addMember(buttonLayout);
-  },
-  setFileInfo: function (name, url, size, ext) {
-    if (!url) {
-      this.link.setLink('', '');
-      this.size.setContents('');
-      this.ext.setContents('');
-      this.link.hide();
-      this.size.hide();
-      this.ext.hide();
-    } else {
-      this.link.setLink(name, url);
-      this.size.setContents(size);
-      this.ext.setContents(ext);
-      this.link.show();
-      this.size.show();
-      if (ext) {
-        this.ext.show();
-      } else {
-        this.ext.hide();
-      }
-    }
-  }
-});
-
-// == OBFileItem ==
-// Item used for Openbravo FileBLOB reference.
-isc.ClassFactory.defineClass('OBFileItem', isc.CanvasItem);
-
-isc.OBFileItem.addProperties({
-  shouldSaveValue: true,
-  canvasConstructor: 'OBFileCanvas',
-  init: function () {
-    this.canvasProperties = this.canvasProperties || {};
-    this.canvasProperties.parentItem = this;
-    this.Super('init', arguments);
-  },
-  //This formitem will never be disabled, so even if the form is readonly, click events will still be triggered
-  isDisabled: function () {
-    return false;
-  },
-  setValue: function (newValue) {
-    var canvas = this.canvas;
-    if (!newValue || newValue === '') {
-      canvas.setFileInfo();
-    } else {
-      var d = {
-        inpfileId: newValue,
-        command: 'GETFILEINFO'
-      };
-
-      OB.RemoteCallManager.call('org.openbravo.client.application.window.FileActionHandler', {}, d, function (response, data, request) {
-        var fileName = data.name;
-        var fileSize = data.displaysize;
-        var fileExt = data.ext;
-        if (fileName) {
-          canvas.setFileInfo(fileName, "utility/GetFile?id=" + newValue + '&nocache=' + Math.random(), fileSize, fileExt);
-        } else {
-          canvas.setFileInfo();
-        }
-      });
-    }
-    //Buttons will not be shown if the form is readonly
-    canvas.deleteButton.updateState(newValue && (this.form && !this.form.readOnly) && !this.disabled);
-    canvas.selectorButton.updateState((this.form && !this.form.readOnly) && !this.disabled);
-    return this.Super('setValue', arguments);
-  },
-  refreshFile: function (fileId) {
-    //If creating/replacing a file, the form is marked as modified
-    //and the file id is set as the value of the item
-    if (typeof fileId === 'undefined') {
-      fileId = '';
-    }
-    this.setValue(fileId);
-    this.form.itemChangeActions();
-  },
-  //This function has been overwritten because this class needs to do specific things if the object is
-  //disabled. It is necessary to hide the delete and selector buttons when the status is disabled 
-  //and to show them when enabled.
-  setDisabled: function (disabled) {
-    if (disabled) {
-      this.canvas.deleteButton.hide();
-      this.canvas.selectorButton.hide();
-    } else {
-      this.canvas.deleteButton.show();
-      this.canvas.selectorButton.show();
-    }
-    this.Super('setDisabled', arguments);
-  }
-});
-
-//== OBFileSelector ==
-//This class displays a selector in a popup which can be used to upload files
-isc.defineClass('OBFileSelector', isc.VLayout);
-
-isc.OBFileSelector.addProperties({
-  submitButton: null,
-  addForm: null,
-  initWidget: function (args) {
-    var fileId = this.fileItem.getValue();
-    var fileExtensions = this.fileItem.fileExtensions;
-    var fileMaxSize = this.fileItem.fileMaxSize;
-    var fileMaxSizeFormat = this.fileItem.fileMaxSizeFormat;
-    var fileMaxSizeUnit = this.fileItem.fileMaxSizeUnit;
-
-    var validateExtension;
-    validateExtension = function (filename, extensions) {
-      if (!extensions) {
-        return true; // extensions is not defined, then filename extension is valid
-      }
-
-      var filenameUpper = filename.toUpperCase(),
-          extensionsList = extensions.split(","),
-          tmp, i;
-
-      for (i = 0; i < extensionsList.length; i++) {
-        tmp = extensionsList[i].trim().toUpperCase();
-        if (filenameUpper.indexOf(tmp, filenameUpper.length - tmp.length) !== -1) {
-          return true;
-        }
-      }
-      return false;
-    };
-
-    var fileExtensionsAcceptChk = '';
-    if (fileExtensions) {
-      fileExtensionsAcceptChk = fileExtensions.toLowerCase();
-    }
-
-    if (isc.Browser.isFirefox && fileExtensionsAcceptChk.indexOf(',') !== -1) {
-      // Firefox has problems handling several extensions if all of them share the same string base (fex: '.xls,.xlsx')
-      // so adding a dummy extension at the end to avoid the potential problem
-      var extensionsList = fileExtensionsAcceptChk.split(","),
-          extA, extB, match, i, j;
-      for (i = 0; i < extensionsList.length; i++) {
-        match = true;
-        extA = extensionsList[i].trim();
-        for (j = 0; j < extensionsList.length; j++) {
-          extB = extensionsList[j].trim();
-          if (extA.indexOf(extB) === -1) {
-            match = false;
-            break;
-          }
-        }
-        if (match) {
-          break;
-        }
-      }
-      if (match) {
-        fileExtensionsAcceptChk += ',.ffhk';
-      }
-    }
-
-    var view = args.form.view;
-    var form = isc.DynamicForm.create({
-      autoFocus: true,
-      fields: [{
-        name: 'inpFile',
-        title: OB.I18N.getLabel('OBUIAPP_FileFile'),
-        type: 'upload',
-        accept: fileExtensionsAcceptChk,
-        changed: function (form, item, value) {
-          var message;
-          if (!validateExtension(value, fileExtensions)) {
-            item.setValue('');
-
-            if (fileExtensions.indexOf(',') !== -1) {
-              message = OB.I18N.getLabel('OBUIAPP_FILE_WARN_EXTENSIONS', [fileExtensions]) + '<br/>';
-            } else {
-              message = OB.I18N.getLabel('OBUIAPP_FILE_WARN_EXTENSION', [fileExtensions]) + '<br/>';
-            }
-
-            isc.warn(message, function () {
-              return true;
-            }, {
-              icon: '[SKINIMG]Dialog/error.png',
-              title: OB.I18N.getLabel('OBUIAPP_Error')
-            });
-          }
-          return this.Super('changed', arguments);
-        },
-        canFocus: false,
-        align: 'right'
-      }, {
-        name: 'Command',
-        type: 'hidden',
-        value: 'SAVE_OB3'
-      }, {
-        name: 'inpColumnName',
-        type: 'hidden',
-        value: args.columnName
-      }, {
-        name: 'inpTabId',
-        type: 'hidden',
-        value: view.tabId
-      }, {
-        name: 'inpadOrgId',
-        type: 'hidden',
-        value: args.form.values.organization
-      }, {
-        name: 'parentObjectId',
-        type: 'hidden',
-        value: args.form.values.id
-      }, {
-        name: 'fileId',
-        type: 'hidden',
-        value: fileId
-      }, {
-        name: 'fileExtensions',
-        type: 'hidden',
-        value: fileExtensions
-      }, {
-        name: 'fileMaxSize',
-        type: 'hidden',
-        value: fileMaxSize
-      }, {
-        name: 'fileMaxSizeUnit',
-        type: 'hidden',
-        value: fileMaxSizeUnit
-      }, {
-        name: 'inpSelectorId',
-        type: 'hidden',
-        value: this.ID
-      }],
-      height: '20px',
-      encoding: 'multipart',
-      action: 'utility/FileInfoBLOB',
-      target: "background_target",
-      redraw: function () {}
-    });
-    this.formDeleteFile = isc.DynamicForm.create({
-      fields: [{
-        name: 'Command',
-        type: 'hidden',
-        value: 'DELETE_OB3'
-      }, {
-        name: 'inpTabId',
-        type: 'hidden',
-        value: view.tabId
-      }, {
-        name: 'fileId',
-        type: 'hidden',
-        value: fileId
-      }],
-      height: '1px',
-      width: '1px',
-      encoding: 'normal',
-      action: 'utility/FileInfoBLOB',
-      target: "background_target",
-      redraw: function () {}
-    });
-
-    var uploadbutton = isc.OBFormButton.create({
-      title: OB.I18N.getLabel('OBUIAPP_Upload'),
-      action: function () {
-        var value = form.getItem('inpFile').getElement().value;
-        if (!value) {
-          return;
-        }
-        form.getField('Command').setValue('SAVE_OB3');
-        form.submitForm();
-      }
-    });
-    this.messageBarText = this.getWarningText(fileExtensions, fileMaxSizeFormat, fileMaxSizeUnit);
-    var messageBar = isc.OBMessageBar.create({
-      visibility: 'hidden'
-    });
-    messageBar.setType(isc.OBMessageBar.TYPE_WARNING);
-    messageBar.setText(null, this.messageBarText);
-    messageBar.hideCloseIcon();
-    if (this.messageBarText) {
-      messageBar.show();
-    }
-
-    this.addMembers([
-    isc.HLayout.create({
-      width: '100%',
-      height: 1,
-      align: 'center',
-      members: [
-      messageBar]
-    }), isc.HLayout.create({
-      width: '100%',
-      height: 20,
-      layoutTopMargin: this.hlayoutTopMargin,
-      layoutBottomMargin: this.hlayoutBottomMargin,
-      align: 'center',
-      members: [
-      form, uploadbutton, this.formDeleteFile]
-    })]);
-    this.Super('initWidget', arguments);
-  },
-  getWarningText: function (fileExtensions, fileMaxSizeFormat, fileMaxSizeUnit) {
-    var message = '';
-    if (fileExtensions) {
-      if (fileExtensions.indexOf(',') !== -1) {
-        message = message + OB.I18N.getLabel('OBUIAPP_FILE_WARN_EXTENSIONS', [fileExtensions]) + '<br/>';
-      } else {
-        message = message + OB.I18N.getLabel('OBUIAPP_FILE_WARN_EXTENSION', [fileExtensions]) + '<br/>';
-      }
-    }
-    if (fileMaxSizeFormat) {
-      message = message + OB.I18N.getLabel('OBUIAPP_FILE_WARN_SIZE', [fileMaxSizeFormat, fileMaxSizeUnit]) + '<br/>';
-    }
-    return message;
-  },
-  getErrorText: function (fileAction, fileName) {
-    if (fileAction === 'SUCESS') {
-      return '';
-    } else {
-      return OB.I18N.getLabel('OBUIAPP_FILE_ERROR_' + fileAction, [fileName]);
-    }
-  },
-  deleteTempFile: function (fileId) {
-    if (fileId) {
-      this.formDeleteFile.getField('fileId').setValue(fileId);
-      this.formDeleteFile.submitForm();
-    }
-  },
-  callback: function (fileId, fileAction, fileName) {
-    var selector = this;
-    if (fileAction !== 'SUCCESS') {
-      isc.warn(this.getErrorText(fileAction, fileName), function () {
-        return true;
-      }, {
-        icon: '[SKINIMG]Dialog/error.png',
-        title: OB.I18N.getLabel('OBUIAPP_Error')
-      });
-    } else {
-      this.refreshFile(fileId);
-    }
-  },
-  refreshFile: function (fileId) {
-    this.fileItem.refreshFile(fileId);
-    this.parentElement.parentElement.closeClick();
-  }
-});
\ No newline at end of file
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js	Thu Feb 18 15:22:50 2016 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js	Thu Feb 18 15:23:29 2016 +0100
@@ -690,7 +690,7 @@
       length = fieldsWithoutBLOBs.length;
       // gets the index of the image fields
       for (i = 0; i < length; i++) {
-        if (fieldsWithoutBLOBs[i].targetEntity === 'ADImage' || fieldsWithoutBLOBs[i].targetEntity === 'AD_FILE') {
+        if (fieldsWithoutBLOBs[i].targetEntity === 'ADImage' || fieldsWithoutBLOBs[i].targetEntity === 'OBFBL_FILE') {
           indexesToDelete.push(i);
         }
       }
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/images/form/erase_icon.png has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/images/form/upload_icon.png has changed
--- a/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.css	Thu Feb 18 15:22:50 2016 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.css	Thu Feb 18 15:23:29 2016 +0100
@@ -11,7 +11,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2010-2014 Openbravo SLU
+ * All portions are Copyright (C) 2010-2016 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -24,7 +24,6 @@
  * Date Picker
  * Form Buttons
  * Image Item
- * File Item
  * LinkButton Item
  * SectionItem Button
  * Dialog
@@ -875,95 +874,6 @@
 =======================================================================*/
 
 /*=======================================================================
- * File Item
-=======================================================================*/
-
-.OBFileItemLink {
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  display: block;
-  font-family: arial, sans-serif;
-  font-size: 12px;
-  text-decoration: none;
-  color: #58A618;
-  padding: 3px 2px 2px 2px;
-}
-
-.OBFileItemLink:hover {
-  cursor: pointer;
-  color: #58A618;
-  text-decoration: underline;
-}
-
-.OBFileItemLink:active {
-  color: #004E27;
-}
-
-.OBFileItemLink:focus {
-  color: #fa962f;
-}
-
-.OBFileItemSize {
-  white-space: nowrap;
-  font-family: arial, sans-serif;
-  font-size: 12px;
-  color: #333333;
-  vertical-align: middle;
-  background: transparent;
-  padding: 1px 4px 0px 1px;
-}
-
-.OBFileItemExt {
-  white-space: nowrap;
-  font-family: 'lucida sans', sans-serif;
-  font-size: 10px;
-  color: #333333;
-  vertical-align: middle;
-  background-color: #CBCBCB;
-  padding: 1px 4px 0px 4px;
-}
-
-.OBFileItemExt_ {
-  background: transparent;
-}
-
-.OBFileItemExt_PDF {
-  color: #FFFFFF;
-  background-color: #FF002A;
-}
-
-.OBFileItemExt_DOC {
-  color: #FFFFFF;
-  background-color: #19478A;
-}
-
-.OBFileItemExt_XLS {
-  color: #FFFFFF;
-  background-color: #0A6332;
-}
-
-.OBFileItemExt_PPT {
-  color: #FFFFFF;
-  background-color: #B83B1D;
-}
-
-.OBFileItemExt_PNG,
-.OBFileItemExt_JPG,
-.OBFileItemExt_JPE,
-.OBFileItemExt_GIF,
-.OBFileItemExt_BMP {
-  color: #333333;
-  background-color: #FAC74C;
-}
-
-.OBFileItemExt_TXT {
-  color: #333333;
-  background-color: #FFFFFF;
-  border: 1px solid #DCDCDC;
-}
-
-/*=======================================================================
  * LinkButton Item
 =======================================================================*/
 
--- a/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.js	Thu Feb 18 15:22:50 2016 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.js	Thu Feb 18 15:23:29 2016 +0100
@@ -11,7 +11,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2010-2015 Openbravo SLU
+ * All portions are Copyright (C) 2010-2016 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -21,10 +21,6 @@
  * Styling properties for:
  * 1) OB Form items
  * 2) OBImageItem
- * 3) OBFileItem
- * 4) SectionItem Button Styles
- * 5) Attachments Styles
- * 6) Image Popup Styles
  =======================================================================*/
 
 /* =====================================================================
@@ -581,89 +577,6 @@
 });
 
 /* =====================================================================
- * OBFileItem
- =======================================================================*/
-
-isc.OBFileItem.addProperties({
-  cellStyle: 'OBFormField',
-  titleStyle: 'OBFormFieldLabel'
-});
-
-isc.OBFileCanvas.addProperties({
-  height: '0px'
-  // Hack to avoid second line be desplaced in Firefox and IE
-});
-
-isc.OBFileItemContainer.addProperties({
-  styleName: 'OBFormFieldImageInput',
-  height: 21,
-  width: '100%',
-  align: 'center',
-  defaultLayoutAlign: 'center',
-  initWidgetStyle: function () {
-    //To adapt the height this code is used because the automatic height doesn't fill empty rows.
-    var rowSpan = 1;
-    var singleRowHeight = this.getHeight();
-    var multipleRowHeight = singleRowHeight + 24; // 24px = title height + form item padding defined in CSS
-    if (this.fileItem.rowSpan) {
-      rowSpan = this.fileItem.rowSpan;
-    }
-    var newHeight = singleRowHeight + (rowSpan - 1) * multipleRowHeight;
-    this.setHeight(newHeight);
-  }
-});
-
-isc.OBFileItemLink.addProperties({
-  width: '100%',
-  linkStyleName: 'OBFileItemLink'
-});
-
-isc.OBFileItemSize.addProperties({
-  width: 1,
-  //To allow button be just text width
-  align: 'left',
-  baseStyle: 'OBFileItemSize',
-  autoFit: true,
-  overflow: 'visible'
-});
-
-isc.OBFileItemExt.addProperties({
-  width: 1,
-  height: 12,
-  //To allow button be just text width
-  align: 'left',
-  baseStyle: 'OBFileItemExt',
-  autoFit: true,
-  overflow: 'visible'
-});
-
-isc.OBFileItemButton.addProperties({
-  showRollOver: true,
-  showDisabled: true,
-  showDown: true,
-  showFocusedAsOver: true,
-  width: 21,
-  height: 21,
-  uploadIconSrc: OB.Styles.skinsPath + 'Default/org.openbravo.client.application/images/form/upload_icon.png',
-  eraseIconSrc: OB.Styles.skinsPath + 'Default/org.openbravo.client.application/images/form/erase_icon.png',
-  initWidgetStyle: function () {
-    if (this.buttonType === 'upload') {
-      this.setSrc(this.uploadIconSrc);
-    } else if (this.buttonType === 'erase') {
-      this.setSrc(this.eraseIconSrc);
-    }
-  }
-});
-
-isc.OBFileSelector.addProperties({
-  hlayoutTopMargin: 10,
-  hlayoutBottomMargin: 10,
-  height: 55,
-  width: 450,
-  align: 'center'
-});
-
-/* =====================================================================
  * SectionItem Button Styles
  =======================================================================*/
 
--- a/modules/org.openbravo.client.kernel/src-db/database/sourcedata/OBCLKER_UIDEFINITION.xml	Thu Feb 18 15:22:50 2016 +0100
+++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/OBCLKER_UIDEFINITION.xml	Thu Feb 18 15:23:29 2016 +0100
@@ -360,14 +360,4 @@
 <!--EF8645E319784280BC7DF5CA4E36AD95-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--EF8645E319784280BC7DF5CA4E36AD95--></OBCLKER_UIDEFINITION>
 
-<!--FF730513ED234EA79E891F61C34F6D78--><OBCLKER_UIDEFINITION>
-<!--FF730513ED234EA79E891F61C34F6D78-->  <OBCLKER_UIDEFINITION_ID><![CDATA[FF730513ED234EA79E891F61C34F6D78]]></OBCLKER_UIDEFINITION_ID>
-<!--FF730513ED234EA79E891F61C34F6D78-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--FF730513ED234EA79E891F61C34F6D78-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--FF730513ED234EA79E891F61C34F6D78-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
-<!--FF730513ED234EA79E891F61C34F6D78-->  <AD_REFERENCE_ID><![CDATA[2B10E78241C94282867D5E750F994D14]]></AD_REFERENCE_ID>
-<!--FF730513ED234EA79E891F61C34F6D78-->  <CLASSNAME><![CDATA[org.openbravo.client.kernel.reference.FileUIDefinition]]></CLASSNAME>
-<!--FF730513ED234EA79E891F61C34F6D78-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--FF730513ED234EA79E891F61C34F6D78--></OBCLKER_UIDEFINITION>
-
 </data>
--- a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/FileUIDefinition.java	Thu Feb 18 15:22:50 2016 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,84 +0,0 @@
-/*
- *************************************************************************
- * The contents of this file are subject to the Openbravo  Public  License
- * Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
- * Version 1.1  with a permitted attribution clause; you may not  use this
- * file except in compliance with the License. You  may  obtain  a copy of
- * the License at http://www.openbravo.com/legal/license.html 
- * Software distributed under the License  is  distributed  on  an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific  language  governing  rights  and  limitations
- * under the License. 
- * The Original Code is Openbravo ERP. 
- * The Initial Developer of the Original Code is Openbravo SLU 
- * All portions are Copyright (C) 2015 Openbravo SLU 
- * All Rights Reserved. 
- * Contributor(s):  ______________________________________.
- ************************************************************************
- */
-package org.openbravo.client.kernel.reference;
-
-import java.math.BigDecimal;
-import java.text.NumberFormat;
-
-import org.codehaus.jettison.json.JSONObject;
-import org.openbravo.client.kernel.RequestContext;
-import org.openbravo.erpCommon.utility.Utility;
-import org.openbravo.model.ad.ui.Field;
-
-/**
- * Implementation of the image ui definition.
- * 
- * @author aro
- */
-public class FileUIDefinition extends UIDefinition {
-
-  @Override
-  public String getParentType() {
-    return "image";
-  }
-
-  @Override
-  public String getFormEditorType() {
-    return "OBFileItem";
-  }
-
-  @Override
-  public String getTypeProperties() {
-    return "shortDisplayFormatter: function(value, field, component, record) {" + "return \"\";"
-        + "},";
-  }
-
-  @Override
-  public String getGridFieldProperties(Field field) {
-    return super.getGridFieldProperties(field) + ", canGroupBy: false";
-  }
-
-  @Override
-  public String getFieldProperties(Field field) {
-    String fieldProperties = super.getFieldProperties(field);
-    try {
-
-      NumberFormat f = Utility.getFormat(RequestContext.get().getVariablesSecureApp(),
-          "amountInform");
-      BigDecimal maxsize = field.getColumn().getFilemaxsize();
-      String maxsizeformat = maxsize == null ? null : f.format(maxsize);
-
-      JSONObject obj;
-      if (fieldProperties.equals("")) {
-        obj = new JSONObject();
-      } else {
-        obj = new JSONObject(fieldProperties);
-      }
-
-      obj.put("fileExtensions", field.getColumn().getFileextensions());
-      obj.put("fileMaxSize", maxsize);
-      obj.put("fileMaxSizeFormat", maxsizeformat);
-      obj.put("fileMaxSizeUnit", field.getColumn().getFilemaxsizeunit());
-      return obj.toString();
-    } catch (Exception e) { // ignore
-      log.error("There was an error when calculating the properties of an File BLOB field", e);
-      return fieldProperties;
-    }
-  }
-}
--- a/src-db/database/model/tables/AD_COLUMN.xml	Thu Feb 18 15:22:50 2016 +0100
+++ b/src-db/database/model/tables/AD_COLUMN.xml	Thu Feb 18 15:23:29 2016 +0100
@@ -209,18 +209,6 @@
         <default/>
         <onCreateDefault/>
       </column>
-      <column name="FILEEXTENSIONS" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false">
-        <default/>
-        <onCreateDefault/>
-      </column>
-      <column name="FILEMAXSIZE" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false">
-        <default/>
-        <onCreateDefault/>
-      </column>
-      <column name="FILEMAXSIZEUNIT" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false">
-        <default/>
-        <onCreateDefault/>
-      </column>
       <column name="ALLOWSORTING" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
         <default><![CDATA[Y]]></default>
         <onCreateDefault><![CDATA['Y']]></onCreateDefault>
--- a/src-db/database/model/tables/AD_FILE.xml	Thu Feb 18 15:22:50 2016 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-<?xml version="1.0"?>
-  <database name="TABLE AD_FILE">
-    <table name="AD_FILE" primaryKey="AD_FILE_KEY">
-      <column name="AD_FILE_ID" primaryKey="true" required="true" type="VARCHAR" size="32" autoIncrement="false">
-        <default/>
-        <onCreateDefault/>
-      </column>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
-        <default/>
-        <onCreateDefault/>
-      </column>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
-        <default/>
-        <onCreateDefault/>
-      </column>
-      <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
-        <default><![CDATA[Y]]></default>
-        <onCreateDefault/>
-      </column>
-      <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false">
-        <default><![CDATA[SYSDATE]]></default>
-        <onCreateDefault/>
-      </column>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
-        <default/>
-        <onCreateDefault/>
-      </column>
-      <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false">
-        <default><![CDATA[SYSDATE]]></default>
-        <onCreateDefault/>
-      </column>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
-        <default/>
-        <onCreateDefault/>
-      </column>
-      <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="2000" autoIncrement="false">
-        <default/>
-        <onCreateDefault/>
-      </column>
-      <column name="MIMETYPE" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false">
-        <default/>
-        <onCreateDefault/>
-      </column>
-      <column name="FILESIZE" primaryKey="false" required="false" type="DECIMAL" size="10,0" autoIncrement="false">
-        <default/>
-        <onCreateDefault/>
-      </column>
-      <column name="BINARYDATA" primaryKey="false" required="false" type="BLOB" size="4000" autoIncrement="false">
-        <default/>
-        <onCreateDefault/>
-      </column>
-      <foreign-key foreignTable="AD_CLIENT" name="AD_FILE_AD_CLIENT">
-        <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
-      </foreign-key>
-      <foreign-key foreignTable="AD_ORG" name="AD_FILE_AD_ORG">
-        <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
-      </foreign-key>
-      <check name="AD_FILE_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
-    </table>
-  </database>
--- a/src-db/database/model/triggers/AD_COLUMN_MOD_TRG.xml	Thu Feb 18 15:22:50 2016 +0100
+++ b/src-db/database/model/triggers/AD_COLUMN_MOD_TRG.xml	Thu Feb 18 15:23:29 2016 +0100
@@ -3,6 +3,7 @@
     <trigger name="AD_COLUMN_MOD_TRG" table="AD_COLUMN" fires="before" insert="true" update="true" delete="true" foreach="row">
       <body><![CDATA[
 
+
 /*************************************************************************
 * The contents of this file are subject to the Openbravo  Public  License
 * Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
@@ -15,7 +16,7 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2008-2012 Openbravo SLU
+* All portions are Copyright (C) 2008-2016 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -111,9 +112,6 @@
         COALESCE(:NEW.imagewidth , 1) != COALESCE(:OLD.imagewidth , 1) OR
         COALESCE(:NEW.imageheight , 1) != COALESCE(:OLD.imageheight , 1) OR
         COALESCE(:NEW.isusedsequence , '.') != COALESCE(:OLD.isusedsequence , '.') OR
-        COALESCE(:NEW.fileextensions , '.') != COALESCE(:OLD.fileextensions , '.') OR
-        COALESCE(:NEW.filemaxsize , 0) != COALESCE(:OLD.filemaxsize , 0) OR
-        COALESCE(:NEW.filemaxsizeunit , '.') != COALESCE(:OLD.filemaxsizeunit , '.') OR
         1=2) THEN
       RAISE_APPLICATION_ERROR(-20000, '@20532@');
     END IF;
@@ -180,9 +178,6 @@
         COALESCE(:NEW.imagewidth                 , 1 ) = COALESCE(:OLD.imagewidth                 , 1 )AND
         COALESCE(:NEW.imageheight                , 1 ) = COALESCE(:OLD.imageheight                , 1 )AND
         COALESCE(:NEW.isusedsequence             ,'.') = COALESCE(:OLD.isusedsequence             ,'.')AND
-        COALESCE(:NEW.fileextensions, '.') = COALESCE(:OLD.fileextensions, '.') AND
-        COALESCE(:NEW.filemaxsize, 0) = COALESCE(:OLD.filemaxsize, 0) AND
-        COALESCE(:NEW.filemaxsizeunit, '.') = COALESCE(:OLD.filemaxsizeunit, '.') AND
         COALESCE(:OLD.ISEXCLUDEAUDIT		,'.') != COALESCE(:NEW.ISEXCLUDEAUDIT		,'.')) THEN
       
 		:NEW.UPDATED := :OLD.UPDATED;
--- a/src-db/database/sourcedata/AD_COLUMN.xml	Thu Feb 18 15:22:50 2016 +0100
+++ b/src-db/database/sourcedata/AD_COLUMN.xml	Thu Feb 18 15:23:29 2016 +0100
@@ -236919,44 +236919,6 @@
 <!--026810E03C274CD9A01DC0C688C78EF2-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
 <!--026810E03C274CD9A01DC0C688C78EF2--></AD_COLUMN>
 
-<!--02BBE161BED8456DA4E79EADABAA87F3--><AD_COLUMN>
-<!--02BBE161BED8456DA4E79EADABAA87F3-->  <AD_COLUMN_ID><![CDATA[02BBE161BED8456DA4E79EADABAA87F3]]></AD_COLUMN_ID>
-<!--02BBE161BED8456DA4E79EADABAA87F3-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--02BBE161BED8456DA4E79EADABAA87F3-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--02BBE161BED8456DA4E79EADABAA87F3-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--02BBE161BED8456DA4E79EADABAA87F3-->  <NAME><![CDATA[Creation Date]]></NAME>
-<!--02BBE161BED8456DA4E79EADABAA87F3-->  <DESCRIPTION><![CDATA[The date that this record is completed.]]></DESCRIPTION>
-<!--02BBE161BED8456DA4E79EADABAA87F3-->  <HELP><![CDATA[The Created field indicates the date that this record was created.]]></HELP>
-<!--02BBE161BED8456DA4E79EADABAA87F3-->  <COLUMNNAME><![CDATA[Created]]></COLUMNNAME>
-<!--02BBE161BED8456DA4E79EADABAA87F3-->  <AD_TABLE_ID><![CDATA[7A0FF566741E4C8B8B4540609D1E382B]]></AD_TABLE_ID>
-<!--02BBE161BED8456DA4E79EADABAA87F3-->  <AD_REFERENCE_ID><![CDATA[16]]></AD_REFERENCE_ID>
-<!--02BBE161BED8456DA4E79EADABAA87F3-->  <FIELDLENGTH><![CDATA[19]]></FIELDLENGTH>
-<!--02BBE161BED8456DA4E79EADABAA87F3-->  <DEFAULTVALUE><![CDATA[@#Date@]]></DEFAULTVALUE>
-<!--02BBE161BED8456DA4E79EADABAA87F3-->  <ISKEY><![CDATA[N]]></ISKEY>
-<!--02BBE161BED8456DA4E79EADABAA87F3-->  <ISPARENT><![CDATA[N]]></ISPARENT>
-<!--02BBE161BED8456DA4E79EADABAA87F3-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
-<!--02BBE161BED8456DA4E79EADABAA87F3-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
-<!--02BBE161BED8456DA4E79EADABAA87F3-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
-<!--02BBE161BED8456DA4E79EADABAA87F3-->  <SEQNO><![CDATA[50]]></SEQNO>
-<!--02BBE161BED8456DA4E79EADABAA87F3-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
-<!--02BBE161BED8456DA4E79EADABAA87F3-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--02BBE161BED8456DA4E79EADABAA87F3-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--02BBE161BED8456DA4E79EADABAA87F3-->  <AD_ELEMENT_ID><![CDATA[245]]></AD_ELEMENT_ID>
-<!--02BBE161BED8456DA4E79EADABAA87F3-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
-<!--02BBE161BED8456DA4E79EADABAA87F3-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
-<!--02BBE161BED8456DA4E79EADABAA87F3-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
-<!--02BBE161BED8456DA4E79EADABAA87F3-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
-<!--02BBE161BED8456DA4E79EADABAA87F3-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--02BBE161BED8456DA4E79EADABAA87F3-->  <POSITION><![CDATA[5]]></POSITION>
-<!--02BBE161BED8456DA4E79EADABAA87F3-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
-<!--02BBE161BED8456DA4E79EADABAA87F3-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
-<!--02BBE161BED8456DA4E79EADABAA87F3-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
-<!--02BBE161BED8456DA4E79EADABAA87F3-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
-<!--02BBE161BED8456DA4E79EADABAA87F3-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
-<!--02BBE161BED8456DA4E79EADABAA87F3-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
-<!--02BBE161BED8456DA4E79EADABAA87F3-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
-<!--02BBE161BED8456DA4E79EADABAA87F3--></AD_COLUMN>
-
 <!--02E827D16F9042D59CDC4FD71C4FAFAC--><AD_COLUMN>
 <!--02E827D16F9042D59CDC4FD71C4FAFAC-->  <AD_COLUMN_ID><![CDATA[02E827D16F9042D59CDC4FD71C4FAFAC]]></AD_COLUMN_ID>
 <!--02E827D16F9042D59CDC4FD71C4FAFAC-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -237937,45 +237899,6 @@
 <!--054CE1530B8E4A95803570D06FE6F9F9-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
 <!--054CE1530B8E4A95803570D06FE6F9F9--></AD_COLUMN>
 
-<!--056376ABE2194DB087665B23E0C647B5--><AD_COLUMN>
-<!--056376ABE2194DB087665B23E0C647B5-->  <AD_COLUMN_ID><![CDATA[056376ABE2194DB087665B23E0C647B5]]></AD_COLUMN_ID>
-<!--056376ABE2194DB087665B23E0C647B5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--056376ABE2194DB087665B23E0C647B5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--056376ABE2194DB087665B23E0C647B5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--056376ABE2194DB087665B23E0C647B5-->  <NAME><![CDATA[Organization]]></NAME>
-<!--056376ABE2194DB087665B23E0C647B5-->  <DESCRIPTION><![CDATA[Organizational entity within client]]></DESCRIPTION>
-<!--056376ABE2194DB087665B23E0C647B5-->  <HELP><![CDATA[An organization is a unit of your client or legal entity - examples are store, department. You can share data between organizations.]]></HELP>
-<!--056376ABE2194DB087665B23E0C647B5-->  <COLUMNNAME><![CDATA[AD_Org_ID]]></COLUMNNAME>
-<!--056376ABE2194DB087665B23E0C647B5-->  <AD_TABLE_ID><![CDATA[7A0FF566741E4C8B8B4540609D1E382B]]></AD_TABLE_ID>
-<!--056376ABE2194DB087665B23E0C647B5-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
-<!--056376ABE2194DB087665B23E0C647B5-->  <AD_VAL_RULE_ID><![CDATA[103]]></AD_VAL_RULE_ID>
-<!--056376ABE2194DB087665B23E0C647B5-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
-<!--056376ABE2194DB087665B23E0C647B5-->  <DEFAULTVALUE><![CDATA[@AD_ORG_ID@]]></DEFAULTVALUE>
-<!--056376ABE2194DB087665B23E0C647B5-->  <ISKEY><![CDATA[N]]></ISKEY>
-<!--056376ABE2194DB087665B23E0C647B5-->  <ISPARENT><![CDATA[N]]></ISPARENT>
-<!--056376ABE2194DB087665B23E0C647B5-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
-<!--056376ABE2194DB087665B23E0C647B5-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
-<!--056376ABE2194DB087665B23E0C647B5-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
-<!--056376ABE2194DB087665B23E0C647B5-->  <SEQNO><![CDATA[30]]></SEQNO>
-<!--056376ABE2194DB087665B23E0C647B5-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
-<!--056376ABE2194DB087665B23E0C647B5-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--056376ABE2194DB087665B23E0C647B5-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--056376ABE2194DB087665B23E0C647B5-->  <AD_ELEMENT_ID><![CDATA[113]]></AD_ELEMENT_ID>
-<!--056376ABE2194DB087665B23E0C647B5-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
-<!--056376ABE2194DB087665B23E0C647B5-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
-<!--056376ABE2194DB087665B23E0C647B5-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
-<!--056376ABE2194DB087665B23E0C647B5-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
-<!--056376ABE2194DB087665B23E0C647B5-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--056376ABE2194DB087665B23E0C647B5-->  <POSITION><![CDATA[3]]></POSITION>
-<!--056376ABE2194DB087665B23E0C647B5-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
-<!--056376ABE2194DB087665B23E0C647B5-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
-<!--056376ABE2194DB087665B23E0C647B5-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
-<!--056376ABE2194DB087665B23E0C647B5-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
-<!--056376ABE2194DB087665B23E0C647B5-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
-<!--056376ABE2194DB087665B23E0C647B5-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
-<!--056376ABE2194DB087665B23E0C647B5-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
-<!--056376ABE2194DB087665B23E0C647B5--></AD_COLUMN>
-
 <!--0585AF05D2BC47A2998C969EC5793239--><AD_COLUMN>
 <!--0585AF05D2BC47A2998C969EC5793239-->  <AD_COLUMN_ID><![CDATA[0585AF05D2BC47A2998C969EC5793239]]></AD_COLUMN_ID>
 <!--0585AF05D2BC47A2998C969EC5793239-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -238577,43 +238500,6 @@
 <!--070CB5DDE659436984E4DEB06100AC41-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
 <!--070CB5DDE659436984E4DEB06100AC41--></AD_COLUMN>
 
-<!--07258CCFD5D843FE8EDA3364078AFA8A--><AD_COLUMN>
-<!--07258CCFD5D843FE8EDA3364078AFA8A-->  <AD_COLUMN_ID><![CDATA[07258CCFD5D843FE8EDA3364078AFA8A]]></AD_COLUMN_ID>
-<!--07258CCFD5D843FE8EDA3364078AFA8A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--07258CCFD5D843FE8EDA3364078AFA8A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--07258CCFD5D843FE8EDA3364078AFA8A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--07258CCFD5D843FE8EDA3364078AFA8A-->  <NAME><![CDATA[Created By]]></NAME>
-<!--07258CCFD5D843FE8EDA3364078AFA8A-->  <DESCRIPTION><![CDATA[User who created this records]]></DESCRIPTION>
-<!--07258CCFD5D843FE8EDA3364078AFA8A-->  <HELP><![CDATA[The Created By field indicates the user who created this record.]]></HELP>
-<!--07258CCFD5D843FE8EDA3364078AFA8A-->  <COLUMNNAME><![CDATA[Createdby]]></COLUMNNAME>
-<!--07258CCFD5D843FE8EDA3364078AFA8A-->  <AD_TABLE_ID><![CDATA[7A0FF566741E4C8B8B4540609D1E382B]]></AD_TABLE_ID>
-<!--07258CCFD5D843FE8EDA3364078AFA8A-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
-<!--07258CCFD5D843FE8EDA3364078AFA8A-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
-<!--07258CCFD5D843FE8EDA3364078AFA8A-->  <ISKEY><![CDATA[N]]></ISKEY>
-<!--07258CCFD5D843FE8EDA3364078AFA8A-->  <ISPARENT><![CDATA[N]]></ISPARENT>
-<!--07258CCFD5D843FE8EDA3364078AFA8A-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
-<!--07258CCFD5D843FE8EDA3364078AFA8A-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
-<!--07258CCFD5D843FE8EDA3364078AFA8A-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
-<!--07258CCFD5D843FE8EDA3364078AFA8A-->  <SEQNO><![CDATA[60]]></SEQNO>
-<!--07258CCFD5D843FE8EDA3364078AFA8A-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
-<!--07258CCFD5D843FE8EDA3364078AFA8A-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--07258CCFD5D843FE8EDA3364078AFA8A-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--07258CCFD5D843FE8EDA3364078AFA8A-->  <AD_ELEMENT_ID><![CDATA[246]]></AD_ELEMENT_ID>
-<!--07258CCFD5D843FE8EDA3364078AFA8A-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
-<!--07258CCFD5D843FE8EDA3364078AFA8A-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
-<!--07258CCFD5D843FE8EDA3364078AFA8A-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
-<!--07258CCFD5D843FE8EDA3364078AFA8A-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
-<!--07258CCFD5D843FE8EDA3364078AFA8A-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--07258CCFD5D843FE8EDA3364078AFA8A-->  <POSITION><![CDATA[6]]></POSITION>
-<!--07258CCFD5D843FE8EDA3364078AFA8A-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
-<!--07258CCFD5D843FE8EDA3364078AFA8A-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
-<!--07258CCFD5D843FE8EDA3364078AFA8A-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
-<!--07258CCFD5D843FE8EDA3364078AFA8A-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
-<!--07258CCFD5D843FE8EDA3364078AFA8A-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
-<!--07258CCFD5D843FE8EDA3364078AFA8A-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
-<!--07258CCFD5D843FE8EDA3364078AFA8A-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
-<!--07258CCFD5D843FE8EDA3364078AFA8A--></AD_COLUMN>
-
 <!--0737CBC87537427E951BC3EAC8C11E1A--><AD_COLUMN>
 <!--0737CBC87537427E951BC3EAC8C11E1A-->  <AD_COLUMN_ID><![CDATA[0737CBC87537427E951BC3EAC8C11E1A]]></AD_COLUMN_ID>
 <!--0737CBC87537427E951BC3EAC8C11E1A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -252253,46 +252139,6 @@
 <!--379FB64EDAE34511BF519A46C721394C-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
 <!--379FB64EDAE34511BF519A46C721394C--></AD_COLUMN>
 
-<!--37D400F787864A77BB8F1FDF66835882--><AD_COLUMN>
-<!--37D400F787864A77BB8F1FDF66835882-->  <AD_COLUMN_ID><![CDATA[37D400F787864A77BB8F1FDF66835882]]></AD_COLUMN_ID>
-<!--37D400F787864A77BB8F1FDF66835882-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--37D400F787864A77BB8F1FDF66835882-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--37D400F787864A77BB8F1FDF66835882-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--37D400F787864A77BB8F1FDF66835882-->  <NAME><![CDATA[Active]]></NAME>
-<!--37D400F787864A77BB8F1FDF66835882-->  <DESCRIPTION><![CDATA[A flag indicating whether this record is available for use or de-activated.]]></DESCRIPTION>
-<!--37D400F787864A77BB8F1FDF66835882-->  <HELP><![CDATA[There are two methods of making records unavailable in the system: One is to delete the record, the other is to de-activate the record. A de-activated record is not available for selection, but available for reporting. There are two reasons for de-activating and not deleting records: 
-(1) The system requires the record for auditing purposes.
-(2) The record is referenced by other records. E.g., you cannot delete a Business Partner, if there are existing invoices for it. By de-activating the Business Partner you prevent it from being used in future transactions.]]></HELP>
-<!--37D400F787864A77BB8F1FDF66835882-->  <COLUMNNAME><![CDATA[Isactive]]></COLUMNNAME>
-<!--37D400F787864A77BB8F1FDF66835882-->  <AD_TABLE_ID><![CDATA[7A0FF566741E4C8B8B4540609D1E382B]]></AD_TABLE_ID>
-<!--37D400F787864A77BB8F1FDF66835882-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
-<!--37D400F787864A77BB8F1FDF66835882-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
-<!--37D400F787864A77BB8F1FDF66835882-->  <DEFAULTVALUE><![CDATA[Y]]></DEFAULTVALUE>
-<!--37D400F787864A77BB8F1FDF66835882-->  <ISKEY><![CDATA[N]]></ISKEY>
-<!--37D400F787864A77BB8F1FDF66835882-->  <ISPARENT><![CDATA[N]]></ISPARENT>
-<!--37D400F787864A77BB8F1FDF66835882-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
-<!--37D400F787864A77BB8F1FDF66835882-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
-<!--37D400F787864A77BB8F1FDF66835882-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
-<!--37D400F787864A77BB8F1FDF66835882-->  <SEQNO><![CDATA[40]]></SEQNO>
-<!--37D400F787864A77BB8F1FDF66835882-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
-<!--37D400F787864A77BB8F1FDF66835882-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--37D400F787864A77BB8F1FDF66835882-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--37D400F787864A77BB8F1FDF66835882-->  <AD_ELEMENT_ID><![CDATA[348]]></AD_ELEMENT_ID>
-<!--37D400F787864A77BB8F1FDF66835882-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
-<!--37D400F787864A77BB8F1FDF66835882-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
-<!--37D400F787864A77BB8F1FDF66835882-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
-<!--37D400F787864A77BB8F1FDF66835882-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
-<!--37D400F787864A77BB8F1FDF66835882-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--37D400F787864A77BB8F1FDF66835882-->  <POSITION><![CDATA[4]]></POSITION>
-<!--37D400F787864A77BB8F1FDF66835882-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
-<!--37D400F787864A77BB8F1FDF66835882-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
-<!--37D400F787864A77BB8F1FDF66835882-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
-<!--37D400F787864A77BB8F1FDF66835882-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
-<!--37D400F787864A77BB8F1FDF66835882-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
-<!--37D400F787864A77BB8F1FDF66835882-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
-<!--37D400F787864A77BB8F1FDF66835882-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
-<!--37D400F787864A77BB8F1FDF66835882--></AD_COLUMN>
-
 <!--3808ABE5D08E4650A2DE65596DB61F49--><AD_COLUMN>
 <!--3808ABE5D08E4650A2DE65596DB61F49-->  <AD_COLUMN_ID><![CDATA[3808ABE5D08E4650A2DE65596DB61F49]]></AD_COLUMN_ID>
 <!--3808ABE5D08E4650A2DE65596DB61F49-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -275598,43 +275444,6 @@
 <!--5C2A957291294E66B257235EB564F078-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
 <!--5C2A957291294E66B257235EB564F078--></AD_COLUMN>
 
-<!--5C2B254C6C6241B4BA459B8981257BAA--><AD_COLUMN>
-<!--5C2B254C6C6241B4BA459B8981257BAA-->  <AD_COLUMN_ID><![CDATA[5C2B254C6C6241B4BA459B8981257BAA]]></AD_COLUMN_ID>
-<!--5C2B254C6C6241B4BA459B8981257BAA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--5C2B254C6C6241B4BA459B8981257BAA-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--5C2B254C6C6241B4BA459B8981257BAA-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--5C2B254C6C6241B4BA459B8981257BAA-->  <NAME><![CDATA[Updated By]]></NAME>
-<!--5C2B254C6C6241B4BA459B8981257BAA-->  <DESCRIPTION><![CDATA[User who updated this records]]></DESCRIPTION>
-<!--5C2B254C6C6241B4BA459B8981257BAA-->  <HELP><![CDATA[The Updated By field indicates the user who updated this record.]]></HELP>
-<!--5C2B254C6C6241B4BA459B8981257BAA-->  <COLUMNNAME><![CDATA[Updatedby]]></COLUMNNAME>
-<!--5C2B254C6C6241B4BA459B8981257BAA-->  <AD_TABLE_ID><![CDATA[7A0FF566741E4C8B8B4540609D1E382B]]></AD_TABLE_ID>
-<!--5C2B254C6C6241B4BA459B8981257BAA-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
-<!--5C2B254C6C6241B4BA459B8981257BAA-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
-<!--5C2B254C6C6241B4BA459B8981257BAA-->  <ISKEY><![CDATA[N]]></ISKEY>
-<!--5C2B254C6C6241B4BA459B8981257BAA-->  <ISPARENT><![CDATA[N]]></ISPARENT>
-<!--5C2B254C6C6241B4BA459B8981257BAA-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
-<!--5C2B254C6C6241B4BA459B8981257BAA-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
-<!--5C2B254C6C6241B4BA459B8981257BAA-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
-<!--5C2B254C6C6241B4BA459B8981257BAA-->  <SEQNO><![CDATA[80]]></SEQNO>
-<!--5C2B254C6C6241B4BA459B8981257BAA-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
-<!--5C2B254C6C6241B4BA459B8981257BAA-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--5C2B254C6C6241B4BA459B8981257BAA-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--5C2B254C6C6241B4BA459B8981257BAA-->  <AD_ELEMENT_ID><![CDATA[608]]></AD_ELEMENT_ID>
-<!--5C2B254C6C6241B4BA459B8981257BAA-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
-<!--5C2B254C6C6241B4BA459B8981257BAA-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
-<!--5C2B254C6C6241B4BA459B8981257BAA-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
-<!--5C2B254C6C6241B4BA459B8981257BAA-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
-<!--5C2B254C6C6241B4BA459B8981257BAA-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--5C2B254C6C6241B4BA459B8981257BAA-->  <POSITION><![CDATA[8]]></POSITION>
-<!--5C2B254C6C6241B4BA459B8981257BAA-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
-<!--5C2B254C6C6241B4BA459B8981257BAA-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
-<!--5C2B254C6C6241B4BA459B8981257BAA-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
-<!--5C2B254C6C6241B4BA459B8981257BAA-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
-<!--5C2B254C6C6241B4BA459B8981257BAA-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
-<!--5C2B254C6C6241B4BA459B8981257BAA-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
-<!--5C2B254C6C6241B4BA459B8981257BAA-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
-<!--5C2B254C6C6241B4BA459B8981257BAA--></AD_COLUMN>
-
 <!--5C315336D8D1F72DE040007F01013754--><AD_COLUMN>
 <!--5C315336D8D1F72DE040007F01013754-->  <AD_COLUMN_ID><![CDATA[5C315336D8D1F72DE040007F01013754]]></AD_COLUMN_ID>
 <!--5C315336D8D1F72DE040007F01013754-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -277622,41 +277431,6 @@
 <!--5EA7646DA48B45BDB69509885DBC4D0C-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
 <!--5EA7646DA48B45BDB69509885DBC4D0C--></AD_COLUMN>
 
-<!--5ED5BE44C6BC4E96A7C0163DF1BF9BD7--><AD_COLUMN>
-<!--5ED5BE44C6BC4E96A7C0163DF1BF9BD7-->  <AD_COLUMN_ID><![CDATA[5ED5BE44C6BC4E96A7C0163DF1BF9BD7]]></AD_COLUMN_ID>
-<!--5ED5BE44C6BC4E96A7C0163DF1BF9BD7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--5ED5BE44C6BC4E96A7C0163DF1BF9BD7-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--5ED5BE44C6BC4E96A7C0163DF1BF9BD7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--5ED5BE44C6BC4E96A7C0163DF1BF9BD7-->  <NAME><![CDATA[Mimetype]]></NAME>
-<!--5ED5BE44C6BC4E96A7C0163DF1BF9BD7-->  <COLUMNNAME><![CDATA[Mimetype]]></COLUMNNAME>
-<!--5ED5BE44C6BC4E96A7C0163DF1BF9BD7-->  <AD_TABLE_ID><![CDATA[7A0FF566741E4C8B8B4540609D1E382B]]></AD_TABLE_ID>
-<!--5ED5BE44C6BC4E96A7C0163DF1BF9BD7-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
-<!--5ED5BE44C6BC4E96A7C0163DF1BF9BD7-->  <FIELDLENGTH><![CDATA[255]]></FIELDLENGTH>
-<!--5ED5BE44C6BC4E96A7C0163DF1BF9BD7-->  <ISKEY><![CDATA[N]]></ISKEY>
-<!--5ED5BE44C6BC4E96A7C0163DF1BF9BD7-->  <ISPARENT><![CDATA[N]]></ISPARENT>
-<!--5ED5BE44C6BC4E96A7C0163DF1BF9BD7-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
-<!--5ED5BE44C6BC4E96A7C0163DF1BF9BD7-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
-<!--5ED5BE44C6BC4E96A7C0163DF1BF9BD7-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
-<!--5ED5BE44C6BC4E96A7C0163DF1BF9BD7-->  <SEQNO><![CDATA[100]]></SEQNO>
-<!--5ED5BE44C6BC4E96A7C0163DF1BF9BD7-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
-<!--5ED5BE44C6BC4E96A7C0163DF1BF9BD7-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--5ED5BE44C6BC4E96A7C0163DF1BF9BD7-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--5ED5BE44C6BC4E96A7C0163DF1BF9BD7-->  <AD_ELEMENT_ID><![CDATA[8971717F183347B0834A2AEB218C5AFB]]></AD_ELEMENT_ID>
-<!--5ED5BE44C6BC4E96A7C0163DF1BF9BD7-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
-<!--5ED5BE44C6BC4E96A7C0163DF1BF9BD7-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
-<!--5ED5BE44C6BC4E96A7C0163DF1BF9BD7-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
-<!--5ED5BE44C6BC4E96A7C0163DF1BF9BD7-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
-<!--5ED5BE44C6BC4E96A7C0163DF1BF9BD7-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--5ED5BE44C6BC4E96A7C0163DF1BF9BD7-->  <POSITION><![CDATA[10]]></POSITION>
-<!--5ED5BE44C6BC4E96A7C0163DF1BF9BD7-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
-<!--5ED5BE44C6BC4E96A7C0163DF1BF9BD7-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
-<!--5ED5BE44C6BC4E96A7C0163DF1BF9BD7-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
-<!--5ED5BE44C6BC4E96A7C0163DF1BF9BD7-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
-<!--5ED5BE44C6BC4E96A7C0163DF1BF9BD7-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
-<!--5ED5BE44C6BC4E96A7C0163DF1BF9BD7-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
-<!--5ED5BE44C6BC4E96A7C0163DF1BF9BD7-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
-<!--5ED5BE44C6BC4E96A7C0163DF1BF9BD7--></AD_COLUMN>
-
 <!--5F0553A1327C4BC595CB3C8381FC3524--><AD_COLUMN>
 <!--5F0553A1327C4BC595CB3C8381FC3524-->  <AD_COLUMN_ID><![CDATA[5F0553A1327C4BC595CB3C8381FC3524]]></AD_COLUMN_ID>
 <!--5F0553A1327C4BC595CB3C8381FC3524-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -285901,45 +285675,6 @@
 <!--6F3ACF22507E445B925E1D1561F03029-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
 <!--6F3ACF22507E445B925E1D1561F03029--></AD_COLUMN>
 
-<!--6F3C36CC74C34FD2B624651280F67858--><AD_COLUMN>
-<!--6F3C36CC74C34FD2B624651280F67858-->  <AD_COLUMN_ID><![CDATA[6F3C36CC74C34FD2B624651280F67858]]></AD_COLUMN_ID>
-<!--6F3C36CC74C34FD2B624651280F67858-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--6F3C36CC74C34FD2B624651280F67858-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--6F3C36CC74C34FD2B624651280F67858-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--6F3C36CC74C34FD2B624651280F67858-->  <NAME><![CDATA[Filemaxsizeunit]]></NAME>
-<!--6F3C36CC74C34FD2B624651280F67858-->  <DESCRIPTION><![CDATA[File Max Size Unit]]></DESCRIPTION>
-<!--6F3C36CC74C34FD2B624651280F67858-->  <HELP><![CDATA[Unit used to define the file maximum size allowed to be stored. It can be: B, KB, MB or GB.]]></HELP>
-<!--6F3C36CC74C34FD2B624651280F67858-->  <COLUMNNAME><![CDATA[Filemaxsizeunit]]></COLUMNNAME>
-<!--6F3C36CC74C34FD2B624651280F67858-->  <AD_TABLE_ID><![CDATA[101]]></AD_TABLE_ID>
-<!--6F3C36CC74C34FD2B624651280F67858-->  <AD_REFERENCE_ID><![CDATA[17]]></AD_REFERENCE_ID>
-<!--6F3C36CC74C34FD2B624651280F67858-->  <AD_REFERENCE_VALUE_ID><![CDATA[405D1D8FF526432A8E33EC56BE7966F7]]></AD_REFERENCE_VALUE_ID>
-<!--6F3C36CC74C34FD2B624651280F67858-->  <FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
-<!--6F3C36CC74C34FD2B624651280F67858-->  <DEFAULTVALUE><![CDATA[KB]]></DEFAULTVALUE>
-<!--6F3C36CC74C34FD2B624651280F67858-->  <ISKEY><![CDATA[N]]></ISKEY>
-<!--6F3C36CC74C34FD2B624651280F67858-->  <ISPARENT><![CDATA[N]]></ISPARENT>
-<!--6F3C36CC74C34FD2B624651280F67858-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
-<!--6F3C36CC74C34FD2B624651280F67858-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
-<!--6F3C36CC74C34FD2B624651280F67858-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
-<!--6F3C36CC74C34FD2B624651280F67858-->  <SEQNO><![CDATA[221]]></SEQNO>
-<!--6F3C36CC74C34FD2B624651280F67858-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
-<!--6F3C36CC74C34FD2B624651280F67858-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--6F3C36CC74C34FD2B624651280F67858-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--6F3C36CC74C34FD2B624651280F67858-->  <AD_ELEMENT_ID><![CDATA[AFED41FA6F1D4209B9DB0980197AF53B]]></AD_ELEMENT_ID>
-<!--6F3C36CC74C34FD2B624651280F67858-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
-<!--6F3C36CC74C34FD2B624651280F67858-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
-<!--6F3C36CC74C34FD2B624651280F67858-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
-<!--6F3C36CC74C34FD2B624651280F67858-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
-<!--6F3C36CC74C34FD2B624651280F67858-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--6F3C36CC74C34FD2B624651280F67858-->  <POSITION><![CDATA[56]]></POSITION>
-<!--6F3C36CC74C34FD2B624651280F67858-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
-<!--6F3C36CC74C34FD2B624651280F67858-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
-<!--6F3C36CC74C34FD2B624651280F67858-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
-<!--6F3C36CC74C34FD2B624651280F67858-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
-<!--6F3C36CC74C34FD2B624651280F67858-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
-<!--6F3C36CC74C34FD2B624651280F67858-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
-<!--6F3C36CC74C34FD2B624651280F67858-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
-<!--6F3C36CC74C34FD2B624651280F67858--></AD_COLUMN>
-
 <!--6F4ED3E932F04E888A3C8E0F2D515CBE--><AD_COLUMN>
 <!--6F4ED3E932F04E888A3C8E0F2D515CBE-->  <AD_COLUMN_ID><![CDATA[6F4ED3E932F04E888A3C8E0F2D515CBE]]></AD_COLUMN_ID>
 <!--6F4ED3E932F04E888A3C8E0F2D515CBE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -288934,43 +288669,6 @@
 <!--7555569CC84A010FE040007F01010B4D-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
 <!--7555569CC84A010FE040007F01010B4D--></AD_COLUMN>
 
-<!--755F05A04ED7467B9250D5EA22276E45--><AD_COLUMN>
-<!--755F05A04ED7467B9250D5EA22276E45-->  <AD_COLUMN_ID><![CDATA[755F05A04ED7467B9250D5EA22276E45]]></AD_COLUMN_ID>
-<!--755F05A04ED7467B9250D5EA22276E45-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--755F05A04ED7467B9250D5EA22276E45-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--755F05A04ED7467B9250D5EA22276E45-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--755F05A04ED7467B9250D5EA22276E45-->  <NAME><![CDATA[Name]]></NAME>
-<!--755F05A04ED7467B9250D5EA22276E45-->  <DESCRIPTION><![CDATA[A non-unique identifier for a record/document often used as a search tool.]]></DESCRIPTION>
-<!--755F05A04ED7467B9250D5EA22276E45-->  <HELP><![CDATA[A more descriptive identifier (that does need to be unique) of a record/document that is used as a default search option along with the search key (that is unique and mostly shorter). It is up to 60 characters in length.]]></HELP>
-<!--755F05A04ED7467B9250D5EA22276E45-->  <COLUMNNAME><![CDATA[Name]]></COLUMNNAME>
-<!--755F05A04ED7467B9250D5EA22276E45-->  <AD_TABLE_ID><![CDATA[7A0FF566741E4C8B8B4540609D1E382B]]></AD_TABLE_ID>
-<!--755F05A04ED7467B9250D5EA22276E45-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
-<!--755F05A04ED7467B9250D5EA22276E45-->  <FIELDLENGTH><![CDATA[2000]]></FIELDLENGTH>
-<!--755F05A04ED7467B9250D5EA22276E45-->  <ISKEY><![CDATA[N]]></ISKEY>
-<!--755F05A04ED7467B9250D5EA22276E45-->  <ISPARENT><![CDATA[N]]></ISPARENT>
-<!--755F05A04ED7467B9250D5EA22276E45-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
-<!--755F05A04ED7467B9250D5EA22276E45-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
-<!--755F05A04ED7467B9250D5EA22276E45-->  <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER>
-<!--755F05A04ED7467B9250D5EA22276E45-->  <SEQNO><![CDATA[90]]></SEQNO>
-<!--755F05A04ED7467B9250D5EA22276E45-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
-<!--755F05A04ED7467B9250D5EA22276E45-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--755F05A04ED7467B9250D5EA22276E45-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--755F05A04ED7467B9250D5EA22276E45-->  <AD_ELEMENT_ID><![CDATA[469]]></AD_ELEMENT_ID>
-<!--755F05A04ED7467B9250D5EA22276E45-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
-<!--755F05A04ED7467B9250D5EA22276E45-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
-<!--755F05A04ED7467B9250D5EA22276E45-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
-<!--755F05A04ED7467B9250D5EA22276E45-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
-<!--755F05A04ED7467B9250D5EA22276E45-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--755F05A04ED7467B9250D5EA22276E45-->  <POSITION><![CDATA[9]]></POSITION>
-<!--755F05A04ED7467B9250D5EA22276E45-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
-<!--755F05A04ED7467B9250D5EA22276E45-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
-<!--755F05A04ED7467B9250D5EA22276E45-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
-<!--755F05A04ED7467B9250D5EA22276E45-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
-<!--755F05A04ED7467B9250D5EA22276E45-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
-<!--755F05A04ED7467B9250D5EA22276E45-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
-<!--755F05A04ED7467B9250D5EA22276E45-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
-<!--755F05A04ED7467B9250D5EA22276E45--></AD_COLUMN>
-
 <!--7587F6B4EF014242B8B275D34A3E9082--><AD_COLUMN>
 <!--7587F6B4EF014242B8B275D34A3E9082-->  <AD_COLUMN_ID><![CDATA[7587F6B4EF014242B8B275D34A3E9082]]></AD_COLUMN_ID>
 <!--7587F6B4EF014242B8B275D34A3E9082-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -289270,7 +288968,6 @@
 <!--76C8751A12F84B4F87D03A0D747771CC-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
 <!--76C8751A12F84B4F87D03A0D747771CC-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--76C8751A12F84B4F87D03A0D747771CC-->  <ENTITY_ALIAS><![CDATA[coalesce((select sum(olo.priceAdjustmentAmt) from OrderLineOffer olo where olo.salesOrderLine.id = e.id), 0)]]></ENTITY_ALIAS>
-<!--76C8751A12F84B4F87D03A0D747771CC-->  <FILEMAXSIZEUNIT><![CDATA[KB]]></FILEMAXSIZEUNIT>
 <!--76C8751A12F84B4F87D03A0D747771CC-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--76C8751A12F84B4F87D03A0D747771CC-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
 <!--76C8751A12F84B4F87D03A0D747771CC--></AD_COLUMN>
@@ -293622,44 +293319,6 @@
 <!--789C71A9ABAB40228548F7CECB40531E-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
 <!--789C71A9ABAB40228548F7CECB40531E--></AD_COLUMN>
 
-<!--78A12B09DD6F4138A091C5E4ABDCFCCA--><AD_COLUMN>
-<!--78A12B09DD6F4138A091C5E4ABDCFCCA-->  <AD_COLUMN_ID><![CDATA[78A12B09DD6F4138A091C5E4ABDCFCCA]]></AD_COLUMN_ID>
-<!--78A12B09DD6F4138A091C5E4ABDCFCCA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--78A12B09DD6F4138A091C5E4ABDCFCCA-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--78A12B09DD6F4138A091C5E4ABDCFCCA-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--78A12B09DD6F4138A091C5E4ABDCFCCA-->  <NAME><![CDATA[Client]]></NAME>
-<!--78A12B09DD6F4138A091C5E4ABDCFCCA-->  <DESCRIPTION><![CDATA[Client for this installation.]]></DESCRIPTION>
-<!--78A12B09DD6F4138A091C5E4ABDCFCCA-->  <HELP><![CDATA[A Client is a company or a legal entity. You cannot share data between Clients.]]></HELP>
-<!--78A12B09DD6F4138A091C5E4ABDCFCCA-->  <COLUMNNAME><![CDATA[AD_Client_ID]]></COLUMNNAME>
-<!--78A12B09DD6F4138A091C5E4ABDCFCCA-->  <AD_TABLE_ID><![CDATA[7A0FF566741E4C8B8B4540609D1E382B]]></AD_TABLE_ID>
-<!--78A12B09DD6F4138A091C5E4ABDCFCCA-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
-<!--78A12B09DD6F4138A091C5E4ABDCFCCA-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
-<!--78A12B09DD6F4138A091C5E4ABDCFCCA-->  <DEFAULTVALUE><![CDATA[@AD_CLIENT_ID@]]></DEFAULTVALUE>
-<!--78A12B09DD6F4138A091C5E4ABDCFCCA-->  <ISKEY><![CDATA[N]]></ISKEY>
-<!--78A12B09DD6F4138A091C5E4ABDCFCCA-->  <ISPARENT><![CDATA[N]]></ISPARENT>
-<!--78A12B09DD6F4138A091C5E4ABDCFCCA-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
-<!--78A12B09DD6F4138A091C5E4ABDCFCCA-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
-<!--78A12B09DD6F4138A091C5E4ABDCFCCA-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
-<!--78A12B09DD6F4138A091C5E4ABDCFCCA-->  <SEQNO><![CDATA[20]]></SEQNO>
-<!--78A12B09DD6F4138A091C5E4ABDCFCCA-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
-<!--78A12B09DD6F4138A091C5E4ABDCFCCA-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--78A12B09DD6F4138A091C5E4ABDCFCCA-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--78A12B09DD6F4138A091C5E4ABDCFCCA-->  <AD_ELEMENT_ID><![CDATA[102]]></AD_ELEMENT_ID>
-<!--78A12B09DD6F4138A091C5E4ABDCFCCA-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
-<!--78A12B09DD6F4138A091C5E4ABDCFCCA-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
-<!--78A12B09DD6F4138A091C5E4ABDCFCCA-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
-<!--78A12B09DD6F4138A091C5E4ABDCFCCA-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
-<!--78A12B09DD6F4138A091C5E4ABDCFCCA-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--78A12B09DD6F4138A091C5E4ABDCFCCA-->  <POSITION><![CDATA[2]]></POSITION>
-<!--78A12B09DD6F4138A091C5E4ABDCFCCA-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
-<!--78A12B09DD6F4138A091C5E4ABDCFCCA-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
-<!--78A12B09DD6F4138A091C5E4ABDCFCCA-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
-<!--78A12B09DD6F4138A091C5E4ABDCFCCA-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
-<!--78A12B09DD6F4138A091C5E4ABDCFCCA-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
-<!--78A12B09DD6F4138A091C5E4ABDCFCCA-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
-<!--78A12B09DD6F4138A091C5E4ABDCFCCA-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
-<!--78A12B09DD6F4138A091C5E4ABDCFCCA--></AD_COLUMN>
-
 <!--78D10D5CC289A0ADE040007F010152E6--><AD_COLUMN>
 <!--78D10D5CC289A0ADE040007F010152E6-->  <AD_COLUMN_ID><![CDATA[78D10D5CC289A0ADE040007F010152E6]]></AD_COLUMN_ID>
 <!--78D10D5CC289A0ADE040007F010152E6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -321638,43 +321297,6 @@
 <!--99002FE5874A49E899A025F499D21D99-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
 <!--99002FE5874A49E899A025F499D21D99--></AD_COLUMN>
 
-<!--9909BD9D50704813BDB5AEAE12C73E9C--><AD_COLUMN>
-<!--9909BD9D50704813BDB5AEAE12C73E9C-->  <AD_COLUMN_ID><![CDATA[9909BD9D50704813BDB5AEAE12C73E9C]]></AD_COLUMN_ID>
-<!--9909BD9D50704813BDB5AEAE12C73E9C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--9909BD9D50704813BDB5AEAE12C73E9C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--9909BD9D50704813BDB5AEAE12C73E9C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--9909BD9D50704813BDB5AEAE12C73E9C-->  <NAME><![CDATA[Bindary Data]]></NAME>
-<!--9909BD9D50704813BDB5AEAE12C73E9C-->  <DESCRIPTION><![CDATA[Binary Data]]></DESCRIPTION>
-<!--9909BD9D50704813BDB5AEAE12C73E9C-->  <HELP><![CDATA[The Binary field stores binary data.]]></HELP>
-<!--9909BD9D50704813BDB5AEAE12C73E9C-->  <COLUMNNAME><![CDATA[Binarydata]]></COLUMNNAME>
-<!--9909BD9D50704813BDB5AEAE12C73E9C-->  <AD_TABLE_ID><![CDATA[7A0FF566741E4C8B8B4540609D1E382B]]></AD_TABLE_ID>
-<!--9909BD9D50704813BDB5AEAE12C73E9C-->  <AD_REFERENCE_ID><![CDATA[23]]></AD_REFERENCE_ID>
-<!--9909BD9D50704813BDB5AEAE12C73E9C-->  <FIELDLENGTH><![CDATA[4000]]></FIELDLENGTH>
-<!--9909BD9D50704813BDB5AEAE12C73E9C-->  <ISKEY><![CDATA[N]]></ISKEY>
-<!--9909BD9D50704813BDB5AEAE12C73E9C-->  <ISPARENT><![CDATA[N]]></ISPARENT>
-<!--9909BD9D50704813BDB5AEAE12C73E9C-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
-<!--9909BD9D50704813BDB5AEAE12C73E9C-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
-<!--9909BD9D50704813BDB5AEAE12C73E9C-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
-<!--9909BD9D50704813BDB5AEAE12C73E9C-->  <SEQNO><![CDATA[120]]></SEQNO>
-<!--9909BD9D50704813BDB5AEAE12C73E9C-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
-<!--9909BD9D50704813BDB5AEAE12C73E9C-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--9909BD9D50704813BDB5AEAE12C73E9C-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--9909BD9D50704813BDB5AEAE12C73E9C-->  <AD_ELEMENT_ID><![CDATA[174]]></AD_ELEMENT_ID>
-<!--9909BD9D50704813BDB5AEAE12C73E9C-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
-<!--9909BD9D50704813BDB5AEAE12C73E9C-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
-<!--9909BD9D50704813BDB5AEAE12C73E9C-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
-<!--9909BD9D50704813BDB5AEAE12C73E9C-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
-<!--9909BD9D50704813BDB5AEAE12C73E9C-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--9909BD9D50704813BDB5AEAE12C73E9C-->  <POSITION><![CDATA[12]]></POSITION>
-<!--9909BD9D50704813BDB5AEAE12C73E9C-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
-<!--9909BD9D50704813BDB5AEAE12C73E9C-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
-<!--9909BD9D50704813BDB5AEAE12C73E9C-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
-<!--9909BD9D50704813BDB5AEAE12C73E9C-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
-<!--9909BD9D50704813BDB5AEAE12C73E9C-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
-<!--9909BD9D50704813BDB5AEAE12C73E9C-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
-<!--9909BD9D50704813BDB5AEAE12C73E9C-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
-<!--9909BD9D50704813BDB5AEAE12C73E9C--></AD_COLUMN>
-
 <!--991D1765E9794BCDBEBC7397444AD6E0--><AD_COLUMN>
 <!--991D1765E9794BCDBEBC7397444AD6E0-->  <AD_COLUMN_ID><![CDATA[991D1765E9794BCDBEBC7397444AD6E0]]></AD_COLUMN_ID>
 <!--991D1765E9794BCDBEBC7397444AD6E0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -334801,41 +334423,6 @@
 <!--B515858C2040417D9BC41BA12F936B78-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
 <!--B515858C2040417D9BC41BA12F936B78--></AD_COLUMN>
 
-<!--B54B7A0AB8AB490BA64080293311DA20--><AD_COLUMN>
-<!--B54B7A0AB8AB490BA64080293311DA20-->  <AD_COLUMN_ID><![CDATA[B54B7A0AB8AB490BA64080293311DA20]]></AD_COLUMN_ID>
-<!--B54B7A0AB8AB490BA64080293311DA20-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--B54B7A0AB8AB490BA64080293311DA20-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--B54B7A0AB8AB490BA64080293311DA20-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--B54B7A0AB8AB490BA64080293311DA20-->  <NAME><![CDATA[Filesize]]></NAME>
-<!--B54B7A0AB8AB490BA64080293311DA20-->  <COLUMNNAME><![CDATA[Filesize]]></COLUMNNAME>
-<!--B54B7A0AB8AB490BA64080293311DA20-->  <AD_TABLE_ID><![CDATA[7A0FF566741E4C8B8B4540609D1E382B]]></AD_TABLE_ID>
-<!--B54B7A0AB8AB490BA64080293311DA20-->  <AD_REFERENCE_ID><![CDATA[11]]></AD_REFERENCE_ID>
-<!--B54B7A0AB8AB490BA64080293311DA20-->  <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
-<!--B54B7A0AB8AB490BA64080293311DA20-->  <ISKEY><![CDATA[N]]></ISKEY>
-<!--B54B7A0AB8AB490BA64080293311DA20-->  <ISPARENT><![CDATA[N]]></ISPARENT>
-<!--B54B7A0AB8AB490BA64080293311DA20-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
-<!--B54B7A0AB8AB490BA64080293311DA20-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
-<!--B54B7A0AB8AB490BA64080293311DA20-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
-<!--B54B7A0AB8AB490BA64080293311DA20-->  <SEQNO><![CDATA[110]]></SEQNO>
-<!--B54B7A0AB8AB490BA64080293311DA20-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
-<!--B54B7A0AB8AB490BA64080293311DA20-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--B54B7A0AB8AB490BA64080293311DA20-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--B54B7A0AB8AB490BA64080293311DA20-->  <AD_ELEMENT_ID><![CDATA[A4F46D47A4284AA8957CFC4C20BCD5BB]]></AD_ELEMENT_ID>
-<!--B54B7A0AB8AB490BA64080293311DA20-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
-<!--B54B7A0AB8AB490BA64080293311DA20-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
-<!--B54B7A0AB8AB490BA64080293311DA20-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
-<!--B54B7A0AB8AB490BA64080293311DA20-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
-<!--B54B7A0AB8AB490BA64080293311DA20-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--B54B7A0AB8AB490BA64080293311DA20-->  <POSITION><![CDATA[11]]></POSITION>
-<!--B54B7A0AB8AB490BA64080293311DA20-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
-<!--B54B7A0AB8AB490BA64080293311DA20-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
-<!--B54B7A0AB8AB490BA64080293311DA20-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
-<!--B54B7A0AB8AB490BA64080293311DA20-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
-<!--B54B7A0AB8AB490BA64080293311DA20-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
-<!--B54B7A0AB8AB490BA64080293311DA20-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
-<!--B54B7A0AB8AB490BA64080293311DA20-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
-<!--B54B7A0AB8AB490BA64080293311DA20--></AD_COLUMN>
-
 <!--B554D33CA43C4FDBB15E6B79E1D5A116--><AD_COLUMN>
 <!--B554D33CA43C4FDBB15E6B79E1D5A116-->  <AD_COLUMN_ID><![CDATA[B554D33CA43C4FDBB15E6B79E1D5A116]]></AD_COLUMN_ID>
 <!--B554D33CA43C4FDBB15E6B79E1D5A116-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -341163,43 +340750,6 @@
 <!--C0D9A7D1D5B043A4B8AE9F6AC683FD50-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
 <!--C0D9A7D1D5B043A4B8AE9F6AC683FD50--></AD_COLUMN>
 
-<!--C0EE5FB7B5794FBD9F2655C1DE55133D--><AD_COLUMN>
-<!--C0EE5FB7B5794FBD9F2655C1DE55133D-->  <AD_COLUMN_ID><![CDATA[C0EE5FB7B5794FBD9F2655C1DE55133D]]></AD_COLUMN_ID>
-<!--C0EE5FB7B5794FBD9F2655C1DE55133D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--C0EE5FB7B5794FBD9F2655C1DE55133D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--C0EE5FB7B5794FBD9F2655C1DE55133D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--C0EE5FB7B5794FBD9F2655C1DE55133D-->  <NAME><![CDATA[Filemaxsize]]></NAME>
-<!--C0EE5FB7B5794FBD9F2655C1DE55133D-->  <DESCRIPTION><![CDATA[File Max Size]]></DESCRIPTION>
-<!--C0EE5FB7B5794FBD9F2655C1DE55133D-->  <HELP><![CDATA[file maximum size allowed to be stored.]]></HELP>
-<!--C0EE5FB7B5794FBD9F2655C1DE55133D-->  <COLUMNNAME><![CDATA[Filemaxsize]]></COLUMNNAME>
-<!--C0EE5FB7B5794FBD9F2655C1DE55133D-->  <AD_TABLE_ID><![CDATA[101]]></AD_TABLE_ID>
-<!--C0EE5FB7B5794FBD9F2655C1DE55133D-->  <AD_REFERENCE_ID><![CDATA[22]]></AD_REFERENCE_ID>
-<!--C0EE5FB7B5794FBD9F2655C1DE55133D-->  <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
-<!--C0EE5FB7B5794FBD9F2655C1DE55133D-->  <ISKEY><![CDATA[N]]></ISKEY>
-<!--C0EE5FB7B5794FBD9F2655C1DE55133D-->  <ISPARENT><![CDATA[N]]></ISPARENT>
-<!--C0EE5FB7B5794FBD9F2655C1DE55133D-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
-<!--C0EE5FB7B5794FBD9F2655C1DE55133D-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
-<!--C0EE5FB7B5794FBD9F2655C1DE55133D-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
-<!--C0EE5FB7B5794FBD9F2655C1DE55133D-->  <SEQNO><![CDATA[211]]></SEQNO>
-<!--C0EE5FB7B5794FBD9F2655C1DE55133D-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
-<!--C0EE5FB7B5794FBD9F2655C1DE55133D-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--C0EE5FB7B5794FBD9F2655C1DE55133D-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--C0EE5FB7B5794FBD9F2655C1DE55133D-->  <AD_ELEMENT_ID><![CDATA[0D3864627CFC4961A414F7E89FAE6E86]]></AD_ELEMENT_ID>
-<!--C0EE5FB7B5794FBD9F2655C1DE55133D-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
-<!--C0EE5FB7B5794FBD9F2655C1DE55133D-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
-<!--C0EE5FB7B5794FBD9F2655C1DE55133D-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
-<!--C0EE5FB7B5794FBD9F2655C1DE55133D-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
-<!--C0EE5FB7B5794FBD9F2655C1DE55133D-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--C0EE5FB7B5794FBD9F2655C1DE55133D-->  <POSITION><![CDATA[55]]></POSITION>
-<!--C0EE5FB7B5794FBD9F2655C1DE55133D-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
-<!--C0EE5FB7B5794FBD9F2655C1DE55133D-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
-<!--C0EE5FB7B5794FBD9F2655C1DE55133D-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
-<!--C0EE5FB7B5794FBD9F2655C1DE55133D-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
-<!--C0EE5FB7B5794FBD9F2655C1DE55133D-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
-<!--C0EE5FB7B5794FBD9F2655C1DE55133D-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
-<!--C0EE5FB7B5794FBD9F2655C1DE55133D-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
-<!--C0EE5FB7B5794FBD9F2655C1DE55133D--></AD_COLUMN>
-
 <!--C0FF55F981BB47279B6BA18A2D811482--><AD_COLUMN>
 <!--C0FF55F981BB47279B6BA18A2D811482-->  <AD_COLUMN_ID><![CDATA[C0FF55F981BB47279B6BA18A2D811482]]></AD_COLUMN_ID>
 <!--C0FF55F981BB47279B6BA18A2D811482-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -342319,44 +341869,6 @@
 <!--C5023002E8C04E859A36860237BF9B42-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
 <!--C5023002E8C04E859A36860237BF9B42--></AD_COLUMN>
 
-<!--C50EF7F2D9C440BDBEE293BA9A4C8BA8--><AD_COLUMN>
-<!--C50EF7F2D9C440BDBEE293BA9A4C8BA8-->  <AD_COLUMN_ID><![CDATA[C50EF7F2D9C440BDBEE293BA9A4C8BA8]]></AD_COLUMN_ID>
-<!--C50EF7F2D9C440BDBEE293BA9A4C8BA8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--C50EF7F2D9C440BDBEE293BA9A4C8BA8-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--C50EF7F2D9C440BDBEE293BA9A4C8BA8-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--C50EF7F2D9C440BDBEE293BA9A4C8BA8-->  <NAME><![CDATA[Updated]]></NAME>
-<!--C50EF7F2D9C440BDBEE293BA9A4C8BA8-->  <DESCRIPTION><![CDATA[The date that this record was last updated]]></DESCRIPTION>
-<!--C50EF7F2D9C440BDBEE293BA9A4C8BA8-->  <HELP><![CDATA[The Updated field indicates the date that this record was updated.]]></HELP>
-<!--C50EF7F2D9C440BDBEE293BA9A4C8BA8-->  <COLUMNNAME><![CDATA[Updated]]></COLUMNNAME>
-<!--C50EF7F2D9C440BDBEE293BA9A4C8BA8-->  <AD_TABLE_ID><![CDATA[7A0FF566741E4C8B8B4540609D1E382B]]></AD_TABLE_ID>
-<!--C50EF7F2D9C440BDBEE293BA9A4C8BA8-->  <AD_REFERENCE_ID><![CDATA[16]]></AD_REFERENCE_ID>
-<!--C50EF7F2D9C440BDBEE293BA9A4C8BA8-->  <FIELDLENGTH><![CDATA[19]]></FIELDLENGTH>
-<!--C50EF7F2D9C440BDBEE293BA9A4C8BA8-->  <DEFAULTVALUE><![CDATA[@#Date@]]></DEFAULTVALUE>
-<!--C50EF7F2D9C440BDBEE293BA9A4C8BA8-->  <ISKEY><![CDATA[N]]></ISKEY>
-<!--C50EF7F2D9C440BDBEE293BA9A4C8BA8-->  <ISPARENT><![CDATA[N]]></ISPARENT>
-<!--C50EF7F2D9C440BDBEE293BA9A4C8BA8-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
-<!--C50EF7F2D9C440BDBEE293BA9A4C8BA8-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
-<!--C50EF7F2D9C440BDBEE293BA9A4C8BA8-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
-<!--C50EF7F2D9C440BDBEE293BA9A4C8BA8-->  <SEQNO><![CDATA[70]]></SEQNO>
-<!--C50EF7F2D9C440BDBEE293BA9A4C8BA8-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
-<!--C50EF7F2D9C440BDBEE293BA9A4C8BA8-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--C50EF7F2D9C440BDBEE293BA9A4C8BA8-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--C50EF7F2D9C440BDBEE293BA9A4C8BA8-->  <AD_ELEMENT_ID><![CDATA[607]]></AD_ELEMENT_ID>
-<!--C50EF7F2D9C440BDBEE293BA9A4C8BA8-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
-<!--C50EF7F2D9C440BDBEE293BA9A4C8BA8-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
-<!--C50EF7F2D9C440BDBEE293BA9A4C8BA8-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
-<!--C50EF7F2D9C440BDBEE293BA9A4C8BA8-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
-<!--C50EF7F2D9C440BDBEE293BA9A4C8BA8-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--C50EF7F2D9C440BDBEE293BA9A4C8BA8-->  <POSITION><![CDATA[7]]></POSITION>
-<!--C50EF7F2D9C440BDBEE293BA9A4C8BA8-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
-<!--C50EF7F2D9C440BDBEE293BA9A4C8BA8-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
-<!--C50EF7F2D9C440BDBEE293BA9A4C8BA8-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
-<!--C50EF7F2D9C440BDBEE293BA9A4C8BA8-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
-<!--C50EF7F2D9C440BDBEE293BA9A4C8BA8-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
-<!--C50EF7F2D9C440BDBEE293BA9A4C8BA8-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
-<!--C50EF7F2D9C440BDBEE293BA9A4C8BA8-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
-<!--C50EF7F2D9C440BDBEE293BA9A4C8BA8--></AD_COLUMN>
-
 <!--C523906F9ACC461A9C95D7DEB111D566--><AD_COLUMN>
 <!--C523906F9ACC461A9C95D7DEB111D566-->  <AD_COLUMN_ID><![CDATA[C523906F9ACC461A9C95D7DEB111D566]]></AD_COLUMN_ID>
 <!--C523906F9ACC461A9C95D7DEB111D566-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -351334,41 +350846,6 @@
 <!--D61411AE7BB049FC9456BC9F1169B67F-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
 <!--D61411AE7BB049FC9456BC9F1169B67F--></AD_COLUMN>
 
-<!--D62BD0E419D6419A91C9FB342E8A6756--><AD_COLUMN>
-<!--D62BD0E419D6419A91C9FB342E8A6756-->  <AD_COLUMN_ID><![CDATA[D62BD0E419D6419A91C9FB342E8A6756]]></AD_COLUMN_ID>
-<!--D62BD0E419D6419A91C9FB342E8A6756-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--D62BD0E419D6419A91C9FB342E8A6756-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--D62BD0E419D6419A91C9FB342E8A6756-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--D62BD0E419D6419A91C9FB342E8A6756-->  <NAME><![CDATA[AD_File_ID]]></NAME>
-<!--D62BD0E419D6419A91C9FB342E8A6756-->  <COLUMNNAME><![CDATA[AD_File_ID]]></COLUMNNAME>
-<!--D62BD0E419D6419A91C9FB342E8A6756-->  <AD_TABLE_ID><![CDATA[7A0FF566741E4C8B8B4540609D1E382B]]></AD_TABLE_ID>
-<!--D62BD0E419D6419A91C9FB342E8A6756-->  <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
-<!--D62BD0E419D6419A91C9FB342E8A6756-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
-<!--D62BD0E419D6419A91C9FB342E8A6756-->  <ISKEY><![CDATA[Y]]></ISKEY>
-<!--D62BD0E419D6419A91C9FB342E8A6756-->  <ISPARENT><![CDATA[N]]></ISPARENT>
-<!--D62BD0E419D6419A91C9FB342E8A6756-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
-<!--D62BD0E419D6419A91C9FB342E8A6756-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
-<!--D62BD0E419D6419A91C9FB342E8A6756-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
-<!--D62BD0E419D6419A91C9FB342E8A6756-->  <SEQNO><![CDATA[10]]></SEQNO>
-<!--D62BD0E419D6419A91C9FB342E8A6756-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
-<!--D62BD0E419D6419A91C9FB342E8A6756-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--D62BD0E419D6419A91C9FB342E8A6756-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--D62BD0E419D6419A91C9FB342E8A6756-->  <AD_ELEMENT_ID><![CDATA[7EFFE65A2D684D03BEC8228602B9A545]]></AD_ELEMENT_ID>
-<!--D62BD0E419D6419A91C9FB342E8A6756-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
-<!--D62BD0E419D6419A91C9FB342E8A6756-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
-<!--D62BD0E419D6419A91C9FB342E8A6756-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
-<!--D62BD0E419D6419A91C9FB342E8A6756-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
-<!--D62BD0E419D6419A91C9FB342E8A6756-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--D62BD0E419D6419A91C9FB342E8A6756-->  <POSITION><![CDATA[1]]></POSITION>
-<!--D62BD0E419D6419A91C9FB342E8A6756-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
-<!--D62BD0E419D6419A91C9FB342E8A6756-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
-<!--D62BD0E419D6419A91C9FB342E8A6756-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
-<!--D62BD0E419D6419A91C9FB342E8A6756-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
-<!--D62BD0E419D6419A91C9FB342E8A6756-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
-<!--D62BD0E419D6419A91C9FB342E8A6756-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
-<!--D62BD0E419D6419A91C9FB342E8A6756-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
-<!--D62BD0E419D6419A91C9FB342E8A6756--></AD_COLUMN>
-
 <!--D64045B0DE3C46769D2B225CDC4A6F30--><AD_COLUMN>
 <!--D64045B0DE3C46769D2B225CDC4A6F30-->  <AD_COLUMN_ID><![CDATA[D64045B0DE3C46769D2B225CDC4A6F30]]></AD_COLUMN_ID>
 <!--D64045B0DE3C46769D2B225CDC4A6F30-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -356352,43 +355829,6 @@
 <!--DB59C7DACFC24CAA857DCC94332DE6E4-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
 <!--DB59C7DACFC24CAA857DCC94332DE6E4--></AD_COLUMN>
 
-<!--DB905AED8FA34349B1BFD638A106D439--><AD_COLUMN>
-<!--DB905AED8FA34349B1BFD638A106D439-->  <AD_COLUMN_ID><![CDATA[DB905AED8FA34349B1BFD638A106D439]]></AD_COLUMN_ID>
-<!--DB905AED8FA34349B1BFD638A106D439-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--DB905AED8FA34349B1BFD638A106D439-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--DB905AED8FA34349B1BFD638A106D439-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--DB905AED8FA34349B1BFD638A106D439-->  <NAME><![CDATA[Fileextensions]]></NAME>
-<!--DB905AED8FA34349B1BFD638A106D439-->  <DESCRIPTION><![CDATA[File Extensions]]></DESCRIPTION>
-<!--DB905AED8FA34349B1BFD638A106D439-->  <HELP><![CDATA[File name extensions separated by comma allowed to be stored.]]></HELP>
-<!--DB905AED8FA34349B1BFD638A106D439-->  <COLUMNNAME><![CDATA[Fileextensions]]></COLUMNNAME>
-<!--DB905AED8FA34349B1BFD638A106D439-->  <AD_TABLE_ID><![CDATA[101]]></AD_TABLE_ID>
-<!--DB905AED8FA34349B1BFD638A106D439-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
-<!--DB905AED8FA34349B1BFD638A106D439-->  <FIELDLENGTH><![CDATA[2000]]></FIELDLENGTH>
-<!--DB905AED8FA34349B1BFD638A106D439-->  <ISKEY><![CDATA[N]]></ISKEY>
-<!--DB905AED8FA34349B1BFD638A106D439-->  <ISPARENT><![CDATA[N]]></ISPARENT>
-<!--DB905AED8FA34349B1BFD638A106D439-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
-<!--DB905AED8FA34349B1BFD638A106D439-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
-<!--DB905AED8FA34349B1BFD638A106D439-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
-<!--DB905AED8FA34349B1BFD638A106D439-->  <SEQNO><![CDATA[201]]></SEQNO>
-<!--DB905AED8FA34349B1BFD638A106D439-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
-<!--DB905AED8FA34349B1BFD638A106D439-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--DB905AED8FA34349B1BFD638A106D439-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--DB905AED8FA34349B1BFD638A106D439-->  <AD_ELEMENT_ID><![CDATA[5506BFDD31C14C88884014D20979ED5D]]></AD_ELEMENT_ID>
-<!--DB905AED8FA34349B1BFD638A106D439-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
-<!--DB905AED8FA34349B1BFD638A106D439-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
-<!--DB905AED8FA34349B1BFD638A106D439-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
-<!--DB905AED8FA34349B1BFD638A106D439-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
-<!--DB905AED8FA34349B1BFD638A106D439-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--DB905AED8FA34349B1BFD638A106D439-->  <POSITION><![CDATA[54]]></POSITION>
-<!--DB905AED8FA34349B1BFD638A106D439-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
-<!--DB905AED8FA34349B1BFD638A106D439-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
-<!--DB905AED8FA34349B1BFD638A106D439-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
-<!--DB905AED8FA34349B1BFD638A106D439-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
-<!--DB905AED8FA34349B1BFD638A106D439-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
-<!--DB905AED8FA34349B1BFD638A106D439-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
-<!--DB905AED8FA34349B1BFD638A106D439-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
-<!--DB905AED8FA34349B1BFD638A106D439--></AD_COLUMN>
-
 <!--DBC7B14E6B2E4660BF5B37B5FA56F148--><AD_COLUMN>
 <!--DBC7B14E6B2E4660BF5B37B5FA56F148-->  <AD_COLUMN_ID><![CDATA[DBC7B14E6B2E4660BF5B37B5FA56F148]]></AD_COLUMN_ID>
 <!--DBC7B14E6B2E4660BF5B37B5FA56F148-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_DATASET_TABLE.xml	Thu Feb 18 15:22:50 2016 +0100
+++ b/src-db/database/sourcedata/AD_DATASET_TABLE.xml	Thu Feb 18 15:23:29 2016 +0100
@@ -210,20 +210,6 @@
 <!--016788FA8C6B48F7AFD34BB0288CA700-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--016788FA8C6B48F7AFD34BB0288CA700--></AD_DATASET_TABLE>
 
-<!--01A37175A8B746168D872531F512B015--><AD_DATASET_TABLE>
-<!--01A37175A8B746168D872531F512B015-->  <AD_DATASET_TABLE_ID><![CDATA[01A37175A8B746168D872531F512B015]]></AD_DATASET_TABLE_ID>
-<!--01A37175A8B746168D872531F512B015-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--01A37175A8B746168D872531F512B015-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--01A37175A8B746168D872531F512B015-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--01A37175A8B746168D872531F512B015-->  <AD_DATASET_ID><![CDATA[D81C5C810AEF47C690E4F688ABC8AAC8]]></AD_DATASET_ID>
-<!--01A37175A8B746168D872531F512B015-->  <AD_TABLE_ID><![CDATA[7A0FF566741E4C8B8B4540609D1E382B]]></AD_TABLE_ID>
-<!--01A37175A8B746168D872531F512B015-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--01A37175A8B746168D872531F512B015-->  <WHERECLAUSE><![CDATA[client.id=:ClientID]]></WHERECLAUSE>
-<!--01A37175A8B746168D872531F512B015-->  <EXCLUDEAUDITINFO><![CDATA[N]]></EXCLUDEAUDITINFO>
-<!--01A37175A8B746168D872531F512B015-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
-<!--01A37175A8B746168D872531F512B015-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--01A37175A8B746168D872531F512B015--></AD_DATASET_TABLE>
-
 <!--02D940C2122349C69B38C7870E7B3BBC--><AD_DATASET_TABLE>
 <!--02D940C2122349C69B38C7870E7B3BBC-->  <AD_DATASET_TABLE_ID><![CDATA[02D940C2122349C69B38C7870E7B3BBC]]></AD_DATASET_TABLE_ID>
 <!--02D940C2122349C69B38C7870E7B3BBC-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_ELEMENT.xml	Thu Feb 18 15:22:50 2016 +0100
+++ b/src-db/database/sourcedata/AD_ELEMENT.xml	Thu Feb 18 15:23:29 2016 +0100
@@ -21268,20 +21268,6 @@
 <!--0D1F9C2D797C49A7AA476A3047DC075A-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--0D1F9C2D797C49A7AA476A3047DC075A--></AD_ELEMENT>
 
-<!--0D3864627CFC4961A414F7E89FAE6E86--><AD_ELEMENT>
-<!--0D3864627CFC4961A414F7E89FAE6E86-->  <AD_ELEMENT_ID><![CDATA[0D3864627CFC4961A414F7E89FAE6E86]]></AD_ELEMENT_ID>
-<!--0D3864627CFC4961A414F7E89FAE6E86-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--0D3864627CFC4961A414F7E89FAE6E86-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--0D3864627CFC4961A414F7E89FAE6E86-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--0D3864627CFC4961A414F7E89FAE6E86-->  <COLUMNNAME><![CDATA[Filemaxsize]]></COLUMNNAME>
-<!--0D3864627CFC4961A414F7E89FAE6E86-->  <NAME><![CDATA[File Max Size]]></NAME>
-<!--0D3864627CFC4961A414F7E89FAE6E86-->  <PRINTNAME><![CDATA[File Max Size]]></PRINTNAME>
-<!--0D3864627CFC4961A414F7E89FAE6E86-->  <DESCRIPTION><![CDATA[File Max Size]]></DESCRIPTION>
-<!--0D3864627CFC4961A414F7E89FAE6E86-->  <HELP><![CDATA[file maximum size allowed to be stored.]]></HELP>
-<!--0D3864627CFC4961A414F7E89FAE6E86-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--0D3864627CFC4961A414F7E89FAE6E86-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
-<!--0D3864627CFC4961A414F7E89FAE6E86--></AD_ELEMENT>
-
 <!--0DCA4840773E45198061B6F1E5F22841--><AD_ELEMENT>
 <!--0DCA4840773E45198061B6F1E5F22841-->  <AD_ELEMENT_ID><![CDATA[0DCA4840773E45198061B6F1E5F22841]]></AD_ELEMENT_ID>
 <!--0DCA4840773E45198061B6F1E5F22841-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -24078,20 +24064,6 @@
 <!--5491745132934260A5F00EF178EBC04B-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--5491745132934260A5F00EF178EBC04B--></AD_ELEMENT>
 
-<!--5506BFDD31C14C88884014D20979ED5D--><AD_ELEMENT>
-<!--5506BFDD31C14C88884014D20979ED5D-->  <AD_ELEMENT_ID><![CDATA[5506BFDD31C14C88884014D20979ED5D]]></AD_ELEMENT_ID>
-<!--5506BFDD31C14C88884014D20979ED5D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--5506BFDD31C14C88884014D20979ED5D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--5506BFDD31C14C88884014D20979ED5D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--5506BFDD31C14C88884014D20979ED5D-->  <COLUMNNAME><![CDATA[Fileextensions]]></COLUMNNAME>
-<!--5506BFDD31C14C88884014D20979ED5D-->  <NAME><![CDATA[File Extensions]]></NAME>
-<!--5506BFDD31C14C88884014D20979ED5D-->  <PRINTNAME><![CDATA[File Extensions]]></PRINTNAME>
-<!--5506BFDD31C14C88884014D20979ED5D-->  <DESCRIPTION><![CDATA[File Extensions]]></DESCRIPTION>
-<!--5506BFDD31C14C88884014D20979ED5D-->  <HELP><![CDATA[File name extensions separated by comma allowed to be stored.]]></HELP>
-<!--5506BFDD31C14C88884014D20979ED5D-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--5506BFDD31C14C88884014D20979ED5D-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
-<!--5506BFDD31C14C88884014D20979ED5D--></AD_ELEMENT>
-
 <!--557DE7C402C04DE9AFC02935F933FECC--><AD_ELEMENT>
 <!--557DE7C402C04DE9AFC02935F933FECC-->  <AD_ELEMENT_ID><![CDATA[557DE7C402C04DE9AFC02935F933FECC]]></AD_ELEMENT_ID>
 <!--557DE7C402C04DE9AFC02935F933FECC-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -27676,18 +27648,6 @@
 <!--7EC3B5CF03729057E040007F010110BF-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--7EC3B5CF03729057E040007F010110BF--></AD_ELEMENT>
 
-<!--7EFFE65A2D684D03BEC8228602B9A545--><AD_ELEMENT>
-<!--7EFFE65A2D684D03BEC8228602B9A545-->  <AD_ELEMENT_ID><![CDATA[7EFFE65A2D684D03BEC8228602B9A545]]></AD_ELEMENT_ID>
-<!--7EFFE65A2D684D03BEC8228602B9A545-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--7EFFE65A2D684D03BEC8228602B9A545-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--7EFFE65A2D684D03BEC8228602B9A545-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--7EFFE65A2D684D03BEC8228602B9A545-->  <COLUMNNAME><![CDATA[AD_File_ID]]></COLUMNNAME>
-<!--7EFFE65A2D684D03BEC8228602B9A545-->  <NAME><![CDATA[AD_File_ID]]></NAME>
-<!--7EFFE65A2D684D03BEC8228602B9A545-->  <PRINTNAME><![CDATA[AD_File_ID]]></PRINTNAME>
-<!--7EFFE65A2D684D03BEC8228602B9A545-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--7EFFE65A2D684D03BEC8228602B9A545-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
-<!--7EFFE65A2D684D03BEC8228602B9A545--></AD_ELEMENT>
-
 <!--7F4D0513811345AA84C7FF1E3CFD5EEC--><AD_ELEMENT>
 <!--7F4D0513811345AA84C7FF1E3CFD5EEC-->  <AD_ELEMENT_ID><![CDATA[7F4D0513811345AA84C7FF1E3CFD5EEC]]></AD_ELEMENT_ID>
 <!--7F4D0513811345AA84C7FF1E3CFD5EEC-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -30501,18 +30461,6 @@
 <!--A4827245681B4DB7AD944A73AF231759-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--A4827245681B4DB7AD944A73AF231759--></AD_ELEMENT>
 
-<!--A4F46D47A4284AA8957CFC4C20BCD5BB--><AD_ELEMENT>
-<!--A4F46D47A4284AA8957CFC4C20BCD5BB-->  <AD_ELEMENT_ID><![CDATA[A4F46D47A4284AA8957CFC4C20BCD5BB]]></AD_ELEMENT_ID>
-<!--A4F46D47A4284AA8957CFC4C20BCD5BB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--A4F46D47A4284AA8957CFC4C20BCD5BB-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--A4F46D47A4284AA8957CFC4C20BCD5BB-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--A4F46D47A4284AA8957CFC4C20BCD5BB-->  <COLUMNNAME><![CDATA[Filesize]]></COLUMNNAME>
-<!--A4F46D47A4284AA8957CFC4C20BCD5BB-->  <NAME><![CDATA[Filesize]]></NAME>
-<!--A4F46D47A4284AA8957CFC4C20BCD5BB-->  <PRINTNAME><![CDATA[Filesize]]></PRINTNAME>
-<!--A4F46D47A4284AA8957CFC4C20BCD5BB-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--A4F46D47A4284AA8957CFC4C20BCD5BB-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
-<!--A4F46D47A4284AA8957CFC4C20BCD5BB--></AD_ELEMENT>
-
 <!--A5A0A7C3D96546C0A69CB04EC35BF351--><AD_ELEMENT>
 <!--A5A0A7C3D96546C0A69CB04EC35BF351-->  <AD_ELEMENT_ID><![CDATA[A5A0A7C3D96546C0A69CB04EC35BF351]]></AD_ELEMENT_ID>
 <!--A5A0A7C3D96546C0A69CB04EC35BF351-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -30954,20 +30902,6 @@
 <!--AFEC76A1618B47CA85630F223540FA38-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--AFEC76A1618B47CA85630F223540FA38--></AD_ELEMENT>
 
-<!--AFED41FA6F1D4209B9DB0980197AF53B--><AD_ELEMENT>
-<!--AFED41FA6F1D4209B9DB0980197AF53B-->  <AD_ELEMENT_ID><![CDATA[AFED41FA6F1D4209B9DB0980197AF53B]]></AD_ELEMENT_ID>
-<!--AFED41FA6F1D4209B9DB0980197AF53B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--AFED41FA6F1D4209B9DB0980197AF53B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--AFED41FA6F1D4209B9DB0980197AF53B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--AFED41FA6F1D4209B9DB0980197AF53B-->  <COLUMNNAME><![CDATA[Filemaxsizeunit]]></COLUMNNAME>
-<!--AFED41FA6F1D4209B9DB0980197AF53B-->  <NAME><![CDATA[File Max Size Unit]]></NAME>
-<!--AFED41FA6F1D4209B9DB0980197AF53B-->  <PRINTNAME><![CDATA[File Max Size Unit]]></PRINTNAME>
-<!--AFED41FA6F1D4209B9DB0980197AF53B-->  <DESCRIPTION><![CDATA[File Max Size Unit]]></DESCRIPTION>
-<!--AFED41FA6F1D4209B9DB0980197AF53B-->  <HELP><![CDATA[Unit used to define the file maximum size allowed to be stored. It can be: B, KB, MB or GB.]]></HELP>
-<!--AFED41FA6F1D4209B9DB0980197AF53B-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--AFED41FA6F1D4209B9DB0980197AF53B-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
-<!--AFED41FA6F1D4209B9DB0980197AF53B--></AD_ELEMENT>
-
 <!--B04AF439C0EDCC90E040007F010032CD--><AD_ELEMENT>
 <!--B04AF439C0EDCC90E040007F010032CD-->  <AD_ELEMENT_ID><![CDATA[B04AF439C0EDCC90E040007F010032CD]]></AD_ELEMENT_ID>
 <!--B04AF439C0EDCC90E040007F010032CD-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_FIELD.xml	Thu Feb 18 15:22:50 2016 +0100
+++ b/src-db/database/sourcedata/AD_FIELD.xml	Thu Feb 18 15:23:29 2016 +0100
@@ -182755,32 +182755,6 @@
 <!--0D99028F130B4764A8DC0EE776FE9AB1-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--0D99028F130B4764A8DC0EE776FE9AB1--></AD_FIELD>
 
-<!--0DCE0916FD934291B2000943CD9956D2--><AD_FIELD>
-<!--0DCE0916FD934291B2000943CD9956D2-->  <AD_FIELD_ID><![CDATA[0DCE0916FD934291B2000943CD9956D2]]></AD_FIELD_ID>
-<!--0DCE0916FD934291B2000943CD9956D2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--0DCE0916FD934291B2000943CD9956D2-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--0DCE0916FD934291B2000943CD9956D2-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--0DCE0916FD934291B2000943CD9956D2-->  <NAME><![CDATA[Filesize]]></NAME>
-<!--0DCE0916FD934291B2000943CD9956D2-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
-<!--0DCE0916FD934291B2000943CD9956D2-->  <AD_TAB_ID><![CDATA[6882148AC8B046318FC69D7628727050]]></AD_TAB_ID>
-<!--0DCE0916FD934291B2000943CD9956D2-->  <AD_COLUMN_ID><![CDATA[B54B7A0AB8AB490BA64080293311DA20]]></AD_COLUMN_ID>
-<!--0DCE0916FD934291B2000943CD9956D2-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
-<!--0DCE0916FD934291B2000943CD9956D2-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--0DCE0916FD934291B2000943CD9956D2-->  <DISPLAYLENGTH><![CDATA[12]]></DISPLAYLENGTH>
-<!--0DCE0916FD934291B2000943CD9956D2-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--0DCE0916FD934291B2000943CD9956D2-->  <SEQNO><![CDATA[50]]></SEQNO>
-<!--0DCE0916FD934291B2000943CD9956D2-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
-<!--0DCE0916FD934291B2000943CD9956D2-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
-<!--0DCE0916FD934291B2000943CD9956D2-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--0DCE0916FD934291B2000943CD9956D2-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
-<!--0DCE0916FD934291B2000943CD9956D2-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
-<!--0DCE0916FD934291B2000943CD9956D2-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--0DCE0916FD934291B2000943CD9956D2-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
-<!--0DCE0916FD934291B2000943CD9956D2-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
-<!--0DCE0916FD934291B2000943CD9956D2-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
-<!--0DCE0916FD934291B2000943CD9956D2-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
-<!--0DCE0916FD934291B2000943CD9956D2--></AD_FIELD>
-
 <!--0DD33819894E498CA0DA60FDA02F37DD--><AD_FIELD>
 <!--0DD33819894E498CA0DA60FDA02F37DD-->  <AD_FIELD_ID><![CDATA[0DD33819894E498CA0DA60FDA02F37DD]]></AD_FIELD_ID>
 <!--0DD33819894E498CA0DA60FDA02F37DD-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -228259,35 +228233,6 @@
 <!--665D8ADA760E42879A30B63A8064FB05-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--665D8ADA760E42879A30B63A8064FB05--></AD_FIELD>
 
-<!--6691241CE9374A95A529477BC869CC08--><AD_FIELD>
-<!--6691241CE9374A95A529477BC869CC08-->  <AD_FIELD_ID><![CDATA[6691241CE9374A95A529477BC869CC08]]></AD_FIELD_ID>
-<!--6691241CE9374A95A529477BC869CC08-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--6691241CE9374A95A529477BC869CC08-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--6691241CE9374A95A529477BC869CC08-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--6691241CE9374A95A529477BC869CC08-->  <NAME><![CDATA[File Max Size]]></NAME>
-<!--6691241CE9374A95A529477BC869CC08-->  <DESCRIPTION><![CDATA[File Max Size]]></DESCRIPTION>
-<!--6691241CE9374A95A529477BC869CC08-->  <HELP><![CDATA[file maximum size allowed to be stored.]]></HELP>
-<!--6691241CE9374A95A529477BC869CC08-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
-<!--6691241CE9374A95A529477BC869CC08-->  <AD_TAB_ID><![CDATA[101]]></AD_TAB_ID>
-<!--6691241CE9374A95A529477BC869CC08-->  <AD_COLUMN_ID><![CDATA[C0EE5FB7B5794FBD9F2655C1DE55133D]]></AD_COLUMN_ID>
-<!--6691241CE9374A95A529477BC869CC08-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
-<!--6691241CE9374A95A529477BC869CC08-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--6691241CE9374A95A529477BC869CC08-->  <DISPLAYLOGIC><![CDATA[@ad_reference_id@='2B10E78241C94282867D5E750F994D14']]></DISPLAYLOGIC>
-<!--6691241CE9374A95A529477BC869CC08-->  <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
-<!--6691241CE9374A95A529477BC869CC08-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--6691241CE9374A95A529477BC869CC08-->  <SEQNO><![CDATA[400]]></SEQNO>
-<!--6691241CE9374A95A529477BC869CC08-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
-<!--6691241CE9374A95A529477BC869CC08-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
-<!--6691241CE9374A95A529477BC869CC08-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--6691241CE9374A95A529477BC869CC08-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
-<!--6691241CE9374A95A529477BC869CC08-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
-<!--6691241CE9374A95A529477BC869CC08-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--6691241CE9374A95A529477BC869CC08-->  <STARTINODDCOLUMN><![CDATA[Y]]></STARTINODDCOLUMN>
-<!--6691241CE9374A95A529477BC869CC08-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
-<!--6691241CE9374A95A529477BC869CC08-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
-<!--6691241CE9374A95A529477BC869CC08-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
-<!--6691241CE9374A95A529477BC869CC08--></AD_FIELD>
-
 <!--66957626EA51492295FC1477E1CDC936--><AD_FIELD>
 <!--66957626EA51492295FC1477E1CDC936-->  <AD_FIELD_ID><![CDATA[66957626EA51492295FC1477E1CDC936]]></AD_FIELD_ID>
 <!--66957626EA51492295FC1477E1CDC936-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -230342,35 +230287,6 @@
 <!--6C8B4DB8B83C46A8B54EA1624A7D9BF7-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--6C8B4DB8B83C46A8B54EA1624A7D9BF7--></AD_FIELD>
 
-<!--6C8C38F30F3B472D940694442C48D781--><AD_FIELD>
-<!--6C8C38F30F3B472D940694442C48D781-->  <AD_FIELD_ID><![CDATA[6C8C38F30F3B472D940694442C48D781]]></AD_FIELD_ID>
-<!--6C8C38F30F3B472D940694442C48D781-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--6C8C38F30F3B472D940694442C48D781-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--6C8C38F30F3B472D940694442C48D781-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--6C8C38F30F3B472D940694442C48D781-->  <NAME><![CDATA[File Max Size Unit]]></NAME>
-<!--6C8C38F30F3B472D940694442C48D781-->  <DESCRIPTION><![CDATA[File Max Size Unit]]></DESCRIPTION>
-<!--6C8C38F30F3B472D940694442C48D781-->  <HELP><![CDATA[Unit used to define the file maximum size allowed to be stored. It can be: B, KB, MB or GB.]]></HELP>
-<!--6C8C38F30F3B472D940694442C48D781-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
-<!--6C8C38F30F3B472D940694442C48D781-->  <AD_TAB_ID><![CDATA[101]]></AD_TAB_ID>
-<!--6C8C38F30F3B472D940694442C48D781-->  <AD_COLUMN_ID><![CDATA[6F3C36CC74C34FD2B624651280F67858]]></AD_COLUMN_ID>
-<!--6C8C38F30F3B472D940694442C48D781-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
-<!--6C8C38F30F3B472D940694442C48D781-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--6C8C38F30F3B472D940694442C48D781-->  <DISPLAYLOGIC><![CDATA[@ad_reference_id@='2B10E78241C94282867D5E750F994D14']]></DISPLAYLOGIC>
-<!--6C8C38F30F3B472D940694442C48D781-->  <DISPLAYLENGTH><![CDATA[60]]></DISPLAYLENGTH>
-<!--6C8C38F30F3B472D940694442C48D781-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--6C8C38F30F3B472D940694442C48D781-->  <SEQNO><![CDATA[410]]></SEQNO>
-<!--6C8C38F30F3B472D940694442C48D781-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
-<!--6C8C38F30F3B472D940694442C48D781-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
-<!--6C8C38F30F3B472D940694442C48D781-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--6C8C38F30F3B472D940694442C48D781-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
-<!--6C8C38F30F3B472D940694442C48D781-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
-<!--6C8C38F30F3B472D940694442C48D781-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--6C8C38F30F3B472D940694442C48D781-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
-<!--6C8C38F30F3B472D940694442C48D781-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
-<!--6C8C38F30F3B472D940694442C48D781-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
-<!--6C8C38F30F3B472D940694442C48D781-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
-<!--6C8C38F30F3B472D940694442C48D781--></AD_FIELD>
-
 <!--6CAE8771333E46698C87F963193332D8--><AD_FIELD>
 <!--6CAE8771333E46698C87F963193332D8-->  <AD_FIELD_ID><![CDATA[6CAE8771333E46698C87F963193332D8]]></AD_FIELD_ID>
 <!--6CAE8771333E46698C87F963193332D8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -238604,32 +238520,6 @@
 <!--7D020376FB5F4BFFB7FC4C759B9FFA74-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--7D020376FB5F4BFFB7FC4C759B9FFA74--></AD_FIELD>
 
-<!--7D03A183389E4876A5E436F777246BE2--><AD_FIELD>
-<!--7D03A183389E4876A5E436F777246BE2-->  <AD_FIELD_ID><![CDATA[7D03A183389E4876A5E436F777246BE2]]></AD_FIELD_ID>
-<!--7D03A183389E4876A5E436F777246BE2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--7D03A183389E4876A5E436F777246BE2-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--7D03A183389E4876A5E436F777246BE2-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--7D03A183389E4876A5E436F777246BE2-->  <NAME><![CDATA[Mimetype]]></NAME>
-<!--7D03A183389E4876A5E436F777246BE2-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
-<!--7D03A183389E4876A5E436F777246BE2-->  <AD_TAB_ID><![CDATA[6882148AC8B046318FC69D7628727050]]></AD_TAB_ID>
-<!--7D03A183389E4876A5E436F777246BE2-->  <AD_COLUMN_ID><![CDATA[5ED5BE44C6BC4E96A7C0163DF1BF9BD7]]></AD_COLUMN_ID>
-<!--7D03A183389E4876A5E436F777246BE2-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
-<!--7D03A183389E4876A5E436F777246BE2-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--7D03A183389E4876A5E436F777246BE2-->  <DISPLAYLENGTH><![CDATA[255]]></DISPLAYLENGTH>
-<!--7D03A183389E4876A5E436F777246BE2-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--7D03A183389E4876A5E436F777246BE2-->  <SEQNO><![CDATA[40]]></SEQNO>
-<!--7D03A183389E4876A5E436F777246BE2-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
-<!--7D03A183389E4876A5E436F777246BE2-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
-<!--7D03A183389E4876A5E436F777246BE2-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--7D03A183389E4876A5E436F777246BE2-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
-<!--7D03A183389E4876A5E436F777246BE2-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
-<!--7D03A183389E4876A5E436F777246BE2-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--7D03A183389E4876A5E436F777246BE2-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
-<!--7D03A183389E4876A5E436F777246BE2-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
-<!--7D03A183389E4876A5E436F777246BE2-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
-<!--7D03A183389E4876A5E436F777246BE2-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
-<!--7D03A183389E4876A5E436F777246BE2--></AD_FIELD>
-
 <!--7D0BAB123C0049CFAC96BEB0269A45BF--><AD_FIELD>
 <!--7D0BAB123C0049CFAC96BEB0269A45BF-->  <AD_FIELD_ID><![CDATA[7D0BAB123C0049CFAC96BEB0269A45BF]]></AD_FIELD_ID>
 <!--7D0BAB123C0049CFAC96BEB0269A45BF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -264825,33 +264715,6 @@
 <!--A9686A8ABB9B41E1942E9AD90D3397E9-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--A9686A8ABB9B41E1942E9AD90D3397E9--></AD_FIELD>
 
-<!--A9966287782E45578910FC05C9F128EE--><AD_FIELD>
-<!--A9966287782E45578910FC05C9F128EE-->  <AD_FIELD_ID><![CDATA[A9966287782E45578910FC05C9F128EE]]></AD_FIELD_ID>
-<!--A9966287782E45578910FC05C9F128EE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--A9966287782E45578910FC05C9F128EE-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--A9966287782E45578910FC05C9F128EE-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--A9966287782E45578910FC05C9F128EE-->  <NAME><![CDATA[Client]]></NAME>
-<!--A9966287782E45578910FC05C9F128EE-->  <DESCRIPTION><![CDATA[Client for this installation.]]></DESCRIPTION>
-<!--A9966287782E45578910FC05C9F128EE-->  <HELP><![CDATA[A Client is a company or a legal entity. You cannot share data between Clients.]]></HELP>
-<!--A9966287782E45578910FC05C9F128EE-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
-<!--A9966287782E45578910FC05C9F128EE-->  <AD_TAB_ID><![CDATA[6882148AC8B046318FC69D7628727050]]></AD_TAB_ID>
-<!--A9966287782E45578910FC05C9F128EE-->  <AD_COLUMN_ID><![CDATA[78A12B09DD6F4138A091C5E4ABDCFCCA]]></AD_COLUMN_ID>
-<!--A9966287782E45578910FC05C9F128EE-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
-<!--A9966287782E45578910FC05C9F128EE-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
-<!--A9966287782E45578910FC05C9F128EE-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
-<!--A9966287782E45578910FC05C9F128EE-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--A9966287782E45578910FC05C9F128EE-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
-<!--A9966287782E45578910FC05C9F128EE-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
-<!--A9966287782E45578910FC05C9F128EE-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--A9966287782E45578910FC05C9F128EE-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
-<!--A9966287782E45578910FC05C9F128EE-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
-<!--A9966287782E45578910FC05C9F128EE-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--A9966287782E45578910FC05C9F128EE-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
-<!--A9966287782E45578910FC05C9F128EE-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
-<!--A9966287782E45578910FC05C9F128EE-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
-<!--A9966287782E45578910FC05C9F128EE-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
-<!--A9966287782E45578910FC05C9F128EE--></AD_FIELD>
-
 <!--A9AA1AAD978D44A1B10C2117E1232609--><AD_FIELD>
 <!--A9AA1AAD978D44A1B10C2117E1232609-->  <AD_FIELD_ID><![CDATA[A9AA1AAD978D44A1B10C2117E1232609]]></AD_FIELD_ID>
 <!--A9AA1AAD978D44A1B10C2117E1232609-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -274883,34 +274746,6 @@
 <!--B1E12E0B94FA45CB8D0E3F51160705E0-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--B1E12E0B94FA45CB8D0E3F51160705E0--></AD_FIELD>
 
-<!--B1E50F7E343B401A8D629C1347EBD3A5--><AD_FIELD>
-<!--B1E50F7E343B401A8D629C1347EBD3A5-->  <AD_FIELD_ID><![CDATA[B1E50F7E343B401A8D629C1347EBD3A5]]></AD_FIELD_ID>
-<!--B1E50F7E343B401A8D629C1347EBD3A5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--B1E50F7E343B401A8D629C1347EBD3A5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--B1E50F7E343B401A8D629C1347EBD3A5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--B1E50F7E343B401A8D629C1347EBD3A5-->  <NAME><![CDATA[Bindary Data]]></NAME>
-<!--B1E50F7E343B401A8D629C1347EBD3A5-->  <DESCRIPTION><![CDATA[Binary Data]]></DESCRIPTION>
-<!--B1E50F7E343B401A8D629C1347EBD3A5-->  <HELP><![CDATA[The Binary field stores binary data.]]></HELP>
-<!--B1E50F7E343B401A8D629C1347EBD3A5-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
-<!--B1E50F7E343B401A8D629C1347EBD3A5-->  <AD_TAB_ID><![CDATA[6882148AC8B046318FC69D7628727050]]></AD_TAB_ID>
-<!--B1E50F7E343B401A8D629C1347EBD3A5-->  <AD_COLUMN_ID><![CDATA[9909BD9D50704813BDB5AEAE12C73E9C]]></AD_COLUMN_ID>
-<!--B1E50F7E343B401A8D629C1347EBD3A5-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
-<!--B1E50F7E343B401A8D629C1347EBD3A5-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--B1E50F7E343B401A8D629C1347EBD3A5-->  <DISPLAYLENGTH><![CDATA[4000]]></DISPLAYLENGTH>
-<!--B1E50F7E343B401A8D629C1347EBD3A5-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--B1E50F7E343B401A8D629C1347EBD3A5-->  <SEQNO><![CDATA[60]]></SEQNO>
-<!--B1E50F7E343B401A8D629C1347EBD3A5-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
-<!--B1E50F7E343B401A8D629C1347EBD3A5-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
-<!--B1E50F7E343B401A8D629C1347EBD3A5-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--B1E50F7E343B401A8D629C1347EBD3A5-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
-<!--B1E50F7E343B401A8D629C1347EBD3A5-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
-<!--B1E50F7E343B401A8D629C1347EBD3A5-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--B1E50F7E343B401A8D629C1347EBD3A5-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
-<!--B1E50F7E343B401A8D629C1347EBD3A5-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
-<!--B1E50F7E343B401A8D629C1347EBD3A5-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
-<!--B1E50F7E343B401A8D629C1347EBD3A5-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
-<!--B1E50F7E343B401A8D629C1347EBD3A5--></AD_FIELD>
-
 <!--B1EBC90EB5EAC896E040A8C0280118CA--><AD_FIELD>
 <!--B1EBC90EB5EAC896E040A8C0280118CA-->  <AD_FIELD_ID><![CDATA[B1EBC90EB5EAC896E040A8C0280118CA]]></AD_FIELD_ID>
 <!--B1EBC90EB5EAC896E040A8C0280118CA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -281318,36 +281153,6 @@
 <!--BCF5F27A4E7F452A81F9C4606D593D21-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--BCF5F27A4E7F452A81F9C4606D593D21--></AD_FIELD>
 
-<!--BD412A8BBFED45EDA716715F58122E83--><AD_FIELD>
-<!--BD412A8BBFED45EDA716715F58122E83-->  <AD_FIELD_ID><![CDATA[BD412A8BBFED45EDA716715F58122E83]]></AD_FIELD_ID>
-<!--BD412A8BBFED45EDA716715F58122E83-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--BD412A8BBFED45EDA716715F58122E83-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--BD412A8BBFED45EDA716715F58122E83-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--BD412A8BBFED45EDA716715F58122E83-->  <NAME><![CDATA[Active]]></NAME>
-<!--BD412A8BBFED45EDA716715F58122E83-->  <DESCRIPTION><![CDATA[A flag indicating whether this record is available for use or de-activated.]]></DESCRIPTION>
-<!--BD412A8BBFED45EDA716715F58122E83-->  <HELP><![CDATA[There are two methods of making records unavailable in the system: One is to delete the record, the other is to de-activate the record. A de-activated record is not available for selection, but available for reporting. There are two reasons for de-activating and not deleting records: 
-(1) The system requires the record for auditing purposes.
-(2) The record is referenced by other records. E.g., you cannot delete a Business Partner, if there are existing invoices for it. By de-activating the Business Partner you prevent it from being used in future transactions.]]></HELP>
-<!--BD412A8BBFED45EDA716715F58122E83-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
-<!--BD412A8BBFED45EDA716715F58122E83-->  <AD_TAB_ID><![CDATA[6882148AC8B046318FC69D7628727050]]></AD_TAB_ID>
-<!--BD412A8BBFED45EDA716715F58122E83-->  <AD_COLUMN_ID><![CDATA[37D400F787864A77BB8F1FDF66835882]]></AD_COLUMN_ID>
-<!--BD412A8BBFED45EDA716715F58122E83-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
-<!--BD412A8BBFED45EDA716715F58122E83-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--BD412A8BBFED45EDA716715F58122E83-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
-<!--BD412A8BBFED45EDA716715F58122E83-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--BD412A8BBFED45EDA716715F58122E83-->  <SEQNO><![CDATA[20]]></SEQNO>
-<!--BD412A8BBFED45EDA716715F58122E83-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
-<!--BD412A8BBFED45EDA716715F58122E83-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
-<!--BD412A8BBFED45EDA716715F58122E83-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--BD412A8BBFED45EDA716715F58122E83-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
-<!--BD412A8BBFED45EDA716715F58122E83-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
-<!--BD412A8BBFED45EDA716715F58122E83-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--BD412A8BBFED45EDA716715F58122E83-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
-<!--BD412A8BBFED45EDA716715F58122E83-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
-<!--BD412A8BBFED45EDA716715F58122E83-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
-<!--BD412A8BBFED45EDA716715F58122E83-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
-<!--BD412A8BBFED45EDA716715F58122E83--></AD_FIELD>
-
 <!--BD4BAFB9387C42949E1DA18F63DC4272--><AD_FIELD>
 <!--BD4BAFB9387C42949E1DA18F63DC4272-->  <AD_FIELD_ID><![CDATA[BD4BAFB9387C42949E1DA18F63DC4272]]></AD_FIELD_ID>
 <!--BD4BAFB9387C42949E1DA18F63DC4272-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -283782,35 +283587,6 @@
 <!--C30F6340AF33433F8F3E533082B72481-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--C30F6340AF33433F8F3E533082B72481--></AD_FIELD>
 
-<!--C310253B47D64D93A2C6F23B5DB0156D--><AD_FIELD>
-<!--C310253B47D64D93A2C6F23B5DB0156D-->  <AD_FIELD_ID><![CDATA[C310253B47D64D93A2C6F23B5DB0156D]]></AD_FIELD_ID>
-<!--C310253B47D64D93A2C6F23B5DB0156D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--C310253B47D64D93A2C6F23B5DB0156D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--C310253B47D64D93A2C6F23B5DB0156D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--C310253B47D64D93A2C6F23B5DB0156D-->  <NAME><![CDATA[File Extensions]]></NAME>
-<!--C310253B47D64D93A2C6F23B5DB0156D-->  <DESCRIPTION><![CDATA[File Extensions]]></DESCRIPTION>
-<!--C310253B47D64D93A2C6F23B5DB0156D-->  <HELP><![CDATA[File name extensions separated by comma allowed to be stored.]]></HELP>
-<!--C310253B47D64D93A2C6F23B5DB0156D-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
-<!--C310253B47D64D93A2C6F23B5DB0156D-->  <AD_TAB_ID><![CDATA[101]]></AD_TAB_ID>
-<!--C310253B47D64D93A2C6F23B5DB0156D-->  <AD_COLUMN_ID><![CDATA[DB905AED8FA34349B1BFD638A106D439]]></AD_COLUMN_ID>
-<!--C310253B47D64D93A2C6F23B5DB0156D-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
-<!--C310253B47D64D93A2C6F23B5DB0156D-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--C310253B47D64D93A2C6F23B5DB0156D-->  <DISPLAYLOGIC><![CDATA[@ad_reference_id@='2B10E78241C94282867D5E750F994D14']]></DISPLAYLOGIC>
-<!--C310253B47D64D93A2C6F23B5DB0156D-->  <DISPLAYLENGTH><![CDATA[2000]]></DISPLAYLENGTH>
-<!--C310253B47D64D93A2C6F23B5DB0156D-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--C310253B47D64D93A2C6F23B5DB0156D-->  <SEQNO><![CDATA[420]]></SEQNO>
-<!--C310253B47D64D93A2C6F23B5DB0156D-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
-<!--C310253B47D64D93A2C6F23B5DB0156D-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
-<!--C310253B47D64D93A2C6F23B5DB0156D-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--C310253B47D64D93A2C6F23B5DB0156D-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
-<!--C310253B47D64D93A2C6F23B5DB0156D-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
-<!--C310253B47D64D93A2C6F23B5DB0156D-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--C310253B47D64D93A2C6F23B5DB0156D-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
-<!--C310253B47D64D93A2C6F23B5DB0156D-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
-<!--C310253B47D64D93A2C6F23B5DB0156D-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
-<!--C310253B47D64D93A2C6F23B5DB0156D-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
-<!--C310253B47D64D93A2C6F23B5DB0156D--></AD_FIELD>
-
 <!--C33C3F719C654199904ED0B085F5F5AE--><AD_FIELD>
 <!--C33C3F719C654199904ED0B085F5F5AE-->  <AD_FIELD_ID><![CDATA[C33C3F719C654199904ED0B085F5F5AE]]></AD_FIELD_ID>
 <!--C33C3F719C654199904ED0B085F5F5AE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -298587,31 +298363,6 @@
 <!--DBBB729D2F5747C8B5B41A888CCD37D9-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--DBBB729D2F5747C8B5B41A888CCD37D9--></AD_FIELD>
 
-<!--DBE30F80B81A4A029FB2C46B9EEDDF05--><AD_FIELD>
-<!--DBE30F80B81A4A029FB2C46B9EEDDF05-->  <AD_FIELD_ID><![CDATA[DBE30F80B81A4A029FB2C46B9EEDDF05]]></AD_FIELD_ID>
-<!--DBE30F80B81A4A029FB2C46B9EEDDF05-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--DBE30F80B81A4A029FB2C46B9EEDDF05-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--DBE30F80B81A4A029FB2C46B9EEDDF05-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--DBE30F80B81A4A029FB2C46B9EEDDF05-->  <NAME><![CDATA[AD_File_ID]]></NAME>
-<!--DBE30F80B81A4A029FB2C46B9EEDDF05-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
-<!--DBE30F80B81A4A029FB2C46B9EEDDF05-->  <AD_TAB_ID><![CDATA[6882148AC8B046318FC69D7628727050]]></AD_TAB_ID>
-<!--DBE30F80B81A4A029FB2C46B9EEDDF05-->  <AD_COLUMN_ID><![CDATA[D62BD0E419D6419A91C9FB342E8A6756]]></AD_COLUMN_ID>
-<!--DBE30F80B81A4A029FB2C46B9EEDDF05-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
-<!--DBE30F80B81A4A029FB2C46B9EEDDF05-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
-<!--DBE30F80B81A4A029FB2C46B9EEDDF05-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
-<!--DBE30F80B81A4A029FB2C46B9EEDDF05-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--DBE30F80B81A4A029FB2C46B9EEDDF05-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
-<!--DBE30F80B81A4A029FB2C46B9EEDDF05-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
-<!--DBE30F80B81A4A029FB2C46B9EEDDF05-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--DBE30F80B81A4A029FB2C46B9EEDDF05-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
-<!--DBE30F80B81A4A029FB2C46B9EEDDF05-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
-<!--DBE30F80B81A4A029FB2C46B9EEDDF05-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--DBE30F80B81A4A029FB2C46B9EEDDF05-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
-<!--DBE30F80B81A4A029FB2C46B9EEDDF05-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
-<!--DBE30F80B81A4A029FB2C46B9EEDDF05-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
-<!--DBE30F80B81A4A029FB2C46B9EEDDF05-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
-<!--DBE30F80B81A4A029FB2C46B9EEDDF05--></AD_FIELD>
-
 <!--DC012143C3B747B3B529102E8F465F2B--><AD_FIELD>
 <!--DC012143C3B747B3B529102E8F465F2B-->  <AD_FIELD_ID><![CDATA[DC012143C3B747B3B529102E8F465F2B]]></AD_FIELD_ID>
 <!--DC012143C3B747B3B529102E8F465F2B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -299037,34 +298788,6 @@
 <!--DD0531283F1A445BA9A768FE7EED21A1-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--DD0531283F1A445BA9A768FE7EED21A1--></AD_FIELD>
 
-<!--DD09D68411EA44B5B3F9B63CCC0A097F--><AD_FIELD>
-<!--DD09D68411EA44B5B3F9B63CCC0A097F-->  <AD_FIELD_ID><![CDATA[DD09D68411EA44B5B3F9B63CCC0A097F]]></AD_FIELD_ID>
-<!--DD09D68411EA44B5B3F9B63CCC0A097F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--DD09D68411EA44B5B3F9B63CCC0A097F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--DD09D68411EA44B5B3F9B63CCC0A097F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--DD09D68411EA44B5B3F9B63CCC0A097F-->  <NAME><![CDATA[Organization]]></NAME>
-<!--DD09D68411EA44B5B3F9B63CCC0A097F-->  <DESCRIPTION><![CDATA[Organizational entity within client]]></DESCRIPTION>
-<!--DD09D68411EA44B5B3F9B63CCC0A097F-->  <HELP><![CDATA[An organization is a unit of your client or legal entity - examples are store, department. You can share data between organizations.]]></HELP>
-<!--DD09D68411EA44B5B3F9B63CCC0A097F-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
-<!--DD09D68411EA44B5B3F9B63CCC0A097F-->  <AD_TAB_ID><![CDATA[6882148AC8B046318FC69D7628727050]]></AD_TAB_ID>
-<!--DD09D68411EA44B5B3F9B63CCC0A097F-->  <AD_COLUMN_ID><![CDATA[056376ABE2194DB087665B23E0C647B5]]></AD_COLUMN_ID>
-<!--DD09D68411EA44B5B3F9B63CCC0A097F-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
-<!--DD09D68411EA44B5B3F9B63CCC0A097F-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--DD09D68411EA44B5B3F9B63CCC0A097F-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
-<!--DD09D68411EA44B5B3F9B63CCC0A097F-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--DD09D68411EA44B5B3F9B63CCC0A097F-->  <SEQNO><![CDATA[10]]></SEQNO>
-<!--DD09D68411EA44B5B3F9B63CCC0A097F-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
-<!--DD09D68411EA44B5B3F9B63CCC0A097F-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
-<!--DD09D68411EA44B5B3F9B63CCC0A097F-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--DD09D68411EA44B5B3F9B63CCC0A097F-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
-<!--DD09D68411EA44B5B3F9B63CCC0A097F-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
-<!--DD09D68411EA44B5B3F9B63CCC0A097F-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--DD09D68411EA44B5B3F9B63CCC0A097F-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
-<!--DD09D68411EA44B5B3F9B63CCC0A097F-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
-<!--DD09D68411EA44B5B3F9B63CCC0A097F-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
-<!--DD09D68411EA44B5B3F9B63CCC0A097F-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
-<!--DD09D68411EA44B5B3F9B63CCC0A097F--></AD_FIELD>
-
 <!--DD0A1F35341446C2BCC14B330B1DC545--><AD_FIELD>
 <!--DD0A1F35341446C2BCC14B330B1DC545-->  <AD_FIELD_ID><![CDATA[DD0A1F35341446C2BCC14B330B1DC545]]></AD_FIELD_ID>
 <!--DD0A1F35341446C2BCC14B330B1DC545-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -305673,34 +305396,6 @@
 <!--EE6BC3B7624E4D69938E0EF9027773D7-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--EE6BC3B7624E4D69938E0EF9027773D7--></AD_FIELD>
 
-<!--EE832053835D40E1AB9FB9C9B5F92766--><AD_FIELD>
-<!--EE832053835D40E1AB9FB9C9B5F92766-->  <AD_FIELD_ID><![CDATA[EE832053835D40E1AB9FB9C9B5F92766]]></AD_FIELD_ID>
-<!--EE832053835D40E1AB9FB9C9B5F92766-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--EE832053835D40E1AB9FB9C9B5F92766-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--EE832053835D40E1AB9FB9C9B5F92766-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--EE832053835D40E1AB9FB9C9B5F92766-->  <NAME><![CDATA[Name]]></NAME>
-<!--EE832053835D40E1AB9FB9C9B5F92766-->  <DESCRIPTION><![CDATA[A non-unique identifier for a record/document often used as a search tool.]]></DESCRIPTION>
-<!--EE832053835D40E1AB9FB9C9B5F92766-->  <HELP><![CDATA[A more descriptive identifier (that does need to be unique) of a record/document that is used as a default search option along with the search key (that is unique and mostly shorter). It is up to 60 characters in length.]]></HELP>
-<!--EE832053835D40E1AB9FB9C9B5F92766-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
-<!--EE832053835D40E1AB9FB9C9B5F92766-->  <AD_TAB_ID><![CDATA[6882148AC8B046318FC69D7628727050]]></AD_TAB_ID>
-<!--EE832053835D40E1AB9FB9C9B5F92766-->  <AD_COLUMN_ID><![CDATA[755F05A04ED7467B9250D5EA22276E45]]></AD_COLUMN_ID>
-<!--EE832053835D40E1AB9FB9C9B5F92766-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
-<!--EE832053835D40E1AB9FB9C9B5F92766-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--EE832053835D40E1AB9FB9C9B5F92766-->  <DISPLAYLENGTH><![CDATA[60]]></DISPLAYLENGTH>
-<!--EE832053835D40E1AB9FB9C9B5F92766-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--EE832053835D40E1AB9FB9C9B5F92766-->  <SEQNO><![CDATA[30]]></SEQNO>
-<!--EE832053835D40E1AB9FB9C9B5F92766-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
-<!--EE832053835D40E1AB9FB9C9B5F92766-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
-<!--EE832053835D40E1AB9FB9C9B5F92766-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--EE832053835D40E1AB9FB9C9B5F92766-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
-<!--EE832053835D40E1AB9FB9C9B5F92766-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
-<!--EE832053835D40E1AB9FB9C9B5F92766-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--EE832053835D40E1AB9FB9C9B5F92766-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
-<!--EE832053835D40E1AB9FB9C9B5F92766-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
-<!--EE832053835D40E1AB9FB9C9B5F92766-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
-<!--EE832053835D40E1AB9FB9C9B5F92766-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
-<!--EE832053835D40E1AB9FB9C9B5F92766--></AD_FIELD>
-
 <!--EE892B33CF154E5DB5A97CCEDD31B42D--><AD_FIELD>
 <!--EE892B33CF154E5DB5A97CCEDD31B42D-->  <AD_FIELD_ID><![CDATA[EE892B33CF154E5DB5A97CCEDD31B42D]]></AD_FIELD_ID>
 <!--EE892B33CF154E5DB5A97CCEDD31B42D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_MODEL_OBJECT.xml	Thu Feb 18 15:22:50 2016 +0100
+++ b/src-db/database/sourcedata/AD_MODEL_OBJECT.xml	Thu Feb 18 15:23:29 2016 +0100
@@ -3931,19 +3931,6 @@
 <!--74993EB84A38413CA6109A5D2B563552-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
 <!--74993EB84A38413CA6109A5D2B563552--></AD_MODEL_OBJECT>
 
-<!--749FF1705F8E4883AB053FC7FF333C5E--><AD_MODEL_OBJECT>
-<!--749FF1705F8E4883AB053FC7FF333C5E-->  <AD_MODEL_OBJECT_ID><![CDATA[749FF1705F8E4883AB053FC7FF333C5E]]></AD_MODEL_OBJECT_ID>
-<!--749FF1705F8E4883AB053FC7FF333C5E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--749FF1705F8E4883AB053FC7FF333C5E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--749FF1705F8E4883AB053FC7FF333C5E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--749FF1705F8E4883AB053FC7FF333C5E-->  <ACTION><![CDATA[P]]></ACTION>
-<!--749FF1705F8E4883AB053FC7FF333C5E-->  <CLASSNAME><![CDATA[org.openbravo.erpCommon.info.FileInfoBLOB]]></CLASSNAME>
-<!--749FF1705F8E4883AB053FC7FF333C5E-->  <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
-<!--749FF1705F8E4883AB053FC7FF333C5E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--749FF1705F8E4883AB053FC7FF333C5E-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
-<!--749FF1705F8E4883AB053FC7FF333C5E-->  <NAME><![CDATA[File Info BLOB]]></NAME>
-<!--749FF1705F8E4883AB053FC7FF333C5E--></AD_MODEL_OBJECT>
-
 <!--75CE8C1D309F44B7A3545E7B0EFC5449--><AD_MODEL_OBJECT>
 <!--75CE8C1D309F44B7A3545E7B0EFC5449-->  <AD_MODEL_OBJECT_ID><![CDATA[75CE8C1D309F44B7A3545E7B0EFC5449]]></AD_MODEL_OBJECT_ID>
 <!--75CE8C1D309F44B7A3545E7B0EFC5449-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -3956,19 +3943,6 @@
 <!--75CE8C1D309F44B7A3545E7B0EFC5449-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
 <!--75CE8C1D309F44B7A3545E7B0EFC5449--></AD_MODEL_OBJECT>
 
-<!--7624963B91F948A3AA60BD7676F09CFC--><AD_MODEL_OBJECT>
-<!--7624963B91F948A3AA60BD7676F09CFC-->  <AD_MODEL_OBJECT_ID><![CDATA[7624963B91F948A3AA60BD7676F09CFC]]></AD_MODEL_OBJECT_ID>
-<!--7624963B91F948A3AA60BD7676F09CFC-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--7624963B91F948A3AA60BD7676F09CFC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--7624963B91F948A3AA60BD7676F09CFC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--7624963B91F948A3AA60BD7676F09CFC-->  <ACTION><![CDATA[P]]></ACTION>
-<!--7624963B91F948A3AA60BD7676F09CFC-->  <CLASSNAME><![CDATA[org.openbravo.erpCommon.utility.GetFile]]></CLASSNAME>
-<!--7624963B91F948A3AA60BD7676F09CFC-->  <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
-<!--7624963B91F948A3AA60BD7676F09CFC-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--7624963B91F948A3AA60BD7676F09CFC-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
-<!--7624963B91F948A3AA60BD7676F09CFC-->  <NAME><![CDATA[GetFile]]></NAME>
-<!--7624963B91F948A3AA60BD7676F09CFC--></AD_MODEL_OBJECT>
-
 <!--76EA6723BB5544D585D9BDC128968F58--><AD_MODEL_OBJECT>
 <!--76EA6723BB5544D585D9BDC128968F58-->  <AD_MODEL_OBJECT_ID><![CDATA[76EA6723BB5544D585D9BDC128968F58]]></AD_MODEL_OBJECT_ID>
 <!--76EA6723BB5544D585D9BDC128968F58-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml	Thu Feb 18 15:22:50 2016 +0100
+++ b/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml	Thu Feb 18 15:23:29 2016 +0100
@@ -3810,16 +3810,6 @@
 <!--42F9B228EF7A45B2A6907742D592B26A-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
 <!--42F9B228EF7A45B2A6907742D592B26A--></AD_MODEL_OBJECT_MAPPING>
 
-<!--4425C54A36F347FEB4AC58BACC434D05--><AD_MODEL_OBJECT_MAPPING>
-<!--4425C54A36F347FEB4AC58BACC434D05-->  <AD_MODEL_OBJECT_MAPPING_ID><![CDATA[4425C54A36F347FEB4AC58BACC434D05]]></AD_MODEL_OBJECT_MAPPING_ID>
-<!--4425C54A36F347FEB4AC58BACC434D05-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--4425C54A36F347FEB4AC58BACC434D05-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--4425C54A36F347FEB4AC58BACC434D05-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--4425C54A36F347FEB4AC58BACC434D05-->  <AD_MODEL_OBJECT_ID><![CDATA[7624963B91F948A3AA60BD7676F09CFC]]></AD_MODEL_OBJECT_ID>
-<!--4425C54A36F347FEB4AC58BACC434D05-->  <MAPPINGNAME><![CDATA[/utility/GetFile]]></MAPPINGNAME>
-<!--4425C54A36F347FEB4AC58BACC434D05-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
-<!--4425C54A36F347FEB4AC58BACC434D05--></AD_MODEL_OBJECT_MAPPING>
-
 <!--4477C79355804B6BA77079A9CE605E5A--><AD_MODEL_OBJECT_MAPPING>
 <!--4477C79355804B6BA77079A9CE605E5A-->  <AD_MODEL_OBJECT_MAPPING_ID><![CDATA[4477C79355804B6BA77079A9CE605E5A]]></AD_MODEL_OBJECT_MAPPING_ID>
 <!--4477C79355804B6BA77079A9CE605E5A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -4310,16 +4300,6 @@
 <!--96AB68C2B5AC4E09A94E1A7B259E19BE-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
 <!--96AB68C2B5AC4E09A94E1A7B259E19BE--></AD_MODEL_OBJECT_MAPPING>
 
-<!--9BB6609DADCB4251A84170EE91049982--><AD_MODEL_OBJECT_MAPPING>
-<!--9BB6609DADCB4251A84170EE91049982-->  <AD_MODEL_OBJECT_MAPPING_ID><![CDATA[9BB6609DADCB4251A84170EE91049982]]></AD_MODEL_OBJECT_MAPPING_ID>
-<!--9BB6609DADCB4251A84170EE91049982-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--9BB6609DADCB4251A84170EE91049982-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--9BB6609DADCB4251A84170EE91049982-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--9BB6609DADCB4251A84170EE91049982-->  <AD_MODEL_OBJECT_ID><![CDATA[749FF1705F8E4883AB053FC7FF333C5E]]></AD_MODEL_OBJECT_ID>
-<!--9BB6609DADCB4251A84170EE91049982-->  <MAPPINGNAME><![CDATA[/utility/FileInfoBLOB]]></MAPPINGNAME>
-<!--9BB6609DADCB4251A84170EE91049982-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
-<!--9BB6609DADCB4251A84170EE91049982--></AD_MODEL_OBJECT_MAPPING>
-
 <!--9C7DDC171D20464A9FA79C71B1516DE3--><AD_MODEL_OBJECT_MAPPING>
 <!--9C7DDC171D20464A9FA79C71B1516DE3-->  <AD_MODEL_OBJECT_MAPPING_ID><![CDATA[9C7DDC171D20464A9FA79C71B1516DE3]]></AD_MODEL_OBJECT_MAPPING_ID>
 <!--9C7DDC171D20464A9FA79C71B1516DE3-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_REFERENCE.xml	Thu Feb 18 15:22:50 2016 +0100
+++ b/src-db/database/sourcedata/AD_REFERENCE.xml	Thu Feb 18 15:23:29 2016 +0100
@@ -4680,22 +4680,6 @@
 <!--2969F07308CB43ECBCDAE151C12F03E0-->  <ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED>
 <!--2969F07308CB43ECBCDAE151C12F03E0--></AD_REFERENCE>
 
-<!--2B10E78241C94282867D5E750F994D14--><AD_REFERENCE>
-<!--2B10E78241C94282867D5E750F994D14-->  <AD_REFERENCE_ID><![CDATA[2B10E78241C94282867D5E750F994D14]]></AD_REFERENCE_ID>
-<!--2B10E78241C94282867D5E750F994D14-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--2B10E78241C94282867D5E750F994D14-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--2B10E78241C94282867D5E750F994D14-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--2B10E78241C94282867D5E750F994D14-->  <NAME><![CDATA[File BLOB]]></NAME>
-<!--2B10E78241C94282867D5E750F994D14-->  <DESCRIPTION><![CDATA[Contains a link to a file in AD_File table]]></DESCRIPTION>
-<!--2B10E78241C94282867D5E750F994D14-->  <HELP><![CDATA[Contains a link to a file in AD_File table.]]></HELP>
-<!--2B10E78241C94282867D5E750F994D14-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--2B10E78241C94282867D5E750F994D14-->  <ISBASEREFERENCE><![CDATA[Y]]></ISBASEREFERENCE>
-<!--2B10E78241C94282867D5E750F994D14-->  <MODEL_IMPL><![CDATA[org.openbravo.base.model.domaintype.SearchDomainType]]></MODEL_IMPL>
-<!--2B10E78241C94282867D5E750F994D14-->  <WAD_IMPL><![CDATA[org.openbravo.wad.controls.WADFileBLOB]]></WAD_IMPL>
-<!--2B10E78241C94282867D5E750F994D14-->  <UI_IMPL><![CDATA[org.openbravo.reference.ui.UIFileBLOB]]></UI_IMPL>
-<!--2B10E78241C94282867D5E750F994D14-->  <ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED>
-<!--2B10E78241C94282867D5E750F994D14--></AD_REFERENCE>
-
 <!--2F18FEBF939D4F6DA5D5AEED73AE11D0--><AD_REFERENCE>
 <!--2F18FEBF939D4F6DA5D5AEED73AE11D0-->  <AD_REFERENCE_ID><![CDATA[2F18FEBF939D4F6DA5D5AEED73AE11D0]]></AD_REFERENCE_ID>
 <!--2F18FEBF939D4F6DA5D5AEED73AE11D0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -4875,20 +4859,6 @@
 <!--4028E61131FB4B1B0131FB5226C90008-->  <ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED>
 <!--4028E61131FB4B1B0131FB5226C90008--></AD_REFERENCE>
 
-<!--405D1D8FF526432A8E33EC56BE7966F7--><AD_REFERENCE>
-<!--405D1D8FF526432A8E33EC56BE7966F7-->  <AD_REFERENCE_ID><![CDATA[405D1D8FF526432A8E33EC56BE7966F7]]></AD_REFERENCE_ID>
-<!--405D1D8FF526432A8E33EC56BE7966F7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--405D1D8FF526432A8E33EC56BE7966F7-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--405D1D8FF526432A8E33EC56BE7966F7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--405D1D8FF526432A8E33EC56BE7966F7-->  <NAME><![CDATA[File Size Unit]]></NAME>
-<!--405D1D8FF526432A8E33EC56BE7966F7-->  <DESCRIPTION><![CDATA[File Size Unit]]></DESCRIPTION>
-<!--405D1D8FF526432A8E33EC56BE7966F7-->  <HELP><![CDATA[Units used to define file sizes. It can be: B, KB, MB or GB.]]></HELP>
-<!--405D1D8FF526432A8E33EC56BE7966F7-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--405D1D8FF526432A8E33EC56BE7966F7-->  <ISBASEREFERENCE><![CDATA[N]]></ISBASEREFERENCE>
-<!--405D1D8FF526432A8E33EC56BE7966F7-->  <PARENTREFERENCE_ID><![CDATA[17]]></PARENTREFERENCE_ID>
-<!--405D1D8FF526432A8E33EC56BE7966F7-->  <ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED>
-<!--405D1D8FF526432A8E33EC56BE7966F7--></AD_REFERENCE>
-
 <!--40B84CF78FC9435790887846CCDAE875--><AD_REFERENCE>
 <!--40B84CF78FC9435790887846CCDAE875-->  <AD_REFERENCE_ID><![CDATA[40B84CF78FC9435790887846CCDAE875]]></AD_REFERENCE_ID>
 <!--40B84CF78FC9435790887846CCDAE875-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_REF_LIST.xml	Thu Feb 18 15:22:50 2016 +0100
+++ b/src-db/database/sourcedata/AD_REF_LIST.xml	Thu Feb 18 15:23:29 2016 +0100
@@ -8278,19 +8278,6 @@
 <!--12CD29ED0686428DACEF24B5040A8EA5-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--12CD29ED0686428DACEF24B5040A8EA5--></AD_REF_LIST>
 
-<!--134E5211EEE141EC8F402C3AC281B7A1--><AD_REF_LIST>
-<!--134E5211EEE141EC8F402C3AC281B7A1-->  <AD_REF_LIST_ID><![CDATA[134E5211EEE141EC8F402C3AC281B7A1]]></AD_REF_LIST_ID>
-<!--134E5211EEE141EC8F402C3AC281B7A1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--134E5211EEE141EC8F402C3AC281B7A1-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--134E5211EEE141EC8F402C3AC281B7A1-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--134E5211EEE141EC8F402C3AC281B7A1-->  <VALUE><![CDATA[KB]]></VALUE>
-<!--134E5211EEE141EC8F402C3AC281B7A1-->  <NAME><![CDATA[KB]]></NAME>
-<!--134E5211EEE141EC8F402C3AC281B7A1-->  <DESCRIPTION><![CDATA[KiloByte]]></DESCRIPTION>
-<!--134E5211EEE141EC8F402C3AC281B7A1-->  <AD_REFERENCE_ID><![CDATA[405D1D8FF526432A8E33EC56BE7966F7]]></AD_REFERENCE_ID>
-<!--134E5211EEE141EC8F402C3AC281B7A1-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--134E5211EEE141EC8F402C3AC281B7A1-->  <SEQNO><![CDATA[20]]></SEQNO>
-<!--134E5211EEE141EC8F402C3AC281B7A1--></AD_REF_LIST>
-
 <!--137FAE2E0B2E41CB901067BC77E37EE7--><AD_REF_LIST>
 <!--137FAE2E0B2E41CB901067BC77E37EE7-->  <AD_REF_LIST_ID><![CDATA[137FAE2E0B2E41CB901067BC77E37EE7]]></AD_REF_LIST_ID>
 <!--137FAE2E0B2E41CB901067BC77E37EE7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -8464,19 +8451,6 @@
 <!--1B5CF993D6934A5D851C4F13F9DCB441-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--1B5CF993D6934A5D851C4F13F9DCB441--></AD_REF_LIST>
 
-<!--1CD5FA356E684F9AAE50F642AF63AD71--><AD_REF_LIST>
-<!--1CD5FA356E684F9AAE50F642AF63AD71-->  <AD_REF_LIST_ID><![CDATA[1CD5FA356E684F9AAE50F642AF63AD71]]></AD_REF_LIST_ID>
-<!--1CD5FA356E684F9AAE50F642AF63AD71-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--1CD5FA356E684F9AAE50F642AF63AD71-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--1CD5FA356E684F9AAE50F642AF63AD71-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--1CD5FA356E684F9AAE50F642AF63AD71-->  <VALUE><![CDATA[MB]]></VALUE>
-<!--1CD5FA356E684F9AAE50F642AF63AD71-->  <NAME><![CDATA[MB]]></NAME>
-<!--1CD5FA356E684F9AAE50F642AF63AD71-->  <DESCRIPTION><![CDATA[MegaByte]]></DESCRIPTION>
-<!--1CD5FA356E684F9AAE50F642AF63AD71-->  <AD_REFERENCE_ID><![CDATA[405D1D8FF526432A8E33EC56BE7966F7]]></AD_REFERENCE_ID>
-<!--1CD5FA356E684F9AAE50F642AF63AD71-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--1CD5FA356E684F9AAE50F642AF63AD71-->  <SEQNO><![CDATA[30]]></SEQNO>
-<!--1CD5FA356E684F9AAE50F642AF63AD71--></AD_REF_LIST>
-
 <!--1D364B1DD350473DB0C1BC56DAD663D9--><AD_REF_LIST>
 <!--1D364B1DD350473DB0C1BC56DAD663D9-->  <AD_REF_LIST_ID><![CDATA[1D364B1DD350473DB0C1BC56DAD663D9]]></AD_REF_LIST_ID>
 <!--1D364B1DD350473DB0C1BC56DAD663D9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -10702,19 +10676,6 @@
 <!--8F5FF4C1DAE84C0A8B6B3115FEC8D206-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--8F5FF4C1DAE84C0A8B6B3115FEC8D206--></AD_REF_LIST>
 
-<!--8FF71FB5B11A4459850A3275F8B12A4E--><AD_REF_LIST>
-<!--8FF71FB5B11A4459850A3275F8B12A4E-->  <AD_REF_LIST_ID><![CDATA[8FF71FB5B11A4459850A3275F8B12A4E]]></AD_REF_LIST_ID>
-<!--8FF71FB5B11A4459850A3275F8B12A4E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--8FF71FB5B11A4459850A3275F8B12A4E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--8FF71FB5B11A4459850A3275F8B12A4E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--8FF71FB5B11A4459850A3275F8B12A4E-->  <VALUE><![CDATA[B]]></VALUE>
-<!--8FF71FB5B11A4459850A3275F8B12A4E-->  <NAME><![CDATA[B]]></NAME>
-<!--8FF71FB5B11A4459850A3275F8B12A4E-->  <DESCRIPTION><![CDATA[Byte]]></DESCRIPTION>
-<!--8FF71FB5B11A4459850A3275F8B12A4E-->  <AD_REFERENCE_ID><![CDATA[405D1D8FF526432A8E33EC56BE7966F7]]></AD_REFERENCE_ID>
-<!--8FF71FB5B11A4459850A3275F8B12A4E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--8FF71FB5B11A4459850A3275F8B12A4E-->  <SEQNO><![CDATA[10]]></SEQNO>
-<!--8FF71FB5B11A4459850A3275F8B12A4E--></AD_REF_LIST>
-
 <!--90CD0AB2B9944AE2B91466FC3C371056--><AD_REF_LIST>
 <!--90CD0AB2B9944AE2B91466FC3C371056-->  <AD_REF_LIST_ID><![CDATA[90CD0AB2B9944AE2B91466FC3C371056]]></AD_REF_LIST_ID>
 <!--90CD0AB2B9944AE2B91466FC3C371056-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -12399,19 +12360,6 @@
 <!--D9FFDD5DD51D434FB45628FCBAD10A4E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--D9FFDD5DD51D434FB45628FCBAD10A4E--></AD_REF_LIST>
 
-<!--DAAEC47B730344CABED9B419A61D7B34--><AD_REF_LIST>
-<!--DAAEC47B730344CABED9B419A61D7B34-->  <AD_REF_LIST_ID><![CDATA[DAAEC47B730344CABED9B419A61D7B34]]></AD_REF_LIST_ID>
-<!--DAAEC47B730344CABED9B419A61D7B34-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--DAAEC47B730344CABED9B419A61D7B34-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--DAAEC47B730344CABED9B419A61D7B34-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--DAAEC47B730344CABED9B419A61D7B34-->  <VALUE><![CDATA[GB]]></VALUE>
-<!--DAAEC47B730344CABED9B419A61D7B34-->  <NAME><![CDATA[GB]]></NAME>
-<!--DAAEC47B730344CABED9B419A61D7B34-->  <DESCRIPTION><![CDATA[GigaByte]]></DESCRIPTION>
-<!--DAAEC47B730344CABED9B419A61D7B34-->  <AD_REFERENCE_ID><![CDATA[405D1D8FF526432A8E33EC56BE7966F7]]></AD_REFERENCE_ID>
-<!--DAAEC47B730344CABED9B419A61D7B34-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--DAAEC47B730344CABED9B419A61D7B34-->  <SEQNO><![CDATA[40]]></SEQNO>
-<!--DAAEC47B730344CABED9B419A61D7B34--></AD_REF_LIST>
-
 <!--DAC02370F50D485BAA4F79957AA1A7A4--><AD_REF_LIST>
 <!--DAC02370F50D485BAA4F79957AA1A7A4-->  <AD_REF_LIST_ID><![CDATA[DAC02370F50D485BAA4F79957AA1A7A4]]></AD_REF_LIST_ID>
 <!--DAC02370F50D485BAA4F79957AA1A7A4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_REF_SEARCH.xml	Thu Feb 18 15:22:50 2016 +0100
+++ b/src-db/database/sourcedata/AD_REF_SEARCH.xml	Thu Feb 18 15:23:29 2016 +0100
@@ -190,16 +190,6 @@
 <!--7504B2DE5C1B4B7D875F6D4B60A1AD19-->  <AD_COLUMN_ID><![CDATA[1125]]></AD_COLUMN_ID>
 <!--7504B2DE5C1B4B7D875F6D4B60A1AD19--></AD_REF_SEARCH>
 
-<!--CAF7114E34C846FEB897080F5B436F76--><AD_REF_SEARCH>
-<!--CAF7114E34C846FEB897080F5B436F76-->  <AD_REF_SEARCH_ID><![CDATA[CAF7114E34C846FEB897080F5B436F76]]></AD_REF_SEARCH_ID>
-<!--CAF7114E34C846FEB897080F5B436F76-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--CAF7114E34C846FEB897080F5B436F76-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--CAF7114E34C846FEB897080F5B436F76-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--CAF7114E34C846FEB897080F5B436F76-->  <AD_REFERENCE_ID><![CDATA[2B10E78241C94282867D5E750F994D14]]></AD_REFERENCE_ID>
-<!--CAF7114E34C846FEB897080F5B436F76-->  <AD_TABLE_ID><![CDATA[7A0FF566741E4C8B8B4540609D1E382B]]></AD_TABLE_ID>
-<!--CAF7114E34C846FEB897080F5B436F76-->  <AD_COLUMN_ID><![CDATA[D62BD0E419D6419A91C9FB342E8A6756]]></AD_COLUMN_ID>
-<!--CAF7114E34C846FEB897080F5B436F76--></AD_REF_SEARCH>
-
 <!--D2057B09D3B24BBBBF0B0F1A581F5C69--><AD_REF_SEARCH>
 <!--D2057B09D3B24BBBBF0B0F1A581F5C69-->  <AD_REF_SEARCH_ID><![CDATA[D2057B09D3B24BBBBF0B0F1A581F5C69]]></AD_REF_SEARCH_ID>
 <!--D2057B09D3B24BBBBF0B0F1A581F5C69-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_TAB.xml	Thu Feb 18 15:22:50 2016 +0100
+++ b/src-db/database/sourcedata/AD_TAB.xml	Thu Feb 18 15:23:29 2016 +0100
@@ -16059,35 +16059,6 @@
 <!--6868B706DA8340158DE353A6C252A564-->  <EM_OBUIAPP_SHOW_SELECT><![CDATA[Y]]></EM_OBUIAPP_SHOW_SELECT>
 <!--6868B706DA8340158DE353A6C252A564--></AD_TAB>
 
-<!--6882148AC8B046318FC69D7628727050--><AD_TAB>
-<!--6882148AC8B046318FC69D7628727050-->  <AD_TAB_ID><![CDATA[6882148AC8B046318FC69D7628727050]]></AD_TAB_ID>
-<!--6882148AC8B046318FC69D7628727050-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--6882148AC8B046318FC69D7628727050-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--6882148AC8B046318FC69D7628727050-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--6882148AC8B046318FC69D7628727050-->  <NAME><![CDATA[Application File]]></NAME>
-<!--6882148AC8B046318FC69D7628727050-->  <AD_TABLE_ID><![CDATA[7A0FF566741E4C8B8B4540609D1E382B]]></AD_TABLE_ID>
-<!--6882148AC8B046318FC69D7628727050-->  <AD_WINDOW_ID><![CDATA[2B0FB07F53CF4700A59CDF78168B8861]]></AD_WINDOW_ID>
-<!--6882148AC8B046318FC69D7628727050-->  <SEQNO><![CDATA[10]]></SEQNO>
-<!--6882148AC8B046318FC69D7628727050-->  <TABLEVEL><![CDATA[0]]></TABLEVEL>
-<!--6882148AC8B046318FC69D7628727050-->  <ISSINGLEROW><![CDATA[N]]></ISSINGLEROW>
-<!--6882148AC8B046318FC69D7628727050-->  <ISINFOTAB><![CDATA[N]]></ISINFOTAB>
-<!--6882148AC8B046318FC69D7628727050-->  <ISTRANSLATIONTAB><![CDATA[N]]></ISTRANSLATIONTAB>
-<!--6882148AC8B046318FC69D7628727050-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--6882148AC8B046318FC69D7628727050-->  <HASTREE><![CDATA[N]]></HASTREE>
-<!--6882148AC8B046318FC69D7628727050-->  <PROCESSING><![CDATA[N]]></PROCESSING>
-<!--6882148AC8B046318FC69D7628727050-->  <IMPORTFIELDS><![CDATA[N]]></IMPORTFIELDS>
-<!--6882148AC8B046318FC69D7628727050-->  <ISSORTTAB><![CDATA[N]]></ISSORTTAB>
-<!--6882148AC8B046318FC69D7628727050-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--6882148AC8B046318FC69D7628727050-->  <UIPATTERN><![CDATA[STD]]></UIPATTERN>
-<!--6882148AC8B046318FC69D7628727050-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
-<!--6882148AC8B046318FC69D7628727050-->  <DISABLE_PARENT_KEY_PROPERTY><![CDATA[N]]></DISABLE_PARENT_KEY_PROPERTY>
-<!--6882148AC8B046318FC69D7628727050-->  <ISREADONLYTREE><![CDATA[N]]></ISREADONLYTREE>
-<!--6882148AC8B046318FC69D7628727050-->  <ISSHOWTREENODEICONS><![CDATA[Y]]></ISSHOWTREENODEICONS>
-<!--6882148AC8B046318FC69D7628727050-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
-<!--6882148AC8B046318FC69D7628727050-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
-<!--6882148AC8B046318FC69D7628727050-->  <EM_OBUIAPP_SHOW_SELECT><![CDATA[Y]]></EM_OBUIAPP_SHOW_SELECT>
-<!--6882148AC8B046318FC69D7628727050--></AD_TAB>
-
 <!--69CB5A3952654BCCAE3C085370B729FF--><AD_TAB>
 <!--69CB5A3952654BCCAE3C085370B729FF-->  <AD_TAB_ID><![CDATA[69CB5A3952654BCCAE3C085370B729FF]]></AD_TAB_ID>
 <!--69CB5A3952654BCCAE3C085370B729FF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_TABLE.xml	Thu Feb 18 15:22:50 2016 +0100
+++ b/src-db/database/sourcedata/AD_TABLE.xml	Thu Feb 18 15:23:29 2016 +0100
@@ -10894,31 +10894,6 @@
 <!--79A893C3D71A4CCDACB34E4EBFC5124D-->  <ISTREE><![CDATA[N]]></ISTREE>
 <!--79A893C3D71A4CCDACB34E4EBFC5124D--></AD_TABLE>
 
-<!--7A0FF566741E4C8B8B4540609D1E382B--><AD_TABLE>
-<!--7A0FF566741E4C8B8B4540609D1E382B-->  <AD_TABLE_ID><![CDATA[7A0FF566741E4C8B8B4540609D1E382B]]></AD_TABLE_ID>
-<!--7A0FF566741E4C8B8B4540609D1E382B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--7A0FF566741E4C8B8B4540609D1E382B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--7A0FF566741E4C8B8B4540609D1E382B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--7A0FF566741E4C8B8B4540609D1E382B-->  <NAME><![CDATA[AD_FILE]]></NAME>
-<!--7A0FF566741E4C8B8B4540609D1E382B-->  <DESCRIPTION><![CDATA[This table stores files]]></DESCRIPTION>
-<!--7A0FF566741E4C8B8B4540609D1E382B-->  <HELP><![CDATA[This table stores files that can be used in different places of the application.]]></HELP>
-<!--7A0FF566741E4C8B8B4540609D1E382B-->  <TABLENAME><![CDATA[AD_File]]></TABLENAME>
-<!--7A0FF566741E4C8B8B4540609D1E382B-->  <CLASSNAME><![CDATA[ADFile]]></CLASSNAME>
-<!--7A0FF566741E4C8B8B4540609D1E382B-->  <ISVIEW><![CDATA[N]]></ISVIEW>
-<!--7A0FF566741E4C8B8B4540609D1E382B-->  <ACCESSLEVEL><![CDATA[7]]></ACCESSLEVEL>
-<!--7A0FF566741E4C8B8B4540609D1E382B-->  <AD_WINDOW_ID><![CDATA[2B0FB07F53CF4700A59CDF78168B8861]]></AD_WINDOW_ID>
-<!--7A0FF566741E4C8B8B4540609D1E382B-->  <ISSECURITYENABLED><![CDATA[N]]></ISSECURITYENABLED>
-<!--7A0FF566741E4C8B8B4540609D1E382B-->  <ISDELETEABLE><![CDATA[Y]]></ISDELETEABLE>
-<!--7A0FF566741E4C8B8B4540609D1E382B-->  <ISHIGHVOLUME><![CDATA[N]]></ISHIGHVOLUME>
-<!--7A0FF566741E4C8B8B4540609D1E382B-->  <IMPORTTABLE><![CDATA[N]]></IMPORTTABLE>
-<!--7A0FF566741E4C8B8B4540609D1E382B-->  <ISCHANGELOG><![CDATA[N]]></ISCHANGELOG>
-<!--7A0FF566741E4C8B8B4540609D1E382B-->  <ISDEFAULTACCT><![CDATA[N]]></ISDEFAULTACCT>
-<!--7A0FF566741E4C8B8B4540609D1E382B-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
-<!--7A0FF566741E4C8B8B4540609D1E382B-->  <AD_PACKAGE_ID><![CDATA[5A3ED54AB1D04B84E040007F01006125]]></AD_PACKAGE_ID>
-<!--7A0FF566741E4C8B8B4540609D1E382B-->  <DATAORIGINTYPE><![CDATA[Table]]></DATAORIGINTYPE>
-<!--7A0FF566741E4C8B8B4540609D1E382B-->  <ISTREE><![CDATA[N]]></ISTREE>
-<!--7A0FF566741E4C8B8B4540609D1E382B--></AD_TABLE>
-
 <!--7BDAC914CA60418795E453BC0E8C89DC--><AD_TABLE>
 <!--7BDAC914CA60418795E453BC0E8C89DC-->  <AD_TABLE_ID><![CDATA[7BDAC914CA60418795E453BC0E8C89DC]]></AD_TABLE_ID>
 <!--7BDAC914CA60418795E453BC0E8C89DC-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_WINDOW.xml	Thu Feb 18 15:22:50 2016 +0100
+++ b/src-db/database/sourcedata/AD_WINDOW.xml	Thu Feb 18 15:23:29 2016 +0100
@@ -2782,22 +2782,6 @@
 <!--273673D2ED914C399A6C51DB758BE0F9-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--273673D2ED914C399A6C51DB758BE0F9--></AD_WINDOW>
 
-<!--2B0FB07F53CF4700A59CDF78168B8861--><AD_WINDOW>
-<!--2B0FB07F53CF4700A59CDF78168B8861-->  <AD_WINDOW_ID><![CDATA[2B0FB07F53CF4700A59CDF78168B8861]]></AD_WINDOW_ID>
-<!--2B0FB07F53CF4700A59CDF78168B8861-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--2B0FB07F53CF4700A59CDF78168B8861-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--2B0FB07F53CF4700A59CDF78168B8861-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--2B0FB07F53CF4700A59CDF78168B8861-->  <NAME><![CDATA[Application File]]></NAME>
-<!--2B0FB07F53CF4700A59CDF78168B8861-->  <DESCRIPTION><![CDATA[Files stored in the database used in different places of the application]]></DESCRIPTION>
-<!--2B0FB07F53CF4700A59CDF78168B8861-->  <WINDOWTYPE><![CDATA[M]]></WINDOWTYPE>
-<!--2B0FB07F53CF4700A59CDF78168B8861-->  <ISSOTRX><![CDATA[Y]]></ISSOTRX>
-<!--2B0FB07F53CF4700A59CDF78168B8861-->  <PROCESSING><![CDATA[N]]></PROCESSING>
-<!--2B0FB07F53CF4700A59CDF78168B8861-->  <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
-<!--2B0FB07F53CF4700A59CDF78168B8861-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--2B0FB07F53CF4700A59CDF78168B8861-->  <ISTHREADSAFE><![CDATA[N]]></ISTHREADSAFE>
-<!--2B0FB07F53CF4700A59CDF78168B8861-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
-<!--2B0FB07F53CF4700A59CDF78168B8861--></AD_WINDOW>
-
 <!--2CC1DC1EDEA2454F987E7F2BBF48A4AE--><AD_WINDOW>
 <!--2CC1DC1EDEA2454F987E7F2BBF48A4AE-->  <AD_WINDOW_ID><![CDATA[2CC1DC1EDEA2454F987E7F2BBF48A4AE]]></AD_WINDOW_ID>
 <!--2CC1DC1EDEA2454F987E7F2BBF48A4AE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-test/src/org/openbravo/test/base/OBBaseTest.java	Thu Feb 18 15:22:50 2016 +0100
+++ b/src-test/src/org/openbravo/test/base/OBBaseTest.java	Thu Feb 18 15:23:29 2016 +0100
@@ -11,7 +11,7 @@
  * under the License. 
  * The Original Code is Openbravo ERP. 
  * The Initial Developer of the Original Code is Openbravo SLU 
- * All portions are Copyright (C) 2014-2015 Openbravo SLU 
+ * All portions are Copyright (C) 2014-2016 Openbravo SLU 
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -26,9 +26,11 @@
 import java.util.Map;
 import java.util.Random;
 
+import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 import org.apache.log4j.PropertyConfigurator;
 import org.hibernate.criterion.Restrictions;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Rule;
@@ -167,6 +169,8 @@
    */
   protected static Map<String, String[]> TEST_ORG_TREE = new HashMap<String, String[]>();
 
+  private static TestLogAppender testLogAppender;
+
   static {
 
     // "F&B International Group"
@@ -206,13 +210,20 @@
   protected static final String TEST_LOCATION_ID = "A21EF1AB822149BEB65D055CD91F261B";
 
   /**
-   * Overridden to initialize the Dal layer
+   * Initializes DAL, it also craetes a log appender that can be used to assert on logs. This log
+   * appender is disabled by default, to activate it set the level with
+   * {@link OBBaseTest#setTestLogAppenderLevel(Level)}
    * 
+   * @see TestLogAppender
    */
   @BeforeClass
   public static void setDalUp() throws Exception {
     if (OBBaseTest.class.getResource("/log4j.lcf") != null) {
       PropertyConfigurator.configure(OBBaseTest.class.getResource("/log4j.lcf"));
+      testLogAppender = new TestLogAppender();
+
+      testLogAppender.setThreshold(Level.OFF);
+      Logger.getRootLogger().addAppender(testLogAppender);
     }
     staticInitializeDalLayer();
   }
@@ -227,6 +238,31 @@
     errorOccured = false;
   }
 
+  /** Test log appender is reset and switched off */
+  @After
+  public void testDone() {
+    if (testLogAppender != null) {
+      testLogAppender.reset();
+      setTestLogAppenderLevel(Level.OFF);
+    }
+  }
+
+  /**
+   * Defines the threshold {@link Level} that will make messages to be tracked by
+   * {@link TestLogAppender}. Note after test completion appender is reset and its level is set back
+   * to Level.OFF disabling in this manner subsequent logging track.
+   */
+  protected void setTestLogAppenderLevel(Level level) {
+    if (testLogAppender != null) {
+      testLogAppender.setThreshold(level);
+    }
+  }
+
+  /** Returns log appender in order to be possible to do assertions on it */
+  protected TestLogAppender getTestLogAppender() {
+    return testLogAppender;
+  }
+
   /**
    * Initializes the DALLayer, can be overridden to add specific initialization behavior.
    * 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src-test/src/org/openbravo/test/base/TestLogAppender.java	Thu Feb 18 15:23:29 2016 +0100
@@ -0,0 +1,86 @@
+/*
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo  Public  License
+ * Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
+ * Version 1.1  with a permitted attribution clause; you may not  use this
+ * file except in compliance with the License. You  may  obtain  a copy of
+ * the License at http://www.openbravo.com/legal/license.html
+ * Software distributed under the License  is  distributed  on  an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific  language  governing  rights  and  limitations
+ * under the License.
+ * The Original Code is Openbravo ERP.
+ * The Initial Developer of the Original Code is Openbravo SLU
+ * All portions are Copyright (C) 2016 Openbravo SLU 
+ * All Rights Reserved.
+ * Contributor(s):  ______________________________________.
+ ************************************************************************
+ */
+package org.openbravo.test.base;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.apache.log4j.AppenderSkeleton;
+import org.apache.log4j.Level;
+import org.apache.log4j.spi.LoggingEvent;
+
+/**
+ * Used in {@link OBBaseTest}, keeps track of all messages written in log in order to make possible
+ * to later do assertions on them.
+ *
+ * @author alostale
+ *
+ */
+public class TestLogAppender extends AppenderSkeleton {
+  private Map<Level, List<String>> messages = new HashMap<Level, List<String>>();
+
+  @Override
+  protected void append(LoggingEvent event) {
+    List<String> levelMsgs = messages.get(event.getLevel());
+    if (levelMsgs == null) {
+      levelMsgs = new ArrayList<String>();
+      messages.put(event.getLevel(), levelMsgs);
+    }
+    levelMsgs.add(event.getMessage().toString());
+  }
+
+  @Override
+  public void close() {
+  }
+
+  @Override
+  public boolean requiresLayout() {
+    return false;
+  }
+
+  /** Removes all the messages tracked so far */
+  public void reset() {
+    messages = new HashMap<Level, List<String>>();
+  }
+
+  /**
+   * Returns a list with all messaged currently tracked. If none is tracked, an empty list is
+   * returned.
+   */
+  public List<String> getAllMessages() {
+    List<String> allMessages = new ArrayList<String>();
+    for (Entry<Level, List<String>> msgLvl : messages.entrySet()) {
+      allMessages.addAll(msgLvl.getValue());
+    }
+    return allMessages;
+  }
+
+  /** Returns a list of tracked message for a given Level, or an empty if none is tracked */
+  public List<String> getMessages(Level level) {
+    List<String> msgs = messages.get(level);
+    if (msgs == null) {
+      msgs = Collections.emptyList();
+    }
+    return msgs;
+  }
+}
--- a/src-wad/src/org/openbravo/wad/controls/WADFileBLOB.java	Thu Feb 18 15:22:50 2016 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,116 +0,0 @@
-/*
- *************************************************************************
- * The contents of this file are subject to the Openbravo  Public  License
- * Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
- * Version 1.1  with a permitted attribution clause; you may not  use this
- * file except in compliance with the License. You  may  obtain  a copy of
- * the License at http://www.openbravo.com/legal/license.html 
- * Software distributed under the License  is  distributed  on  an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific  language  governing  rights  and  limitations
- * under the License. 
- * The Original Code is Openbravo ERP. 
- * The Initial Developer of the Original Code is Openbravo SLU 
- * All portions are Copyright (C) 2015 Openbravo SLU 
- * All Rights Reserved. 
- * Contributor(s):  ______________________________________.
- ************************************************************************
- */
-package org.openbravo.wad.controls;
-
-import java.util.Properties;
-
-import org.openbravo.xmlEngine.XmlDocument;
-
-public class WADFileBLOB extends WADControl {
-
-  public WADFileBLOB() {
-  }
-
-  public WADFileBLOB(Properties prop) {
-    setInfo(prop);
-    initialize();
-  }
-
-  public void initialize() {
-    addImport("searchs", "../../../../../web/js/searchs.js");
-    generateJSCode();
-  }
-
-  private void generateJSCode() {
-    if (getData("IsMandatory").equals("Y")) {
-      XmlDocument xmlDocument = getReportEngine().readXmlTemplate(
-          "org/openbravo/wad/controls/WADImageJSValidation").createXmlDocument();
-
-      xmlDocument.setParameter("columnNameInp", getData("ColumnNameInp"));
-      setValidation(replaceHTML(xmlDocument.print()));
-    }
-    setCalloutJS();
-  }
-
-  public String getType() {
-    return "Image";
-  }
-
-  public String editMode() {
-    String[] discard = { "buttonxx" };
-    if (!getData("IsReadOnly").equals("Y") && !getData("IsReadOnlyTab").equals("Y")
-        && !getData("IsUpdateable").equals("N"))
-      discard[0] = "paramInactive";
-    XmlDocument xmlDocument = getReportEngine().readXmlTemplate(
-        "org/openbravo/wad/controls/WADImageBLOB", discard).createXmlDocument();
-
-    xmlDocument.setParameter("columnName", getData("ColumnName"));
-    xmlDocument.setParameter("columnNameInp", getData("ColumnNameInp"));
-    xmlDocument.setParameter("name", getData("Name"));
-
-    xmlDocument.setParameter("callout", getOnChangeCode());
-
-    return replaceHTML(xmlDocument.print());
-  }
-
-  public String newMode() {
-    String[] discard = { "buttonxx" };
-    if (!getData("IsReadOnly").equals("Y") && !getData("IsReadOnlyTab").equals("Y"))
-      discard[0] = "paramInactive";
-    XmlDocument xmlDocument = getReportEngine().readXmlTemplate(
-        "org/openbravo/wad/controls/WADImageBLOB", discard).createXmlDocument();
-
-    xmlDocument.setParameter("columnName", getData("ColumnName"));
-    xmlDocument.setParameter("columnNameInp", getData("ColumnNameInp"));
-    xmlDocument.setParameter("name", getData("Name"));
-
-    xmlDocument.setParameter("callout", getOnChangeCode());
-
-    return replaceHTML(xmlDocument.print());
-  }
-
-  public String toXml() {
-    String[] discard = { "xx_PARAM", "xx_PARAM_R" };
-    if (getData("IsParameter").equals("Y")) {
-      discard[0] = "xx";
-      discard[1] = "xx_R";
-    }
-    XmlDocument xmlDocument = getReportEngine().readXmlTemplate(
-        "org/openbravo/wad/controls/WADImageBLOBXML", discard).createXmlDocument();
-
-    xmlDocument.setParameter("columnName", getData("ColumnName"));
-    return replaceHTML(xmlDocument.print());
-  }
-
-  public String toJava() {
-    StringBuffer text = new StringBuffer();
-    if (getData("IsDisplayed").equals("Y")) {
-      text.append("String strCurrentImageURL" + getData("ColumnName")
-          + " = (dataField==null?data[0].getField(\"");
-      text.append(getData("ColumnNameInp")).append("\"):dataField.getField(\"");
-      text.append(getData("ColumnNameInp")).append("\"));\n");
-      text.append("if (strCurrentImageURL" + getData("ColumnName") + "==null || strCurrentImageURL"
-          + getData("ColumnName") + ".equals(\"\")){\n");
-      text.append("  xmlDocument.setParameter(\"").append(getData("ColumnName"))
-          .append("Class\", \"Image_NotAvailable_medium\");\n");
-      text.append("}\n");
-    }
-    return text.toString();
-  }
-}
--- a/src/org/openbravo/base/model/ModelProvider.java	Thu Feb 18 15:22:50 2016 +0100
+++ b/src/org/openbravo/base/model/ModelProvider.java	Thu Feb 18 15:23:29 2016 +0100
@@ -11,7 +11,7 @@
  * under the License. 
  * The Original Code is Openbravo ERP. 
  * The Initial Developer of the Original Code is Openbravo SLU 
- * All portions are Copyright (C) 2008-2015 Openbravo SLU 
+ * All portions are Copyright (C) 2008-2016 Openbravo SLU 
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -857,7 +857,7 @@
       }
     }
     // If the Entity is ADFile, add its entity to entitiesWithFile
-    if (parentEntity.getName().equals("AD_FILE")) {
+    if (parentEntity.getName().equals("OBPRF_FILE")) {
       if (entitiesWithFile.containsKey(childProperty.getEntity())) {
         entitiesWithFile.get(childProperty.getEntity()).add(childProperty.getName());
       } else {
--- a/src/org/openbravo/erpCommon/info/FileInfoBLOB.java	Thu Feb 18 15:22:50 2016 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,211 +0,0 @@
-/*
- *************************************************************************
- * The contents of this file are subject to the Openbravo  Public  License
- * Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
- * Version 1.1  with a permitted attribution clause; you may not  use this
- * file except in compliance with the License. You  may  obtain  a copy of
- * the License at http://www.openbravo.com/legal/license.html 
- * Software distributed under the License  is  distributed  on  an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific  language  governing  rights  and  limitations
- * under the License. 
- * The Original Code is Openbravo ERP. 
- * The Initial Developer of the Original Code is Openbravo SLU 
- * All portions are Copyright (C) 2015 Openbravo SLU 
- * All Rights Reserved. 
- * Contributor(s):  ______________________________________.
- ************************************************************************
- */
-package org.openbravo.erpCommon.info;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.List;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.fileupload.FileItem;
-import org.openbravo.base.provider.OBProvider;
-import org.openbravo.base.secureApp.HttpSecureAppServlet;
-import org.openbravo.base.secureApp.VariablesSecureApp;
-import org.openbravo.dal.core.OBContext;
-import org.openbravo.dal.service.OBDal;
-import org.openbravo.data.Sqlc;
-import org.openbravo.erpCommon.utility.MimeTypeUtil;
-import org.openbravo.model.ad.datamodel.Column;
-import org.openbravo.model.ad.datamodel.Table;
-import org.openbravo.model.ad.ui.Tab;
-import org.openbravo.model.ad.utility.ADFile;
-import org.openbravo.model.common.enterprise.Organization;
-
-public class FileInfoBLOB extends HttpSecureAppServlet {
-  private static final long serialVersionUID = 1L;
-
-  public void init(ServletConfig config) {
-    super.init(config);
-    boolHist = false;
-  }
-
-  public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException,
-      ServletException {
-    VariablesSecureApp vars = new VariablesSecureApp(request);
-
-    String columnName = vars.getStringParameter("columnName");
-    if (columnName == null || columnName.equals(""))
-      columnName = vars.getStringParameter("inpColumnName");
-    String tableId = vars.getStringParameter("tableId");
-    if (tableId == null || tableId.equals("")) {
-      tableId = vars.getStringParameter("inpTableId");
-    }
-    if (tableId == null || tableId.equals("")) {
-      String tabId = vars.getStringParameter("inpTabId");
-      try {
-        OBContext.setAdminMode(true);
-        Tab tab = OBDal.getInstance().get(Tab.class, tabId);
-        tableId = tab.getTable().getId();
-      } finally {
-        OBContext.restorePreviousMode();
-      }
-    }
-    String imageID = vars.getStringParameter("inp" + Sqlc.TransformaNombreColumna(columnName));
-    if (imageID == null || imageID.equals("")) {
-      imageID = vars.getStringParameter("imageId");
-    }
-
-    String orgId = vars.getStringParameter("inpOrgId");
-    if (orgId == null || orgId.equals("")) {
-      orgId = vars.getStringParameter("inpadOrgId");
-    }
-    if (orgId == null || orgId.equals("")) {
-      orgId = OBContext.getOBContext().getCurrentOrganization().getId();
-    }
-
-    String parentObjectId = vars.getStringParameter("parentObjectId");
-    if (parentObjectId == null || parentObjectId.equals("")) {
-      OBContext.setAdminMode(true);
-      try {
-        Table table = OBDal.getInstance().get(Table.class, vars.getStringParameter("inpTableId"));
-        if (table != null) {
-          List<Column> cols = table.getADColumnList();
-          String keyCol = "";
-          for (Column col : cols) {
-            if (col.isKeyColumn()) {
-              keyCol = col.getDBColumnName();
-              break;
-            }
-          }
-          parentObjectId = vars.getStringParameter("inp" + Sqlc.TransformaNombreColumna(keyCol));
-        }
-      } finally {
-        OBContext.restorePreviousMode();
-      }
-
-    }
-
-    if (vars.getCommand().startsWith("SAVE_OB3")) {
-      OBContext.setAdminMode(true);
-      try {
-        final FileItem fi = vars.getMultiFile("inpFile");
-        byte[] bytea = fi.get();
-        String fileName = fi.getName();
-        String mimeType = MimeTypeUtil.getInstance().getMimeTypeName(bytea);
-        int size = bytea.length;
-
-        String fileAction = null;
-
-        // Check file constraints.
-        if (!validateExtension(fileName, vars.getStringParameter("fileExtensions"))) {
-          fileAction = "WRONG_EXTENSION";
-        } else if (!validateSize(size, vars.getStringParameter("fileMaxSize"),
-            vars.getStringParameter("fileMaxSizeUnit"))) {
-          fileAction = "WRONG_SIZE";
-        } else {
-          fileAction = "SUCCESS";
-        }
-
-        // Now save the file
-        ADFile file = OBProvider.getInstance().get(ADFile.class);
-        file.setOrganization(OBDal.getInstance().get(Organization.class, orgId));
-        file.setBindaryData(bytea);
-        file.setActive(true);
-        file.setName(fileName);
-        file.setMimetype(mimeType);
-        file.setFilesize((long) size);
-        OBDal.getInstance().save(file);
-        OBDal.getInstance().flush();
-
-        String fileid = file.getId();
-
-        response.setContentType("text/html; charset=UTF-8");
-        PrintWriter writer = response.getWriter();
-        String selectorId = orgId = vars.getStringParameter("inpSelectorId");
-        writeRedirectOB3(writer, selectorId, fileid, fileAction, fileName);
-      } catch (Throwable t) {
-        log4j.error("Error uploading file", t);
-        response.setContentType("text/html; charset=UTF-8");
-        PrintWriter writer = response.getWriter();
-        String selectorId = orgId = vars.getStringParameter("inpSelectorId");
-        writeRedirectOB3(writer, selectorId, "", "ERROR_UPLOADING", t.getMessage());
-      } finally {
-        OBContext.restorePreviousMode();
-      }
-    } else {
-      pageError(response);
-    }
-  }
-
-  private void writeRedirectOB3(PrintWriter writer, String selectorId, String fileid,
-      String fileAction, String fileName) {
-    writer.write("<HTML><BODY><script type=\"text/javascript\">");
-    writer.write("top." + selectorId + ".callback('" + fileid + "', '" + fileAction + "', '"
-        + fileName + "');");
-
-    // if (StringUtils.isNotEmpty(msg)) {
-    // writer.write(", '" + StringEscapeUtils.escapeJavaScript(msg) + "'");
-    // }
-    //
-    // writer.write(");");
-    writer.write("</SCRIPT></BODY></HTML>");
-  }
-
-  private boolean validateExtension(String filename, String extensions) {
-    if (extensions == null || extensions.equals("")) {
-      return true; // extensions is not defined, then filename extension is valid
-    }
-
-    String filenameupper = filename.toUpperCase();
-    String[] extensionslist = extensions.split(",");
-
-    for (int j = 0; j < extensionslist.length; j++) {
-      if (filenameupper.endsWith(extensionslist[j].trim().toUpperCase())) {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  private boolean validateSize(int size, String maxSize, String maxSizeUnit) {
-    if (maxSize == null || maxSize.equals("")) {
-      return true; // Max size is not defined, then size is valid
-    }
-
-    double readMaxSize = Double.parseDouble(maxSize);
-    double calcMaxSize;
-    if ("B".equals(maxSizeUnit)) {
-      calcMaxSize = readMaxSize;
-    } else if ("KB".equals(maxSizeUnit)) {
-      calcMaxSize = readMaxSize * 1024.0;
-    } else if ("MB".equals(maxSizeUnit)) {
-      calcMaxSize = readMaxSize * 1048576.0;
-    } else if ("GB".equals(maxSizeUnit)) {
-      calcMaxSize = readMaxSize * 1073741824.0;
-    } else {
-      calcMaxSize = readMaxSize * 1024.0; // KB by default
-    }
-
-    return size <= (int) calcMaxSize;
-  }
-}
--- a/src/org/openbravo/erpCommon/utility/GetFile.java	Thu Feb 18 15:22:50 2016 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,85 +0,0 @@
-/*
- *************************************************************************
- * The contents of this file are subject to the Openbravo  Public  License
- * Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
- * Version 1.1  with a permitted attribution clause; you may not  use this
- * file except in compliance with the License. You  may  obtain  a copy of
- * the License at http://www.openbravo.com/legal/license.html 
- * Software distributed under the License  is  distributed  on  an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific  language  governing  rights  and  limitations
- * under the License. 
- * The Original Code is Openbravo ERP.
- * The Initial Developer of the Original Code is Openbravo SLU 
- * All portions are Copyright (C) 2015 Openbravo SLU
- * All Rights Reserved. 
- * Contributor(s):  ______________________________________.
- ************************************************************************
- */
-
-package org.openbravo.erpCommon.utility;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.openbravo.base.secureApp.HttpSecureAppServlet;
-import org.openbravo.dal.core.OBContext;
-import org.openbravo.dal.service.OBDal;
-import org.openbravo.model.ad.utility.ADFile;
-
-/**
- * 
- * This utility class implements a servlet that download files stored in the database
- * 
- */
-public class GetFile extends HttpSecureAppServlet {
-
-  private static final long serialVersionUID = 1L;
-
-  protected static final String RESPONSE_HEADER_CACHE_CONTROL = "Cache-Control";
-  protected static final String RESPONSE_NO_CACHE = "no-cache";
-
-  @Override
-  public void init(ServletConfig config) {
-    super.init(config);
-    boolHist = false;
-  }
-
-  /**
-   * Receiving an id parameter it looks in database for the file with that id and downloads it
-   */
-  public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException,
-      ServletException {
-
-    String fileID = request.getParameter("id");
-    if (fileID == null) {
-      response.sendError(HttpServletResponse.SC_BAD_REQUEST);
-      return;
-    }
-
-    OBContext.setAdminMode(true);
-    try {
-      // Check file null or invalid
-      ADFile file = OBDal.getInstance().get(ADFile.class, fileID);
-      if (file == null) {
-        response.sendError(HttpServletResponse.SC_NOT_FOUND);
-        return;
-      }
-
-      // enforce cache validation/checks every time
-      response.addHeader(RESPONSE_HEADER_CACHE_CONTROL, RESPONSE_NO_CACHE);
-      response.setHeader("Content-Disposition", "attachment; filename=\"" + file.getName() + "\"");
-      response.setContentType(file.getMimetype());
-      OutputStream out = response.getOutputStream();
-      out.write(file.getBindaryData());
-      out.close();
-    } finally {
-      OBContext.restorePreviousMode();
-    }
-  }
-}
--- a/src/org/openbravo/reference/ui/UIFileBLOB.java	Thu Feb 18 15:22:50 2016 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-/*
- *************************************************************************
- * The contents of this file are subject to the Openbravo  Public  License
- * Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
- * Version 1.1  with a permitted attribution clause; you may not  use this
- * file except in compliance with the License. You  may  obtain  a copy of
- * the License at http://www.openbravo.com/legal/license.html 
- * Software distributed under the License  is  distributed  on  an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific  language  governing  rights  and  limitations
- * under the License. 
- * The Original Code is Openbravo ERP. 
- * The Initial Developer of the Original Code is Openbravo SLU 
- * All portions are Copyright (C) 2015 Openbravo SLU 
- * All Rights Reserved. 
- * Contributor(s):  ______________________________________.
- ************************************************************************
- */
-package org.openbravo.reference.ui;
-
-
-public class UIFileBLOB extends UIReference {
-  public UIFileBLOB(String reference, String subreference) {
-    super(reference, subreference);
-  }
-  //
-  // public String getGridType() {
-  // return "img";
-  // }
-  //
-  // public String formatGridValue(VariablesSecureApp vars, String value) {
-  // return "../utility/ShowImage?id=" + value;
-  // }
-
-}