midsuit
/
core-jgi
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-3581 XB0001 Address Line Reverse display improvement in Location field

This commit is contained in:
z5k1 2017-12-17 20:57:43 +08:00
parent 80d831f486
commit 3136d8cda3
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
org.adempiere.base/src/org/compiere/model/MLocation.java
View File

@ -537,7 +537,7 @@ public class MLocation extends X_C_Location implements Comparator<Object>
if (isAddressLinesReverse()) if (isAddressLinesReverse())
{ {
// City, Region, Postal // City, Region, Postal
retStr.append(", ").append(parseCRP (getCountry())); retStr.append(parseCRP (getCountry()));
if (getAddress5() != null && getAddress5().length() > 0) if (getAddress5() != null && getAddress5().length() > 0)
retStr.append(", ").append(getAddress5()); retStr.append(", ").append(getAddress5());
if (getAddress4() != null && getAddress4().length() > 0) if (getAddress4() != null && getAddress4().length() > 0)
@ -547,7 +547,7 @@ public class MLocation extends X_C_Location implements Comparator<Object>
if (getAddress2() != null && getAddress2().length() > 0) if (getAddress2() != null && getAddress2().length() > 0)
retStr.append(", ").append(getAddress2()); retStr.append(", ").append(getAddress2());
if (getAddress1() != null) if (getAddress1() != null)
retStr.append(getAddress1()); retStr.append(", ").append(getAddress1());
} }
else else
{ {
@ -564,6 +564,7 @@ public class MLocation extends X_C_Location implements Comparator<Object>
// City, Region, Postal // City, Region, Postal
retStr.append(", ").append(parseCRP (getCountry())); retStr.append(", ").append(parseCRP (getCountry()));
// Add Country would come here // Add Country would come here
// retStr.append(", ").append(getCountry());
} }
return retStr.toString(); return retStr.toString();
} // toString } // toString