[OpenbravoERP-commits] devel/pi: Fixed issue 26305:starts with operator is not supporte...
details: https://code.openbravo.com/erp/devel/pi/rev/d9ce373c75da
changeset: 23060:d9ce373c75da
user: Guillermo Gil guillermo.gil at openbravo.com
date: Tue May 20 09:38:17 2014 +0200
summary: Fixed issue 26305:starts with operator is not supported for numbers
starts with is not a supported operator for numbers. Look for validOperators
and if the operator is not a valid operator, remove it.
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-number.js
| 7 +++
1 files changed, 7 insertions(+), 0 deletions(-)
diffs (17 lines):
diff -r 80167ec6695d -r d9ce373c75da
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-number.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-number.js
Mon May 19 15:38:10 2014 +
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-number.js
Tue May 20 09:38:17 2014 +0200
@@ -548,6 +548,13 @@
}
ret = this.Super('parseValueExpressions', [value, fieldName, operator]);
+
+// if operator is not supported remove it
+if (!this.validOperators.contains(ret.operator)) {
+ ret.operator = '';
+ ret.value = '';
+ this.setValue('');
+}
if (ret ret.start) {
ret.start = this.convertToTypedValue(ret.start);
}
--
Accelerate Dev Cycles with Automated Cross-Browser Testing - For FREE
Instantly run your Selenium tests across 300+ browser/OS combos.
Get unparalleled scalability from the best Selenium testing platform available
Simple to use. Nothing to install. Get started now for free.
http://p.sf.net/sfu/SauceLabs
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: Fixed issue 26535: It would be nice to access variable...
details: https://code.openbravo.com/erp/devel/pi/rev/4414f6d9140b
changeset: 23061:4414f6d9140b
user: Aaron Calero aaron.calero at openbravo.com
date: Tue May 20 11:46:57 2014 +0200
summary: Fixed issue 26535: It would be nice to access variable result on
CalloutInfo class (nested class of SimpleCallout)
diffstat:
src/org/openbravo/erpCommon/ad_callouts/SimpleCallout.java | 7 +++
1 files changed, 7 insertions(+), 0 deletions(-)
diffs (16 lines):
diff -r d9ce373c75da -r 4414f6d9140b
src/org/openbravo/erpCommon/ad_callouts/SimpleCallout.java
--- a/src/org/openbravo/erpCommon/ad_callouts/SimpleCallout.javaTue May
20 09:38:17 2014 +0200
+++ b/src/org/openbravo/erpCommon/ad_callouts/SimpleCallout.javaTue May
20 11:46:57 2014 +0200
@@ -380,5 +380,12 @@
protected void executeCodeInBrowser(String value) {
addResult(JSEXECUTE, value);
}
+
+/**
+ * Returns the value of the result variable as a String
+ */
+public String getResult() {
+ return result.toString();
+}
}
}
--
Accelerate Dev Cycles with Automated Cross-Browser Testing - For FREE
Instantly run your Selenium tests across 300+ browser/OS combos.
Get unparalleled scalability from the best Selenium testing platform available
Simple to use. Nothing to install. Get started now for free.
http://p.sf.net/sfu/SauceLabs
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: 12 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/695cedf436b3 changeset: 23062:695cedf436b3 user: David Baz Fayos david.baz at openbravo.com date: Tue Apr 29 09:25:17 2014 +0200 summary: [treeimpr] Added 'Read Only Tree' and 'Show Tree Node Icons' flags to AD_TAB details: https://code.openbravo.com/erp/devel/pi/rev/08ecbbe06eca changeset: 23063:08ecbbe06eca user: David Baz Fayos david.baz at openbravo.com date: Wed Apr 30 16:10:23 2014 +0200 summary: [treeimpr] Added 'Node Deletion Policy' combo to 'Tree Table Category' tab details: https://code.openbravo.com/erp/devel/pi/rev/4f1590259dcc changeset: 23064:4f1590259dcc user: David Baz Fayos david.baz at openbravo.com date: Wed Apr 30 16:14:35 2014 +0200 summary: [treeimpr] Added 'Node Deletion Policy' combo to 'Tree Table Category' tab - microfix details: https://code.openbravo.com/erp/devel/pi/rev/d2c5527eee60 changeset: 23065:d2c5527eee60 user: David Baz Fayos david.baz at openbravo.com date: Wed Apr 30 16:26:48 2014 +0200 summary: [treeimpr] Added 'Node Deletion Policy' combo to 'Tree Table Category' tab - microfix2 details: https://code.openbravo.com/erp/devel/pi/rev/3f50a86b6bb0 changeset: 23066:3f50a86b6bb0 user: David Baz Fayos david.baz at openbravo.com date: Wed Apr 30 17:54:08 2014 +0200 summary: [treeimpr] Saved views now take into account if 'Tree Grid' view is selected details: https://code.openbravo.com/erp/devel/pi/rev/80b77a38ea27 changeset: 23067:80b77a38ea27 user: David Baz Fayos david.baz at openbravo.com date: Thu May 01 16:03:46 2014 +0200 summary: [treeimpr] Added 'Default Tree View Logic' field to AD_TAB in order to be able to specify logic to set if by default the view should show the regular Grid or the new Tree view when it loads details: https://code.openbravo.com/erp/devel/pi/rev/5b40c2f9f260 changeset: 23068:5b40c2f9f260 user: Augusto Mauch augusto.mauch at openbravo.com date: Tue May 06 18:06:30 2014 +0200 summary: [treeimpr] Default tree view supports using auxiliary inputs details: https://code.openbravo.com/erp/devel/pi/rev/3abcd4bb913c changeset: 23069:3abcd4bb913c user: Augusto Mauch augusto.mauch at openbravo.com date: Wed May 07 13:22:04 2014 +0200 summary: [treeimpr] Fixes error in console when opening a record in form view details: https://code.openbravo.com/erp/devel/pi/rev/7585dd17e9b4 changeset: 23070:7585dd17e9b4 user: David Baz Fayos david.baz at openbravo.com date: Mon May 12 13:41:58 2014 +0200 summary: [treeimpr] Merge from pi details: https://code.openbravo.com/erp/devel/pi/rev/104dcede731c changeset: 23071:104dcede731c user: Augusto Mauch augusto.mauch at openbravo.com date: Thu May 15 22:57:15 2014 +0200 summary: [treeimpr] handleDefaultTreeView is invoked after updating the auxiliary inputs details: https://code.openbravo.com/erp/devel/pi/rev/46963a2a753e changeset: 23072:46963a2a753e user: Augusto Mauch augusto.mauch at openbravo.com date: Fri May 16 09:26:42 2014 +0200 summary: [pw3] Microfix, some dates were not being parsed properly in the tree view details: https://code.openbravo.com/erp/devel/pi/rev/f401b711161b changeset: 23073:f401b711161b user: Asier Lostalé asier.lostale at openbravo.com date: Tue May 20 12:22:06 2014 +0200 summary: [treeimpr] fixed issue 26455: Tree Extension Improvements *Add a way to avoid view the icons. If the tree is not read-only, they always must be shown *Allow define a tree as read-only at tab level. Avoid delete records from tree view *Support different deletion policies. Define a combo inside the Table Tree Category subtab of the header of Tables and Columns. There should be two optiones here: **Reparent child nodes (current one) **Do not allow removing if a node has a children *Support saved views with tree views *Default Tree View logic: show the tree view or the grid view based on a logic defined at tab level diffstat: .hgsigs | 2 + .hgtags | 2 + modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/AlertsForWrongOrders.class | 0 modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/AlertsForWrongOrdersData.class | 0 modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_ORD.xml |12 +
[OpenbravoERP-commits] devel/pi: Fixed issue 25936: Added 'javaTimeformat.java=MM-dd-yy...
details: https://code.openbravo.com/erp/devel/pi/rev/43e598987eb7
changeset: 23074:43e598987eb7
user: David Baz Fayos david.baz at openbravo.com
date: Thu May 15 23:49:40 2014 +0200
summary: Fixed issue 25936: Added 'javaTimeformat.java=MM-dd- hh:mm:ss a'
capability
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-datetime.js
| 11 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-time.js
| 10 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities-date.js
| 53 +-
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.css
| 56 ++
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/AbsoluteTimeUIDefinition.java
| 10 +-
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/DateUIDefinition.java
| 13 +-
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/TimeUIDefinition.java
| 10 +-
src/index.jsp
| 9 +
8 files changed, 157 insertions(+), 15 deletions(-)
diffs (truncated from 342 to 300 lines):
diff -r f401b711161b -r 43e598987eb7
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-datetime.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-datetime.js
Tue May 20 12:22:06 2014 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-datetime.js
Thu May 15 23:49:40 2014 +0200
@@ -137,13 +137,22 @@
} else {
this.showPickerTimeItem = false;
}
+if (OB.Format.dateTime.toUpperCase().endsWith(' A')) {
+ this.use24HourTime = false;
+} else {
+ this.use24HourTime = true;
+}
return this.Super('doInit', arguments);
},
parseValue: function () {
var parseVal = this.Super('parseValue', arguments);
if (this.showTime parseVal.indexOf(' ') === -1) {
- parseVal = parseVal + ' ' + '00:00:00';
+ if (this.use24HourTime) {
+parseVal = parseVal + ' ' + '00:00:00';
+ } else {
+parseVal = parseVal + ' ' + '12:00:00 AM';
+ }
}
return parseVal;
},
diff -r f401b711161b -r 43e598987eb7
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-time.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-time.js
Tue May 20 12:22:06 2014 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-time.js
Thu May 15 23:49:40 2014 +0200
@@ -30,12 +30,7 @@
operator: 'equals',
validateOnExit: true,
showHint: false,
- timeFormatter: 'to24HourTime',
- displayFormat: 'to24HourTime',
- short24TimeFormat: 'HH:MM:SS',
- shortTimeFormat: 'HH:MM:SS',
- long24TimeFormat: 'HH:MM:SS',
- longTimeFormat: 'HH:MM:SS',
+ timeFormatter: isc.Time.displayFormat,
mapValueToDisplay: function (value) {
var newValue = value;
@@ -146,7 +141,6 @@
init: function () {
var oldShowHint, hint, formatDefinition =
OB.Utilities.getTimeFormatDefinition();
-this.timeFormatter = formatDefinition.timeFormatter;
this.timeFormat = formatDefinition.timeFormat;
this.Super('init', arguments);
@@ -573,7 +567,7 @@
this.precission = 'hour';
}
-if (this.timeFormat.toUpperCase().indexOf('AM') !== -1 ||
this.timeFormat.toUpperCase().indexOf('PM') !== -1) {
+if (this.timeFormat.toUpperCase().indexOf(isc.Time.AMIndicator) !== -1 ||
this.timeFormat.toUpperCase().indexOf(isc.Time.PMIndicator) !== -1) {
this.is24hTime = false;
}
diff -r f401b711161b -r 43e598987eb7
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities-date.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities-date.js
Tue May 20 12:22:06 2014 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities-date.js
Thu May 15 23:49:40 2014 +0200
@@ -62,6 +62,9 @@
} else if (displayFormat.indexOf(' HH.MI') !== -1) {
[OpenbravoERP-commits] devel/pi: Fixes issue 26636: Error in int-checks-pgsql
details: https://code.openbravo.com/erp/devel/pi/rev/5f805d20cad7
changeset: 23075:5f805d20cad7
user: Augusto Mauch augusto.mauch at openbravo.com
date: Tue May 20 17:11:03 2014 +0200
summary: Fixes issue 26636: Error in int-checks-pgsql
Before a refactor, the showTreeGrid attribute was declared, initialized and
used in a function. After this refactor, the attribute is declared and
initialized in a function, and used in another, without being declared in the
latter function.
To fix this, now the first functions passes the showTreeGrid attribute as an
argument to the second function.
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-manage-views.js
| 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diffs (21 lines):
diff -r 43e598987eb7 -r 5f805d20cad7
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-manage-views.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-manage-views.js
Thu May 15 23:49:40 2014 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-manage-views.js
Tue May 20 17:11:03 2014 +0200
@@ -159,7 +159,7 @@
view.childTabSet.selectTab(viewTabDefinition.selectedTab);
}
if (view.isRootView || view.isRenderedChildView) {
-OB.Personalization.applyViewDefinitionToView(view, viewTabDefinition);
+OB.Personalization.applyViewDefinitionToView(view, viewTabDefinition,
showTreeGrid);
} else {
// If the view has not been rendered yet, store the
'initialTabDefinition' to be able
// to set the proper view definition as soon as the view be loaded.
@@ -171,7 +171,7 @@
// ** {{{OB.Personalization.applyViewDefinitionToView}}} **
// Apply a passed view definition to a particular view
-OB.Personalization.applyViewDefinitionToView = function (view,
viewTabDefinition) {
+OB.Personalization.applyViewDefinitionToView = function (view,
viewTabDefinition, showTreeGrid) {
if (!view || !viewTabDefinition) {
return;
}
--
Accelerate Dev Cycles with Automated Cross-Browser Testing - For FREE
Instantly run your Selenium tests across 300+ browser/OS combos.
Get unparalleled scalability from the best Selenium testing platform available
Simple to use. Nothing to install. Get started now for free.
http://p.sf.net/sfu/SauceLabs
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/main: 6 new changesets
details: https://code.openbravo.com/erp/devel/main/rev/927030652194 changeset: 23056:927030652194 user: Atul Gaware atul.gaware at openbravo.com date: Mon May 12 22:19:01 2014 +0530 summary: Fixes Issue 26242: Avoid reactivating orders with payment awaiting execution. Modulescript to create alerts for orders having wrong payment plan info. details: https://code.openbravo.com/erp/devel/main/rev/c60e27530619 changeset: 23057:c60e27530619 user: Rafa Roda Palacios rafa.roda at ubiquads.com date: Wed May 14 10:32:46 2014 +0200 summary: Fixes Issue 26148 Modified ReportGeneralLedgerJournal JRXML file so entry numbers are displayed details: https://code.openbravo.com/erp/devel/main/rev/e9d8dcaed86a changeset: 23058:e9d8dcaed86a user: Guillermo Gil guillermo.gil at openbravo.com date: Mon May 19 12:43:51 2014 +0200 summary: Fixed issue 26552: email sent when the role should not receive it Alert's messages are now created taking into account if the record can be shown by the recipient role. details: https://code.openbravo.com/erp/devel/main/rev/80167ec6695d changeset: 23059:80167ec6695d user: RM packaging bot staff.rm at openbravo.com date: Mon May 19 15:38:10 2014 + summary: CI: merge back from main details: https://code.openbravo.com/erp/devel/main/rev/d9ce373c75da changeset: 23060:d9ce373c75da user: Guillermo Gil guillermo.gil at openbravo.com date: Tue May 20 09:38:17 2014 +0200 summary: Fixed issue 26305:starts with operator is not supported for numbers starts with is not a supported operator for numbers. Look for validOperators and if the operator is not a valid operator, remove it. details: https://code.openbravo.com/erp/devel/main/rev/8d555b8cf67e changeset: 23061:8d555b8cf67e user: RM packaging bot staff.rm at openbravo.com date: Tue May 20 15:36:45 2014 + summary: CI: update AD_MODULE to version 23060 diffstat: modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/AlertsForWrongOrders.class |0 modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/AlertsForWrongOrdersData.class |0 modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_ORD.xml | 12 + modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml |2 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml |4 +- modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/org/openbravo/advpaymentmngt/modulescript/AlertsForWrongOrders.java | 80 + modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/org/openbravo/advpaymentmngt/modulescript/AlertsForWrongOrders_data.xsql | 137 +++ modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/src/org/openbravo/advpaymentmngt/modulescript/AlertsForWrongOrdersData.java | 427 ++ modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml |2 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml |2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml |2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml |8 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-number.js |7 + modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml |2 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml |2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml |2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml |6 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml |2 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml |4 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml |2 +-
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/8d555b8cf67e changeset: 23076:8d555b8cf67e user: RM packaging bot staff.rm at openbravo.com date: Tue May 20 15:36:45 2014 + summary: CI: update AD_MODULE to version 23060 details: https://code.openbravo.com/erp/devel/pi/rev/3583bc1b3338 changeset: 23077:3583bc1b3338 user: RM packaging bot staff.rm at openbravo.com date: Tue May 20 15:52:55 2014 + summary: CI: merge back from main diffstat: modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml |62 + modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml |12 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 8 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_TAB.xml |30 + modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-tree-grid.js.ftl | 2 + modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-tab.js.ftl | 5 + modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBTreeGridComponent.java |21 + modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java |18 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-datetime.js |11 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-time.js |10 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-tree-filter.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-tree.js | 4 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js | 1 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-tree-grid.js | 3 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-tree-view-grid.js |10 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js |66 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-manage-views.js |28 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js |48 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities-date.js |53 +- modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.css |56 + modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml
