details: https://code.openbravo.com/erp/devel/pi/rev/3753ecf11172 changeset: 32325:3753ecf11172 user: Alejandro <alekosmp86 <at> gmail.com> date: Wed Jun 14 15:20:16 2017 -0400 summary: Fixes issue 36270: When generating a PO from Requisition To Order window for a product with AUM.
Strings comparison are made with StringUtils.equals(<string1>, <string2>) instead of <string>.equals(<string>), due to the null check in the parameters. details: https://code.openbravo.com/erp/devel/pi/rev/1060aa4441df changeset: 32326:1060aa4441df user: David Miguelez <david.miguelez <at> openbravo.com> date: Mon Jun 19 09:44:01 2017 +0200 summary: Related to Issue 36270. Fixes all places in which the StringUtils comparison should be used instead of variable.equals("string") diffstat: src/org/openbravo/erpCommon/ad_forms/RequisitionToOrder.java | 20 +++++++---- 1 files changed, 12 insertions(+), 8 deletions(-) diffs (79 lines): diff -r 540e39d05914 -r 1060aa4441df src/org/openbravo/erpCommon/ad_forms/RequisitionToOrder.java --- a/src/org/openbravo/erpCommon/ad_forms/RequisitionToOrder.java Tue Jun 20 01:33:48 2017 +0200 +++ b/src/org/openbravo/erpCommon/ad_forms/RequisitionToOrder.java Mon Jun 19 09:44:01 2017 +0200 @@ -264,7 +264,8 @@ boolean strHaveAumDataLines = false; for (int i = 0; i < datalines.length; i++) { try { - if (!datalines[i].quantityorder.isEmpty() && !datalines[i].secuomname.equals("**")) { + if (!datalines[i].quantityorder.isEmpty() + && !StringUtils.equals(datalines[i].secuomname, "**")) { strHaveSecDataLines = true; } if (uomManagementPreference && !datalines[i].cAum.isEmpty() @@ -286,7 +287,8 @@ xmlDocument.setParameter("uompreference", ""); xmlDocument.setParameter("havesecuom", ""); if (datalines[i].cAum.isEmpty() && datalines[i].aumqty.isEmpty() - && datalines[i].quantityorder.isEmpty() && datalines[i].secuomname.equals("**")) { + && datalines[i].quantityorder.isEmpty() + && StringUtils.equals(datalines[i].secuomname, "**")) { RequisitionToOrderData[] defaultAumData = RequisitionToOrderData.selectAUMDefault(this, datalines[i].mProductId); String defaultAum = (defaultAumData.length > 0) ? defaultAumData[0].cAum @@ -301,7 +303,7 @@ } } } else if (uomManagementPreference && datalines[i].quantityorder.isEmpty() - && datalines[i].secuomname.equals("**")) { + && StringUtils.equals(datalines[i].secuomname, "**")) { // UOM preference is Y and no line has secondary UOM datalines[i].havesecuom = "none"; xmlDocument.setParameter("uompreference", ""); @@ -332,7 +334,8 @@ boolean strHaveAumDataSelected = false; for (int i = 0; i < dataselected.length; i++) { try { - if (!dataselected[i].quantityorder.isEmpty() && !dataselected[i].secuomname.equals("**")) { + if (!dataselected[i].quantityorder.isEmpty() + && !StringUtils.equals(dataselected[i].secuomname, "**")) { strHaveSecDataSelected = true; } if (uomManagementPreference && !dataselected[i].cAum.isEmpty() @@ -354,7 +357,8 @@ xmlDocument.setParameter("uompreferencesel", ""); xmlDocument.setParameter("havesecuomsel", ""); if (dataselected[i].cAum.isEmpty() && dataselected[i].aumqty.isEmpty() - && dataselected[i].quantityorder.isEmpty() && dataselected[i].secuomname.equals("**")) { + && dataselected[i].quantityorder.isEmpty() + && StringUtils.equals(dataselected[i].secuomname, "**")) { RequisitionToOrderData[] defaultAumData = RequisitionToOrderData.selectAUMDefault(this, dataselected[i].mProductId); String defaultAum = (defaultAumData.length > 0) ? defaultAumData[0].cAum @@ -369,7 +373,7 @@ } } } else if (uomManagementPreference && dataselected[i].quantityorder.isEmpty() - && dataselected[i].secuomname.equals("**")) { + && StringUtils.equals(dataselected[i].secuomname, "**")) { // UOM preference is Y and no line has secondary UOM dataselected[i].havesecuom = "none"; xmlDocument.setParameter("uompreferencesel", ""); @@ -431,7 +435,7 @@ String strLockQty = ""; String strLockAqumQty = null; if (uomManagementPreference && dataselected[i].quantityorder.isEmpty() - && dataselected[i].secuomname.equals("**")) { + && StringUtils.equals(dataselected[i].secuomname, "**")) { strLockQty = vars.getNumericParameter("inpQty" + dataselected[i].mRequisitionlineId); strLockAqumQty = vars.getNumericParameter("inpAumQty" + dataselected[i].mRequisitionlineId); } else { @@ -691,7 +695,7 @@ lines[i].aumqty = lines[i].lockaumqty; if (uomManagementPreference && lines[i].quantityorder.isEmpty() - && lines[i].secuomname.equals("**")) { + && StringUtils.equals(lines[i].secuomname, "**")) { try { if (lines[i].cAum.isEmpty()) { RequisitionToOrderData[] defaultAumData = RequisitionToOrderData.selectAUMDefault( ------------------------------------------------------------------------------ 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