details: /erp/devel/pi/rev/355c51c7ea25
changeset: 11549:355c51c7ea25
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Thu Apr 07 17:44:20 2011 +0200
summary: CI: update AD_MODULE to version 11522
details: /erp/devel/pi/rev/f852c552d3cc
changeset: 11550:f852c552d3cc
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Thu Apr 07 17:53:33 2011 +0200
summary: CI: promote changesets from pi to main
details: /erp/devel/pi/rev/8d002e0b6285
changeset: 11551:8d002e0b6285
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Thu Apr 07 17:55:21 2011 +0200
summary: CI: merge back from main
diffstat:
.hgsigs
| 1 +
.hgtags
| 1 +
build.xml
| 2 +-
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 2 +-
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
|
2 +-
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-field.js.ftl
| 4 +
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-formitem-widgets.js
| 9 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-window.js
| 2 +
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-form-notes.js
| 13 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-form.js
| 6 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js
| 38 +-
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-form-styles.css
| 14 +-
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/CSSMinimizer.java
| 4
+-
modules/org.openbravo.client.myob/referencedata/standard/MyOBData.xml
| 15 +-
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_DATASET.xml
| 2 +-
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_DATASET_TABLE.xml
|
4 +-
modules/org.openbravo.client.myob/src/org/openbravo/client/myob/WidgetProvider.java
|
1 +
modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-myopenbravo.js
|
9 +-
modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/templates/datasource.ftl
| 3 +
modules/org.openbravo.service.datasource/web/org.openbravo.service.datasource/js/ob-datasource-utilities.js
| 5 +
modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 4 +-
referencedata/sampledata/F_B_International_Group.xml
| 197 ++++-----
src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
25 files changed, 206 insertions(+), 138 deletions(-)
diffs (truncated from 936 to 300 lines):
diff -r 0649b6a37a1e -r 8d002e0b6285 .hgsigs
--- a/.hgsigs Wed Apr 06 17:58:50 2011 +0200
+++ b/.hgsigs Thu Apr 07 17:55:21 2011 +0200
@@ -30,3 +30,4 @@
668651fe8a81bcb9a55c3073d6a8f59d91d70b26 0
iEYEABECAAYFAk1eS8gACgkQCX/oGf+2qkOW4ACbB0zLCbzqWAECmpERhBOmSp+hrfAAoPfnoksz58TTrITz6vIdNLlOykKX
37f2d5f6122e0b7d404f15af699bbf517c8620f1 0
iEYEABECAAYFAk1e5jYACgkQCX/oGf+2qkNdOwCg+BZzm0X320yJPlglOs6S3meDeesAoI+GDdOqlwP0J3ZJxtwS2LYiC68K
6b5829bdfb83a717983a5cc3d93cf23993504dee 0
iEYEABECAAYFAk2D2aIACgkQCX/oGf+2qkNw4ACgnusvXTfY7cwcF8JIyx3gMPDE18sAmQG/UCHIcT/mmqX1UcgpiCgEqUB3
+290cb79e7e1b40a7584920fa1ab2319bb6f36dd2 0
iEYEABECAAYFAk2TX/0ACgkQCX/oGf+2qkPETwCdF5Lxy/MMap+EFbYn3VPcBWjg6qUAoLYKMP5vkaxVXxQWqMrAEKJ+Tr3a
diff -r 0649b6a37a1e -r 8d002e0b6285 .hgtags
--- a/.hgtags Wed Apr 06 17:58:50 2011 +0200
+++ b/.hgtags Thu Apr 07 17:55:21 2011 +0200
@@ -40,3 +40,4 @@
379b55d7906ebbfe04b0d864a8b2543f437f7781 3.0RC3
72e872c1dee28e32260afb806938f730c73b6c8e 3.0RC4
2900108d13e7c88366e2993a7e4ccae9a9a13618 3.0RC5
+5f47e83fbcb3746a754737199769a7edd6a9eee2 3.0RC5.1
diff -r 0649b6a37a1e -r 8d002e0b6285 build.xml
--- a/build.xml Wed Apr 06 17:58:50 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">
diff -r 0649b6a37a1e -r 8d002e0b6285
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
Wed Apr 06 17:58:50 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
Thu Apr 07 17:55:21 2011 +0200
@@ -6,7 +6,7 @@
<!--A918E3331C404B889D69AA9BFAFB23AC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--A918E3331C404B889D69AA9BFAFB23AC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--A918E3331C404B889D69AA9BFAFB23AC--> <NAME><![CDATA[Advanced Payables and
Receivables Mngmt]]></NAME>
-<!--A918E3331C404B889D69AA9BFAFB23AC-->
<VERSION><![CDATA[3.0.11404]]></VERSION>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->
<VERSION><![CDATA[3.0.11522]]></VERSION>
<!--A918E3331C404B889D69AA9BFAFB23AC--> <DESCRIPTION><![CDATA[Managing your
finances with an ERP does not have to be difficult. Enjoy a radically improved
user experience that combines the power of an enterprise grade financial
application with the simplicity and ease of a web 2.0 personal accounting
service.]]></DESCRIPTION>
<!--A918E3331C404B889D69AA9BFAFB23AC--> <HELP><![CDATA[Advanced Payables and
Receivables Management simplifies and automates the business processes around
the management of financial accounts, from the receipt and issue of payment, to
the reconciliation of those events with bank statements.
If you would like to help shape this module you are welcome to take part in
the forum discussions or register feature requests or issues in the
corresponding (Forum and Bug Tracking) sections in the Advanced Payables and
Receivable project in the OB Forge.]]></HELP>
diff -r 0649b6a37a1e -r 8d002e0b6285
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Wed Apr 06 17:58:50 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Thu Apr 07 17:55:21 2011 +0200
@@ -21,7 +21,7 @@
<!--B97FC854C6DD41E692161585645A900F--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--B97FC854C6DD41E692161585645A900F-->
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
<!--B97FC854C6DD41E692161585645A900F-->
<AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--B97FC854C6DD41E692161585645A900F-->
<STARTVERSION><![CDATA[3.0.11404]]></STARTVERSION>
+<!--B97FC854C6DD41E692161585645A900F-->
<STARTVERSION><![CDATA[3.0.11522]]></STARTVERSION>
<!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--B97FC854C6DD41E692161585645A900F-->
<DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
<!--B97FC854C6DD41E692161585645A900F-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r 0649b6a37a1e -r 8d002e0b6285
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
---
a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
Wed Apr 06 17:58:50 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>
diff -r 0649b6a37a1e -r 8d002e0b6285
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-field.js.ftl
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-field.js.ftl
Wed Apr 06 17:58:50 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>
diff -r 0649b6a37a1e -r 8d002e0b6285
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-formitem-widgets.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-formitem-widgets.js
Wed Apr 06 17:58:50 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;
}
diff -r 0649b6a37a1e -r 8d002e0b6285
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-window.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-window.js
Wed Apr 06 17:58:50 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);
},
diff -r 0649b6a37a1e -r 8d002e0b6285
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-form-notes.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-form-notes.js
Wed Apr 06 17:58:50 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;
},
diff -r 0649b6a37a1e -r 8d002e0b6285
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-form.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-form.js
Wed Apr 06 17:58:50 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() {
diff -r 0649b6a37a1e -r 8d002e0b6285
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js
Wed Apr 06 17:58:50 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]);
diff -r 0649b6a37a1e -r 8d002e0b6285
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-form-styles.css
---
a/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-form-styles.css
Wed Apr 06 17:58:50 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;
------------------------------------------------------------------------------
Xperia(TM) PLAY
It's a major breakthrough. An authentic gaming
smartphone on the nation's most reliable network.
And it wants your games.
http://p.sf.net/sfu/verizon-sfdev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
