--- a/src/org/openbravo/service/system/SystemService.java	Thu Aug 01 10:00:53 2013 +0200
+++ b/src/org/openbravo/service/system/SystemService.java	Thu Aug 08 14:44:30 2013 +0200
@@ -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) 2009-2011 Openbravo SLU 
+ * All portions are Copyright (C) 2009-2013 Openbravo SLU 
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -321,7 +321,8 @@
 
       List<Entity> entities = ModelProvider.getInstance().getModel();
       for (Entity entity : entities) {
-        if ((entity.isClientEnabled() || entity.getName().equals("ADClient")) && !entity.isView()) {
+        if ((entity.isClientEnabled() || entity.getName().equals("ADClient")) && !entity.isView()
+            && !entity.isDataSourceBased()) {
           final String sql = "delete from " + entity.getTableName() + " where ad_client_id=?";
           sqlCommands.add(sql);
         }