details: https://code.openbravo.com/erp/devel/pi/rev/41e2c1a6b6d9
changeset: 32328:41e2c1a6b6d9
user: David Miguelez <david.miguelez <at> openbravo.com>
date: Tue Jun 20 13:31:26 2017 +0200
summary: Backed out changeset 1060aa4441df
diffstat:
src/org/openbravo/erpCommon/ad_forms/RequisitionToOrder.java | 18 ++++-------
1 files changed, 7 insertions(+), 11 deletions(-)
diffs (70 lines):
diff -r eb2456d033f9 -r 41e2c1a6b6d9
src/org/openbravo/erpCommon/ad_forms/RequisitionToOrder.java
--- a/src/org/openbravo/erpCommon/ad_forms/RequisitionToOrder.java Tue Jun
20 13:24:01 2017 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/RequisitionToOrder.java Tue Jun
20 13:31:26 2017 +0200
@@ -264,8 +264,7 @@
boolean strHaveAumDataLines = false;
for (int i = 0; i < datalines.length; i++) {
try {
- if (!datalines[i].quantityorder.isEmpty()
- && !StringUtils.equals(datalines[i].secuomname, "**")) {
+ if (!datalines[i].quantityorder.isEmpty() &&
!datalines[i].secuomname.equals("**")) {
strHaveSecDataLines = true;
}
if (uomManagementPreference && !datalines[i].cAum.isEmpty()
@@ -287,8 +286,7 @@
xmlDocument.setParameter("uompreference", "");
xmlDocument.setParameter("havesecuom", "");
if (datalines[i].cAum.isEmpty() && datalines[i].aumqty.isEmpty()
- && datalines[i].quantityorder.isEmpty()
- && StringUtils.equals(datalines[i].secuomname, "**")) {
+ && datalines[i].quantityorder.isEmpty() &&
datalines[i].secuomname.equals("**")) {
RequisitionToOrderData[] defaultAumData =
RequisitionToOrderData.selectAUMDefault(this,
datalines[i].mProductId);
String defaultAum = (defaultAumData.length > 0) ?
defaultAumData[0].cAum
@@ -303,7 +301,7 @@
}
}
} else if (uomManagementPreference &&
datalines[i].quantityorder.isEmpty()
- && StringUtils.equals(datalines[i].secuomname, "**")) {
+ && datalines[i].secuomname.equals("**")) {
// UOM preference is Y and no line has secondary UOM
datalines[i].havesecuom = "none";
xmlDocument.setParameter("uompreference", "");
@@ -334,8 +332,7 @@
boolean strHaveAumDataSelected = false;
for (int i = 0; i < dataselected.length; i++) {
try {
- if (!dataselected[i].quantityorder.isEmpty()
- && !StringUtils.equals(dataselected[i].secuomname, "**")) {
+ if (!dataselected[i].quantityorder.isEmpty() &&
!dataselected[i].secuomname.equals("**")) {
strHaveSecDataSelected = true;
}
if (uomManagementPreference && !dataselected[i].cAum.isEmpty()
@@ -357,8 +354,7 @@
xmlDocument.setParameter("uompreferencesel", "");
xmlDocument.setParameter("havesecuomsel", "");
if (dataselected[i].cAum.isEmpty() && dataselected[i].aumqty.isEmpty()
- && dataselected[i].quantityorder.isEmpty()
- && StringUtils.equals(dataselected[i].secuomname, "**")) {
+ && dataselected[i].quantityorder.isEmpty() &&
dataselected[i].secuomname.equals("**")) {
RequisitionToOrderData[] defaultAumData =
RequisitionToOrderData.selectAUMDefault(this,
dataselected[i].mProductId);
String defaultAum = (defaultAumData.length > 0) ?
defaultAumData[0].cAum
@@ -373,7 +369,7 @@
}
}
} else if (uomManagementPreference &&
dataselected[i].quantityorder.isEmpty()
- && StringUtils.equals(dataselected[i].secuomname, "**")) {
+ && dataselected[i].secuomname.equals("**")) {
// UOM preference is Y and no line has secondary UOM
dataselected[i].havesecuom = "none";
xmlDocument.setParameter("uompreferencesel", "");
@@ -435,7 +431,7 @@
String strLockQty = "";
String strLockAqumQty = null;
if (uomManagementPreference && dataselected[i].quantityorder.isEmpty()
- && StringUtils.equals(dataselected[i].secuomname, "**")) {
+ && dataselected[i].secuomname.equals("**")) {
strLockQty = vars.getNumericParameter("inpQty" +
dataselected[i].mRequisitionlineId);
strLockAqumQty = vars.getNumericParameter("inpAumQty" +
dataselected[i].mRequisitionlineId);
} else {
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
