details: https://code.openbravo.com/erp/devel/pi/rev/6a127be95605
changeset: 22999:6a127be95605
user: Sandra Huguet <sandra.huguet <at> openbravo.com>
date: Thu May 08 12:46:08 2014 +0200
summary: Fixed bug 26488 Return From Customer pick/edit lines not working in
Oracle
diffstat:
src/org/openbravo/common/datasource/ReturnFromCustomerPickEditLineDatasource.java
| 24 ++++-----
src/org/openbravo/common/datasource/ReturnFromCustomerPickEditLineRow.java
| 6 ++-
2 files changed, 15 insertions(+), 15 deletions(-)
diffs (111 lines):
diff -r 945d5e9d9475 -r 6a127be95605
src/org/openbravo/common/datasource/ReturnFromCustomerPickEditLineDatasource.java
---
a/src/org/openbravo/common/datasource/ReturnFromCustomerPickEditLineDatasource.java
Thu May 08 12:07:29 2014 +0200
+++
b/src/org/openbravo/common/datasource/ReturnFromCustomerPickEditLineDatasource.java
Thu May 08 12:46:08 2014 +0200
@@ -1,6 +1,5 @@
package org.openbravo.common.datasource;
-import java.math.BigInteger;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
@@ -63,7 +62,7 @@
qry =
OBDal.getInstance().getSession().createSQLQuery(getSQLCountQuery(parameters));
}
OBDal.getInstance().getSession().createSQLQuery(getSQLCountQuery(parameters));
- BigInteger count = (BigInteger) qry.uniqueResult();
+ Number count = (Number) qry.uniqueResult();
return count.intValue();
}
@@ -96,12 +95,13 @@
SQLQuery qry = null;
if (parameters.get(JsonConstants.DISTINCT_PARAMETER) != null) {
fetchType = (String) parameters.get(JsonConstants.DISTINCT_PARAMETER);
- qry = OBDal.getInstance().getSession()
- .createSQLQuery(getDistinctProductQuery(parameters, offset, nRows));
+ qry =
OBDal.getInstance().getSession().createSQLQuery(getDistinctProductQuery(parameters));
} else {
fetchType = "grid";
- qry =
OBDal.getInstance().getSession().createSQLQuery(getSQLQuery(parameters, offset,
nRows));
+ qry =
OBDal.getInstance().getSession().createSQLQuery(getSQLQuery(parameters));
}
+ qry.setFirstResult(offset);
+ qry.setMaxResults(nRows);
for (Object o : qry.list()) {
Map<String, Object> row = createRow(o, fetchType);
@@ -132,11 +132,11 @@
return queryBuilder.toString();
}
- private String getSQLQuery(Map<String, String> parameters, int offset, int
nRows) {
+ private String getSQLQuery(Map<String, String> parameters) {
String sortClause = getSortClause(parameters);
StringBuilder queryBuilder = new StringBuilder();
queryBuilder
- .append("SELECT COALESCE(il.m_inoutline_id, rol.c_orderline_id) AS
c_rm_order_pick_edit_lines_id,");
+ .append("SELECT COALESCE(il.m_inoutline_id, rol.c_orderline_id) AS
c_rm_order_pick_edit_ls_id,");
queryBuilder
.append(" COALESCE(rol.ad_client_id,il.ad_client_id) AS
ad_client_id, COALESCE(rol.ad_org_id, il.ad_org_id) AS ad_org_id,");
queryBuilder
@@ -157,7 +157,7 @@
queryBuilder
.append(" COALESCE(rol.m_attributesetinstance_id,
il.m_attributesetinstance_id) AS m_attributesetinstance_id,");
queryBuilder
- .append(" COALESCE(rol.m_attributesetinstance_identifier,
iat.description) AS m_attributesetinstance_identifier,");
+ .append(" COALESCE(rol.m_attributesetinstance_iden,
iat.description) AS m_attributesetinstance_iden,");
queryBuilder
.append(" il.movementqty, COALESCE(rol.c_uom_id, il.c_uom_id) AS
c_uom_id, COALESCE(rol.c_uom_identifier,iuom.name) AS c_uom_identifier,");
queryBuilder.append(" (-1) * rol.qtyordered AS returned,");
@@ -179,8 +179,6 @@
if (sortClause != null && !sortClause.isEmpty()) {
queryBuilder.append(sortClause);
}
- queryBuilder
- .append(" OFFSET " + Integer.toString(offset) + " LIMIT " +
Integer.toString(nRows));
return queryBuilder.toString();
}
@@ -191,7 +189,7 @@
return queryBuilder.toString();
}
- private String getDistinctProductQuery(Map<String, String> parameters, int
offset, int nRows) {
+ private String getDistinctProductQuery(Map<String, String> parameters) {
StringBuilder queryBuilder = new StringBuilder();
queryBuilder
.append("SELECT distinct COALESCE(rol.m_product_id,il.m_product_id) AS
m_product_id,");
@@ -199,8 +197,6 @@
.append(" COALESCE(rol.m_product_identifier,ip.name) AS
m_product_identifier");
queryBuilder.append(getSQLMainBody(parameters));
queryBuilder.append(" ORDER BY COALESCE(rol.m_product_identifier, ip.name)
");
- queryBuilder
- .append(" OFFSET " + Integer.toString(offset) + " LIMIT " +
Integer.toString(nRows));
return queryBuilder.toString();
}
@@ -241,7 +237,7 @@
queryBuilder
.append(" ol2.c_uom_id, roluom.name as
c_uom_identifier, ol2.c_tax_id, pl2.istaxincluded, ol2.gross_unit_price,");
queryBuilder
- .append(" rolat.description as
m_attributesetinstance_identifier, rolreas.name as c_return_reason_identifier");
+ .append(" rolat.description as
m_attributesetinstance_iden, rolreas.name as c_return_reason_identifier");
queryBuilder.append(" FROM c_orderline ol2");
queryBuilder.append(" JOIN c_order o2 ON ol2.c_order_id =
o2.c_order_id");
queryBuilder.append(" AND o2.processed = 'N'
");
diff -r 945d5e9d9475 -r 6a127be95605
src/org/openbravo/common/datasource/ReturnFromCustomerPickEditLineRow.java
---
a/src/org/openbravo/common/datasource/ReturnFromCustomerPickEditLineRow.java
Thu May 08 12:07:29 2014 +0200
+++
b/src/org/openbravo/common/datasource/ReturnFromCustomerPickEditLineRow.java
Thu May 08 12:46:08 2014 +0200
@@ -55,7 +55,11 @@
this.updatedBy = (String) values[7];
this.created = (Date) values[8];
this.updated = (Date) values[9];
- this.obSelected = (String) values[10];
+ if (values[10] instanceof java.lang.Character) {
+ this.obSelected = ((java.lang.Character) values[10]).toString();
+ } else {
+ this.obSelected = (String) values[10];
+ }
this.mInOutLineId = (String) values[11];
this.returnOrderid = (String) values[12];
this.inOutNo = (String) values[13];
------------------------------------------------------------------------------
Is your legacy SCM system holding you back? Join Perforce May 7 to find out:
• 3 signs your SCM is hindering your productivity
• Requirements for releasing software faster
• Expert tips and advice for migrating your SCM now
http://p.sf.net/sfu/perforce
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
