[Compiere-cvslog] CVS: dbPort/src/org/compiere/model MLocation.java,1.36,1.37 MRole.java,1.48,1.49

[Jorg J. <jj...@us...>]

Update of /cvsroot/compiere/dbPort/src/org/compiere/model
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1586/src/org/compiere/model

Modified Files:
	MLocation.java MRole.java 
Log Message:


Index: MLocation.java
===================================================================
RCS file: /cvsroot/compiere/dbPort/src/org/compiere/model/MLocation.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** MLocation.java	28 Nov 2005 03:35:24 -0000	1.36
--- MLocation.java	5 Jan 2006 07:26:38 -0000	1.37
***************
*** 457,471 ****
  	{
  		StringBuffer retStr = new StringBuffer();
! 		if (getAddress1() != null)
! 			retStr.append(getAddress1());
! 		if (getAddress2() != null && getAddress2().length() > 0)
! 			retStr.append(", ").append(getAddress2());
! 		if (getAddress3() != null && getAddress3().length() > 0)
! 			retStr.append(", ").append(getAddress3());
! 		if (getAddress4() != null && getAddress4().length() > 0)
! 			retStr.append(", ").append(getAddress4());
! 		//	City, Region, Postal
! 		retStr.append(", ").append(parseCRP (getCountry()));
! 		//
  		return retStr.toString();
  	}	//	toString
--- 457,487 ----
  	{
  		StringBuffer retStr = new StringBuffer();
! 		if (isAddressLinesReverse())
! 		{
! 			//	City, Region, Postal
! 			retStr.append(", ").append(parseCRP (getCountry()));
! 			if (getAddress4() != null && getAddress4().length() > 0)
! 				retStr.append(", ").append(getAddress4());
! 			if (getAddress3() != null && getAddress3().length() > 0)
! 				retStr.append(", ").append(getAddress3());
! 			if (getAddress2() != null && getAddress2().length() > 0)
! 				retStr.append(", ").append(getAddress2());
! 			if (getAddress1() != null)
! 				retStr.append(getAddress1());
! 		}
! 		else
! 		{
! 			if (getAddress1() != null)
! 				retStr.append(getAddress1());
! 			if (getAddress2() != null && getAddress2().length() > 0)
! 				retStr.append(", ").append(getAddress2());
! 			if (getAddress3() != null && getAddress3().length() > 0)
! 				retStr.append(", ").append(getAddress3());
! 			if (getAddress4() != null && getAddress4().length() > 0)
! 				retStr.append(", ").append(getAddress4());
! 			//	City, Region, Postal
! 			retStr.append(", ").append(parseCRP (getCountry()));
! 			//	Add Country would come here
! 		}
  		return retStr.toString();
  	}	//	toString
***************
*** 478,492 ****
  	{
  		StringBuffer retStr = new StringBuffer();
! 		if (getAddress1() != null)
! 			retStr.append(getAddress1());
! 		if (getAddress2() != null && getAddress2().length() > 0)
! 			retStr.append("\n").append(getAddress2());
! 		if (getAddress3() != null && getAddress3().length() > 0)
! 			retStr.append("\n").append(getAddress3());
! 		if (getAddress4() != null && getAddress4().length() > 0)
! 			retStr.append("\n").append(getAddress4());
! 		//	City, Region, Postal
! 		retStr.append("\n").append(parseCRP (getCountry()));
! 		//	Add Country would come here
  		return retStr.toString();
  	}	//	toStringCR
--- 494,524 ----
  	{
  		StringBuffer retStr = new StringBuffer();
! 		if (isAddressLinesReverse())
! 		{
! 			//	City, Region, Postal
! 			retStr.append(parseCRP (getCountry()));
! 			if (getAddress4() != null && getAddress4().length() > 0)
! 				retStr.append("\n").append(getAddress4());
! 			if (getAddress3() != null && getAddress3().length() > 0)
! 				retStr.append("\n").append(getAddress3());
! 			if (getAddress2() != null && getAddress2().length() > 0)
! 				retStr.append("\n").append(getAddress2());
! 			if (getAddress1() != null)
! 				retStr.append("\n").append(getAddress1());
! 		}
! 		else
! 		{
! 			if (getAddress1() != null)
! 				retStr.append(getAddress1());
! 			if (getAddress2() != null && getAddress2().length() > 0)
! 				retStr.append("\n").append(getAddress2());
! 			if (getAddress3() != null && getAddress3().length() > 0)
! 				retStr.append("\n").append(getAddress3());
! 			if (getAddress4() != null && getAddress4().length() > 0)
! 				retStr.append("\n").append(getAddress4());
! 			//	City, Region, Postal
! 			retStr.append("\n").append(parseCRP (getCountry()));
! 			//	Add Country would come here
! 		}
  		return retStr.toString();
  	}	//	toStringCR

Index: MRole.java
===================================================================
RCS file: /cvsroot/compiere/dbPort/src/org/compiere/model/MRole.java,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** MRole.java	5 Jan 2006 06:39:40 -0000	1.48
--- MRole.java	5 Jan 2006 07:26:39 -0000	1.49
***************
*** 1300,1304 ****
  	 *	@param AD_Table_ID table
  	 *	@param Record_ID record
! 	 *	@param ro 
  	 *	@return boolean
  	 */
--- 1300,1304 ----
  	 *	@param AD_Table_ID table
  	 *	@param Record_ID record
! 	 *	@param ro read only
  	 *	@return boolean
  	 */
***************
*** 1711,1714 ****
--- 1711,1721 ----
  	}	//	addAccessSQL
  
+ 	/**
+ 	 * 	Get Dependent Access 
+ 	 *	@param whereColumnName column
+ 	 *	@param includes ids to include
+ 	 *	@param excludes ids to exclude
+ 	 *	@return where clause starting with AND or ""
+ 	 */
  	private String getDependentAccess(String whereColumnName,
  		ArrayList<Integer> includes, ArrayList<Integer> excludes)