diff --git a/client/src/org/compiere/apps/search/Find.java b/client/src/org/compiere/apps/search/Find.java
index 64562b5b75..bd5a1a0e57 100644
--- a/client/src/org/compiere/apps/search/Find.java
+++ b/client/src/org/compiere/apps/search/Find.java
@@ -501,12 +501,12 @@ public final class Find extends CDialog
 	{
 		log.info(e.getActionCommand());
 		//
-		if (e.getActionCommand() == ConfirmPanel.A_CANCEL)
+		if (e.getActionCommand().equals(ConfirmPanel.A_CANCEL))
 			cmd_cancel();
-		else if (e.getActionCommand() == ConfirmPanel.A_REFRESH)
+		else if (e.getActionCommand().equals(ConfirmPanel.A_REFRESH))
 			cmd_refresh();
 		//
-		else if (e.getActionCommand() == ConfirmPanel.A_NEW)
+		else if (e.getActionCommand().equals(ConfirmPanel.A_NEW))
 		{
 			m_query = MQuery.getNoRecordQuery(m_tableName, true);
 			m_total = 0;
diff --git a/client/src/org/compiere/grid/VCreateFromInvoice.java b/client/src/org/compiere/grid/VCreateFromInvoice.java
index d2ddf941da..35f05a0f22 100644
--- a/client/src/org/compiere/grid/VCreateFromInvoice.java
+++ b/client/src/org/compiere/grid/VCreateFromInvoice.java
@@ -164,7 +164,7 @@ public class VCreateFromInvoice extends VCreateFrom implements VetoableChangeLis
 		log.config(e.getPropertyName() + "=" + e.getNewValue());
 
 		//  BPartner - load Order/Invoice/Shipment
-		if (e.getPropertyName() == "C_BPartner_ID")
+		if (e.getPropertyName().equals("C_BPartner_ID"))
 		{
 			int C_BPartner_ID = ((Integer)e.getNewValue()).intValue();
 			initBPartnerOIS (C_BPartner_ID, true);
diff --git a/client/src/org/compiere/grid/VCreateFromShipment.java b/client/src/org/compiere/grid/VCreateFromShipment.java
index 6bd1cc42ed..2cad083299 100644
--- a/client/src/org/compiere/grid/VCreateFromShipment.java
+++ b/client/src/org/compiere/grid/VCreateFromShipment.java
@@ -179,7 +179,7 @@ public class VCreateFromShipment extends VCreateFrom implements VetoableChangeLi
 		log.config(e.getPropertyName() + "=" + e.getNewValue());
 
 		//  BPartner - load Order/Invoice/Shipment
-		if (e.getPropertyName() == "C_BPartner_ID")
+		if (e.getPropertyName().equals("C_BPartner_ID"))
 		{
 			int C_BPartner_ID = ((Integer)e.getNewValue()).intValue();
 			initBPartnerOIS (C_BPartner_ID, false);
diff --git a/client/src/org/compiere/grid/VCreateFromStatement.java b/client/src/org/compiere/grid/VCreateFromStatement.java
index 0148ec23f0..6611d46e95 100644
--- a/client/src/org/compiere/grid/VCreateFromStatement.java
+++ b/client/src/org/compiere/grid/VCreateFromStatement.java
@@ -92,7 +92,7 @@ public class VCreateFromStatement extends VCreateFrom implements VetoableChangeL
 		log.config(e.getPropertyName() + "=" + e.getNewValue());
 
 		//  BankAccount
-		if (e.getPropertyName() == "C_BankAccount_ID")
+		if (e.getPropertyName().equals("C_BankAccount_ID"))
 		{
 			int C_BankAccount_ID = ((Integer)e.getNewValue()).intValue();
 			loadBankAccount(C_BankAccount_ID);
diff --git a/dbPort/src/org/compiere/util/AmtInWords_ES.java b/dbPort/src/org/compiere/util/AmtInWords_ES.java
index 5a5fa52e82..eb76646025 100644
--- a/dbPort/src/org/compiere/util/AmtInWords_ES.java
+++ b/dbPort/src/org/compiere/util/AmtInWords_ES.java
@@ -99,7 +99,7 @@ public class AmtInWords_ES implements AmtInWords
 			String s = Integer.toString (number);
 			if (s.endsWith ("2") && soFar != "")
 				soFar = " VEINTI" + soFar.trim ();
-			else if (soFar == "")
+			else if (soFar.equals(""))
 				soFar = tensNames[number % 10] + soFar;
 			else
 				soFar = tensNames[number % 10] + " Y" + soFar;
@@ -153,7 +153,7 @@ public class AmtInWords_ES implements AmtInWords
 				{
 					s = s.replaceFirst ("NUEVE CIENTOS", "NOVECIENTOS");
 				}
-				if (s == " UNO")
+				if (s.equals(" UNO"))
 				{
 					soFar = majorNames[place] + soFar;
 				}