[OpenbravoERP-commits] devel/pi: 4 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/85730acf7b16
changeset: 23405:85730acf7b16
user: Sandra Huguet sandra.huguet at openbravo.com
date: Wed May 28 13:23:22 2014 +0200
summary: Fixed bug 26719 Stock reservation pick lines does not keep selected
lines
details: https://code.openbravo.com/erp/devel/pi/rev/eece3bb3d696
changeset: 23406:eece3bb3d696
user: Sandra Huguet sandra.huguet at openbravo.com
date: Thu May 29 12:35:15 2014 +0200
summary: Fixed bug 26689 Return from customer pick lines does not keep
selected lines
details: https://code.openbravo.com/erp/devel/pi/rev/2b23a4e38022
changeset: 23407:2b23a4e38022
user: Sandra Huguet sandra.huguet at openbravo.com
date: Wed May 28 13:24:31 2014 +0200
summary: Fixed bug 26688 Return to vendor pick lines does not keep selected
lines
details: https://code.openbravo.com/erp/devel/pi/rev/6deeeb7a363e
changeset: 23408:6deeeb7a363e
user: Sandra Huguet sandra.huguet at openbravo.com
date: Thu May 29 15:32:20 2014 +0200
summary: Related to issue 26689
diffstat:
modules/org.openbravo.service.json/src/org/openbravo/service/json/AdvancedQueryBuilder.java
|2 +-
src-db/database/sourcedata/AD_TAB.xml
|1 +
src-db/database/sourcedata/AD_TABLE.xml
|3 +-
src-db/database/sourcedata/OBUIAPP_PARAMETER.xml
|2 +-
src/org/openbravo/common/datasource/ResultMapCriteriaUtils.java
| 520 ++
src/org/openbravo/common/datasource/ReturnFromCustomerPickEditLineDatasource.java
| 51 +-
src/org/openbravo/common/datasource/ReturnFromCustomerPickEditLineRow.java
|4 +
src/org/openbravo/common/datasource/ReturnToVendorPickAndEditDataSource.java
| 164 ++-
src/org/openbravo/common/datasource/StockReservationPickAndEditDataSource.java
| 258 +++-
9 files changed, 853 insertions(+), 152 deletions(-)
diffs (truncated from 1332 to 300 lines):
diff -r b99f3051275b -r 6deeeb7a363e
modules/org.openbravo.service.json/src/org/openbravo/service/json/AdvancedQueryBuilder.java
---
a/modules/org.openbravo.service.json/src/org/openbravo/service/json/AdvancedQueryBuilder.java
Thu May 29 21:00:40 2014 +
+++
b/modules/org.openbravo.service.json/src/org/openbravo/service/json/AdvancedQueryBuilder.java
Thu May 29 15:32:20 2014 +0200
@@ -1230,7 +1230,7 @@
*
* @return a valid order by clause (or an empty string if no sorting)
*/
- protected String getOrderByClause() {
+ public String getOrderByClause() {
if (orderByClause != null) {
return orderByClause;
}
diff -r b99f3051275b -r 6deeeb7a363e src-db/database/sourcedata/AD_TAB.xml
--- a/src-db/database/sourcedata/AD_TAB.xml Thu May 29 21:00:40 2014 +
+++ b/src-db/database/sourcedata/AD_TAB.xml Thu May 29 15:32:20 2014 +0200
@@ -18104,6 +18104,7 @@
!--F4204696A73647E2AA9700106C00C7A5--
DISABLE_PARENT_KEY_PROPERTY![CDATA[N]]/DISABLE_PARENT_KEY_PROPERTY
!--F4204696A73647E2AA9700106C00C7A5--
ISREADONLYTREE![CDATA[N]]/ISREADONLYTREE
!--F4204696A73647E2AA9700106C00C7A5--
ISSHOWTREENODEICONS![CDATA[Y]]/ISSHOWTREENODEICONS
+!--F4204696A73647E2AA9700106C00C7A5--
EM_OBUIAPP_SELECTION![CDATA[OB.RM.RMOrderSelectionChange]]/EM_OBUIAPP_SELECTION
!--F4204696A73647E2AA9700106C00C7A5--
EM_OBUIAPP_CAN_ADD![CDATA[N]]/EM_OBUIAPP_CAN_ADD
!--F4204696A73647E2AA9700106C00C7A5--
EM_OBUIAPP_CAN_DELETE![CDATA[N]]/EM_OBUIAPP_CAN_DELETE
!--F4204696A73647E2AA9700106C00C7A5--
EM_OBUIAPP_SHOW_SELECT![CDATA[Y]]/EM_OBUIAPP_SHOW_SELECT
diff -r b99f3051275b -r 6deeeb7a363e src-db/database/sourcedata/AD_TABLE.xml
--- a/src-db/database/sourcedata/AD_TABLE.xml Thu May 29 21:00:40 2014 +
+++ b/src-db/database/sourcedata/AD_TABLE.xml Thu May 29 15:32:20 2014 +0200
@@ -11031,7 +11031,8 @@
!--A9BC62219E644720867F6402B0C25933--
TABLENAME![CDATA[C_RM_RFC_PE_LINES]]/TABLENAME
!--A9BC62219E644720867F6402B0C25933--
CLASSNAME![CDATA[C_RM_RFC_PE_LINES]]/CLASSNAME
!--A9BC62219E644720867F6402B0C25933-- ISVIEW![CDATA[N]]/ISVIEW
-!--A9BC62219E644720867F6402B0C25933--
ACCESSLEVEL![CDATA[3]]/ACCESSLEVEL
+!--A9BC62219E644720867F6402B0C25933--
ACCESSLEVEL![CDATA[1]]/ACCESSLEVEL
+!--A9BC62219E644720867F6402B0C25933--
AD_WINDOW_ID![CDATA[FF808081330213E60133021822E40007]]/AD_WINDOW_ID
!--A9BC62219E644720867F6402B0C25933--
ISSECURITYENABLED![CDATA[N]]/ISSECURITYENABLED
!--A9BC62219E644720867F6402B0C25933--
ISDELETEABLE![CDATA[Y]]/ISDELETEABLE
!--A9BC62219E644720867F6402B0C25933--
ISHIGHVOLUME![CDATA[N]]/ISHIGHVOLUME
diff -r b99f3051275b -r 6deeeb7a363e
src-db/database/sourcedata/OBUIAPP_PARAMETER.xml
--- a/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml Thu May 29 21:00:40
2014 +
+++ b/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml Thu May 29
[OpenbravoERP-commits] devel/pi: Fixed issue 26703:Clear filters does not the clickable...
details: https://code.openbravo.com/erp/devel/pi/rev/5a33d46319ec
changeset: 23409:5a33d46319ec
user: Guillermo Gil guillermo.gil at openbravo.com
date: Fri May 30 11:21:25 2014 +0200
summary: Fixed issue 26703:Clear filters does not the clickable checkboxes
If there is no value selected, deselect all
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-list-filter.js
| 5 -
1 files changed, 4 insertions(+), 1 deletions(-)
diffs (22 lines):
diff -r 6deeeb7a363e -r 5a33d46319ec
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-list-filter.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-list-filter.js
Thu May 29 15:32:20 2014 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-list-filter.js
Fri May 30 11:21:25 2014 +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) 2011-2013 Openbravo SLU
+ * All portions are Copyright (C) 2011-2014 Openbravo SLU
* All Rights Reserved.
* Contributor(s): __.
@@ -59,6 +59,9 @@
value[i] = value[i].substring(2, value[i].length);
}
}
+} else {
+ // If no value is selected, deselect all
+ this.pickList.selection.deselectAll();
}
this.selectItemFromValue(value);
},
--
Time is money. Stop wasting it! Get your web API in 5 minutes.
www.restlet.com/download
http://p.sf.net/sfu/restlet
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: Related To Issue 26689:Scrollable result were not closed
details: https://code.openbravo.com/erp/devel/pi/rev/9d38c60189f3
changeset: 23410:9d38c60189f3
user: Atul Gaware atul.gaware at openbravo.com
date: Fri May 30 16:39:12 2014 +0530
summary: Related To Issue 26689:Scrollable result were not closed
diffstat:
src/org/openbravo/common/datasource/ReturnFromCustomerPickEditLineDatasource.java
| 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diffs (22 lines):
diff -r 5a33d46319ec -r 9d38c60189f3
src/org/openbravo/common/datasource/ReturnFromCustomerPickEditLineDatasource.java
---
a/src/org/openbravo/common/datasource/ReturnFromCustomerPickEditLineDatasource.java
Fri May 30 11:21:25 2014 +0200
+++
b/src/org/openbravo/common/datasource/ReturnFromCustomerPickEditLineDatasource.java
Fri May 30 16:39:12 2014 +0530
@@ -94,8 +94,8 @@
fetchType = grid;
qry =
OBDal.getInstance().getSession().createSQLQuery(getSQLQuery(parameters));
}
+final ScrollableResults scrollresult = qry.scroll(ScrollMode.FORWARD_ONLY);
try {
- ScrollableResults scrollresult = qry.scroll(ScrollMode.FORWARD_ONLY);
boolean addValue;
while (scrollresult.next()) {
Object resultLine = (Object) scrollresult.get();
@@ -110,6 +110,8 @@
}
} catch (JSONException e) {
+} finally {
+ scrollresult.close();
}
return result;
}
--
Time is money. Stop wasting it! Get your web API in 5 minutes.
www.restlet.com/download
http://p.sf.net/sfu/restlet
___
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/b99f3051275b changeset: 23404:b99f3051275b user: RM packaging bot staff.rm at openbravo.com date: Thu May 29 21:00:40 2014 + summary: CI: merge back from main details: https://code.openbravo.com/erp/devel/main/rev/85730acf7b16 changeset: 23405:85730acf7b16 user: Sandra Huguet sandra.huguet at openbravo.com date: Wed May 28 13:23:22 2014 +0200 summary: Fixed bug 26719 Stock reservation pick lines does not keep selected lines details: https://code.openbravo.com/erp/devel/main/rev/eece3bb3d696 changeset: 23406:eece3bb3d696 user: Sandra Huguet sandra.huguet at openbravo.com date: Thu May 29 12:35:15 2014 +0200 summary: Fixed bug 26689 Return from customer pick lines does not keep selected lines details: https://code.openbravo.com/erp/devel/main/rev/2b23a4e38022 changeset: 23407:2b23a4e38022 user: Sandra Huguet sandra.huguet at openbravo.com date: Wed May 28 13:24:31 2014 +0200 summary: Fixed bug 26688 Return to vendor pick lines does not keep selected lines details: https://code.openbravo.com/erp/devel/main/rev/6deeeb7a363e changeset: 23408:6deeeb7a363e user: Sandra Huguet sandra.huguet at openbravo.com date: Thu May 29 15:32:20 2014 +0200 summary: Related to issue 26689 details: https://code.openbravo.com/erp/devel/main/rev/e3e965850ae5 changeset: 23409:e3e965850ae5 user: RM packaging bot staff.rm at openbravo.com date: Fri May 30 13:38:07 2014 + summary: CI: update AD_MODULE to version 23408 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.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.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 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml |2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml |2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml |2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml |2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml |2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml |2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml |2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml |2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 10 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml |2 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml |4 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml |2 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml |2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml |2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml |2 +-
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/e3e965850ae5 changeset: 23411:e3e965850ae5 user: RM packaging bot staff.rm at openbravo.com date: Fri May 30 13:38:07 2014 + summary: CI: update AD_MODULE to version 23408 details: https://code.openbravo.com/erp/devel/pi/rev/04679db80d12 changeset: 23412:04679db80d12 user: RM packaging bot staff.rm at openbravo.com date: Fri May 30 13:53:57 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.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-list-filter.js | 5 +- 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 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 10 ++-- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 12 ++-- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml
