CI: merge back from main
authorRM packaging bot <staff.rm@openbravo.com>
Thu, 07 Apr 2011 17:55:21 +0200
changeset 11551 8d002e0b6285
parent 11548 b981769d0cef (diff)
parent 11550 f852c552d3cc (current diff)
child 11552 e5716dbd8be4
CI: merge back from main
src-db/database/sourcedata/AD_MODULE.xml
--- a/build.xml	Thu Apr 07 17:53:33 2011 +0200
+++ b/build.xml	Thu Apr 07 17:55:21 2011 +0200
@@ -329,8 +329,8 @@
   <taskdef resource="axis-tasks.properties" classpathref="project.class.path" />
   
   <target name="init" depends="code.rev">
+    <fail if="root.user" message="Don't run ant tasks with the root user" />
     <fail if="no.java.home" message="The environment variable JAVA_HOME is not set." />
-    <fail if="root.user" message="Don't run ant tasks with the root user" />
   </target>
 
   <target name="code.rev" depends="set.code.rev">
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml	Thu Apr 07 17:53:33 2011 +0200
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml	Thu Apr 07 17:55:21 2011 +0200
@@ -888,7 +888,7 @@
 <!--FF8080812F10C577012F1138306C0027-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--FF8080812F10C577012F1138306C0027-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080812F10C577012F1138306C0027-->  <VALUE><![CDATA[OBUIAPP_ExecuteInCallout]]></VALUE>
-<!--FF8080812F10C577012F1138306C0027-->  <MSGTEXT><![CDATA[This window is using some functionality which needs to be updated to work in Openbravo 3. Therefore, it's likely that this window will not work correctly in Openbravo 3 mode. A preference has been added so that this window is opened in classic mode until this problem is fixed. Contact with your System Administrator, or with the developer of the module to fix this. You now need to log out of the application, and login again, so that this window is shown in classic mode.]]></MSGTEXT>
+<!--FF8080812F10C577012F1138306C0027-->  <MSGTEXT><![CDATA[This window is using some functionality which needs to be updated to work in Openbravo 3. A preference has been added so that this window is opened in classic mode until this problem is fixed. Contact with your System Administrator, or with the developer of the module to fix this. You now need to log out of the application, and login again, so that this window is shown in classic mode.]]></MSGTEXT>
 <!--FF8080812F10C577012F1138306C0027-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
 <!--FF8080812F10C577012F1138306C0027-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--FF8080812F10C577012F1138306C0027--></AD_MESSAGE>
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-field.js.ftl	Thu Apr 07 17:53:33 2011 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-field.js.ftl	Thu Apr 07 17:55:21 2011 +0200
@@ -62,7 +62,11 @@
           </#if>
         </#if>
         <#if fieldDefinition.type = "OBSectionItem" || fieldDefinition.type = "OBNoteSectionItem" || fieldDefinition.type = "OBLinkedItemSectionItem" >
+        <#if fieldDefinition.type = "OBNoteSectionItem">
         sectionExpanded: false,
+        <#else>
+        sectionExpanded: true,
+        </#if>
         defaultValue: '${fieldDefinition.label?js_string}',
         itemIds: [
         <#list fieldDefinition.children as childField>
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-formitem-widgets.js	Thu Apr 07 17:53:33 2011 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-formitem-widgets.js	Thu Apr 07 17:55:21 2011 +0200
@@ -511,7 +511,7 @@
   moveFocusOnPickValue: true,
   
   // is overridden to keep track that a value has been explicitly picked
-  pickValue : function (value) {
+  pickValue: function (value) {
     this._pickedValue = true;
     this.Super('pickValue', arguments);
     delete this._pickedValue;
@@ -898,6 +898,13 @@
   change: function(form, item, value, oldValue){ /* transformInput */
     var isADate = value !== null &&
               Object.prototype.toString.call(value) === '[object Date]';
+    // prevent a change if nothing changed
+    if (value === oldValue) {
+      return false;
+    }
+    if (isADate && value && oldValue && oldValue.getTime && value.getTime() === oldValue.getTime()) {
+      return false;
+    }
     if (isADate) {
       return;
     }
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-window.js	Thu Apr 07 17:53:33 2011 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-window.js	Thu Apr 07 17:55:21 2011 +0200
@@ -225,6 +225,7 @@
     }
 
     var callback = function(ok){
+      delete me.inAutoSaveConfirmation;
       if (ok) {
         if (me.getDirtyEditForm()) {
           me.getDirtyEditForm().resetForm();
@@ -242,6 +243,7 @@
         }
       }
     };
+    this.inAutoSaveConfirmation = true;
     isc.ask(OB.I18N.getLabel('OBUIAPP_AutoSaveNotPossibleExecuteAction'), callback);
   },
   
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-form-notes.js	Thu Apr 07 17:53:33 2011 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-form-notes.js	Thu Apr 07 17:55:21 2011 +0200
@@ -64,6 +64,11 @@
 	this.getNotePart().refresh();
 },
 
+expandSection: function() {
+  this.Super('expandSection',arguments);
+  this.form.noteSection.refresh();
+},
+
 hide: function(){
  this.Super('hide',arguments);
  if (this.canvasItem) {
@@ -219,7 +224,8 @@
 
 							fetchData : function(criteria, callback,
 									requestProperties) {
-							  if (this.layout.isDrawn()) {
+							  if (this.layout.getForm() && this.layout.getForm().noteSection && 
+							      this.layout.getForm().noteSection.visible && this.layout.getForm().noteSection.isExpanded()) {
 								  return this.Super('fetchData', [ this.convertCriteria(criteria),
 										callback, requestProperties ]);
 							  }
@@ -276,7 +282,7 @@
 								value =  value + ' <span class="OBNoteListGridAuthor">' +
 								        OB.Utilities.getTimePassed(record.created) +
 										' ' + OB.I18N.getLabel('OBUIAPP_by') + ' ' +
-										record['createdBy._identifier'];
+										record['createdBy._identifier']+'</span>';
 
 								// show delete link if the note was created by
 								// the current user
@@ -285,9 +291,8 @@
 											' <span class="OBNoteListGridDelete" >[ <a class="OBNoteListGridDelete" href="#" onclick="' +
 											this.layout.ID + '.deleteNote(\'' +
 											record.id +
-											'\')">' + OB.I18N.getLabel('OBUIAPP_delete') + '</a> ]</span>';
+											'\')">' + OB.I18N.getLabel('OBUIAPP_delete') + ' </a>]</span>';
 								} 
-								value = value + '</span>';
 								return value;
 							},
 
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-form.js	Thu Apr 07 17:53:33 2011 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-form.js	Thu Apr 07 17:55:21 2011 +0200
@@ -771,7 +771,10 @@
 
     // disable with a delay to allow the focus to be moved to a new field
     // before disabling
-    this.delayCall('setDisabled', [true], 10);
+    // only do this if there is no popup currently
+    if (!this.view.standardWindow.inAutoSaveConfirmation) {
+      this.delayCall('setDisabled', [true], 10);
+    }
 
     var editRow = this.view.viewGrid.getEditRow();
     
@@ -1025,7 +1028,6 @@
       }
       return;
     }
-    this.resetFocusItem();
   },
   
   getFirstErrorItem: function() {
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js	Thu Apr 07 17:53:33 2011 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js	Thu Apr 07 17:55:21 2011 +0200
@@ -1268,6 +1268,10 @@
         }        
       }
     }
+    if (colNum || colNum === 0) {
+      this.forceFocusColumn = this.getField(colNum).name;
+    }
+    
     return this.Super('startEditing', [rowNum, colNum, suppressFocus, eCe, suppressWarning]);
   },
 
@@ -1468,14 +1472,28 @@
   // check if a fic call needs to be done when leaving a cell and moving to the next
   // row
   // see description in saveEditvalues
-  cellEditEnd : function (editCompletionEvent, newValue, ficCallDone) {
+  cellEditEnd: function (editCompletionEvent, newValue, ficCallDone, autoSaveDone) {
     var rowNum = this.getEditRow(), colNum = this.getEditCol();
+    var editForm = this.getEditForm(), focusItem = editForm.getFocusItem();
+    // sometimes rowNum and colnum are not set, then don't compute the next cell
+    var nextEditCell = ((rowNum || rowNum === 0) && (colNum || colNum === 0) ? this.getNextEditCell(rowNum, colNum, editCompletionEvent) : null);
+    var newRow = nextEditCell && nextEditCell[0] !== rowNum;
+    // the enter key saves anyway, so no autosave needed
+    var enterKey = editCompletionEvent === 'enter';
+    if (!enterKey && !autoSaveDone && newRow && (this.getEditForm().hasChanged || this.getEditForm().isNew)) {
+      var actionObject = {
+          target: this,
+          method: this.cellEditEnd,
+          parameters: [editCompletionEvent, newValue, ficCallDone, true]
+        };
+      this.view.standardWindow.doActionAfterAutoSave(actionObject, true);
+      return;
+    }
     if (ficCallDone) {
       // get new value as the row can have changed
-      this.Super('cellEditEnd', [editCompletionEvent, this.getEditValue(rowNum, colNum), ficCallDone]);
+      this.Super('cellEditEnd', [editCompletionEvent, this.getEditValue(rowNum, colNum)]);
       return;
     } else {
-      var editForm = this.getEditForm(), focusItem = editForm.getFocusItem();
       if (focusItem) {
         focusItem.updateValue();
         editForm.handleItemChange(focusItem);
@@ -1485,13 +1503,17 @@
           editValues.actionAfterFicReturn = {
             target: this,
             method: this.cellEditEnd,
-            parameters: [editCompletionEvent, newValue, true]
+            parameters: [editCompletionEvent, newValue, true, autoSaveDone]
           };
           return;
         }
       }      
-    }    
-    this.Super('cellEditEnd', arguments);
+    }
+    if (newValue) {
+      this.Super('cellEditEnd', [editCompletionEvent, newValue]);
+    } else {
+      this.Super('cellEditEnd', [editCompletionEvent]);
+    }
   },
   
   // overridden to set the enterkeyaction to nextrowstart in cases the current row
@@ -1614,6 +1636,10 @@
       // if the focus does not get suppressed then the clicked field will receive focus
       // and won't be disabled so the user can already start typing      
       suppressFocus = true;
+
+      if (!this.forceFocusColumn && (colNum || colNum === 0)) {
+        this.forceFocusColumn = this.getField(colNum).name;
+      }
     }
     
     var ret = this.Super('showInlineEditor', [rowNum, colNum, newCell, newRow, suppressFocus]);
--- a/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-form-styles.css	Thu Apr 07 17:53:33 2011 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-form-styles.css	Thu Apr 07 17:55:21 2011 +0200
@@ -729,6 +729,8 @@
    border: 0px;
    background-color: transparent;
    padding:5px; 
+   font-family: arial;
+   font-size: 12px;
 }
 
 .OBNoteListGridCurrentUserNoteCell,
@@ -742,18 +744,26 @@
 }
 
 .OBNoteListGridAuthor {
+  font-family: arial;
   font-style: italic;
-  font-size: 10px;
+  font-size: 11px;
   margin-left: 3px;
 }
 
 .OBNoteListGridDelete {
+  font-family: 'lucida sans', sans-serif;
   font-style: normal;
-  color: green;
+  font-size: 12px;
+  color: #0d7813;
   margin-left: 0px;
 }
 
 a.OBNoteListGridDelete:link {
   padding: 0px;
+  text-decoration: none;
+}
+
+a.OBNoteListGridDelete:hover {
+  text-decoration: underline;
 }
 	
\ No newline at end of file
--- a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/CSSMinimizer.java	Thu Apr 07 17:53:33 2011 +0200
+++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/CSSMinimizer.java	Thu Apr 07 17:55:21 2011 +0200
@@ -62,7 +62,7 @@
  * 
  * @author Barry van Oudtshoorn
  */
-public class CSSMinimizer {
+class CSSMinimizer {
 
   private static Logger log = Logger.getLogger(CSSMinimizer.class);
 
@@ -133,7 +133,7 @@
               selectors.addElement(new Selector(sb.substring(n, i + 1)));
             } catch (Exception e) {
               if (e.getMessage().contains("Empty selector body:")) {
-                log.warn(e.getMessage());
+                log.debug(e.getMessage());
               } else {
                 log.error(e.getMessage(), e);
               }
--- a/modules/org.openbravo.client.myob/referencedata/standard/MyOBData.xml	Thu Apr 07 17:53:33 2011 +0200
+++ b/modules/org.openbravo.client.myob/referencedata/standard/MyOBData.xml	Thu Apr 07 17:55:21 2011 +0200
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ob:Openbravo xmlns:ob="http://www.openbravo.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <OBKMO_WidgetInstance id="FF8080812C402030012C40246CA40009" identifier="Openbravo Community Branding - 0 - 0">
+  <OBKMO_WidgetInstance id="FF8080812C402030012C40246CA40009" identifier="Welcome to Openbravo 3 - 0 - 0">
     <id>FF8080812C402030012C40246CA40009</id>
     <active>true</active>
-    <widgetClass id="50F3F7AED43A4B31AF176F1AF0714284" entity-name="OBKMO_WidgetClass" identifier="Openbravo Community Branding"/>
+    <widgetClass id="50F3F7AED43A4B31AF176F1AF0714284" entity-name="OBKMO_WidgetClass" identifier="Welcome to Openbravo 3"/>
     <copiedFrom xsi:nil="true"/>
     <columnPosition>0</columnPosition>
     <sequenceInColumn>0</sequenceInColumn>
@@ -11,4 +11,15 @@
     <visibleAtUser xsi:nil="true"/>
     <relativePriority>0</relativePriority>
   </OBKMO_WidgetInstance>
+  <OBKMO_WidgetInstance id="FF8080812F2BB278012F2BC4BE640017" identifier="Getting Started - 1 - 0">
+    <id>FF8080812F2BB278012F2BC4BE640017</id>
+    <active>true</active>
+    <widgetClass id="FF8080812E144FAE012E1455F6020009" entity-name="OBKMO_WidgetClass" identifier="Getting Started"/>
+    <copiedFrom xsi:nil="true"/>
+    <columnPosition>1</columnPosition>
+    <sequenceInColumn>0</sequenceInColumn>
+    <visibleAtRole xsi:nil="true"/>
+    <visibleAtUser xsi:nil="true"/>
+    <relativePriority>1</relativePriority>
+  </OBKMO_WidgetInstance>
 </ob:Openbravo>
--- a/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_DATASET.xml	Thu Apr 07 17:53:33 2011 +0200
+++ b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_DATASET.xml	Thu Apr 07 17:55:21 2011 +0200
@@ -11,7 +11,7 @@
 <!--6DAA315A20A5498691531B9B583FB90B-->  <EXPORT><![CDATA[N]]></EXPORT>
 <!--6DAA315A20A5498691531B9B583FB90B-->  <ACCESSLEVEL><![CDATA[4]]></ACCESSLEVEL>
 <!--6DAA315A20A5498691531B9B583FB90B-->  <EXPORTALLOWED><![CDATA[Y]]></EXPORTALLOWED>
-<!--6DAA315A20A5498691531B9B583FB90B-->  <CHECKSUM><![CDATA[199308082254480370952731372313178174824]]></CHECKSUM>
+<!--6DAA315A20A5498691531B9B583FB90B-->  <CHECKSUM><![CDATA[51868188549308667501861375052954901138]]></CHECKSUM>
 <!--6DAA315A20A5498691531B9B583FB90B--></AD_DATASET>
 
 </data>
--- a/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_DATASET_TABLE.xml	Thu Apr 07 17:53:33 2011 +0200
+++ b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_DATASET_TABLE.xml	Thu Apr 07 17:55:21 2011 +0200
@@ -8,7 +8,7 @@
 <!--3C2A6ECF09BC40168E0852224B086D6D-->  <AD_DATASET_ID><![CDATA[6DAA315A20A5498691531B9B583FB90B]]></AD_DATASET_ID>
 <!--3C2A6ECF09BC40168E0852224B086D6D-->  <AD_TABLE_ID><![CDATA[CF1D8385DC364B97B6A1BA2EE76C8DA1]]></AD_TABLE_ID>
 <!--3C2A6ECF09BC40168E0852224B086D6D-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--3C2A6ECF09BC40168E0852224B086D6D-->  <WHERECLAUSE><![CDATA[relativePriority = 0 AND copiedFrom IS NULL]]></WHERECLAUSE>
+<!--3C2A6ECF09BC40168E0852224B086D6D-->  <WHERECLAUSE><![CDATA[widgetClass.module.id = '2758CD25B2704AF6BBAD10365FC82C06' AND relativePriority IN (0, 1) AND copiedFrom IS NULL]]></WHERECLAUSE>
 <!--3C2A6ECF09BC40168E0852224B086D6D-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
 <!--3C2A6ECF09BC40168E0852224B086D6D-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
 <!--3C2A6ECF09BC40168E0852224B086D6D-->  <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID>
@@ -50,7 +50,7 @@
 <!--71FD68D870174A5D8B6B0A7B5CC1FB78-->  <AD_DATASET_ID><![CDATA[6DAA315A20A5498691531B9B583FB90B]]></AD_DATASET_ID>
 <!--71FD68D870174A5D8B6B0A7B5CC1FB78-->  <AD_TABLE_ID><![CDATA[815D739C48414E01AF9F44EE3E8CCEBB]]></AD_TABLE_ID>
 <!--71FD68D870174A5D8B6B0A7B5CC1FB78-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--71FD68D870174A5D8B6B0A7B5CC1FB78-->  <WHERECLAUSE><![CDATA[obkmoWidgetInstance.relativePriority = 0 AND obkmoWidgetInstance.copiedFrom IS NULL]]></WHERECLAUSE>
+<!--71FD68D870174A5D8B6B0A7B5CC1FB78-->  <WHERECLAUSE><![CDATA[obkmoWidgetInstance.widgetClass.module.id = '2758CD25B2704AF6BBAD10365FC82C06' AND obkmoWidgetInstance.relativePriority IN (0, 1) AND obkmoWidgetInstance.copiedFrom IS NULL]]></WHERECLAUSE>
 <!--71FD68D870174A5D8B6B0A7B5CC1FB78-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
 <!--71FD68D870174A5D8B6B0A7B5CC1FB78-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
 <!--71FD68D870174A5D8B6B0A7B5CC1FB78-->  <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID>
--- a/modules/org.openbravo.client.myob/src/org/openbravo/client/myob/WidgetProvider.java	Thu Apr 07 17:53:33 2011 +0200
+++ b/modules/org.openbravo.client.myob/src/org/openbravo/client/myob/WidgetProvider.java	Thu Apr 07 17:55:21 2011 +0200
@@ -230,6 +230,7 @@
 
   protected void addDefaultWidgetProperties(JSONObject jsonObject, WidgetInstance widgetInstance)
       throws JSONException {
+    jsonObject.put(WIDGETCLASSID, widgetInstance.getWidgetClass().getId());
     jsonObject.put(MyOpenbravoWidgetComponent.CLASSNAMEPARAMETER, myOBUtils.getWidgetProvider(
         widgetClass).getClientSideWidgetClassName());
     jsonObject.put(DBINSTANCEID, widgetInstance.getId());
--- a/modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-myopenbravo.js	Thu Apr 07 17:53:33 2011 +0200
+++ b/modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-myopenbravo.js	Thu Apr 07 17:55:21 2011 +0200
@@ -517,9 +517,12 @@
           localWidgetProperties.showMaximizeButton = this.availableWidgetClasses[i].showMaximizeButton;
           localWidgetProperties.menuItems = this.availableWidgetClasses[i].menuItems;
           localWidgetProperties.fieldDefinitions = this.availableWidgetClasses[i].fieldDefinitions;
-          localWidgetProperties.aboutFieldDefinitions = this.availableWidgetClasses[i].aboutFieldDefinitions;
-          localWidgetProperties.parameters = isc.addProperties({}, widgetProperties.parameters);
-          localWidgetProperties.widgetClassId = this.availableWidgetClasses[i].widgetClassId;
+          if(!localWidgetProperties.aboutFieldDefinitions) {
+            localWidgetProperties.aboutFieldDefinitions = this.availableWidgetClasses[i].aboutFieldDefinitions;
+          }
+          if(!localWidgetProperties.parameters) {
+            localWidgetProperties.parameters = isc.addProperties({}, widgetProperties.parameters);
+          }
           break;
         }
       }
--- a/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/templates/datasource.ftl	Thu Apr 07 17:53:33 2011 +0200
+++ b/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/templates/datasource.ftl	Thu Apr 07 17:55:21 2011 +0200
@@ -39,6 +39,9 @@
 <#if data.getParameter("_onlyGenerateCreateStatement") == "" || data.getParameter("_create") != "">
         ID:'${data.id}',
 </#if>
+<#if data.getParameter("_new") != "">
+        _new: true,
+</#if>
         titleField: OB.Constants.IDENTIFIER
         , dataURL:'${data.dataUrl?js_string}${data.name?js_string}'
         , recordXPath: '/response/data', dataFormat: 'json'
--- a/modules/org.openbravo.service.datasource/web/org.openbravo.service.datasource/js/ob-datasource-utilities.js	Thu Apr 07 17:53:33 2011 +0200
+++ b/modules/org.openbravo.service.datasource/web/org.openbravo.service.datasource/js/ob-datasource-utilities.js	Thu Apr 07 17:55:21 2011 +0200
@@ -108,6 +108,11 @@
 // * {{{dsProperties}}}: the properties of the datasource which needs to be
 // created.
 OB.Datasource.create = function(/* Object */dsProperties) {
+  // if must be a new datasource then change the id 
+  // https://issues.openbravo.com/view.php?id=16581
+  if (dsProperties._new && dsProperties.ID) {
+    dsProperties.ID = dsProperties.ID + '_' + new Date().getTime();
+  }
   if (dsProperties.ID) {
     var ds = isc.DataSource.getDataSource(dsProperties.ID);
     if (ds) {
--- a/referencedata/sampledata/F_B_International_Group.xml	Thu Apr 07 17:53:33 2011 +0200
+++ b/referencedata/sampledata/F_B_International_Group.xml	Thu Apr 07 17:55:21 2011 +0200
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?><ob:Openbravo xmlns:ob="http://www.openbravo.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0" encoding="UTF-8"?>
+<ob:Openbravo xmlns:ob="http://www.openbravo.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <FinancialMgmtMatchingAlgorithm id="F6B492F80B6C4733AA653D8B45679B6C">
     <id>F6B492F80B6C4733AA653D8B45679B6C</id>
     <client id="FF8080812AFBCB14012AFBD3E373001F"/>
@@ -3305,15 +3306,6 @@
     <uponWithdrawalUse>WIT</uponWithdrawalUse>
     <oUTUponClearingUse xsi:nil="true"/>
   </FinancialMgmtFinAccPaymentMethod>
-  <FinancialMgmtBankFileFormat id="1CC0F943F1AA4DDA9CECCEF01969CBF5">
-    <id>1CC0F943F1AA4DDA9CECCEF01969CBF5</id>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
-    <organization id="0"/>
-    <active>true</active>
-    <name>Cuaderno 43</name>
-    <description xsi:nil="true"/>
-    <javaClassName>org.openbravo.module.cuaderno43.es.utility.Cuaderno43</javaClassName>
-  </FinancialMgmtBankFileFormat>
   <FIN_Payment_Schedule id="001CC332B71D470484E7A15BC3ABEB02">
     <id>001CC332B71D470484E7A15BC3ABEB02</id>
     <client id="FF8080812AFBCB14012AFBD3E373001F"/>
@@ -8368,19 +8360,6 @@
     <visibleAtUser id="100"/>
     <relativePriority>6</relativePriority>
   </OBKMO_WidgetInstance>
-  <OBKMO_WidgetInstance id="402880E92E2F838E012E304D841300BF">
-    <id>402880E92E2F838E012E304D841300BF</id>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
-    <organization id="0"/>
-    <active>true</active>
-    <widgetClass id="FF8080812E144FAE012E1455F6020009"/>
-    <copiedFrom xsi:nil="true"/>
-    <columnPosition>1</columnPosition>
-    <sequenceInColumn>0</sequenceInColumn>
-    <visibleAtRole id="FF8080812AFBCB14012AFBD3E4340031"/>
-    <visibleAtUser id="100"/>
-    <relativePriority>6</relativePriority>
-  </OBKMO_WidgetInstance>
   <OBKMO_WidgetInstance id="402880E92E2F838E012E304E5A5F00C0">
     <id>402880E92E2F838E012E304E5A5F00C0</id>
     <client id="FF8080812AFBCB14012AFBD3E373001F"/>
@@ -8524,19 +8503,6 @@
     <visibleAtUser id="F37A0F5F36CB40E79123FE32F9C286D3"/>
     <relativePriority>6</relativePriority>
   </OBKMO_WidgetInstance>
-  <OBKMO_WidgetInstance id="402880E92E2F838E012E306A87FE00F2">
-    <id>402880E92E2F838E012E306A87FE00F2</id>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
-    <organization id="0"/>
-    <active>true</active>
-    <widgetClass id="FF8080812E144FAE012E1455F6020009"/>
-    <copiedFrom xsi:nil="true"/>
-    <columnPosition>1</columnPosition>
-    <sequenceInColumn>0</sequenceInColumn>
-    <visibleAtRole id="1700BE6E97C947A0A765C68976366234"/>
-    <visibleAtUser id="F37A0F5F36CB40E79123FE32F9C286D3"/>
-    <relativePriority>6</relativePriority>
-  </OBKMO_WidgetInstance>
   <OBKMO_WidgetInstance id="402880E92E2F838E012E306B8C6E00F3">
     <id>402880E92E2F838E012E306B8C6E00F3</id>
     <client id="FF8080812AFBCB14012AFBD3E373001F"/>
@@ -8576,19 +8542,6 @@
     <visibleAtUser id="F37A0F5F36CB40E79123FE32F9C286D3"/>
     <relativePriority>6</relativePriority>
   </OBKMO_WidgetInstance>
-  <OBKMO_WidgetInstance id="402880E92E2F838E012E306F9AA300FA">
-    <id>402880E92E2F838E012E306F9AA300FA</id>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
-    <organization id="0"/>
-    <active>true</active>
-    <widgetClass id="FF8080812E144FAE012E1455F6020009"/>
-    <copiedFrom xsi:nil="true"/>
-    <columnPosition>1</columnPosition>
-    <sequenceInColumn>0</sequenceInColumn>
-    <visibleAtRole id="5CDB22F60411492E8716401BF5203770"/>
-    <visibleAtUser id="3DCE85BD0D764716A80BA4626497DDDA"/>
-    <relativePriority>6</relativePriority>
-  </OBKMO_WidgetInstance>
   <OBKMO_WidgetInstance id="402880E92E2F838E012E306FC34A00FB">
     <id>402880E92E2F838E012E306FC34A00FB</id>
     <client id="FF8080812AFBCB14012AFBD3E373001F"/>
@@ -84478,6 +84431,40 @@
     <selected>false</selected>
     <module xsi:nil="true"/>
   </ADPreference>
+  <ADPreference id="402880E72F2BEABD012F2BEF8B07000C">
+    <id>402880E72F2BEABD012F2BEF8B07000C</id>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="B9C7088AB859483A9B1FB342AC2BE17A"/>
+    <active>true</active>
+    <window xsi:nil="true"/>
+    <userContact xsi:nil="true"/>
+    <attribute>ShowAcct</attribute>
+    <searchKey>Y</searchKey>
+    <property xsi:nil="true"/>
+    <propertyList>false</propertyList>
+    <visibleAtClient xsi:nil="true"/>
+    <visibleAtOrganization xsi:nil="true"/>
+    <visibleAtRole id="1700BE6E97C947A0A765C68976366234"/>
+    <selected>false</selected>
+    <module xsi:nil="true"/>
+  </ADPreference>
+  <ADPreference id="402880E72F2BEABD012F2BF07CCA0010">
+    <id>402880E72F2BEABD012F2BF07CCA0010</id>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="B9C7088AB859483A9B1FB342AC2BE17A"/>
+    <active>true</active>
+    <window xsi:nil="true"/>
+    <userContact xsi:nil="true"/>
+    <attribute>Showacct</attribute>
+    <searchKey xsi:nil="true"/>
+    <property xsi:nil="true"/>
+    <propertyList>false</propertyList>
+    <visibleAtClient xsi:nil="true"/>
+    <visibleAtOrganization xsi:nil="true"/>
+    <visibleAtRole id="5CDB22F60411492E8716401BF5203770"/>
+    <selected>false</selected>
+    <module xsi:nil="true"/>
+  </ADPreference>
   <ADPreference id="4CBE646E61B34BD289E199A7B7580389">
     <id>4CBE646E61B34BD289E199A7B7580389</id>
     <client id="FF8080812AFBCB14012AFBD3E373001F"/>
@@ -379568,12 +379555,12 @@
     <subAccountLength xsi:nil="true"/>
   </OrganizationAcctSchema>
   <FIN_Payment id="16248F4ADAE448F482815CB91E1B6AE7">
+    <id>16248F4ADAE448F482815CB91E1B6AE7</id>
     <documentNo>400003</documentNo>
-    <id>16248F4ADAE448F482815CB91E1B6AE7</id>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
     <paymentDate>2010-08-27T00:00:00.0Z</paymentDate>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="90A1F59849E84AFABD04814B3D15A691"/>
     <businessPartner id="8A64B71A2B0B2946012B0FE1E56F01C7"/>
-    <organization id="90A1F59849E84AFABD04814B3D15A691"/>
     <amount>3.00</amount>
     <active>true</active>
     <receipt>true</receipt>
@@ -379604,12 +379591,12 @@
     <createdByAlgorithm>false</createdByAlgorithm>
   </FIN_Payment>
   <FIN_Payment id="22F7D21FB4104C089194547F00D0626B">
+    <id>22F7D21FB4104C089194547F00D0626B</id>
     <documentNo>700007</documentNo>
-    <id>22F7D21FB4104C089194547F00D0626B</id>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
     <paymentDate>2010-09-08T00:00:00.0Z</paymentDate>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0D8E225ADA6E425E98EAA0F34E5912D7"/>
     <businessPartner id="8A64B71A2B0B2946012B0FE1E7A301E9"/>
-    <organization id="0D8E225ADA6E425E98EAA0F34E5912D7"/>
     <amount>550.18</amount>
     <active>true</active>
     <receipt>false</receipt>
@@ -379640,12 +379627,12 @@
     <createdByAlgorithm>false</createdByAlgorithm>
   </FIN_Payment>
   <FIN_Payment id="3D048FCA18DF41A1B09D2FDD088B562B">
+    <id>3D048FCA18DF41A1B09D2FDD088B562B</id>
     <documentNo>400001</documentNo>
-    <id>3D048FCA18DF41A1B09D2FDD088B562B</id>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
     <paymentDate>2010-08-11T00:00:00.0Z</paymentDate>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="90A1F59849E84AFABD04814B3D15A691"/>
     <businessPartner id="8A64B71A2B0B2946012B0FE1E56F01C7"/>
-    <organization id="90A1F59849E84AFABD04814B3D15A691"/>
     <amount>610.07</amount>
     <active>true</active>
     <receipt>true</receipt>
@@ -379676,12 +379663,12 @@
     <createdByAlgorithm>false</createdByAlgorithm>
   </FIN_Payment>
   <FIN_Payment id="4A5808566ECC40DEAF4A5C05D225D81E">
+    <id>4A5808566ECC40DEAF4A5C05D225D81E</id>
     <documentNo>700005</documentNo>
-    <id>4A5808566ECC40DEAF4A5C05D225D81E</id>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
     <paymentDate>2010-08-27T00:00:00.0Z</paymentDate>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="7A8E888A4B4C4E638CD5EB3A41A3289A"/>
     <businessPartner id="8A64B71A2B0B2946012B0FE1E77001E4"/>
-    <organization id="7A8E888A4B4C4E638CD5EB3A41A3289A"/>
     <amount>202.68</amount>
     <active>true</active>
     <receipt>false</receipt>
@@ -379712,12 +379699,12 @@
     <createdByAlgorithm>false</createdByAlgorithm>
   </FIN_Payment>
   <FIN_Payment id="4CBE98FC1EF44556B499DB99EDA26C1B">
+    <id>4CBE98FC1EF44556B499DB99EDA26C1B</id>
     <documentNo>700002</documentNo>
-    <id>4CBE98FC1EF44556B499DB99EDA26C1B</id>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
     <paymentDate>2010-09-06T00:00:00.0Z</paymentDate>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="90A1F59849E84AFABD04814B3D15A691"/>
     <businessPartner id="8A64B71A2B0B2946012B0FE1E49501B5"/>
-    <organization id="90A1F59849E84AFABD04814B3D15A691"/>
     <amount>50.00</amount>
     <active>true</active>
     <receipt>false</receipt>
@@ -379748,12 +379735,12 @@
     <createdByAlgorithm>false</createdByAlgorithm>
   </FIN_Payment>
   <FIN_Payment id="53CC001E6036491080266E38A54D73DF">
+    <id>53CC001E6036491080266E38A54D73DF</id>
     <documentNo>700006</documentNo>
-    <id>53CC001E6036491080266E38A54D73DF</id>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
     <paymentDate>2010-09-06T00:00:00.0Z</paymentDate>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="7A8E888A4B4C4E638CD5EB3A41A3289A"/>
     <businessPartner id="8A64B71A2B0B2946012B0FE1E77001E4"/>
-    <organization id="7A8E888A4B4C4E638CD5EB3A41A3289A"/>
     <amount>300.00</amount>
     <active>true</active>
     <receipt>false</receipt>
@@ -379784,12 +379771,12 @@
     <createdByAlgorithm>false</createdByAlgorithm>
   </FIN_Payment>
   <FIN_Payment id="8A64B71A2B68AAA5012B7D1849130026">
+    <id>8A64B71A2B68AAA5012B7D1849130026</id>
     <documentNo>400005</documentNo>
-    <id>8A64B71A2B68AAA5012B7D1849130026</id>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
     <paymentDate>2010-09-08T00:00:00.0Z</paymentDate>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="378AF0EAE1A2479EAAA33436645E9433"/>
     <businessPartner id="8A64B71A2B0B2946012B0FE1E4D501BB"/>
-    <organization id="378AF0EAE1A2479EAAA33436645E9433"/>
     <amount>1383.20</amount>
     <active>true</active>
     <receipt>true</receipt>
@@ -379820,12 +379807,12 @@
     <createdByAlgorithm>false</createdByAlgorithm>
   </FIN_Payment>
   <FIN_Payment id="A9310A008E744E50929ADE299B724D1E">
+    <id>A9310A008E744E50929ADE299B724D1E</id>
     <documentNo>700003</documentNo>
-    <id>A9310A008E744E50929ADE299B724D1E</id>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
     <paymentDate>2010-09-08T00:00:00.0Z</paymentDate>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="378AF0EAE1A2479EAAA33436645E9433"/>
     <businessPartner id="8A64B71A2B0B2946012B0FE1E37001AB"/>
-    <organization id="378AF0EAE1A2479EAAA33436645E9433"/>
     <amount>628.79</amount>
     <active>true</active>
     <receipt>false</receipt>
@@ -379856,12 +379843,12 @@
     <createdByAlgorithm>false</createdByAlgorithm>
   </FIN_Payment>
   <FIN_Payment id="B67C90A29C734646ABB52EE1F8F64974">
+    <id>B67C90A29C734646ABB52EE1F8F64974</id>
     <documentNo>400008</documentNo>
-    <id>B67C90A29C734646ABB52EE1F8F64974</id>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
     <paymentDate>2010-09-06T00:00:00.0Z</paymentDate>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="7A8E888A4B4C4E638CD5EB3A41A3289A"/>
     <businessPartner id="8A64B71A2B0B2946012B0FE1E8B50200"/>
-    <organization id="7A8E888A4B4C4E638CD5EB3A41A3289A"/>
     <amount>846.83</amount>
     <active>true</active>
     <receipt>true</receipt>
@@ -379892,12 +379879,12 @@
     <createdByAlgorithm>false</createdByAlgorithm>
   </FIN_Payment>
   <FIN_Payment id="BE8D60B5AFF8448CBD44DAF62260D2B5">
+    <id>BE8D60B5AFF8448CBD44DAF62260D2B5</id>
     <documentNo>400010</documentNo>
-    <id>BE8D60B5AFF8448CBD44DAF62260D2B5</id>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
     <paymentDate>2010-09-08T00:00:00.0Z</paymentDate>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0D8E225ADA6E425E98EAA0F34E5912D7"/>
     <businessPartner id="8A64B71A2B0B2946012B0FE1E86301FA"/>
-    <organization id="0D8E225ADA6E425E98EAA0F34E5912D7"/>
     <amount>97.94</amount>
     <active>true</active>
     <receipt>true</receipt>
@@ -379928,12 +379915,12 @@
     <createdByAlgorithm>false</createdByAlgorithm>
   </FIN_Payment>
   <FIN_Payment id="C3783FC1B5C2436C81247DDAEF9D1738">
+    <id>C3783FC1B5C2436C81247DDAEF9D1738</id>
     <documentNo>400007</documentNo>
-    <id>C3783FC1B5C2436C81247DDAEF9D1738</id>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
     <paymentDate>2010-08-27T00:00:00.0Z</paymentDate>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="7A8E888A4B4C4E638CD5EB3A41A3289A"/>
     <businessPartner id="8A64B71A2B0B2946012B0FE1E8B50200"/>
-    <organization id="7A8E888A4B4C4E638CD5EB3A41A3289A"/>
     <amount>500.00</amount>
     <active>true</active>
     <receipt>true</receipt>
@@ -379964,12 +379951,12 @@
     <createdByAlgorithm>false</createdByAlgorithm>
   </FIN_Payment>
   <FIN_Payment id="C40A8A65B0FB4522A40830387B93E5CB">
+    <id>C40A8A65B0FB4522A40830387B93E5CB</id>
     <documentNo>400004</documentNo>
-    <id>C40A8A65B0FB4522A40830387B93E5CB</id>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
     <paymentDate>2010-09-06T00:00:00.0Z</paymentDate>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="90A1F59849E84AFABD04814B3D15A691"/>
     <businessPartner id="8A64B71A2B0B2946012B0FE1E56F01C7"/>
-    <organization id="90A1F59849E84AFABD04814B3D15A691"/>
     <amount>3.31</amount>
     <active>true</active>
     <receipt>true</receipt>
@@ -380000,12 +379987,12 @@
     <createdByAlgorithm>false</createdByAlgorithm>
   </FIN_Payment>
   <FIN_Payment id="E80E742A75F94BB0AA623EA9BBD40758">
+    <id>E80E742A75F94BB0AA623EA9BBD40758</id>
     <documentNo>400006</documentNo>
-    <id>E80E742A75F94BB0AA623EA9BBD40758</id>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
     <paymentDate>2010-08-11T00:00:00.0Z</paymentDate>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="7A8E888A4B4C4E638CD5EB3A41A3289A"/>
     <businessPartner id="8A64B71A2B0B2946012B0FE1E82201F4"/>
-    <organization id="7A8E888A4B4C4E638CD5EB3A41A3289A"/>
     <amount>317.19</amount>
     <active>true</active>
     <receipt>true</receipt>
@@ -380036,12 +380023,12 @@
     <createdByAlgorithm>false</createdByAlgorithm>
   </FIN_Payment>
   <FIN_Payment id="F9C59628E69F413386585EDBC9DDDD34">
+    <id>F9C59628E69F413386585EDBC9DDDD34</id>
     <documentNo>700004</documentNo>
-    <id>F9C59628E69F413386585EDBC9DDDD34</id>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
     <paymentDate>2010-08-11T00:00:00.0Z</paymentDate>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="7A8E888A4B4C4E638CD5EB3A41A3289A"/>
     <businessPartner id="8A64B71A2B0B2946012B0FE1E77001E4"/>
-    <organization id="7A8E888A4B4C4E638CD5EB3A41A3289A"/>
     <amount>0</amount>
     <active>true</active>
     <receipt>false</receipt>
@@ -380070,12 +380057,12 @@
     <createdByAlgorithm>false</createdByAlgorithm>
   </FIN_Payment>
   <FIN_Payment id="FAE31E5467274E86BC7CDF5FBF1788C2">
+    <id>FAE31E5467274E86BC7CDF5FBF1788C2</id>
     <documentNo>700001</documentNo>
-    <id>FAE31E5467274E86BC7CDF5FBF1788C2</id>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
     <paymentDate>2010-08-27T00:00:00.0Z</paymentDate>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="90A1F59849E84AFABD04814B3D15A691"/>
     <businessPartner id="8A64B71A2B0B2946012B0FE1E49501B5"/>
-    <organization id="90A1F59849E84AFABD04814B3D15A691"/>
     <amount>75.03</amount>
     <active>true</active>
     <receipt>false</receipt>
@@ -380106,12 +380093,12 @@
     <createdByAlgorithm>false</createdByAlgorithm>
   </FIN_Payment>
   <FIN_Payment id="FF8080812E38E087012E38EA0ACE000C">
+    <id>FF8080812E38E087012E38EA0ACE000C</id>
     <documentNo>700010</documentNo>
-    <id>FF8080812E38E087012E38EA0ACE000C</id>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
     <paymentDate>2011-02-18T00:00:00.0Z</paymentDate>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="90A1F59849E84AFABD04814B3D15A691"/>
     <businessPartner id="8A64B71A2B0B2946012B0FE1E49501B5"/>
-    <organization id="90A1F59849E84AFABD04814B3D15A691"/>
     <amount>1089.26</amount>
     <active>true</active>
     <receipt>false</receipt>
@@ -380142,12 +380129,12 @@
     <createdByAlgorithm>false</createdByAlgorithm>
   </FIN_Payment>
   <FIN_Payment id="FF8080812E38E087012E38EF47FE0016">
+    <id>FF8080812E38E087012E38EF47FE0016</id>
     <documentNo>700011</documentNo>
-    <id>FF8080812E38E087012E38EF47FE0016</id>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
     <paymentDate>2011-02-18T00:00:00.0Z</paymentDate>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="7A8E888A4B4C4E638CD5EB3A41A3289A"/>
     <businessPartner id="8A64B71A2B0B2946012B0FE1E77001E4"/>
-    <organization id="7A8E888A4B4C4E638CD5EB3A41A3289A"/>
     <amount>3910.23</amount>
     <active>true</active>
     <receipt>false</receipt>
@@ -380178,12 +380165,12 @@
     <createdByAlgorithm>false</createdByAlgorithm>
   </FIN_Payment>
   <FIN_Payment id="FF8080812E39520D012E396BFE590014">
+    <id>FF8080812E39520D012E396BFE590014</id>
     <documentNo>400012</documentNo>
-    <id>FF8080812E39520D012E396BFE590014</id>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
     <paymentDate>2011-02-18T00:00:00.0Z</paymentDate>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="378AF0EAE1A2479EAAA33436645E9433"/>
     <businessPartner id="8A64B71A2B0B2946012B0FE1E51401C1"/>
-    <organization id="378AF0EAE1A2479EAAA33436645E9433"/>
     <amount>48.46</amount>
     <active>true</active>
     <receipt>true</receipt>
@@ -380229,8 +380216,8 @@
     <processNow>false</processNow>
     <processed>false</processed>
     <posted>N</posted>
+    <aPRMProcessReconciliation>P</aPRMProcessReconciliation>
     <printdetailed>false</printdetailed>
-    <aPRMProcessReconciliation>P</aPRMProcessReconciliation>
     <printsummary>false</printsummary>
   </FIN_Reconciliation>
   <FIN_Reconciliation id="8A64B71A2C360F9C012C36CA635A001C">
@@ -380249,8 +380236,8 @@
     <processNow>false</processNow>
     <processed>false</processed>
     <posted>N</posted>
+    <aPRMProcessReconciliation>P</aPRMProcessReconciliation>
     <printdetailed>false</printdetailed>
-    <aPRMProcessReconciliation>P</aPRMProcessReconciliation>
     <printsummary>false</printsummary>
   </FIN_Reconciliation>
   <FinancialMgmtPaymentRunPayment id="8A64B71A2C351129012C35C40271001B">
--- a/src-db/database/sourcedata/AD_MODULE.xml	Thu Apr 07 17:53:33 2011 +0200
+++ b/src-db/database/sourcedata/AD_MODULE.xml	Thu Apr 07 17:55:21 2011 +0200
@@ -22,7 +22,7 @@
 <!--0-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--0-->  <HASREFERENCEDATA><![CDATA[Y]]></HASREFERENCEDATA>
 <!--0-->  <REFERENCEDATAINFO><![CDATA[Standard document types for orders, invoices, etc. and settings]]></REFERENCEDATAINFO>
-<!--0-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
+<!--0-->  <VERSION_LABEL><![CDATA[dev]]></VERSION_LABEL>
 <!--0-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--0--></AD_MODULE>