[Compiere-cvslog] CVS: serverApps/src/main/applet/org/compiere/ifm/filetransfer/monitor UserInterface.java,1.1.2.3,1.1.2.4

[Marek Mosiewicz <marekmosiewicz@us...>]

Update of /cvsroot/compiere/serverApps/src/main/applet/org/compiere/ifm/filetransfer/monitor
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24050/src/main/applet/org/compiere/ifm/filetransfer/monitor

Modified Files:
      Tag: pbs_payment
	UserInterface.java 
Log Message:
thread sync issues

Index: UserInterface.java
===================================================================
RCS file: /cvsroot/compiere/serverApps/src/main/applet/org/compiere/ifm/filetransfer/monitor/Attic/UserInterface.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** UserInterface.java	5 Mar 2005 16:10:55 -0000	1.1.2.3
--- UserInterface.java	20 Mar 2005 21:02:50 -0000	1.1.2.4
***************
*** 415,420 ****
  		SwingRunner.invoke(code,false);
  	}
! 	
! 	public boolean promptForUploadInformation(MonitoredFileInfo fileInfo){
  		
  		//If we are already prompting the user about one file we will not ask about another one
--- 415,426 ----
  		SwingRunner.invoke(code,false);
  	}
! 	public boolean promptForUploadInformation(final MonitoredFileInfo fileInfo){
! 		final UserInterface ui = this;
! 		
! 		PromptRunnable code = new PromptRunnable(this,fileInfo);
! 		SwingRunner.invoke(code,true);
! 		return code.result;
! 	}
! 	public boolean promptForUploadInformationCode(MonitoredFileInfo fileInfo){
  		
  		//If we are already prompting the user about one file we will not ask about another one
***************
*** 1277,1278 ****
--- 1283,1296 ----
  	
  }
+ class PromptRunnable implements Runnable {
+ 	private UserInterface ui;
+ 	private MonitoredFileInfo fileInfo;
+ 	PromptRunnable(UserInterface ui,MonitoredFileInfo fileInfo){
+ 		this.ui=ui;
+ 		this.fileInfo=fileInfo;
+ 	}
+ 	public boolean result;
+ 	public void run() {
+ 		result = ui.promptForUploadInformationCode(fileInfo);
+ 	}
+ };

[Compiere-cvslog] CVS: compiere-all - New directory

[Alexandru Carstoiu <acarstoiu@us...>]

Update of /cvsroot/compiere/compiere-all
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23926/compiere-all

Log Message:
Directory /cvsroot/compiere/compiere-all added to the repository

[Compiere-cvslog] CVS: webStore/src/web/WEB-INF/jspfcomponents/IFM IFMheader.jspf,1.1.2.4,1.1.2.5

[Marek Mosiewicz <marekmosiewicz@us...>]

Update of /cvsroot/compiere/webStore/src/web/WEB-INF/jspfcomponents/IFM
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30067/src/web/WEB-INF/jspfcomponents/IFM

Modified Files:
      Tag: pbs_payment
	IFMheader.jspf 
Log Message:


Index: IFMheader.jspf
===================================================================
RCS file: /cvsroot/compiere/webStore/src/web/WEB-INF/jspfcomponents/IFM/Attic/IFMheader.jspf,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -d -r1.1.2.4 -r1.1.2.5
*** IFMheader.jspf	20 Mar 2005 12:25:21 -0000	1.1.2.4
--- IFMheader.jspf	20 Mar 2005 12:42:19 -0000	1.1.2.5
***************
*** 20,27 ****
  		<td style="background-color: #E2F4FF" height="35" align="right" width="30%">
  			&nbsp;
! 			<c:if test="${EmailLetters.lettersCount!=0}">
  				<%-- requires menu position with this name --%>
! 				<a href="${sitectx.basedir}/emailLetters.htm"><cws:message txt="wsm_EmailBasket"/> ${EmailLetters.lettersCount}</a>
! 			</c:if>
  		</td>
  	</tr>
--- 20,27 ----
  		<td style="background-color: #E2F4FF" height="35" align="right" width="30%">
  			&nbsp;
! 			<%--c:if test="${EmailLetters.lettersCount!=0}"--%>
  				<%-- requires menu position with this name --%>
! 				<a href="${sitectx.basedir}/contentServlet/emailLetters.htm"><cws:message txt="wsm_EmailBasket"/></a>
! 			<%--/c:if--%>
  		</td>
  	</tr>

[Compiere-cvslog] CVS: webStore/src/web/WEB-INF/ifm EmailLettersT.jsp,NONE,1.1.2.1 EmailLetters.jsp,1.1.2.1,1.1.2.2 EmailLettersSend.jsp,1.1.2.2,NONE

[Marek Mosiewicz <marekmosiewicz@us...>]

Update of /cvsroot/compiere/webStore/src/web/WEB-INF/ifm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18144/src/web/WEB-INF/ifm

Modified Files:
      Tag: pbs_payment
	EmailLetters.jsp 
Added Files:
      Tag: pbs_payment
	EmailLettersT.jsp 
Removed Files:
      Tag: pbs_payment
	EmailLettersSend.jsp 
Log Message:


--- NEW FILE: EmailLettersT.jsp ---
<%@ taglib uri="http://java.sun.com/jsf/core"; prefix="f"%>
<%@ taglib uri="http://java.sun.com/jsf/html"; prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c"%>
<%@ taglib uri="webStore.tld" prefix="cws"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c" %>

<jsp:directive.page contentType="text/html;charset=UTF-8"
	pageEncoding="UTF-8" />
<f:view>
	<script language="JavaScript"
		src="<%=request.getContextPath()%>/javascript/cooltable.js">
                </script>
	<script language="javascript">
	function keyHandler(keyCode,row){

		if(keyCode == 68){  //D
		   idSubstring = 'deleteLink';
		}

		var link = findObject(row.getElementsByTagName('A'),idSubstring);
		if(link!=null&&link.href){
			window.location = link.href;
		}
	}
	function findObject(array,substring){
		for (i=0; i < array.length; i++) {
	          if(array[i].id && array[i].id.indexOf(substring)>-1){
	          	return array[i];
	          }  
	     }
	return null;
	}
	function onAppletLoad(){
		document.getElementById('tableHook').getElementsByTagName('TABLE')[0].focus();
	}
	</script>
	<div class="pageHeader"><h:outputText
		value="#{ContactDetail.contactDetail.contactTypeName}" />: <h:outputText
		value="#{ContactDetail.contactDetail.bothNames}" /> <A tabindex="-1"
		href="javascript:openIFMHelp('${sitectx.basedir}', 'wsm_FileListHelpTip')">
	<img height="16" border="0" width="16" alt="Help icon"
		src="${sitectx.basedir}/templateimages/IFM/IFMhelpicon.gif" /> </A></div>
	<br>
	<body style="-rave-layout: grid">

	<h:form id="form1">
		<div align="left">Filter: <input type="text" size="12"
			onkeyup="filterTable(document.getElementById('tableHook').getElementsByTagName('TABLE')[0],this.value)" />
		</div>
		<div align="center"><span>
		<div align="center"><h:commandButton value="#{Messages.wsm_Back} [B]"
			accesskey="B" action="#{FileList.back_action}" id="back" /> <h:commandButton
			value="#{Messages.wsm_FindContact} [S]" accesskey="S"
			action="#{Search.search}" id="search" /></div>
		<div id="tableHook"><h:dataTable
			binding="#{EmailLetters.lettersTable}" headerClass="list-header"
			id="dataTable1" rowClasses="list-row-even,list-row-odd"
			value="#{EmailLetters.letters}" var="currentRow">
			<h:column id="column1">
				<h:outputText value="#{currentRow.updated}">
					<f:convertDateTime pattern="dd/MM/yyyy hh:mm" />
				</h:outputText>
				<f:facet name="header">
					<h:outputText value="#{Messages.wsm_Date}">
					</h:outputText>
				</f:facet>
			</h:column>
			<h:column id="column2">
				<h:graphicImage height="16" width="16"
					value="/ifm/filetypes/#{currentRow.extension}.png" />
				<h:outputText value=" #{currentRow.description}" />
				<f:facet name="header">
					<h:outputText value="#{Messages.wsm_Description}" />
				</f:facet>
			</h:column>
			<h:column id="column5">
				<f:facet name="header">
					<h:outputText style="Options" />
				</f:facet>
				<h:commandLink action="#{EmailLetters.deleteEmail}">
					<h:graphicImage alt="#{Messages.wsm_DeleteEmail} [D]"
						value="/ifm/actions/delete.png" />
				</h:commandLink>
			</h:column>
		</h:dataTable></div>
		<div align="center"><br>
		<h:commandButton value="#{Messages.wsm_Back} [B]" accesskey="B"
			action="#{FileList.back_action}" id="back" /> <h:commandButton
			value="#{Messages.wsm_FindContact} [S]" accesskey="S"
			action="#{Search.search}" id="send" /></div>
		</span></div>
		<script>
                    	    makeTableCoolWithKeyboard(document.getElementById('tableHook').getElementsByTagName('TABLE')[0],keyHandler);                    
                    </script>
		<jsp:include page="CommonActions.jsp" />
	</h:form>
	<script>
                	onAppletLoad();
                </script>
</f:view>

Index: EmailLetters.jsp
===================================================================
RCS file: /cvsroot/compiere/webStore/src/web/WEB-INF/ifm/Attic/EmailLetters.jsp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** EmailLetters.jsp	20 Mar 2005 01:48:46 -0000	1.1.2.1
--- EmailLetters.jsp	20 Mar 2005 12:25:21 -0000	1.1.2.2
***************
*** 3,11 ****
  <%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c"%>
  <%@ taglib uri="webStore.tld" prefix="cws"%>
! <%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c" %>
  
  <jsp:directive.page contentType="text/html;charset=UTF-8"
  	pageEncoding="UTF-8" />
  <f:view>
  	<script language="JavaScript"
  		src="<%=request.getContextPath()%>/javascript/cooltable.js">
--- 3,29 ----
  <%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c"%>
  <%@ taglib uri="webStore.tld" prefix="cws"%>
! <%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c"%>
  
  <jsp:directive.page contentType="text/html;charset=UTF-8"
  	pageEncoding="UTF-8" />
  <f:view>
+ 	<applet height="0" width="0" id="fileTransferApplet"
+ 		name="filetransfer" mayscript="true"
+ 		code="org.compiere.ifm.filetransfer.FileTransferApplet.class"
+ 		codebase="${pageContext.request.contextPath}"
+ 		archive="<%=request.getContextPath()%>/ifm/filetransfer.jar">
+ 		<param name="archive"
+ 			value="<%=request.getContextPath()%>/ifm/filetransfer.jar" />
+ 		<param name="jarLocation" value="/ifm/filetransfer.jar" />
+ 		<param name="ifmDefaultConfURL" value="/ifm/ConfServlet" />
+ 		<param name="ifmImportDirURL" value="/ifm/ImportDirServlet" />
+ 		<param name="AD_User_ID" value="${webUser.AD_User_ID}" />
+ 		<param name="SessionId" value="${pageContext.request.session.id}" />
+ 		<param name="uploadServlet" value="/ifm/UploadServlet" />
+ 		<param name="downloadServlet" value="/ifm/DownloadServlet" />
+ 		<param name="lockServlet" value="/ifm/DownloadServlet" />
+ 		<param name="communicationServlet" value="/ifm/CommunicationServlet" />
+ 		<param name="notificationInterval" value="600" />
+ 	</applet>
  	<script language="JavaScript"
  		src="<%=request.getContextPath()%>/javascript/cooltable.js">
***************
*** 31,36 ****
  	return null;
  	}
  	function onAppletLoad(){
! 		document.getElementById('tableHook').getElementsByTagName('TABLE')[0].focus();
  	}
  	</script>
--- 49,77 ----
  	return null;
  	}
+ 	function comboChange(){
+ 		document.getElementById('freshEmail').disabled=
+ 		(document.form1['form1:emails'].value!="");
+ 	}
  	function onAppletLoad(){
! 		document.form1['form1:emails'].focus();
! 		comboChange();
! 	}
! 	function sendEmail(){
! 		if(document.getElementById('subject').value==null||
! 			document.getElementById('body').value==null){
! 			alert('Please fill subject and body properly');
! 		}
! 	    <c:forEach items='${EmailLetters.letters}' var='letter'> 
! 		document.getElementById('fileTransferApplet').enququeMail(<c:out value='${letter.ID}'/>);
! 		</c:forEach>
! 		var email = document.form1['form1:emails'].value;
! 		if(email==""){
! 			email = document.getElementById('freshEmail').value;
! 		}
! 		document.getElementById('fileTransferApplet').sendEmail(
! 					email,
!                     document.getElementById('subject').value,
!                     document.getElementById('body').value
! 		);
  	}
  	</script>
***************
*** 45,57 ****
  
  	<h:form id="form1">
! 		<div align="left">Filter: <input type="text" size="12"
! 			onkeyup="filterTable(document.getElementById('tableHook').getElementsByTagName('TABLE')[0],this.value)" />
  		</div>
! 		<div align="center"><span>
! 		<div align="center"><h:commandButton value="#{Messages.wsm_Back} [B]"
! 			accesskey="B" action="#{FileList.back_action}" id="back" /> <h:commandButton
! 			value="#{Messages.wsm_FindContact} [S]" accesskey="S"
! 			action="#{Search.search}" id="search" /></div>
! 		<div id="tableHook"><h:dataTable
  			binding="#{EmailLetters.lettersTable}" headerClass="list-header"
  			id="dataTable1" rowClasses="list-row-even,list-row-odd"
--- 86,121 ----
  
  	<h:form id="form1">
! 		<div align="left">
! 		<TABLE>
! 			<tr>
! 				<td><h:outputText value="#{Messages.wsm_SendLettersTo}:" /></td>
! 				<td><h:outputText value="#{EmailLetters.mailto.bothNames}" /></td>
! 			</tr>
! 			<tr>
! 				<td><h:outputText value="#{Messages.wsm_Email}:" /></td>
! 				<td><h:selectOneMenu id="emails" value="#{EmailLetters.email}"
! 					onchange="comboChange();">
! 					<f:selectItem itemLabel="--new--" value="" itemValue="" />
! 					<f:selectItems value="#{EmailLetters.emails}" />
! 				</h:selectOneMenu> <h:commandButton
! 					value="#{Messages.wsm_FindContact} [S]" accesskey="S"
! 					action="#{Search.search}" id="search" /></td>
! 			</tr>
! 			<tr>
! 				<td></td>
! 				<td><input type="text" size="30" id="freshEmail" /></td>
! 			</tr>
! 			<tr>
! 				<td><cws:message txt='wsm_Subject' />:</td>
! 				<td><input type="text" id="subject" size="40"></td>
! 			</tr>
! 			<tr>
! 				<td><cws:message txt='wsm_Body' />:</td>
! 				<td><textarea type="text" size="40" id="body"></textarea></td>
! 			</tr>
! 
! 		</TABLE>
  		</div>
! 		<div id="tableHook" align="center"><h:dataTable
  			binding="#{EmailLetters.lettersTable}" headerClass="list-header"
  			id="dataTable1" rowClasses="list-row-even,list-row-odd"
***************
*** 84,96 ****
  			</h:column>
  		</h:dataTable></div>
  		<div align="center"><br>
  		<h:commandButton value="#{Messages.wsm_Back} [B]" accesskey="B"
! 			action="#{FileList.back_action}" id="back" /> <h:commandButton
! 			value="#{Messages.wsm_FindContact} [S]" accesskey="S"
! 			action="#{Search.search}" id="send" /></div>
! 		</span></div>
  		<script>
!                     	    makeTableCoolWithKeyboard(document.getElementById('tableHook').getElementsByTagName('TABLE')[0],keyHandler);                    
!                     </script>
  		<jsp:include page="CommonActions.jsp" />
  	</h:form>
--- 148,162 ----
  			</h:column>
  		</h:dataTable></div>
+ 
  		<div align="center"><br>
  		<h:commandButton value="#{Messages.wsm_Back} [B]" accesskey="B"
! 			action="#{FileList.back_action}" id="back" /> <input type="button"
! 			accesskey="S" value="<cws:message txt='wsm_SendEmail [S]'/>"
! 			onclick="sendEmail();" id="send" /></div>
! 		</span>
! 		</div>
  		<script>
!            	    makeTableCoolWithKeyboard(document.getElementById('tableHook').getElementsByTagName('TABLE')[0],keyHandler);                    
!         </script>
  		<jsp:include page="CommonActions.jsp" />
  	</h:form>

--- EmailLettersSend.jsp DELETED ---

[Compiere-cvslog] CVS: webStore/src/web/WEB-INF/jspfcomponents/IFM IFMheader.jspf,1.1.2.3,1.1.2.4

[Marek Mosiewicz <marekmosiewicz@us...>]

Update of /cvsroot/compiere/webStore/src/web/WEB-INF/jspfcomponents/IFM
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18144/src/web/WEB-INF/jspfcomponents/IFM

Modified Files:
      Tag: pbs_payment
	IFMheader.jspf 
Log Message:


Index: IFMheader.jspf
===================================================================
RCS file: /cvsroot/compiere/webStore/src/web/WEB-INF/jspfcomponents/IFM/Attic/IFMheader.jspf,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** IFMheader.jspf	10 Feb 2005 09:07:42 -0000	1.1.2.3
--- IFMheader.jspf	20 Mar 2005 12:25:21 -0000	1.1.2.4
***************
*** 12,18 ****
  <table cellpadding="0" cellspacing="0" width="100%" height="35">
  	<tr>
! 		<td style="background-color: #E2F4FF" height="35" align="center" width="100%">
  			<font size=4 color="949494"><b><c:out value="${website.name}"/> </b></font>
  		</td>
  	</tr>
  </table>
\ No newline at end of file
--- 12,28 ----
  <table cellpadding="0" cellspacing="0" width="100%" height="35">
  	<tr>
! 		<td style="background-color: #E2F4FF" height="35" align="center" width="30%">
! 			&nbsp;</font>
! 		</td>
! 		<td style="background-color: #E2F4FF" height="35" align="center" width="40%">
  			<font size=4 color="949494"><b><c:out value="${website.name}"/> </b></font>
  		</td>
+ 		<td style="background-color: #E2F4FF" height="35" align="right" width="30%">
+ 			&nbsp;
+ 			<c:if test="${EmailLetters.lettersCount!=0}">
+ 				<%-- requires menu position with this name --%>
+ 				<a href="${sitectx.basedir}/emailLetters.htm"><cws:message txt="wsm_EmailBasket"/> ${EmailLetters.lettersCount}</a>
+ 			</c:if>
+ 		</td>
  	</tr>
  </table>
\ No newline at end of file

[Compiere-cvslog] CVS: webStore/src/web/WEB-INF navigation.xml,1.1.2.10,1.1.2.11

[Marek Mosiewicz <marekmosiewicz@us...>]

Update of /cvsroot/compiere/webStore/src/web/WEB-INF
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18144/src/web/WEB-INF

Modified Files:
      Tag: pbs_payment
	navigation.xml 
Log Message:


Index: navigation.xml
===================================================================
RCS file: /cvsroot/compiere/webStore/src/web/WEB-INF/Attic/navigation.xml,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -C2 -d -r1.1.2.10 -r1.1.2.11
*** navigation.xml	20 Mar 2005 01:49:21 -0000	1.1.2.10
--- navigation.xml	20 Mar 2005 12:25:21 -0000	1.1.2.11
***************
*** 257,267 ****
          </navigation-case>
    </navigation-rule>
!    <navigation-rule>
!         <from-view-id>/WEB-INF/ifm/EmailLettersSend.jsp</from-view-id>
!         <navigation-case>
!             <from-outcome>back</from-outcome>
!             <to-view-id>/WEB-INF/ifm/FileList.jsp</to-view-id>
!         </navigation-case>
!   </navigation-rule>  
   <navigation-rule>
          <from-view-id>/WEB-INF/ifm/EmailLetters.jsp</from-view-id>
--- 257,261 ----
          </navigation-case>
    </navigation-rule>
!  
   <navigation-rule>
          <from-view-id>/WEB-INF/ifm/EmailLetters.jsp</from-view-id>
***************
*** 298,302 ****
           <navigation-case>
              <from-outcome>select</from-outcome>
!             <to-view-id>/WEB-INF/ifm/EmailLettersSend.jsp</to-view-id>
          </navigation-case>
    </navigation-rule>  
--- 292,296 ----
           <navigation-case>
              <from-outcome>select</from-outcome>
!             <to-view-id>/WEB-INF/ifm/EmailLetters.jsp</to-view-id>
          </navigation-case>
    </navigation-rule>  

[Compiere-cvslog] CVS: serverApps/src/main/applet/org/compiere/ifm/filetransfer/monitor MonitoredFileInfo.java,1.1.2.16,1.1.2.17 HttpFileTransfer.java,1.1.2.14,1.1.2.15 FileCommander.java,1.1.2.24,1.1.2.25

[Marek Mosiewicz <marekmosiewicz@us...>]

Update of /cvsroot/compiere/serverApps/src/main/applet/org/compiere/ifm/filetransfer/monitor
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17807/src/main/applet/org/compiere/ifm/filetransfer/monitor

Modified Files:
      Tag: pbs_payment
	MonitoredFileInfo.java HttpFileTransfer.java 
	FileCommander.java 
Log Message:


Index: MonitoredFileInfo.java
===================================================================
RCS file: /cvsroot/compiere/serverApps/src/main/applet/org/compiere/ifm/filetransfer/monitor/Attic/MonitoredFileInfo.java,v
retrieving revision 1.1.2.16
retrieving revision 1.1.2.17
diff -C2 -d -r1.1.2.16 -r1.1.2.17
*** MonitoredFileInfo.java	20 Mar 2005 01:50:14 -0000	1.1.2.16
--- MonitoredFileInfo.java	20 Mar 2005 04:10:40 -0000	1.1.2.17
***************
*** 319,322 ****
--- 319,323 ----
  		file.setCommand(command);
  		file.addProperties(properties);
+ 		file.setNewFile(false);
  		try{
  			if(FileCommander.downloadFile(file)){
***************
*** 326,329 ****
--- 327,331 ----
  			}
  		}catch(final Exception e){
+ 			e.printStackTrace();
  			SwingRunner.invoke(new Runnable(){
  				public void run(){

Index: HttpFileTransfer.java
===================================================================
RCS file: /cvsroot/compiere/serverApps/src/main/applet/org/compiere/ifm/filetransfer/monitor/Attic/HttpFileTransfer.java,v
retrieving revision 1.1.2.14
retrieving revision 1.1.2.15
diff -C2 -d -r1.1.2.14 -r1.1.2.15
*** HttpFileTransfer.java	5 Mar 2005 16:10:55 -0000	1.1.2.14
--- HttpFileTransfer.java	20 Mar 2005 04:10:40 -0000	1.1.2.15
***************
*** 91,95 ****
  			}
  			//read Content-Disposition header to detect filename
! 			String disposition = c.getHeaderField("Content-Disposition");	
  			if(disposition!=null&&disposition.lastIndexOf(FILE_NAME_SUBSTR)>-1){
  				String fname=disposition.substring(
--- 91,96 ----
  			}
  			//read Content-Disposition header to detect filename
! 			String disposition = c.getHeaderField("Content-Disposition");
! 			System.out.println("Disposition="+disposition);
  			if(disposition!=null&&disposition.lastIndexOf(FILE_NAME_SUBSTR)>-1){
  				String fname=disposition.substring(
***************
*** 101,104 ****
--- 102,106 ----
  						setFileName(fname);
  			}
+ 			System.out.println("filename="+getFileName());
  			in = new BufferedInputStream(c.getInputStream());
  

Index: FileCommander.java
===================================================================
RCS file: /cvsroot/compiere/serverApps/src/main/applet/org/compiere/ifm/filetransfer/monitor/Attic/FileCommander.java,v
retrieving revision 1.1.2.24
retrieving revision 1.1.2.25
diff -C2 -d -r1.1.2.24 -r1.1.2.25
*** FileCommander.java	5 Mar 2005 16:10:55 -0000	1.1.2.24
--- FileCommander.java	20 Mar 2005 04:10:40 -0000	1.1.2.25
***************
*** 163,170 ****
  		int result = transferer.getFileFromURL(downloadURL+ file.getDownloadURLParams(), tmpFile,file.getCookies());
  		String filename = transferer.getFileName();
! 		if(transferer.isReadOnly()){ //add timestamp to avoid duplicates
! 			int pos = filename.indexOf('.');
! 			filename=filename.substring(0,pos)+"_"+new Date().getTime()+filename.substring(pos);
! 		}
  		if(!ensureNotOpen(tmpFile,new File(FileMonitorDaemon.getIFMFilesDir(),filename))){
  			return false;
--- 163,170 ----
  		int result = transferer.getFileFromURL(downloadURL+ file.getDownloadURLParams(), tmpFile,file.getCookies());
  		String filename = transferer.getFileName();
! 		//if(transferer.isReadOnly()){ //add timestamp to avoid duplicates
! 		//	int pos = filename.indexOf('.');
! 		//	filename=filename.substring(0,pos)+"_"+new Date().getTime()+filename.substring(pos);
! 		//}
  		if(!ensureNotOpen(tmpFile,new File(FileMonitorDaemon.getIFMFilesDir(),filename))){
  			return false;

[Compiere-cvslog] CVS: serverApps/src/main/applet/org/compiere/ifm/filetransfer FileTransferApplet.java,1.1.2.28,1.1.2.29

[Marek Mosiewicz <marekmosiewicz@us...>]

Update of /cvsroot/compiere/serverApps/src/main/applet/org/compiere/ifm/filetransfer
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17807/src/main/applet/org/compiere/ifm/filetransfer

Modified Files:
      Tag: pbs_payment
	FileTransferApplet.java 
Log Message:


Index: FileTransferApplet.java
===================================================================
RCS file: /cvsroot/compiere/serverApps/src/main/applet/org/compiere/ifm/filetransfer/Attic/FileTransferApplet.java,v
retrieving revision 1.1.2.28
retrieving revision 1.1.2.29
diff -C2 -d -r1.1.2.28 -r1.1.2.29
*** FileTransferApplet.java	20 Mar 2005 01:50:14 -0000	1.1.2.28
--- FileTransferApplet.java	20 Mar 2005 04:10:40 -0000	1.1.2.29
***************
*** 52,55 ****
--- 52,56 ----
  public class FileTransferApplet extends JApplet {
  	private java.util.List mails = new ArrayList();
+ 
  	String urlProperties = null;
  
***************
*** 60,64 ****
  
  	String localPropertiesFilename = "ifm-conf.properties";
! 	
  	PropertiesInFile properties;
  
--- 61,65 ----
  
  	String localPropertiesFilename = "ifm-conf.properties";
! 
  	PropertiesInFile properties;
  
***************
*** 86,90 ****
  
  	private boolean isUploadInProgress = false;
! 	
  	public void start() {
  		//prevent from gainig focus to applet and steal our
--- 87,91 ----
  
  	private boolean isUploadInProgress = false;
! 
  	public void start() {
  		//prevent from gainig focus to applet and steal our
***************
*** 103,147 ****
  	}
  
- 	
  	public void init() {
! 		
  		/*
! 		 * Create a session file if it does not already exists. The session file is used to check 
! 		 * if this is a newly established session or an existing session.		  
! 		 *  We could use the session file to store information but currently it is just an empty file.
! 		 *  
! 		 *  An open issue is when to delete the session information - maybe just based an age?
  		 *  
  		 */
! 		
! 		
! 		String sessionID=this.getParameter("SessionId");
! 		boolean newSession = true;		
! 		File sessionPropertyFile = new File(FileMonitorDaemon.getIFMDir() + File.separatorChar + "sessions" + File.separatorChar + sessionID);
! 		
! 		if (sessionPropertyFile.exists()){			
  			newSession = false;
! 		} else{
  			try {
! 				String codebase = getAppletProperties().getProperty(PARAM_CODEBASE);				
! 				if (codebase!=null){
! 			
! 				//Convert the codebase to a valid filename
! 			   	codebase= URLEncoder.encode(codebase, "UTF-8").replaceAll("%","");
! 		
! 			   	//Create default property file to be used if the user want to
! 				//import files from the mail system for instance			    
! 				File ifmServerPropertiesDirectory = new File (FileMonitorDaemon.getIFMDir() + File.separatorChar + "servers");
! 				
! 				if (!ifmServerPropertiesDirectory.exists())
! 					ifmServerPropertiesDirectory.mkdirs();
! 		
! 				
! 				File ifmServerPropertyFile =  new File (ifmServerPropertiesDirectory.getAbsolutePath() + File.separatorChar + "." + codebase);
! 				ifmServerPropertyFile.createNewFile();
! 				
! 				getAppletProperties().store(new FileOutputStream(ifmServerPropertyFile), "Infomanager Server Properties");
! 				new File(sessionPropertyFile.getParent()).mkdirs();		
! 				sessionPropertyFile.createNewFile();
  				}
  			} catch (IOException e1) {
--- 104,158 ----
  	}
  
  	public void init() {
! 
  		/*
! 		 * Create a session file if it does not already exists. The session file
! 		 * is used to check if this is a newly established session or an
! 		 * existing session. We could use the session file to store information
! 		 * but currently it is just an empty file.
! 		 * 
! 		 * An open issue is when to delete the session information - maybe just
! 		 * based an age?
  		 *  
  		 */
! 
! 		String sessionID = this.getParameter("SessionId");
! 		boolean newSession = true;
! 		File sessionPropertyFile = new File(FileMonitorDaemon.getIFMDir()
! 				+ File.separatorChar + "sessions" + File.separatorChar
! 				+ sessionID);
! 
! 		if (sessionPropertyFile.exists()) {
  			newSession = false;
! 		} else {
  			try {
! 				String codebase = getAppletProperties().getProperty(
! 						PARAM_CODEBASE);
! 				if (codebase != null) {
! 
! 					//Convert the codebase to a valid filename
! 					codebase = URLEncoder.encode(codebase, "UTF-8").replaceAll(
! 							"%", "");
! 
! 					//Create default property file to be used if the user want
! 					// to
! 					//import files from the mail system for instance
! 					File ifmServerPropertiesDirectory = new File(
! 							FileMonitorDaemon.getIFMDir() + File.separatorChar
! 									+ "servers");
! 
! 					if (!ifmServerPropertiesDirectory.exists())
! 						ifmServerPropertiesDirectory.mkdirs();
! 
! 					File ifmServerPropertyFile = new File(
! 							ifmServerPropertiesDirectory.getAbsolutePath()
! 									+ File.separatorChar + "." + codebase);
! 					ifmServerPropertyFile.createNewFile();
! 
! 					getAppletProperties().store(
! 							new FileOutputStream(ifmServerPropertyFile),
! 							"Infomanager Server Properties");
! 					new File(sessionPropertyFile.getParent()).mkdirs();
! 					sessionPropertyFile.createNewFile();
  				}
  			} catch (IOException e1) {
***************
*** 149,158 ****
  			}
  		}
! 		
! 		
! 	
! 		
  		try {
! 			javax.swing.SwingUtilities.invokeAndWait(new Runnable() {			
  				public void run() {
  					try {
--- 160,166 ----
  			}
  		}
! 
  		try {
! 			javax.swing.SwingUtilities.invokeAndWait(new Runnable() {
  				public void run() {
  					try {
***************
*** 170,197 ****
  			showErrorMessageLocal(e.getLocalizedMessage());
  		}
- 		
- 		if (newSession){
- 		try {
- 			javax.swing.SwingUtilities.invokeAndWait(new Runnable() {			
- 				public void run() {
- 					try {
- 						prepareImportDirectories();
- 					} catch (IOException e) {
- 						// TODO Auto-generated catch block
- 						e.printStackTrace();
- 					}				}
- 			});
- 		} catch (Exception e) {
- 			showErrorMessageLocal(e.getLocalizedMessage());
- 		}
  
! 		
! 		
  		}//if new session
! 		
! 		runImport();	
  	}
  
- 	
  	/**
  	 * @throws IOException
--- 178,203 ----
  			showErrorMessageLocal(e.getLocalizedMessage());
  		}
  
! 		if (newSession) {
! 			try {
! 				javax.swing.SwingUtilities.invokeAndWait(new Runnable() {
! 					public void run() {
! 						try {
! 							prepareImportDirectories();
! 						} catch (IOException e) {
! 							// TODO Auto-generated catch block
! 							e.printStackTrace();
! 						}
! 					}
! 				});
! 			} catch (Exception e) {
! 				showErrorMessageLocal(e.getLocalizedMessage());
! 			}
! 
  		}//if new session
! 
! 		runImport();
  	}
  
  	/**
  	 * @throws IOException
***************
*** 240,244 ****
  	}
  
- 	
  	/**
  	 * @throws IOException
--- 246,249 ----
***************
*** 250,298 ****
  
  		URL url;
! 		
  		try {
  			urlProperties = getCodeBase().toExternalForm()
! 					+ this.getParameter("ifmImportDirURL") 
! 					+ "?AD_User_ID=" +  this.getParameter("AD_User_ID");
  			url = new URL(urlProperties);
! 			
  			URLConnection c = url.openConnection();
  			in = new BufferedReader(new InputStreamReader(c.getInputStream()));
! 			System.out.println("directory url is:" + url);		
  
! 			while (true) {				
! 				String tmp = in.readLine();				
! 				if (tmp == null) {					
  					break;
  				}
  				int splitPos = tmp.indexOf("=");
! 				int ifm_Contact_ID = new Integer(tmp.substring(0, splitPos)).intValue();
! 				String directoryName = tmp.substring(splitPos+1);
! 				
! 				File dir = new File(System.getProperty("user.home") + File.separatorChar + "ifm" + File.separatorChar + directoryName);
  				File ifmlink = null;
  				if (!dir.exists())
  					dir.mkdirs();
! 					
! 				ifmlink = new File (dir.getAbsolutePath() + File.separatorChar + ".ifmlink");
! 				if (!ifmlink.exists()){
! 					ifmlink.createNewFile();	
! 				}					
! 				
! 				if (ifmlink.exists() && ifmlink.canWrite()){
! 							
  					try {
! 			  		  	FileOutputStream fileOut = new FileOutputStream (ifmlink);
! 			    		OutputStreamWriter outWriter = new OutputStreamWriter (fileOut);
! 			    		outWriter.write("IFM_Contacts_ID=" + Integer.toString(ifm_Contact_ID));
! 			    		outWriter.close();
! 						} catch (Exception e) {
  						e.printStackTrace();
  					}
  				}
  				//
! 					
! 			}						
! 			
  		} finally {
  			if (in != null)
--- 255,309 ----
  
  		URL url;
! 
  		try {
  			urlProperties = getCodeBase().toExternalForm()
! 					+ this.getParameter("ifmImportDirURL") + "?AD_User_ID="
! 					+ this.getParameter("AD_User_ID");
  			url = new URL(urlProperties);
! 
  			URLConnection c = url.openConnection();
  			in = new BufferedReader(new InputStreamReader(c.getInputStream()));
! 			System.out.println("directory url is:" + url);
  
! 			while (true) {
! 				String tmp = in.readLine();
! 				if (tmp == null) {
  					break;
  				}
  				int splitPos = tmp.indexOf("=");
! 				int ifm_Contact_ID = new Integer(tmp.substring(0, splitPos))
! 						.intValue();
! 				String directoryName = tmp.substring(splitPos + 1);
! 
! 				File dir = new File(System.getProperty("user.home")
! 						+ File.separatorChar + "ifm" + File.separatorChar
! 						+ directoryName);
  				File ifmlink = null;
  				if (!dir.exists())
  					dir.mkdirs();
! 
! 				ifmlink = new File(dir.getAbsolutePath() + File.separatorChar
! 						+ ".ifmlink");
! 				if (!ifmlink.exists()) {
! 					ifmlink.createNewFile();
! 				}
! 
! 				if (ifmlink.exists() && ifmlink.canWrite()) {
! 
  					try {
! 						FileOutputStream fileOut = new FileOutputStream(ifmlink);
! 						OutputStreamWriter outWriter = new OutputStreamWriter(
! 								fileOut);
! 						outWriter.write("IFM_Contacts_ID="
! 								+ Integer.toString(ifm_Contact_ID));
! 						outWriter.close();
! 					} catch (Exception e) {
  						e.printStackTrace();
  					}
  				}
  				//
! 
! 			}
! 
  		} finally {
  			if (in != null)
***************
*** 305,309 ****
  	}
  
- 	
  	public void configure() {
  		configuration.showModal();
--- 316,319 ----
***************
*** 316,336 ****
  		quickImport.start();
  	}
! 	
  	public void openJournal(String contactId) {
! 		open(MonitoredFileInfo.FILE_KIND_JOURNAL,contactId, Integer.toString(FILE_TYPE_JOURNAL));
  	}
  	public void openSelectionLetter(String contactId) {
  		//we set file type to JOUrNAL as it opens Writer
! 		open(MonitoredFileInfo.FILE_KIND_SELECTION,contactId, Integer.toString(FILE_TYPE_JOURNAL));
  	}
! 	public void mailMerge(String selectionLetterId){
! //		we set file type to JOUrNAL as it opens Writer
! 		open(MonitoredFileInfo.FILE_KIND_MAILMERGE,selectionLetterId, Integer.toString(FILE_TYPE_JOURNAL));
! 		
  	}
  	public void open(final String fileId, final String fileTypeId) {
! 		open(MonitoredFileInfo.FILE_KIND_CONTACT,fileId, fileTypeId);
  	}
! 	public void open(final String fileKind, final String fileId, final String fileTypeId) {
  		AccessController.doPrivileged(new PrivilegedAction() {
  			public Object run() {
--- 326,354 ----
  		quickImport.start();
  	}
! 
  	public void openJournal(String contactId) {
! 		open(MonitoredFileInfo.FILE_KIND_JOURNAL, contactId, Integer
! 				.toString(FILE_TYPE_JOURNAL));
  	}
+ 
  	public void openSelectionLetter(String contactId) {
  		//we set file type to JOUrNAL as it opens Writer
! 		open(MonitoredFileInfo.FILE_KIND_SELECTION, contactId, Integer
! 				.toString(FILE_TYPE_JOURNAL));
  	}
! 
! 	public void mailMerge(String selectionLetterId) {
! 		//		we set file type to JOUrNAL as it opens Writer
! 		open(MonitoredFileInfo.FILE_KIND_MAILMERGE, selectionLetterId, Integer
! 				.toString(FILE_TYPE_JOURNAL));
! 
  	}
+ 
  	public void open(final String fileId, final String fileTypeId) {
! 		open(MonitoredFileInfo.FILE_KIND_CONTACT, fileId, fileTypeId);
  	}
! 
! 	public void open(final String fileKind, final String fileId,
! 			final String fileTypeId) {
  		AccessController.doPrivileged(new PrivilegedAction() {
  			public Object run() {
***************
*** 338,343 ****
  					String ext;
  					ext = properties.getExtForFileTypeId(fileTypeId);
! 					FileEnquequer.enquequeOpen(getAppletProperties(),fileKind, fileId,
! 							ext, false, properties.getPropertyWithDefault(ext));
  				} catch (Exception e) {
  					e.printStackTrace();
--- 356,362 ----
  					String ext;
  					ext = properties.getExtForFileTypeId(fileTypeId);
! 					FileEnquequer.enquequeOpen(getAppletProperties(), fileKind,
! 							fileId, ext, false, properties
! 									.getPropertyWithDefault(ext));
  				} catch (Exception e) {
  					e.printStackTrace();
***************
*** 347,385 ****
  		});
  	}
! 	
! 	public void enququeMail(final String letterId){
  		AccessController.doPrivileged(new PrivilegedAction() {
  			public Object run() {
  				try {
! 					MonitoredFileInfo file = MonitoredFileInfo.downloadEmailFile(getAppletProperties(),MonitoredFileInfo.FILE_KIND_CONTACT,
! 							letterId,null,true,null);
! 					if(file!=null){
  						mails.add(file.getDocumentFileName());
  					}
! 					} catch (Exception e) {
  					e.printStackTrace();
  				}
  				return null; // nothing to return
  			}
! 		});		
  	}
! 	public void sendEmail(final String mailto,final String subject,final String body){
  		AccessController.doPrivileged(new PrivilegedAction() {
  			public Object run() {
  				try {
! 					String params = "mailto:"+mailto+"?subject="+subject+
! 					"&body="+body;
! 					for(int i=0;i<mails.size();i++){
! 						params+="&attach="+mails.get(i);
  					}
  					mails.clear();
! 					Runtime.getRuntime().exec(new String[]{"evolution",params});
! 					
! 					} catch (Exception e) {
  					e.printStackTrace();
  				}
  				return null; // nothing to return
  			}
! 		});		
  	}
  
--- 366,412 ----
  		});
  	}
! 
! 	public void enququeMail(final String letterId) {
  		AccessController.doPrivileged(new PrivilegedAction() {
  			public Object run() {
  				try {
! 					MonitoredFileInfo file = MonitoredFileInfo
! 							.downloadEmailFile(getAppletProperties(),
! 									MonitoredFileInfo.FILE_KIND_CONTACT,
! 									letterId, null, true, null);
! 					if (file != null) {
  						mails.add(file.getDocumentFileName());
  					}
! 				} catch (Exception e) {
  					e.printStackTrace();
  				}
  				return null; // nothing to return
  			}
! 		});
  	}
! 
! 	public void sendEmail(final String mailto, final String subject,
! 			final String body) {
  		AccessController.doPrivileged(new PrivilegedAction() {
  			public Object run() {
  				try {
! 					String params = "mailto:" + mailto + "?subject="
! 							+ subject + "&body="
! 							+ body;
! 					for (int i = 0; i < mails.size(); i++) {
! 						params += "&attach=" + mails.get(i);
  					}
  					mails.clear();
! 					Runtime.getRuntime().exec(
! 							new String[] { "evolution", params });
! 
! 				} catch (Exception e) {
  					e.printStackTrace();
+ 					JOptionPane.showMessageDialog(new Frame("Error"), "Can not launch evolution email client:"+e.getMessage() );
+ 					
  				}
  				return null; // nothing to return
  			}
! 		});
  	}
  
***************
*** 391,395 ****
  					String ext = properties.getExtForFileTypeId(fileTypeId);
  					FileEnquequer.enquequeCreate(getAppletProperties(),
! 							conactId, fileTypeId, ext,desc, properties
  									.getPropertyWithDefault(ext));
  				} catch (Exception e) {
--- 418,422 ----
  					String ext = properties.getExtForFileTypeId(fileTypeId);
  					FileEnquequer.enquequeCreate(getAppletProperties(),
! 							conactId, fileTypeId, ext, desc, properties
  									.getPropertyWithDefault(ext));
  				} catch (Exception e) {
***************
*** 407,411 ****
  	protected Properties getAppletProperties() {
  		Properties props = new Properties();
! 		props.put(PARAM_ARCHIVE, getCodeBase().toExternalForm() + getParameter(PARAM_ARCHIVE));
  		props.put(PARAM_CODEBASE, getCodeBase().toExternalForm());
  		props.put(PARAM_DOWNLOAD_URL, getParameter(PARAM_DOWNLOAD_URL));
--- 434,439 ----
  	protected Properties getAppletProperties() {
  		Properties props = new Properties();
! 		props.put(PARAM_ARCHIVE, getCodeBase().toExternalForm()
! 				+ getParameter(PARAM_ARCHIVE));
  		props.put(PARAM_CODEBASE, getCodeBase().toExternalForm());
  		props.put(PARAM_DOWNLOAD_URL, getParameter(PARAM_DOWNLOAD_URL));
***************
*** 421,425 ****
  					getParameter(PARAM_NOTIFICATION_INTERVAL));
  		}
! 		props.put(PARAM_COOKIES,getCookies());
  		return props;
  
--- 449,453 ----
  					getParameter(PARAM_NOTIFICATION_INTERVAL));
  		}
! 		props.put(PARAM_COOKIES, getCookies());
  		return props;
  
***************
*** 433,438 ****
  					ext = properties.getExtForFileTypeId(Integer
  							.toString(FILE_TYPE_MAIL));
! 					FileEnquequer.enquequeOpen(getAppletProperties(),MonitoredFileInfo.FILE_KIND_CONTACT,fileId,
! 							ext, true, properties.getPropertyWithDefault(ext));
  
  				} catch (Exception e) {
--- 461,467 ----
  					ext = properties.getExtForFileTypeId(Integer
  							.toString(FILE_TYPE_MAIL));
! 					FileEnquequer.enquequeOpen(getAppletProperties(),
! 							MonitoredFileInfo.FILE_KIND_CONTACT, fileId, ext,
! 							true, properties.getPropertyWithDefault(ext));
  
  				} catch (Exception e) {
***************
*** 458,467 ****
  	}
  
! 	public void uploadNew(final String conactId, 
! 			final String desc) {
  		AccessController.doPrivileged(new PrivilegedAction() {
  			public Object run() {
  				try {
! 					applet.doUploadNew(conactId,  desc);
  				} catch (Exception e) {
  					e.printStackTrace();
--- 487,495 ----
  	}
  
! 	public void uploadNew(final String conactId, final String desc) {
  		AccessController.doPrivileged(new PrivilegedAction() {
  			public Object run() {
  				try {
! 					applet.doUploadNew(conactId, desc);
  				} catch (Exception e) {
  					e.printStackTrace();
***************
*** 473,537 ****
  
  	public static void center(JFrame frame) {
!         GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment();
!         Point center = ge.getCenterPoint();
!         Rectangle bounds = ge.getMaximumWindowBounds();
!         int w = Math.max(bounds.width/2, Math.min(frame.getWidth(), bounds.width));
!         int h = Math.max(bounds.height/2, Math.min(frame.getHeight(), bounds.height));
!         int x = center.x - w/2, y = center.y - h/2;
!         frame.setBounds(x, y, w, h);
!         if (w == bounds.width && h == bounds.height)
!             frame.setExtendedState(Frame.MAXIMIZED_BOTH);
!         frame.validate();
!     }
! 
  
- 	
  	private File promptForFile(String fileType) {
! 		if (System.getProperty("os.name").indexOf("Windows")>=0){		
  			//Windows NT cannot handle JFileChooser!
  			JFrame frame = new JFrame();
  			center(frame);
! 			FileDialog dialog = new FileDialog(frame, "Select the '" + fileType + "'-file to upload", FileDialog.LOAD);
! 			if(fileType!=null){
  				dialog.setFile("*." + fileType);
  				dialog.setFilenameFilter(new AppletFilenameFilter(fileType));
  			}
! 			dialog.show();			
! 			String fileStr = dialog.getDirectory() + dialog.getFile();		
  			dialog.dispose();
! 			
! 			if (dialog.getFile()==null)
  				return null;
! 			
! 			if (fileType!=null && !fileStr.endsWith("." + fileType)){
! 				JOptionPane.showMessageDialog(new Frame("Error"), "File must be of type '" + fileType + "'" );
  				return null;
  			}//if
! 				
! 			
! 			File file = null;;
! 			
  			try {
  				file = new File(fileStr);
  			} catch (RuntimeException e) {
! 				JOptionPane.showMessageDialog(new Frame("Error"), "Not a valid file" );
  				return null;
  			}
! 			
! 			if (file==null || !file.isFile()){
! 				JOptionPane.showMessageDialog(new Frame("Error"), "Not a file" );
  				return null;
! 			}	
! 			
  			return file;
! 			
  		} else {
  			//This is not windows NT so we can use the JFileChooser
  
  			JFileChooser chooser = new JFileChooser();
! 			if(fileType!=null){
  				chooser.setAcceptAllFileFilterUsed(false);
  				chooser.addChoosableFileFilter(new AppletFileFilter(fileType));
! 			}		
  			int returnVal = chooser.showOpenDialog(this);
  			if (returnVal == JFileChooser.APPROVE_OPTION) {
--- 501,569 ----
  
  	public static void center(JFrame frame) {
! 		GraphicsEnvironment ge = GraphicsEnvironment
! 				.getLocalGraphicsEnvironment();
! 		Point center = ge.getCenterPoint();
! 		Rectangle bounds = ge.getMaximumWindowBounds();
! 		int w = Math.max(bounds.width / 2, Math.min(frame.getWidth(),
! 				bounds.width));
! 		int h = Math.max(bounds.height / 2, Math.min(frame.getHeight(),
! 				bounds.height));
! 		int x = center.x - w / 2, y = center.y - h / 2;
! 		frame.setBounds(x, y, w, h);
! 		if (w == bounds.width && h == bounds.height)
! 			frame.setExtendedState(Frame.MAXIMIZED_BOTH);
! 		frame.validate();
! 	}
  
  	private File promptForFile(String fileType) {
! 		if (System.getProperty("os.name").indexOf("Windows") >= 0) {
  			//Windows NT cannot handle JFileChooser!
  			JFrame frame = new JFrame();
  			center(frame);
! 			FileDialog dialog = new FileDialog(frame, "Select the '" + fileType
! 					+ "'-file to upload", FileDialog.LOAD);
! 			if (fileType != null) {
  				dialog.setFile("*." + fileType);
  				dialog.setFilenameFilter(new AppletFilenameFilter(fileType));
  			}
! 			dialog.show();
! 			String fileStr = dialog.getDirectory() + dialog.getFile();
  			dialog.dispose();
! 
! 			if (dialog.getFile() == null)
  				return null;
! 
! 			if (fileType != null && !fileStr.endsWith("." + fileType)) {
! 				JOptionPane.showMessageDialog(new Frame("Error"),
! 						"File must be of type '" + fileType + "'");
  				return null;
  			}//if
! 
! 			File file = null;
! 			;
! 
  			try {
  				file = new File(fileStr);
  			} catch (RuntimeException e) {
! 				JOptionPane.showMessageDialog(new Frame("Error"),
! 						"Not a valid file");
  				return null;
  			}
! 
! 			if (file == null || !file.isFile()) {
! 				JOptionPane.showMessageDialog(new Frame("Error"), "Not a file");
  				return null;
! 			}
! 
  			return file;
! 
  		} else {
  			//This is not windows NT so we can use the JFileChooser
  
  			JFileChooser chooser = new JFileChooser();
! 			if (fileType != null) {
  				chooser.setAcceptAllFileFilterUsed(false);
  				chooser.addChoosableFileFilter(new AppletFileFilter(fileType));
! 			}
  			int returnVal = chooser.showOpenDialog(this);
  			if (returnVal == JFileChooser.APPROVE_OPTION) {
***************
*** 540,561 ****
  				return null;
  			}
! 			
! 			
  		}//if
  	}
! 	
! 	
  	void doUpload(String fileId, String fileTypeId) throws Exception {
! 		
! 		
  		File file = promptForFile(properties.getExtForFileTypeId(fileTypeId));
! 		
! 		if (file!=null && file.isFile()) {			
! 			int serverResponse;						
! 			HttpFileTransfer tr = new HttpFileTransfer();	
  			UploadStatusFrame frame = new UploadStatusFrame();
  			frame.startFile(file);
! 			serverResponse = HttpFileTransfer.sendFileViaHttp(file, getCodeBase().toExternalForm()
! 					+ getParameter("uploadServlet") + "?fileKind="+MonitoredFileInfo.FILE_KIND_CONTACT+"&fileId=" + fileId,getCookies(),frame);
  			frame.filesFinished();
  			if (serverResponse == HttpURLConnection.HTTP_CONFLICT) {
--- 572,593 ----
  				return null;
  			}
! 
  		}//if
  	}
! 
  	void doUpload(String fileId, String fileTypeId) throws Exception {
! 
  		File file = promptForFile(properties.getExtForFileTypeId(fileTypeId));
! 
! 		if (file != null && file.isFile()) {
! 			int serverResponse;
! 			HttpFileTransfer tr = new HttpFileTransfer();
  			UploadStatusFrame frame = new UploadStatusFrame();
  			frame.startFile(file);
! 			serverResponse = HttpFileTransfer.sendFileViaHttp(file,
! 					getCodeBase().toExternalForm()
! 							+ getParameter("uploadServlet") + "?fileKind="
! 							+ MonitoredFileInfo.FILE_KIND_CONTACT + "&fileId="
! 							+ fileId, getCookies(), frame);
  			frame.filesFinished();
  			if (serverResponse == HttpURLConnection.HTTP_CONFLICT) {
***************
*** 571,585 ****
  	 *  
  	 */
! 	private void doUploadNew(String contactId, String desc)
! 			throws Exception {
  
  		File file = promptForFile(null);
  		String fname = file.getName();
  		int dotIdx = fname.lastIndexOf('.');
! 		String ext ="";
! 		if(dotIdx!=-1){
! 			ext = fname.substring(dotIdx+1,fname.length()).toLowerCase();
  		}
! 		if (file!=null && file.isFile()) {			
  			int serverResponse;
  			HttpFileTransfer tr = new HttpFileTransfer();
--- 603,616 ----
  	 *  
  	 */
! 	private void doUploadNew(String contactId, String desc) throws Exception {
  
  		File file = promptForFile(null);
  		String fname = file.getName();
  		int dotIdx = fname.lastIndexOf('.');
! 		String ext = "";
! 		if (dotIdx != -1) {
! 			ext = fname.substring(dotIdx + 1, fname.length()).toLowerCase();
  		}
! 		if (file != null && file.isFile()) {
  			int serverResponse;
  			HttpFileTransfer tr = new HttpFileTransfer();
***************
*** 588,595 ****
  			serverResponse = HttpFileTransfer.sendFileViaHttp(file,
  					getCodeBase().toExternalForm()
! 					+ getParameter("uploadServlet") + "?fileKind="+MonitoredFileInfo.FILE_KIND_CONTACT+"&contactId=" + contactId
! 					+ "&extension=" + ext + "&desc=" + URLEncoder.encode(desc,"UTF-8"),getCookies(),frame);
  			frame.filesFinished();
! 			
  			if (serverResponse == HttpURLConnection.HTTP_CONFLICT) {
  				showErrorMessageLocal("File is already locked by another user");
--- 619,629 ----
  			serverResponse = HttpFileTransfer.sendFileViaHttp(file,
  					getCodeBase().toExternalForm()
! 							+ getParameter("uploadServlet") + "?fileKind="
! 							+ MonitoredFileInfo.FILE_KIND_CONTACT
! 							+ "&contactId=" + contactId + "&extension=" + ext
! 							+ "&desc=" + URLEncoder.encode(desc, "UTF-8"),
! 					getCookies(), frame);
  			frame.filesFinished();
! 
  			if (serverResponse == HttpURLConnection.HTTP_CONFLICT) {
  				showErrorMessageLocal("File is already locked by another user");
***************
*** 599,624 ****
  		}
  	}
! 	
  	/**
  	 *  
  	 */
! 	public void doUploadNewNoPrompt(String contactId, String absolutePath, String description, String extension)
! 			throws Exception {
  
  		File file = new File(absolutePath);
! 		
! 		if (file!=null && file.isFile()) {			
  			int serverResponse;
  			HttpFileTransfer tr = new HttpFileTransfer();
  			serverResponse = HttpFileTransfer.sendFileViaHttp(file,
  					getCodeBase().toExternalForm()
! 					+ "/ifm/UploadServlet?fileKind="+MonitoredFileInfo.FILE_KIND_CONTACT+"&contactId=" + contactId
! 					+ "&fileTypeId=" + 0 + "&extension=" + extension + "&desc=" + URLEncoder.encode(description,"UTF-8"),getCookies());		
! 			
  			file.delete();
  			afterUploadMessage();
  		}
  	}
- 	
  
  	public String getArchiveLocation() {
--- 633,661 ----
  		}
  	}
! 
  	/**
  	 *  
  	 */
! 	public void doUploadNewNoPrompt(String contactId, String absolutePath,
! 			String description, String extension) throws Exception {
  
  		File file = new File(absolutePath);
! 
! 		if (file != null && file.isFile()) {
  			int serverResponse;
  			HttpFileTransfer tr = new HttpFileTransfer();
  			serverResponse = HttpFileTransfer.sendFileViaHttp(file,
  					getCodeBase().toExternalForm()
! 							+ "/ifm/UploadServlet?fileKind="
! 							+ MonitoredFileInfo.FILE_KIND_CONTACT
! 							+ "&contactId=" + contactId + "&fileTypeId=" + 0
! 							+ "&extension=" + extension + "&desc="
! 							+ URLEncoder.encode(description, "UTF-8"),
! 					getCookies());
! 
  			file.delete();
  			afterUploadMessage();
  		}
  	}
  
  	public String getArchiveLocation() {
***************
*** 630,636 ****
  	 */
  	private void afterUploadMessage() {
! 		JOptionPane.showMessageDialog(new Frame("Success"), "File has been successfully uploaded...");		
  		JSObject win = (JSObject) JSObject.getWindow(this);
! 		if(getParameter("onUploadFinish")!=null){
  			win.eval(getParameter("onUploadFinish"));
  		}
--- 667,674 ----
  	 */
  	private void afterUploadMessage() {
! 		JOptionPane.showMessageDialog(new Frame("Success"),
! 				"File has been successfully uploaded...");
  		JSObject win = (JSObject) JSObject.getWindow(this);
! 		if (getParameter("onUploadFinish") != null) {
  			win.eval(getParameter("onUploadFinish"));
  		}
***************
*** 660,678 ****
  		}
  	}
  	/**
  	 * WE need cookies to be authenticated with server
  	 * @return
  	 */
!     public String getCookies() {
  
!           JSObject myBrowser = (JSObject) JSObject.getWindow(this);
!           JSObject myDocument =  (JSObject) myBrowser.getMember("document");
!           String myCookie = (String)myDocument.getMember("cookie");
!           
!           return myCookie;
  
!         }
  
-  
  	private class MessageShower implements Runnable {
  		String message;
--- 698,717 ----
  		}
  	}
+ 
  	/**
  	 * WE need cookies to be authenticated with server
+ 	 * 
  	 * @return
  	 */
! 	public String getCookies() {
  
! 		JSObject myBrowser = (JSObject) JSObject.getWindow(this);
! 		JSObject myDocument = (JSObject) myBrowser.getMember("document");
! 		String myCookie = (String) myDocument.getMember("cookie");
  
! 		return myCookie;
! 
! 	}
  
  	private class MessageShower implements Runnable {
  		String message;
***************
*** 690,694 ****
  
  class AppletFilenameFilter implements FilenameFilter {
! 	
  	String filter;
  
--- 729,733 ----
  
  class AppletFilenameFilter implements FilenameFilter {
! 
  	String filter;
  
***************
*** 697,701 ****
  
  	}
! 	
  	public boolean accept(File dir, String name) {
  		if (filter == null) {
--- 736,740 ----
  
  	}
! 
  	public boolean accept(File dir, String name) {
  		if (filter == null) {
***************
*** 704,711 ****
  		return name.endsWith(filter);
  	}
- 	
- 	
- }
  
  
  class AppletFileFilter extends FileFilter {
--- 743,748 ----
  		return name.endsWith(filter);
  	}
  
+ }
  
  class AppletFileFilter extends FileFilter {
***************
*** 724,730 ****
  	}
  
- 
- 	
- 	
  	/*
  	 * (non-Javadoc)
--- 761,764 ----

[Compiere-cvslog] CVS: webStore/src/web/WEB-INF/ifm EmailLettersSend.jsp,1.1.2.1,1.1.2.2

[Marek Mosiewicz <marekmosiewicz@us...>]

Update of /cvsroot/compiere/webStore/src/web/WEB-INF/ifm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14609/src/web/WEB-INF/ifm

Modified Files:
      Tag: pbs_payment
	EmailLettersSend.jsp 
Log Message:


Index: EmailLettersSend.jsp
===================================================================
RCS file: /cvsroot/compiere/webStore/src/web/WEB-INF/ifm/Attic/EmailLettersSend.jsp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** EmailLettersSend.jsp	20 Mar 2005 01:48:46 -0000	1.1.2.1
--- EmailLettersSend.jsp	20 Mar 2005 04:05:19 -0000	1.1.2.2
***************
*** 20,25 ****
  		<param name="AD_User_ID" value="${webUser.AD_User_ID}" />
  		<param name="SessionId" value="${pageContext.request.session.id}" />
! 		<param name="uploadServlet" value="/ifm/JournalUploadServlet" />
! 		<param name="downloadServlet" value="/ifm/JournalDownloadServlet" />
  		<param name="lockServlet" value="/ifm/DownloadServlet" />
  		<param name="communicationServlet" value="/ifm/CommunicationServlet" />
--- 20,25 ----
  		<param name="AD_User_ID" value="${webUser.AD_User_ID}" />
  		<param name="SessionId" value="${pageContext.request.session.id}" />
! 		<param name="uploadServlet" value="/ifm/UploadServlet" />
! 		<param name="downloadServlet" value="/ifm/DownloadServlet" />
  		<param name="lockServlet" value="/ifm/DownloadServlet" />
  		<param name="communicationServlet" value="/ifm/CommunicationServlet" />
***************
*** 61,65 ****
  		</c:forEach>
  		document.getElementById('fileTransferApplet').sendEmail(
! 					document.getElementById('form1:emails').value,
                      document.getElementById('subject').value,
                      document.getElementById('body').value
--- 61,65 ----
  		</c:forEach>
  		document.getElementById('fileTransferApplet').sendEmail(
! 					document.form1['form1:emails'].value,
                      document.getElementById('subject').value,
                      document.getElementById('body').value

[Compiere-cvslog] CVS: serverApps/src/main/applet/org/compiere/ifm/filetransfer FileTransferApplet.java,1.1.2.27,1.1.2.28

[Marek Mosiewicz <marekmosiewicz@us...>]

Update of /cvsroot/compiere/serverApps/src/main/applet/org/compiere/ifm/filetransfer
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32747/src/main/applet/org/compiere/ifm/filetransfer

Modified Files:
      Tag: pbs_payment
	FileTransferApplet.java 
Log Message:


Index: FileTransferApplet.java
===================================================================
RCS file: /cvsroot/compiere/serverApps/src/main/applet/org/compiere/ifm/filetransfer/Attic/FileTransferApplet.java,v
retrieving revision 1.1.2.27
retrieving revision 1.1.2.28
diff -C2 -d -r1.1.2.27 -r1.1.2.28
*** FileTransferApplet.java	28 Feb 2005 14:04:24 -0000	1.1.2.27
--- FileTransferApplet.java	20 Mar 2005 01:50:14 -0000	1.1.2.28
***************
*** 8,11 ****
--- 8,12 ----
  import java.awt.Frame;
  import java.awt.GraphicsEnvironment;
+ import java.awt.List;
  import java.awt.Point;
  import java.awt.Rectangle;
***************
*** 25,28 ****
--- 26,31 ----
  import java.security.AccessController;
  import java.security.PrivilegedAction;
+ import java.util.ArrayList;
+ import java.util.HashMap;
  import java.util.Properties;
  import java.util.Vector;
***************
*** 48,52 ****
   */
  public class FileTransferApplet extends JApplet {
! 
  	String urlProperties = null;
  
--- 51,55 ----
   */
  public class FileTransferApplet extends JApplet {
! 	private java.util.List mails = new ArrayList();
  	String urlProperties = null;
  
***************
*** 344,347 ****
--- 347,386 ----
  		});
  	}
+ 	
+ 	public void enququeMail(final String letterId){
+ 		AccessController.doPrivileged(new PrivilegedAction() {
+ 			public Object run() {
+ 				try {
+ 					MonitoredFileInfo file = MonitoredFileInfo.downloadEmailFile(getAppletProperties(),MonitoredFileInfo.FILE_KIND_CONTACT,
+ 							letterId,null,true,null);
+ 					if(file!=null){
+ 						mails.add(file.getDocumentFileName());
+ 					}
+ 					} catch (Exception e) {
+ 					e.printStackTrace();
+ 				}
+ 				return null; // nothing to return
+ 			}
+ 		});		
+ 	}
+ 	public void sendEmail(final String mailto,final String subject,final String body){
+ 		AccessController.doPrivileged(new PrivilegedAction() {
+ 			public Object run() {
+ 				try {
+ 					String params = "mailto:"+mailto+"?subject="+subject+
+ 					"&body="+body;
+ 					for(int i=0;i<mails.size();i++){
+ 						params+="&attach="+mails.get(i);
+ 					}
+ 					mails.clear();
+ 					Runtime.getRuntime().exec(new String[]{"evolution",params});
+ 					
+ 					} catch (Exception e) {
+ 					e.printStackTrace();
+ 				}
+ 				return null; // nothing to return
+ 			}
+ 		});		
+ 	}
  
  	public void create(final String conactId, final String fileTypeId,

[Compiere-cvslog] CVS: serverApps/src/main/applet/org/compiere/ifm/filetransfer/monitor MonitoredFileInfo.java,1.1.2.15,1.1.2.16

[Marek Mosiewicz <marekmosiewicz@us...>]

Update of /cvsroot/compiere/serverApps/src/main/applet/org/compiere/ifm/filetransfer/monitor
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32747/src/main/applet/org/compiere/ifm/filetransfer/monitor

Modified Files:
      Tag: pbs_payment
	MonitoredFileInfo.java 
Log Message:


Index: MonitoredFileInfo.java
===================================================================
RCS file: /cvsroot/compiere/serverApps/src/main/applet/org/compiere/ifm/filetransfer/monitor/Attic/MonitoredFileInfo.java,v
retrieving revision 1.1.2.15
retrieving revision 1.1.2.16
diff -C2 -d -r1.1.2.15 -r1.1.2.16
*** MonitoredFileInfo.java	5 Mar 2005 16:10:55 -0000	1.1.2.15
--- MonitoredFileInfo.java	20 Mar 2005 01:50:14 -0000	1.1.2.16
***************
*** 309,312 ****
--- 309,337 ----
  		}
  	}
+ 	public static MonitoredFileInfo downloadEmailFile(Properties properties,String fileKind,
+ 			String fileId, String extenstion, boolean openOnly, String command) {
+ 		MonitoredFileInfo file = new MonitoredFileInfo();
+ 		file.setFileId(fileId);
+ 		file.setOpenOnly(openOnly);
+ 		file.setFileKind(fileKind);
+ 		file.setNewFile(openOnly);
+ 		file.setExt(extenstion);
+ 		file.setCommand(command);
+ 		file.addProperties(properties);
+ 		try{
+ 			if(FileCommander.downloadFile(file)){
+ 				return file;
+ 			}else{
+ 				return null;
+ 			}
+ 		}catch(final Exception e){
+ 			SwingRunner.invoke(new Runnable(){
+ 				public void run(){
+ 					JOptionPane.showMessageDialog(null, "Can't download file:"+e.getLocalizedMessage(), "Error",
+ 							JOptionPane.ERROR_MESSAGE);				}
+ 			},true);
+ 			return null;
+ 		}
+ 	}
  
  	public static void enquequeImportFile(Properties properties, String fileKind, String IFM_Contact_ID,

[Compiere-cvslog] CVS: webStore/src/java/org/compiere/ifm/app/query ContactSearch.java,1.1.2.20,1.1.2.21

[Marek Mosiewicz <marekmosiewicz@us...>]

Update of /cvsroot/compiere/webStore/src/java/org/compiere/ifm/app/query
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32620/src/java/org/compiere/ifm/app/query

Modified Files:
      Tag: pbs_payment
	ContactSearch.java 
Log Message:


Index: ContactSearch.java
===================================================================
RCS file: /cvsroot/compiere/webStore/src/java/org/compiere/ifm/app/query/Attic/ContactSearch.java,v
retrieving revision 1.1.2.20
retrieving revision 1.1.2.21
diff -C2 -d -r1.1.2.20 -r1.1.2.21
*** ContactSearch.java	2 Mar 2005 21:12:50 -0000	1.1.2.20
--- ContactSearch.java	20 Mar 2005 01:49:53 -0000	1.1.2.21
***************
*** 114,119 ****
  									+ "	ex.IFM_CONTACTS_ID= IFM_Contacts.IFM_CONTACTS_ID AND IFM_EXTRACTIONCODE_ID =  ? )",
  									condition,query.isExtractionCodeOuterAnd(),query.isExtractionCodeInnerAnd());
  			//remove last AND/OR
! 			condition.setLength(condition.length()-4);
  			if(isNotEmpty(query.getType())){
  				condition.append(" AND ContactType = ? ");
--- 114,126 ----
  									+ "	ex.IFM_CONTACTS_ID= IFM_Contacts.IFM_CONTACTS_ID AND IFM_EXTRACTIONCODE_ID =  ? )",
  									condition,query.isExtractionCodeOuterAnd(),query.isExtractionCodeInnerAnd());
+ 			repeatStrings(
+ 					query.getPermissionGroup(),
+ 					"IFM_Contacts.IFM_PermissionGroup_ID = ?",
+ 							condition,query.isPermissionGroupOuterAnd(),query.isPermissionGroupInnerAnd());
+ 
  			//remove last AND/OR
! 			if(condition.length()>4){
! 				condition.setLength(condition.length()-4);
! 			}
  			if(isNotEmpty(query.getType())){
  				condition.append(" AND ContactType = ? ");
***************
*** 137,140 ****
--- 144,149 ----
  			pos = addParameters(stmt, query.getPostalCode(), pos, 1, "*");
  			pos = addParameters(stmt, query.getExtractionCode(), pos, 1, "");
+ 			pos = addParameters(stmt, query.getPermissionGroup(), pos, 1, "");
+ 			
  			if (isNotEmpty(query.getType())) {
  				stmt.setString(pos++, query.getType());

[Compiere-cvslog] CVS: webStore/src/java/org/compiere/ifm/app/pages LetterDetail.java,NONE,1.1.2.1 EmailLettersContactResult.java,NONE,1.1.2.1 EmailLetters.java,NONE,1.1.2.1 FileList.java,1.1.2.8,1.1.2.9

[Marek Mosiewicz <marekmosiewicz@us...>]

Update of /cvsroot/compiere/webStore/src/java/org/compiere/ifm/app/pages
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32620/src/java/org/compiere/ifm/app/pages

Modified Files:
      Tag: pbs_payment
	FileList.java 
Added Files:
      Tag: pbs_payment
	LetterDetail.java EmailLettersContactResult.java 
	EmailLetters.java 
Log Message:


--- NEW FILE: LetterDetail.java ---
/*
 * Created on 2005-03-18
 *
 * TODO To change the template for this generated file go to
 * Window - Preferences - Java - Code Generation - Code and Comments
 */
package org.compiere.ifm.app.pages;

import org.compiere.model.M_IFM_Letter;

/**
 * @author Marek
 *
 * Details of letter to edit
 */
public class LetterDetail {
	M_IFM_Letter letter;

	public M_IFM_Letter getLetter() {
		return letter;
	}
	public void setLetter(M_IFM_Letter letter) {
		this.letter = letter;
	}
	public String save(){
		letter.save();
		return "back";
	}
}

--- NEW FILE: EmailLettersContactResult.java ---
/*
 * Created on 2005-03-18
 *
 * TODO To change the template for this generated file go to
 * Window - Preferences - Java - Code Generation - Code and Comments
 */
package org.compiere.ifm.app.pages;

import javax.faces.component.html.HtmlDataTable;

import org.compiere.model.M_IFM_Contacts;

/**
 * @author Marek
 *
 * TODO To change the template for this generated type comment go to
 * Window - Preferences - Java - Code Generation - Code and Comments
 */
public class EmailLettersContactResult extends AbstractPage {
	HtmlDataTable contactsBinding = new HtmlDataTable();;

	public HtmlDataTable getContactsBinding() {
		return contactsBinding;
	}
	public void setContactsBinding(HtmlDataTable contactsBinding) {
		this.contactsBinding = contactsBinding;
	}
	public String selectContact(){
		((EmailLetters)getBean("EmailLetters")).setMailto((M_IFM_Contacts)contactsBinding.getRowData());
		return "select";
	}
}

--- NEW FILE: EmailLetters.java ---
/*
 * Created on 2005-03-14
 *
 * TODO To change the template for this generated file go to
 * Window - Preferences - Java - Code Generation - Code and Comments
 */
package org.compiere.ifm.app.pages;

import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;

import javax.faces.component.html.HtmlDataTable;
import javax.faces.model.SelectItem;

import org.compiere.model.M_IFM_Contact_Phone;
import org.compiere.model.M_IFM_Contacts;
import org.compiere.model.M_IFM_Letter;

/**
 * @author Marek
 *
 * TODO To change the template for this generated type comment go to
 * Window - Preferences - Java - Code Generation - Code and Comments
 */
public class EmailLetters extends AbstractPage{
	ArrayList letters = new ArrayList();
	M_IFM_Contacts mailto;
	HtmlDataTable lettersTable = new HtmlDataTable();
	String email;
	ArrayList emails = new ArrayList();
	public int getLettersCount(){
		return letters.size();
	}
	public ArrayList getLetters() {
		return letters;
	}
	public void addLetter(M_IFM_Letter letter){
		if(!letters.contains(letter)){
			letters.add(letter);
		}
	}
	public HtmlDataTable getLettersTable() {
		return lettersTable;
	}
	public void setLettersTable(HtmlDataTable lettersTable) {
		this.lettersTable = lettersTable;
	}
	public String deleteEmail(){
		letters.remove(lettersTable.getRowData());
		return null;
	}
	public M_IFM_Contacts getMailto() {
		return mailto;
	}
	public void setMailto(M_IFM_Contacts mailto) {
		this.mailto = mailto;
		List phones = mailto.getPhones();
		emails.clear();
		for (Iterator iter = phones.iterator(); iter.hasNext();) {
			M_IFM_Contact_Phone phone = (M_IFM_Contact_Phone) iter.next();
			if(phone.getEmail()!=null){
				emails.add(new SelectItem(phone.getEmail(),phone.getEmail()));
			}
		}
	}
	public String getEmail() {
		return email;
	}
	public void setEmail(String email) {
		this.email = email;
	}
	public ArrayList getEmails() {
		return emails;
	}
	public void setEmails(ArrayList emails) {
		this.emails = emails;
	}
}

Index: FileList.java
===================================================================
RCS file: /cvsroot/compiere/webStore/src/java/org/compiere/ifm/app/pages/Attic/FileList.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -C2 -d -r1.1.2.8 -r1.1.2.9
*** FileList.java	4 Feb 2005 23:52:26 -0000	1.1.2.8
--- FileList.java	20 Mar 2005 01:49:53 -0000	1.1.2.9
***************
*** 131,133 ****
--- 131,146 ----
  		this.downloadAccess = downloadAccess;
  	}
+ 	public String addEmail(){
+ 		EmailLetters letters = (EmailLetters) getBean("EmailLetters");
+ 		letters.addLetter((M_IFM_Letter) getFileListTable().getRowData());
+ 		return null;
+ 	}
+ 	public String editDetails(){
+ 		LetterDetail letter = (LetterDetail) getBean("LetterDetail");
+ 		letter.setLetter((M_IFM_Letter) getFileListTable().getRowData());
+ 		return "edit";
+ 	}
+ 	public String viewEmails(){
+ 		return "emails";
+ 	}
  }
\ No newline at end of file

[Compiere-cvslog] CVS: webStore/src/java/org/compiere/ifm/app/beans ContactQuery.java,1.1.2.5,1.1.2.6

[Marek Mosiewicz <marekmosiewicz@us...>]

Update of /cvsroot/compiere/webStore/src/java/org/compiere/ifm/app/beans
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32620/src/java/org/compiere/ifm/app/beans

Modified Files:
      Tag: pbs_payment
	ContactQuery.java 
Log Message:


Index: ContactQuery.java
===================================================================
RCS file: /cvsroot/compiere/webStore/src/java/org/compiere/ifm/app/beans/Attic/ContactQuery.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -C2 -d -r1.1.2.5 -r1.1.2.6
*** ContactQuery.java	1 Mar 2005 19:39:02 -0000	1.1.2.5
--- ContactQuery.java	20 Mar 2005 01:49:53 -0000	1.1.2.6
***************
*** 49,52 ****
--- 49,56 ----
      String postalCodeInnerAND = Boolean.TRUE.toString();
      String postalCodeOuterAND = Boolean.TRUE.toString();
+     private String[] permissionGroup = new String[3];
+     String permissionGroupInnerAND = Boolean.TRUE.toString();
+     String permissionGroupOuterAND = Boolean.TRUE.toString();
+  
      public String[] getName(){
          return name;
***************
*** 152,156 ****
  		return Boolean.valueOf(getKeywordsOuterAND()).booleanValue();
  	}
! 
  	public String getAddressLineInnerAND() {
  		return addressLineInnerAND;
--- 156,171 ----
  		return Boolean.valueOf(getKeywordsOuterAND()).booleanValue();
  	}
! 	/**
! 	 * @return
! 	 */
! 	public boolean isPermissionGroupInnerAnd() {
! 		return Boolean.valueOf(getPermissionGroupInnerAND()).booleanValue();
! 	}
! 	/**
! 	 * @return
! 	 */
! 	public boolean isPermissionGroupOuterAnd() {
! 		return Boolean.valueOf(getPermissionGroupOuterAND()).booleanValue();
! 	}
  	public String getAddressLineInnerAND() {
  		return addressLineInnerAND;
***************
*** 225,227 ****
--- 240,260 ----
  		this.typeOuterAND = typeOuterAND;
  	}
+ 	public String[] getPermissionGroup() {
+ 		return permissionGroup;
+ 	}
+ 	public void setPermissionGroup(String[] permissionGroup) {
+ 		this.permissionGroup = permissionGroup;
+ 	}
+ 	public String getPermissionGroupInnerAND() {
+ 		return permissionGroupInnerAND;
+ 	}
+ 	public void setPermissionGroupInnerAND(String permissionGroupInnerAND) {
+ 		this.permissionGroupInnerAND = permissionGroupInnerAND;
+ 	}
+ 	public String getPermissionGroupOuterAND() {
+ 		return permissionGroupOuterAND;
+ 	}
+ 	public void setPermissionGroupOuterAND(String permissionGroupOuterAND) {
+ 		this.permissionGroupOuterAND = permissionGroupOuterAND;
+ 	}
  	}

[Compiere-cvslog] CVS: webStore/src/web/WEB-INF managed-beans.xml,1.1.2.9,1.1.2.10 navigation.xml,1.1.2.9,1.1.2.10

[Marek Mosiewicz <marekmosiewicz@us...>]

Update of /cvsroot/compiere/webStore/src/web/WEB-INF
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32279/src/web/WEB-INF

Modified Files:
      Tag: pbs_payment
	managed-beans.xml navigation.xml 
Log Message:


Index: managed-beans.xml
===================================================================
RCS file: /cvsroot/compiere/webStore/src/web/WEB-INF/Attic/managed-beans.xml,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -C2 -d -r1.1.2.9 -r1.1.2.10
*** managed-beans.xml	21 Feb 2005 08:24:28 -0000	1.1.2.9
--- managed-beans.xml	20 Mar 2005 01:49:21 -0000	1.1.2.10
***************
*** 96,98 ****
--- 96,118 ----
          <managed-bean-scope>session</managed-bean-scope>
      </managed-bean>
+     <managed-bean>
+         <managed-bean-name>AddRemoveCodes</managed-bean-name>
+         <managed-bean-class>org.compiere.ifm.app.pages.AddRemoveCodes</managed-bean-class>
+         <managed-bean-scope>request</managed-bean-scope>
+     </managed-bean>
+     <managed-bean>
+         <managed-bean-name>EmailLetters</managed-bean-name>
+         <managed-bean-class>org.compiere.ifm.app.pages.EmailLetters</managed-bean-class>
+         <managed-bean-scope>session</managed-bean-scope>
+     </managed-bean>
+       <managed-bean>
+         <managed-bean-name>LetterDetail</managed-bean-name>
+         <managed-bean-class>org.compiere.ifm.app.pages.LetterDetail</managed-bean-class>
+         <managed-bean-scope>session</managed-bean-scope>
+     </managed-bean>
+       <managed-bean>
+         <managed-bean-name>EmailLettersContactResult</managed-bean-name>
+         <managed-bean-class>org.compiere.ifm.app.pages.EmailLettersContactResult</managed-bean-class>
+         <managed-bean-scope>session</managed-bean-scope>
+     </managed-bean>
  </faces-config>

Index: navigation.xml
===================================================================
RCS file: /cvsroot/compiere/webStore/src/web/WEB-INF/Attic/navigation.xml,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -C2 -d -r1.1.2.9 -r1.1.2.10
*** navigation.xml	11 Feb 2005 01:47:54 -0000	1.1.2.9
--- navigation.xml	20 Mar 2005 01:49:21 -0000	1.1.2.10
***************
*** 47,50 ****
--- 47,65 ----
              <to-view-id>/WEB-INF/ifm/ContactDetail.jsp</to-view-id>
          </navigation-case>
+         <navigation-case>
+             <from-outcome>edit</from-outcome>
+             <to-view-id>/WEB-INF/ifm/LetterDetail.jsp</to-view-id>
+         </navigation-case>
+         <navigation-case>
+             <from-outcome>emails</from-outcome>
+             <to-view-id>/WEB-INF/ifm/EmailLetters.jsp</to-view-id>
+         </navigation-case>
+     </navigation-rule>
+     <navigation-rule>
+         <from-view-id>/WEB-INF/ifm/LetterDetail.jsp</from-view-id>
+         <navigation-case>
+             <from-outcome>back</from-outcome>
+             <to-view-id>/WEB-INF/ifm/FileList.jsp</to-view-id>
+         </navigation-case>
      </navigation-rule>
      <navigation-rule>
***************
*** 220,222 ****
--- 235,304 ----
          </navigation-case>
    </navigation-rule>    
+    <navigation-rule>
+         <from-view-id>/WEB-INF/ifm/AddRemoveCodes.jsp</from-view-id>
+         <navigation-case>
+             <from-outcome>back</from-outcome>
+             <to-view-id>/WEB-INF/ifm/Search.jsp</to-view-id>
+         </navigation-case>
+          <navigation-case>
+             <from-outcome>search</from-outcome>
+             <to-view-id>/WEB-INF/ifm/AddRemoveCodesContactResult.jsp</to-view-id>
+         </navigation-case>
+   </navigation-rule>
+    <navigation-rule>
+         <from-view-id>/WEB-INF/ifm/SelectionContactResult.jsp</from-view-id>
+         <navigation-case>
+             <from-outcome>back</from-outcome>
+             <to-view-id>/WEB-INF/ifm/SelectionMembers.jsp</to-view-id>
+         </navigation-case>
+          <navigation-case>
+             <from-outcome>members</from-outcome>
+             <to-view-id>/WEB-INF/ifm/SelectionMembers.jsp</to-view-id>
+         </navigation-case>
+   </navigation-rule>
+    <navigation-rule>
+         <from-view-id>/WEB-INF/ifm/EmailLettersSend.jsp</from-view-id>
+         <navigation-case>
+             <from-outcome>back</from-outcome>
+             <to-view-id>/WEB-INF/ifm/FileList.jsp</to-view-id>
+         </navigation-case>
+   </navigation-rule>  
+  <navigation-rule>
+         <from-view-id>/WEB-INF/ifm/EmailLetters.jsp</from-view-id>
+         <navigation-case>
+             <from-outcome>back</from-outcome>
+             <to-view-id>/WEB-INF/ifm/FileList.jsp</to-view-id>
+         </navigation-case>
+          <navigation-case>
+             <from-outcome>search</from-outcome>
+             <to-view-id>/WEB-INF/ifm/EmailLettersContactSearch.jsp</to-view-id>
+         </navigation-case>
+         <navigation-case>
+             <from-outcome>sendEmail</from-outcome>
+             <to-view-id>/WEB-INF/ifm/SelectionMembers.jsp</to-view-id>
+         </navigation-case>
+   </navigation-rule>
+   <navigation-rule>  
+    <from-view-id>/WEB-INF/ifm/EmailLettersContactSearch.jsp</from-view-id>
+         <navigation-case>
+             <from-outcome>back</from-outcome>
+             <to-view-id>/WEB-INF/ifm/EmailLetters.jsp</to-view-id>
+         </navigation-case>
+          <navigation-case>
+             <from-outcome>search</from-outcome>
+             <to-view-id>/WEB-INF/ifm/EmailLettersContactResult.jsp</to-view-id>
+         </navigation-case>
+   </navigation-rule>  
+   <navigation-rule>  
+    <from-view-id>/WEB-INF/ifm/EmailLettersContactResult.jsp</from-view-id>
+         <navigation-case>
+             <from-outcome>back</from-outcome>
+             <to-view-id>/WEB-INF/ifm/EmailLettersContactSearch.jsp</to-view-id>
+         </navigation-case>
+          <navigation-case>
+             <from-outcome>select</from-outcome>
+             <to-view-id>/WEB-INF/ifm/EmailLettersSend.jsp</to-view-id>
+         </navigation-case>
+   </navigation-rule>  
+   
  </faces-config>

[Compiere-cvslog] CVS: webStore/src/web/WEB-INF/ifm CommonActions.jsp,NONE,1.1.2.1 LetterDetail.jsp,NONE,1.1.2.1 EmailLettersSend.jsp,NONE,1.1.2.1 EmailLettersContactSearch.jsp,NONE,1.1.2.1 EmailLetters.jsp,NONE,1.1.2.1 CopyLettersContactSearch.jsp,NONE,1.1.2.1 CopyLettersContactResult.jsp,NONE,1.1.2.1 EmailLettersContactResult.jsp,NONE,1.1.2.1 SelectionContactSearch.jsp,1.1.2.12,1.1.2.13 AddRemoveCodesContactResult.jsp,1.1.2.1,1.1.2.2 FileList.jsp,1.1.2.40,1.1.2.41 SelectionSearch.jsp,1.1.2.15,1.1.2.16 SelectionCreateEdit.jsp,1.1.2.11,1.1.2.12 ExtractionCodeCreateEdit.jsp,1.1.2.10,1.1.2.11 NewFile.jsp,1.1.2.23,1.1.2.24 AddRemoveCodes.jsp,1.1.2.1,1.1.2.2 SelectionLetters.jsp,1.1.2.16,1.1.2.17 SelectionList.jsp,1.1.2.17,1.1.2.18 ExtractionCodeList.jsp,1.1.2.11,1.1.2.12 ContactSearchSubview.jsp,1.1.2.2,1.1.2.3 SelectionContactResult.jsp,1.1.2.12,1.1.2.13 SelectionMembers.jsp,1.1.2.11,1.1.2.12 ContactList.jsp,1.1.2.18,1.1.2.19 Search.jsp,1.1.2.21,1.1.2.22 CreateEditContact.jsp,1.1.2.23,1.1.2.24 SelectionLetterCreateEdit.jsp,1.1.2.8,1.1.2.9 ContactDetail.jsp,1.1.2.21,1.1.2.22

[Marek Mosiewicz <marekmosiewicz@us...>]

Update of /cvsroot/compiere/webStore/src/web/WEB-INF/ifm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31838/src/web/WEB-INF/ifm

Modified Files:
      Tag: pbs_payment
	SelectionContactSearch.jsp AddRemoveCodesContactResult.jsp 
	FileList.jsp SelectionSearch.jsp SelectionCreateEdit.jsp 
	ExtractionCodeCreateEdit.jsp NewFile.jsp AddRemoveCodes.jsp 
	SelectionLetters.jsp SelectionList.jsp ExtractionCodeList.jsp 
	ContactSearchSubview.jsp SelectionContactResult.jsp 
	SelectionMembers.jsp ContactList.jsp Search.jsp 
	CreateEditContact.jsp SelectionLetterCreateEdit.jsp 
	ContactDetail.jsp 
Added Files:
      Tag: pbs_payment
	CommonActions.jsp LetterDetail.jsp EmailLettersSend.jsp 
	EmailLettersContactSearch.jsp EmailLetters.jsp 
	CopyLettersContactSearch.jsp CopyLettersContactResult.jsp 
	EmailLettersContactResult.jsp 
Log Message:
emails

--- NEW FILE: CommonActions.jsp ---
<%@ taglib uri="http://java.sun.com/jsf/core"; prefix="f"%>
<%@ taglib uri="http://java.sun.com/jsf/html"; prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c"%>  
<%@ taglib uri="webStore.tld" prefix="cws" %>  
<jsp:directive.page contentType="text/html;charset=UTF-8" pageEncoding="UTF-8"/>
<f:subview id="commonActions">
        <h:commandLink accesskey="C" action="#{Navigation.goSearch_action}" id="goSearchAction" style="">
                <h:outputText id="goSearchActionText" value="."/>
        </h:commandLink>
        <h:commandLink accesskey="T" action="#{Search.newContact}" id="newContactAction" style="">
                <h:outputText value="."/>
        </h:commandLink>
</f:subview>


--- NEW FILE: LetterDetail.jsp ---
<%@ taglib uri="http://java.sun.com/jsf/core"; prefix="f"%>
<%@ taglib uri="http://java.sun.com/jsf/html"; prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c"%>  
<%@ taglib uri="webStore.tld" prefix="cws" %>  
<jsp:directive.page contentType="text/html;charset=UTF-8" pageEncoding="UTF-8"/>
    <f:view>
                <h:form id="form1">
                    <div class="pageHeader">
                    	<cws:message txt='wsm_LetterDetail'/>
                    	<A tabindex="-1" href="javascript:openIFMHelp('${sitectx.basedir}', 'wsm_LetterDetailTip')">
							<img height="16" border="0" width="16" alt="Help icon" src="${sitectx.basedir}/templateimages/IFM/IFMhelpicon.gif" />
						</A>
                    </div><br>
                    <table border="1" width="100%">
                        <tbody>
                      
                             <tr>
                                <td>
                                     <h:outputText value="#{Messages.wsm_Description}" />
                                </td>
                                <td>
                                     <h:inputText id="desc" value="#{LetterDetail.letter.description}" size="40"/>
                                </td>
                             </tr>
                              
                             <tr >
                	<tr>
                		<td colspan="2" align="center">        
                			<h:commandButton accesskey="S" action="#{LetterDetail.save}" value="#{Messages.wsm_Save} [S]" id="save"/>                		                 
							<h:commandButton accesskey="B" immediate="true" action="#{Navigation.goBack}" value="#{Messages.wsm_Back} [B]" id="back"/>
                    	</td>			
                    </tr>
                    </tbody>
                </table>

                <jsp:include page="CommonACtions.jsp"/>
                </h:form>
             	<script>
                	onAppletLoad();
                </script>
            </body>
    </f:view>


--- NEW FILE: EmailLettersSend.jsp ---
<%@ taglib uri="http://java.sun.com/jsf/core"; prefix="f"%>
<%@ taglib uri="http://java.sun.com/jsf/html"; prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c"%>
<%@ taglib uri="webStore.tld" prefix="cws"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c"%>

<jsp:directive.page contentType="text/html;charset=UTF-8"
	pageEncoding="UTF-8" />
<f:view>
	<applet height="0" width="0" id="fileTransferApplet"
		name="filetransfer" mayscript="true"
		code="org.compiere.ifm.filetransfer.FileTransferApplet.class"
		codebase="${pageContext.request.contextPath}"
		archive="<%=request.getContextPath()%>/ifm/filetransfer.jar">
		<param name="archive"
			value="<%=request.getContextPath()%>/ifm/filetransfer.jar" />
		<param name="jarLocation" value="/ifm/filetransfer.jar" />
		<param name="ifmDefaultConfURL" value="/ifm/ConfServlet" />
		<param name="ifmImportDirURL" value="/ifm/ImportDirServlet" />
		<param name="AD_User_ID" value="${webUser.AD_User_ID}" />
		<param name="SessionId" value="${pageContext.request.session.id}" />
		<param name="uploadServlet" value="/ifm/JournalUploadServlet" />
		<param name="downloadServlet" value="/ifm/JournalDownloadServlet" />
		<param name="lockServlet" value="/ifm/DownloadServlet" />
		<param name="communicationServlet" value="/ifm/CommunicationServlet" />
		<param name="notificationInterval" value="600" />
	</applet>
	<script language="JavaScript"
		src="<%=request.getContextPath()%>/javascript/cooltable.js">
                </script>
	<script language="javascript">
	function keyHandler(keyCode,row){

		if(keyCode == 68){  //D
		   idSubstring = 'deleteLink';
		}

		var link = findObject(row.getElementsByTagName('A'),idSubstring);
		if(link!=null&&link.href){
			window.location = link.href;
		}
	}
	function findObject(array,substring){
		for (i=0; i < array.length; i++) {
	          if(array[i].id && array[i].id.indexOf(substring)>-1){
	          	return array[i];
	          }  
	     }
	return null;
	}
	function onAppletLoad(){
		document.getElementById('tableHook').getElementsByTagName('TABLE')[0].focus();
	}
	function sendEmail(){
		if(document.getElementById('subject').value==null||
			document.getElementById('body').value==null){
			alert('Please fill subject and body properly');
		}
	    <c:forEach items='${EmailLetters.letters}' var='letter'> 
		document.getElementById('fileTransferApplet').enququeMail(<c:out value='${letter.ID}'/>);
		</c:forEach>
		document.getElementById('fileTransferApplet').sendEmail(
					document.getElementById('form1:emails').value,
                    document.getElementById('subject').value,
                    document.getElementById('body').value
		);
	}
	</script>
	<div class="pageHeader"><h:outputText
		value="#{ContactDetail.contactDetail.contactTypeName}" />: <h:outputText
		value="#{ContactDetail.contactDetail.bothNames}" /> <A tabindex="-1"
		href="javascript:openIFMHelp('${sitectx.basedir}', 'wsm_FileListHelpTip')">
	<img height="16" border="0" width="16" alt="Help icon"
		src="${sitectx.basedir}/templateimages/IFM/IFMhelpicon.gif" /> </A></div>
	<br>
	<body style="-rave-layout: grid">

	<h:form id="form1">
		<div align="left">
		<TABLE>
			<tr>
				<td><h:outputText value="#{Messages.wsm_SendLettersTo}:" /></td>
				<td><h:outputText value="#{EmailLetters.mailto.bothNames}" /></td>
			</tr>
			<tr>
				<td><h:outputText value="#{Messages.wsm_Email}:" /></td>
				<td><h:selectOneMenu id="emails" value="#{EmailLetters.email}">
					<f:selectItems value="#{EmailLetters.emails}" />
				</h:selectOneMenu></td>
			</tr>
			<tr>
				<td><cws:message txt='wsm_Subject' />:</td>
				<td><input type="text" id="subject"></td>
			</tr>
			<tr>
				<td><cws:message txt='wsm_Body' />:</td>
				<td><textarea type="text" id="body"></textarea></td>
			</tr>
			<tr>
				<td>&nbsp;</td>
				<td><input type="button" accesskey="S"
					value="<cws:message txt='wsm_CreateEmail'/>" onclick="sendEmail();"
					id="send" /></td>
			</tr>
		</TABLE>
		</div>

		<div align="center"><br>
		<h:commandButton value="#{Messages.wsm_Back} [B]" accesskey="B"
			action="#{FileList.back_action}" id="back" /></div>
		</span>
		</div>
		<jsp:include page="CommonActions.jsp" />
	</h:form>
	<script>
                	onAppletLoad();
                </script>
</f:view>

--- NEW FILE: EmailLettersContactSearch.jsp ---
<%@ taglib uri="http://java.sun.com/jsf/core"; prefix="f"%>
<%@ taglib uri="http://java.sun.com/jsf/html"; prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c"%>
<%@ taglib uri="webStore.tld" prefix="cws" %>
    <jsp:directive.page contentType="text/html;charset=UTF-8" pageEncoding="UTF-8"/>
    <f:view>
        <html>
            <head>
                <meta content="no-cache" http-equiv="Cache-Control"/>
                <meta content="no-cache" http-equiv="Pragma"/>
                <title><cws:message txt='wsm_SearchContacts'/></title>
                 <link href="<%=request.getContextPath()%>/ifm/css/stylesheet.css" rel="stylesheet" type="text/css"/>
           </head>
            <body style="-rave-layout: grid">
              	<div class="pageHeader">
              		<cws:message txt='wsm_ModifySelectionStep1'/>: <cws:message txt='wsm_SearchContacts'/>
            		<A tabindex="-1" href="javascript:openIFMHelp('${sitectx.basedir}', '<cws:message txt='wsm_ModifySelectionStep1HelpTip'/>')">
						<img height="16" border="0" width="16" alt="Help icon" src="${sitectx.basedir}/templateimages/IFM/IFMhelpicon.gif" />
					</A>
				</div><br>
                <div align="center">
                    <h:form id="form1">
                        <table>
                         <tr>
                            <td colspan="2"><cws:message txt='wsm_InputSearchCriteriaForContactsToSendEmail'/><br><br></td>
                            </tr>
                            
                            <tr><td colspan="2">
                               		<jsp:include page="ContactSearchSubview.jsp" />                               
                       			</td>
                            </tr>
                            <tr>
                                <td align="center" colspan="2">
                                	<br>
                                 	<%--default button first--%><h:commandButton  style="position: absolute; left: -30px; top: -30px;width:0;height:0;" action="#{Search.search}"/>                   
                                    <input type="reset" accesskey="R" value="<cws:message txt='wsm_Reset'/>"/>
                                    <h:commandButton  value="#{Messages.wsm_Back} [B]" accesskey="B" action="#{Navigation.goBack}" />
                                    <h:commandButton value="#{Messages.wsm_Search} [S]" accesskey="S" action="#{Search.search}" />
                                </td>
                            </tr>
                        </table>
                    <jsp:include page="CommonActions.jsp"/>                        
                    </h:form>
                </div>
            </body>
        </html>
    </f:view>

--- NEW FILE: EmailLetters.jsp ---
<%@ taglib uri="http://java.sun.com/jsf/core"; prefix="f"%>
<%@ taglib uri="http://java.sun.com/jsf/html"; prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c"%>
<%@ taglib uri="webStore.tld" prefix="cws"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c" %>

<jsp:directive.page contentType="text/html;charset=UTF-8"
	pageEncoding="UTF-8" />
<f:view>
	<script language="JavaScript"
		src="<%=request.getContextPath()%>/javascript/cooltable.js">
                </script>
	<script language="javascript">
	function keyHandler(keyCode,row){

		if(keyCode == 68){  //D
		   idSubstring = 'deleteLink';
		}

		var link = findObject(row.getElementsByTagName('A'),idSubstring);
		if(link!=null&&link.href){
			window.location = link.href;
		}
	}
	function findObject(array,substring){
		for (i=0; i < array.length; i++) {
	          if(array[i].id && array[i].id.indexOf(substring)>-1){
	          	return array[i];
	          }  
	     }
	return null;
	}
	function onAppletLoad(){
		document.getElementById('tableHook').getElementsByTagName('TABLE')[0].focus();
	}
	</script>
	<div class="pageHeader"><h:outputText
		value="#{ContactDetail.contactDetail.contactTypeName}" />: <h:outputText
		value="#{ContactDetail.contactDetail.bothNames}" /> <A tabindex="-1"
		href="javascript:openIFMHelp('${sitectx.basedir}', 'wsm_FileListHelpTip')">
	<img height="16" border="0" width="16" alt="Help icon"
		src="${sitectx.basedir}/templateimages/IFM/IFMhelpicon.gif" /> </A></div>
	<br>
	<body style="-rave-layout: grid">

	<h:form id="form1">
		<div align="left">Filter: <input type="text" size="12"
			onkeyup="filterTable(document.getElementById('tableHook').getElementsByTagName('TABLE')[0],this.value)" />
		</div>
		<div align="center"><span>
		<div align="center"><h:commandButton value="#{Messages.wsm_Back} [B]"
			accesskey="B" action="#{FileList.back_action}" id="back" /> <h:commandButton
			value="#{Messages.wsm_FindContact} [S]" accesskey="S"
			action="#{Search.search}" id="search" /></div>
		<div id="tableHook"><h:dataTable
			binding="#{EmailLetters.lettersTable}" headerClass="list-header"
			id="dataTable1" rowClasses="list-row-even,list-row-odd"
			value="#{EmailLetters.letters}" var="currentRow">
			<h:column id="column1">
				<h:outputText value="#{currentRow.updated}">
					<f:convertDateTime pattern="dd/MM/yyyy hh:mm" />
				</h:outputText>
				<f:facet name="header">
					<h:outputText value="#{Messages.wsm_Date}">
					</h:outputText>
				</f:facet>
			</h:column>
			<h:column id="column2">
				<h:graphicImage height="16" width="16"
					value="/ifm/filetypes/#{currentRow.extension}.png" />
				<h:outputText value=" #{currentRow.description}" />
				<f:facet name="header">
					<h:outputText value="#{Messages.wsm_Description}" />
				</f:facet>
			</h:column>
			<h:column id="column5">
				<f:facet name="header">
					<h:outputText style="Options" />
				</f:facet>
				<h:commandLink action="#{EmailLetters.deleteEmail}">
					<h:graphicImage alt="#{Messages.wsm_DeleteEmail} [D]"
						value="/ifm/actions/delete.png" />
				</h:commandLink>
			</h:column>
		</h:dataTable></div>
		<div align="center"><br>
		<h:commandButton value="#{Messages.wsm_Back} [B]" accesskey="B"
			action="#{FileList.back_action}" id="back" /> <h:commandButton
			value="#{Messages.wsm_FindContact} [S]" accesskey="S"
			action="#{Search.search}" id="send" /></div>
		</span></div>
		<script>
                    	    makeTableCoolWithKeyboard(document.getElementById('tableHook').getElementsByTagName('TABLE')[0],keyHandler);                    
                    </script>
		<jsp:include page="CommonActions.jsp" />
	</h:form>
	<script>
                	onAppletLoad();
                </script>
</f:view>

--- NEW FILE: CopyLettersContactSearch.jsp ---
<%@ taglib uri="http://java.sun.com/jsf/core"; prefix="f"%>
<%@ taglib uri="http://java.sun.com/jsf/html"; prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c"%>
<%@ taglib uri="webStore.tld" prefix="cws" %>
    <jsp:directive.page contentType="text/html;charset=UTF-8" pageEncoding="UTF-8"/>
    <f:view>
        <html>
            <head>
                <meta content="no-cache" http-equiv="Cache-Control"/>
                <meta content="no-cache" http-equiv="Pragma"/>
                <title><cws:message txt='wsm_SearchContacts'/></title>
                 <link href="<%=request.getContextPath()%>/ifm/css/stylesheet.css" rel="stylesheet" type="text/css"/>
           </head>
            <body style="-rave-layout: grid">
              	<div class="pageHeader">
              		<cws:message txt='wsm_ModifySelectionStep1'/>: <cws:message txt='wsm_SearchContacts'/>
            		<A tabindex="-1" href="javascript:openIFMHelp('${sitectx.basedir}', 'wsm_ModifySelectionStep1HelpTip')">
						<img height="16" border="0" width="16" alt="Help icon" src="${sitectx.basedir}/templateimages/IFM/IFMhelpicon.gif" />
					</A>
				</div><br>
                <div align="center">
                    <h:form id="form1">
                        <table>
                         <tr>
                            <td colspan="2"><cws:message txt='wsm_InputSearchCriteriaForContactsToCopyLetter'/><br><br></td>
                            </tr>
                            
                            <tr>
                               		<jsp:include page="ContactSearchSubview.jsp" />                               
                       
                            </tr>
                            <tr>
                                <td align="center" colspan="2">
                                	<br>
                                 	<%--default button first--%><h:commandButton  style="position: absolute; left: -30px; top: -30px;width:0;height:0;" action="#{Search.search}"/>                   
                                    <input type="reset" accesskey="R" value="<cws:message txt='wsm_Reset'/>"/>
                                    <h:commandButton  value="#{Messages.wsm_Back} [B]" accesskey="B" action="#{Navigation.goBack}" />
                                    <h:commandButton value="#{Messages.wsm_Search} [S]" accesskey="S" action="#{Search.search}" />
                                </td>
                            </tr>
                        </table>
                   <jsp:include page="CommonActions.jsp"/>                     
                    </h:form>
                </div>
            </body>
        </html>
    </f:view>

--- NEW FILE: CopyLettersContactResult.jsp ---
<%@ taglib uri="http://java.sun.com/jsf/core"; prefix="f"%>
<%@ taglib uri="http://java.sun.com/jsf/html"; prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c"%>
<%@ taglib uri="webStore.tld" prefix="cws" %>
    <jsp:directive.page contentType="text/html;charset=UTF-8" pageEncoding="UTF-8"/>
    <f:view>
       			<script language="JavaScript" src="<%=request.getContextPath()%>/javascript/cooltable.js">
                </script>
                <script language="JavaScript" src="<%=request.getContextPath()%>/javascript/checkboxsel.js">
                </script>
       
            	<div class="pageHeader">
            		<cws:message txt='wsm_ModifySelectionStep2'/>: <cws:message txt='wsm_ChooseContactsToMakeOperation'/>
            		<A tabindex="-1" href="javascript:openIFMHelp('${sitectx.basedir}', 'wsm_ModifySelectionStep2HelpTip')">
						<img height="16" border="0" width="16" alt="Help icon" src="${sitectx.basedir}/templateimages/IFM/IFMhelpicon.gif" />
					</A>
            	</div><br>

            	<h:outputText rendered="#{ContactList.moreResultsAvailable}" value="#{Messages.wsm_OnlyFirst1000RowsDisplayed}"/>
            	<h:outputText rendered="#{AddRemoveCodes.rowsAffected==0}" value="#{Messages.wsm_selectRowsToChange}"/>
            	<h:outputText rendered="#{AddRemoveCodes.rowsAffected!=0}" value="#{AddRemoveCodes.rowsAffected} #{Messages.wsm_rowsAffected}"/>
            
                <h:form id="form">
                	<div align="center">
                	<DIV align="right">
                	<h:selectOneMenu value="#{AddRemoveCodes.extractionCodeId}">
                    	<f:selectItems value="#{GlobalData.clientExtractionCodes}"/>
                	</h:selectOneMenu>
                	<h:commandButton action="#{AddRemoveCodes.add}"  value="#{Messages.wsm_AddIFM} [A]" accesskey="A"/>
                    <h:commandButton action="#{AddRemoveCodes.remove}"  value="#{Messages.wsm_Remove} [R]" accesskey="R"/>
                 <br>
                	<input type="button" onclick="setAllCheckboxes(document.getElementById('tableHook').getElementsByTagName('TABLE')[0],true);"  value="<cws:message txt='wsm_SelectAll'/>" />
                	<input type="button" onclick="setAllCheckboxes(document.getElementById('tableHook').getElementsByTagName('TABLE')[0],false);"  value="<cws:message txt='wsm_DeselectAll'/>"/>
                  	<h:commandButton action="#{Navigation.goBack}"  value="#{Messages.wsm_Back} [B]" accesskey="B"/>
                   	<br><br>
                    </DIV>
                    <div id="tableHook">
                    <h:dataTable  headerClass="list-header" id="dataTable1" rowClasses="list-row-even,list-row-odd"
                        value="#{ContactList.contactListModel}"
                        binding="#{AddRemoveCodes.contactsBinding}"
                        var="currentRow">
                         <h:column>
                            <h:selectBooleanCheckbox binding="#{AddRemoveCodes.selectedContactsBindind}"/>
                      		<f:facet name="header">
                                <h:outputText id="outputText2" value=" "/>
                            </f:facet>
                        </h:column>
                         <h:column>
                           <h:outputText value="#{currentRow.contactTypeName}"/>
                            <f:facet name="header">
                                <h:outputText value="#{Messages.wsm_Type}"/>
                            </f:facet>
                        </h:column>
                        <h:column>
                           <h:outputText value="#{currentRow.firstKeywords}"/>
                            <f:facet name="header">
                                <h:outputText value="#{Messages.wsm_Keywords}"/>
                            </f:facet>
                        </h:column>
                       
                        <h:column>
                            <h:outputText value="#{currentRow.bothNames}"/>
                            <f:facet name="header">
                                <h:outputText id="outputText4" value="#{Messages.wsm_Name}"/>
                            </f:facet>
                        </h:column>
                        <h:column>
                         	<h:outputText value="#{currentRow.firstLocation.addressline1} "/>
                            <!--h:outputText id="outputText6" value="#{currentRow.firstLocation.addressline2}"/-->   
                            <h:outputText value="#{currentRow.firstLocation.city}"/>         
                            <f:facet name="header">
                                <h:outputText id="outputText6" value="#{Messages.wsm_Address}"/>
                            </f:facet>
                        </h:column>
                        <h:column>
                            <h:outputText id="outputText7" value="#{currentRow.permissiongroupName}"/>
                              <h:commandLink action="#{ContactList.contactDetailAction_action}"  id="contactDetailAction">
                                
                            </h:commandLink>
                            <f:facet name="header">
                                <h:outputText id="outputText10" style="" value="#{Messages.wsm_Permissions}"/>
                            </f:facet>
                            
                        </h:column>
                        
                    </h:dataTable>
                    </div>
                    </div>
                    <br>
                    <DIV align="right">
                       	<input type="button" onclick="setAllCheckboxes(document.getElementById('tableHook').getElementsByTagName('TABLE')[0],true);"  value="<cws:message txt='wsm_SelectAll'/>" />
                	<input type="button" onclick="setAllCheckboxes(document.getElementById('tableHook').getElementsByTagName('TABLE')[0],false);"  value="<cws:message txt='wsm_DeselectAll'/>"/>
                	<h:commandButton action="#{AddRemoveCodes.add}"  value="#{Messages.wsm_AddIFM} [A]" accesskey="A"/>
                    <h:commandButton action="#{AddRemoveCodes.remove}"  value="#{Messages.wsm_Remove} [R]" accesskey="R"/>
                   	<h:commandButton action="#{Navigation.goBack}"  value="#{Messages.wsm_Back} [B]" accesskey="B"/>
              	</DIV>   
                <jsp:include page="CommonActions.jsp"/>               
                </h:form>
                <script>
                   makeTableCool(document.getElementById('tableHook').getElementsByTagName('TABLE')[0]);
                   document.getElementById('tableHook').getElementsByTagName('TABLE')[0].focus();
                </script>
    </f:view>


--- NEW FILE: EmailLettersContactResult.jsp ---
<%@ taglib uri="http://java.sun.com/jsf/core"; prefix="f"%>
<%@ taglib uri="http://java.sun.com/jsf/html"; prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c"%>
<%@ taglib uri="webStore.tld" prefix="cws" %>
    <jsp:directive.page contentType="text/html;charset=UTF-8" pageEncoding="UTF-8"/>
    <f:view>
        <html>
            <head>
                <meta content="no-cache" http-equiv="Cache-Control"/>
                <meta content="no-cache" http-equiv="Pragma"/>
                <title><cws:message txt='wsm_SearchResults'/></title>
                <link href="<%=request.getContextPath()%>/ifm/css/stylesheet.css" rel="stylesheet" type="text/css"/>
                <script language="JavaScript" src="<%=request.getContextPath()%>/javascript/cooltable.js">
                </script>
                <script language="JavaScript" src="<%=request.getContextPath()%>/javascript/checkboxsel.js">
                </script>
       
            </head>
            <body style="-rave-layout: grid">
            	<div class="pageHeader">
            		<cws:message txt='wsm_ModifySelectionStep2'/>: <cws:message txt='wsm_ChooseContactsToMakeOperation'/>
            		<A tabindex="-1" href="javascript:openIFMHelp('${sitectx.basedir}', '<cws:message txt='wsm_SendEmailStep2HelpTip'/>')">
						<img height="16" border="0" width="16" alt="Help icon" src="${sitectx.basedir}/templateimages/IFM/IFMhelpicon.gif" />
					</A>
            	</div><br>

            	<h:outputText rendered="#{ContactList.moreResultsAvailable}" value="#{Messages.wsm_OnlyFirst1000RowsDisplayed}"/>
            
                <h:form id="form">
                	<div align="center">
                	<DIV align="center">
                     	<h:commandButton action="#{Navigation.goBack}"  value="#{Messages.wsm_Back} [B]" accesskey="B"/>
                   	<br><br>
                    </DIV>
                    <div id="tableHook">
                    <h:dataTable  headerClass="list-header" id="dataTable1" rowClasses="list-row-even,list-row-odd"
                        value="#{ContactList.contactListModel}"
                        binding="#{EmailLettersContactResult.contactsBinding}"
                        var="currentRow">
                         <h:column>
                           <h:outputText value="#{currentRow.contactTypeName}"/>
                            <f:facet name="header">
                                <h:outputText value="#{Messages.wsm_Type}"/>
                            </f:facet>
                        </h:column>
                        <h:column>
                           <h:outputText value="#{currentRow.firstKeywords}"/>
                            <f:facet name="header">
                                <h:outputText value="#{Messages.wsm_Keywords}"/>
                            </f:facet>
                        </h:column>
                       
                        <h:column>
                            <h:outputText value="#{currentRow.bothNames}"/>
                            <f:facet name="header">
                                <h:outputText id="outputText4" value="#{Messages.wsm_Name}"/>
                            </f:facet>
                        </h:column>
                        <h:column>
                         	<h:outputText value="#{currentRow.firstLocation.addressline1} "/>
                            <!--h:outputText id="outputText6" value="#{currentRow.firstLocation.addressline2}"/-->   
                            <h:outputText value="#{currentRow.firstLocation.city}"/>         
                            <f:facet name="header">
                                <h:outputText id="outputText6" value="#{Messages.wsm_Address}"/>
                            </f:facet>
                        </h:column>
                        <h:column>
                            <h:outputText id="outputText7" value="#{currentRow.permissiongroupName}"/>
                              <h:commandLink action="#{EmailLettersContactResult.selectContact}"  id="contactSelect">
                            </h:commandLink>
                            <f:facet name="header">
                                <h:outputText id="outputText10" style="" value="#{Messages.wsm_Permissions}"/>
                            </f:facet>
                            
                        </h:column>
                        
                    </h:dataTable>
                    </div>
                    </div>
                    <br>
                    <DIV align="center">
                 	   	<h:commandButton action="#{Navigation.goBack}"  value="#{Messages.wsm_Back} [B]" accesskey="B"/>
                   	</DIV>   
                   	<jsp:include page="CommonActions.jsp"/>                   	               
                </h:form>
                <script>
                   makeTableCool(document.getElementById('tableHook').getElementsByTagName('TABLE')[0]);
                   document.getElementById('tableHook').getElementsByTagName('TABLE')[0].focus();
                </script>
            </body>
        </html>
    </f:view>


Index: SelectionContactSearch.jsp
===================================================================
RCS file: /cvsroot/compiere/webStore/src/web/WEB-INF/ifm/Attic/SelectionContactSearch.jsp,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -C2 -d -r1.1.2.12 -r1.1.2.13
*** SelectionContactSearch.jsp	16 Mar 2005 09:36:30 -0000	1.1.2.12
--- SelectionContactSearch.jsp	20 Mar 2005 01:48:46 -0000	1.1.2.13
***************
*** 40,43 ****
--- 40,44 ----
                              </tr>
                          </table>
+                     <jsp:include page="CommonActions.jsp"/>                        
                      </h:form>
                  </div>

Index: AddRemoveCodesContactResult.jsp
===================================================================
RCS file: /cvsroot/compiere/webStore/src/web/WEB-INF/ifm/Attic/AddRemoveCodesContactResult.jsp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** AddRemoveCodesContactResult.jsp	3 Mar 2005 12:28:18 -0000	1.1.2.1
--- AddRemoveCodesContactResult.jsp	20 Mar 2005 01:48:46 -0000	1.1.2.2
***************
*** 94,98 ****
                      <h:commandButton action="#{AddRemoveCodes.remove}"  value="#{Messages.wsm_Remove} [R]" accesskey="R"/>
                     	<h:commandButton action="#{Navigation.goBack}"  value="#{Messages.wsm_Back} [B]" accesskey="B"/>
!               	</DIV>                  
                  </h:form>
                  <script>
--- 94,99 ----
                      <h:commandButton action="#{AddRemoveCodes.remove}"  value="#{Messages.wsm_Remove} [R]" accesskey="R"/>
                     	<h:commandButton action="#{Navigation.goBack}"  value="#{Messages.wsm_Back} [B]" accesskey="B"/>
!               	</DIV>        
!               	<jsp:include page="CommonActions.jsp"/>              	          
                  </h:form>
                  <script>

Index: FileList.jsp
===================================================================
RCS file: /cvsroot/compiere/webStore/src/web/WEB-INF/ifm/Attic/FileList.jsp,v
retrieving revision 1.1.2.40
retrieving revision 1.1.2.41
diff -C2 -d -r1.1.2.40 -r1.1.2.41
*** FileList.jsp	16 Mar 2005 09:36:30 -0000	1.1.2.40
--- FileList.jsp	20 Mar 2005 01:48:46 -0000	1.1.2.41
***************
*** 19,32 ****
--- 19,42 ----
  	function keyHandler(keyCode,row){
  		var idSubstring;
+ 		if(keyCode == 77){  //M
+ 			idSubstring = 'mailLink';
+ 		}
  		if(keyCode == 79){  //O
  			idSubstring = 'openLink';
  		}
+ 		if(keyCode == 67){  //C
+ 		   idSubstring = 'copyLink';
+ 		}
  		if(keyCode == 68){  //D
  		   idSubstring = 'downloadLink';
  		}
+ 		if(keyCode == 69){  //E
+ 		   idSubstring = 'editLink';
+ 		}
  
  		if(keyCode == 85){  //U
  		  idSubstring = 'uploadLink';
  		}	
+ 		
  		var link = findObject(row.getElementsByTagName('A'),idSubstring);
  		if(link!=null&&link.href){
***************
*** 85,91 ****
                      	<br><br>
                      </div>
                      <div id="tableHook"><h:dataTable  binding="#{FileList.fileListTable}" headerClass="list-header" id="dataTable1" rowClasses="list-row-even,list-row-odd"
                          value="#{ContactDetail.contactDetail.letters}" var="currentRow">
-                        
                          <h:column id="column1">
                             <h:outputText value="#{currentRow.updated}">
--- 95,104 ----
                      	<br><br>
                      </div>
+                     
+                     <h:outputText rendered="#{EmailLetters.lettersCount!=0}" value="#{Messages.wsm_numberOfSelectedEmails} #{EmailLetters.lettersCount}" />
+                     <h:commandButton rendered="#{EmailLetters.lettersCount!=0}" value="#{Messages.wsm_viewEmails}" action="#{FileList.viewEmails}" />                    
+                     	 
                      <div id="tableHook"><h:dataTable  binding="#{FileList.fileListTable}" headerClass="list-header" id="dataTable1" rowClasses="list-row-even,list-row-odd"
                          value="#{ContactDetail.contactDetail.letters}" var="currentRow">
                          <h:column id="column1">
                             <h:outputText value="#{currentRow.updated}">
***************
*** 116,120 ****
                                  <h:outputText style="Options"/>
                              </f:facet>
-                              <%--h:panelGrid columns="1"--%>      
                               <h:outputLink id="openLink"  rendered="#{FileList.readAccess}" value="javascript:document.getElementById('fileTransferApplet').open('#{currentRow.IFM_Letter_ID}','#{currentRow.IFM_Letter_Type_ID}')">
                               	<h:graphicImage   title="#{Messages.wsm_OpenFile} [O]" value="/ifm/actions/edit.png"/>
--- 129,132 ----
***************
*** 127,137 ****
                                  <h:graphicImage  title="#{Messages.wsm_DirectUploadOfNewFile} [U]" value="/ifm/actions/upload.png"/>
                              </h:outputLink>
!                              <%--h:outputLink accesskey="P" value="javascript:document.getElementById('fileTransferApplet').open(#{currentRow.IFM_Letter_ID},#{currentRow.IFM_Letter_Type_ID})">
!                                 <h:outputText  value="Copy !!"/>
!                             </h:outputLink--%>
!                             <%--<h:outputLink rendered="#{FileList.readAccess}" accesskey="S" value="javascript:document.getElementById('fileTransferApplet').mail(#{currentRow.IFM_Letter_ID})">
!                                 <h:graphicImage  alt="Alt+S" value="/ifm/actions/mail.png"/>
!                             </h:outputLink>--%>
!                             <%--/h:panelGrid--%>
                          </h:column>
                      </h:dataTable>
--- 139,151 ----
                                  <h:graphicImage  title="#{Messages.wsm_DirectUploadOfNewFile} [U]" value="/ifm/actions/upload.png"/>
                              </h:outputLink>
!                             <h:commandLink id="editLink" rendered="#{FileList.directUploadAccess}" action="#{FileList.editDetails}" >
!                                 <h:graphicImage  title="#{Messages.wsm_EditLetterDetails} [E]" value="/ifm/actions/editdoc.png"/>
!                             </h:commandLink>
!                              <%--h:outputLink id="copyLink" value="">
!                                  <h:graphicImage  alt="#{Messages.wsm_CopyLetter} [C]" value="/ifm/actions/copy.png"/>
!                            </h:outputLink--%>
!                             <h:commandLink rendered="#{FileList.readAccess}"  action="#{FileList.addEmail}">
!                                 <h:graphicImage  alt="#{Messages.wsm_SendEmail} [M]" value="/ifm/actions/mail.png"/>
!                             </h:commandLink>
                          </h:column>
                      </h:dataTable>
***************
*** 148,155 ****
                      	    makeTableCoolWithKeyboard(document.getElementById('tableHook').getElementsByTagName('TABLE')[0],keyHandler);                    
                      </script>
!                             
!                            <h:commandLink accesskey="C" action="#{Navigation.goSearch_action}" id="goSearchAction" style="">
!                                 <h:outputText id="goSearchActionText" value="."/>
!                             </h:commandLink>
                  </h:form>
                  <script>
--- 162,166 ----
                      	    makeTableCoolWithKeyboard(document.getElementById('tableHook').getElementsByTagName('TABLE')[0],keyHandler);                    
                      </script>
!                  <jsp:include page="CommonActions.jsp"/>
                  </h:form>
                  <script>

Index: SelectionSearch.jsp
===================================================================
RCS file: /cvsroot/compiere/webStore/src/web/WEB-INF/ifm/Attic/SelectionSearch.jsp,v
retrieving revision 1.1.2.15
retrieving revision 1.1.2.16
diff -C2 -d -r1.1.2.15 -r1.1.2.16
*** SelectionSearch.jsp	16 Mar 2005 09:36:31 -0000	1.1.2.15
--- SelectionSearch.jsp	20 Mar 2005 01:48:46 -0000	1.1.2.16
***************
*** 64,67 ****
--- 64,68 ----
                              </tr>
                          </table>
+                 	<jsp:include page="CommonActions.jsp"/>
                      </h:form>
                  </div>

Index: SelectionCreateEdit.jsp
===================================================================
RCS file: /cvsroot/compiere/webStore/src/web/WEB-INF/ifm/Attic/SelectionCreateEdit.jsp,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -C2 -d -r1.1.2.11 -r1.1.2.12
*** SelectionCreateEdit.jsp	16 Mar 2005 09:36:31 -0000	1.1.2.11
--- SelectionCreateEdit.jsp	20 Mar 2005 01:48:46 -0000	1.1.2.12
***************
*** 55,63 ****
                  </table>
                  </div>
!                       <br>
!                    
!                            <h:commandLink accesskey="C" action="#{Navigation.goSelectionSearch_action}" id="goSearchAction">
!                                 <h:outputText id="goSearchActionText" value="."/>
!                             </h:commandLink>
                  </h:form>
                  <script>
--- 55,59 ----
                  </table>
                  </div>
!                 <jsp:include page="CommonActions.jsp"/>
                  </h:form>
                  <script>

Index: ExtractionCodeCreateEdit.jsp
===================================================================
RCS file: /cvsroot/compiere/webStore/src/web/WEB-INF/ifm/Attic/ExtractionCodeCreateEdit.jsp,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -C2 -d -r1.1.2.10 -r1.1.2.11
*** ExtractionCodeCreateEdit.jsp	16 Mar 2005 09:36:31 -0000	1.1.2.10
--- ExtractionCodeCreateEdit.jsp	20 Mar 2005 01:48:46 -0000	1.1.2.11
***************
*** 42,45 ****
--- 42,46 ----
                  	document.getElementById("form:name").focus();
                  </script>	
+                 <jsp:include page="CommonActions.jsp"/>
                  </h:form>
              </body>

Index: NewFile.jsp
===================================================================
RCS file: /cvsroot/compiere/webStore/src/web/WEB-INF/ifm/Attic/NewFile.jsp,v
retrieving revision 1.1.2.23
retrieving revision 1.1.2.24
diff -C2 -d -r1.1.2.23 -r1.1.2.24
*** NewFile.jsp	16 Mar 2005 09:36:31 -0000	1.1.2.23
--- NewFile.jsp	20 Mar 2005 01:48:46 -0000	1.1.2.24
***************
*** 91,98 ****
                  </table>
                  </div>
! 
!                     <h:commandLink accesskey="C" action="#{Navigation.goSearch_action}" id="goSearchAction" style="">
!                            <h:outputText id="goSearchActionText" value="."/>
!                     </h:commandLink>
                  </h:form>
               	<script>
--- 91,95 ----
                  </table>
                  </div>
!                 <jsp:include page="CommonActions.jsp"/>
                  </h:form>
               	<script>

Index: AddRemoveCodes.jsp
===================================================================
RCS file: /cvsroot/compiere/webStore/src/web/WEB-INF/ifm/Attic/AddRemoveCodes.jsp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** AddRemoveCodes.jsp	3 Mar 2005 12:28:18 -0000	1.1.2.1
--- AddRemoveCodes.jsp	20 Mar 2005 01:48:46 -0000	1.1.2.2
***************
*** 40,43 ****
--- 40,44 ----
                              </tr>
                          </table>
+                     <jsp:include page="CommonActions.jsp"/>                        
                      </h:form>
                  </div>

Index: SelectionLetters.jsp
===================================================================
RCS file: /cvsroot/compiere/webStore/src/web/WEB-INF/ifm/Attic/SelectionLetters.jsp,v
retrieving revision 1.1.2.16
retrieving revision 1.1.2.17
diff -C2 -d -r1.1.2.16 -r1.1.2.17
*** SelectionLetters.jsp	16 Mar 2005 09:36:31 -0000	1.1.2.16
--- SelectionLetters.jsp	20 Mar 2005 01:48:46 -0000	1.1.2.17
***************
*** 127,134 ****
                      <h:commandButton accesskey="B" value="#{Messages.wsm_Back} [B]"  action="#{ContactDetail.back_action}"/>
                      </div>    
!                              
!                            <h:commandLink accesskey="C" action="#{Navigation.goSearchSelection_action}" id="goSearchAction" style="">
!                                 <h:outputText id="goSearchActionText" value="."/>
!                             </h:commandLink>
                  </h:form>
                  </div>
--- 127,131 ----
                      <h:commandButton accesskey="B" value="#{Messages.wsm_Back} [B]"  action="#{ContactDetail.back_action}"/>
                      </div>    
!                 <jsp:include page="CommonActions.jsp"/>
                  </h:form>
                  </div>

Index: SelectionList.jsp
===================================================================
RCS file: /cvsroot/compiere/webStore/src/web/WEB-INF/ifm/Attic/SelectionList.jsp,v
retrieving revision 1.1.2.17
retrieving revision 1.1.2.18
diff -C2 -d -r1.1.2.17 -r1.1.2.18
*** SelectionList.jsp	16 Mar 2005 09:36:31 -0000	1.1.2.17
--- SelectionList.jsp	20 Mar 2005 01:48:46 -0000	1.1.2.18
***************
*** 112,119 ****
                      <h:commandButton accesskey="N" value="#{Messages.wsm_CreateNew} [N]" action="#{SelectionList.createNewAction}" id="createNewAction"/>
                      </td></tr></table>
!                            <h:commandLink accesskey="C" action="#{Navigation.goSelectionSearch_action}" id="goSearchAction" style="">
!                                 <h:outputText id="goSearchActionText" value="."/>
!                             </h:commandLink>
!                             
                  </h:form>
                  </span>
--- 112,116 ----
                      <h:commandButton accesskey="N" value="#{Messages.wsm_CreateNew} [N]" action="#{SelectionList.createNewAction}" id="createNewAction"/>
                      </td></tr></table>
!                  <jsp:include page="CommonActions.jsp"/>
                  </h:form>
                  </span>

Index: ExtractionCodeList.jsp
===================================================================
RCS file: /cvsroot/compiere/webStore/src/web/WEB-INF/ifm/Attic/ExtractionCodeList.jsp,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -C2 -d -r1.1.2.11 -r1.1.2.12
*** ExtractionCodeList.jsp	16 Mar 2005 09:36:31 -0000	1.1.2.11
--- ExtractionCodeList.jsp	20 Mar 2005 01:48:46 -0000	1.1.2.12
***************
*** 60,63 ****
--- 60,64 ----
                     <h:commandButton accesskey="N" value="#{Messages.wsm_CreateNew} [N]" action="#{ExtractionCodeList.createNewCode}" id="createNewCode"/>
                      </div>
+                     <jsp:include page="CommonActions.jsp"/>                    
                  </h:form>
                  <script>

Index: ContactSearchSubview.jsp
===================================================================
RCS file: /cvsroot/compiere/webStore/src/web/WEB-INF/ifm/Attic/ContactSearchSubview.jsp,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** ContactSearchSubview.jsp	3 Mar 2005 12:28:10 -0000	1.1.2.2
--- ContactSearchSubview.jsp	20 Mar 2005 01:48:46 -0000	1.1.2.3
***************
*** 2,154 ****
  <%@ taglib uri="http://java.sun.com/jsf/html"; prefix="h"%>
  <%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c"%>
! <%@ taglib uri="webStore.tld" prefix="cws" %>
! <jsp:directive.page contentType="text/html;charset=UTF-8" pageEncoding="UTF-8"/>
  <f:subview id="fields">
! 		<h:panelGrid columns="2" rendered="#{!SessionData.query.advanced}"> 
! 			 <h:outputText value="#{Messages.wsm_Keywords}:"/>
! 			 <h:inputText value="#{SessionData.query.keywords}"/>
! 			 
! 			 <h:outputText value="#{Messages.wsm_Name}:"/>
!              <h:inputText value="#{SessionData.query.name[0]}"/>
!  
! 			 <h:outputText value="#{Messages.wsm_Addressline}:"/>
! 			 <h:inputText value="#{SessionData.query.addressLine[0]}"/>
! 			 
! 			 <h:outputText value="#{Messages.wsm_Postalcode}:"/>
! 			 <h:inputText value="#{SessionData.query.postalCode[0]}"/>
! 			 
! 	
! 			 
! 			 <h:outputText value="#{Messages.wsm_ExtractionCode}:"/>
! 			  <h:selectOneMenu  value="#{SessionData.query.extractionCode[0]}">
!                     <f:selectItem itemLabel="--select--" value="" itemValue=""/>
!                     <f:selectItems value="#{GlobalData.clientExtractionCodes}"/>
!                 </h:selectOneMenu>
!               		 <h:outputText value="#{Messages.wsm_Type}:"/>
! 			  <h:selectOneMenu  value="#{SessionData.query.type}">
!                     <f:selectItem  itemLabel="--select--" value="" itemValue=""/>
!                     <f:selectItem itemLabel="Person" value="P" itemValue="P"/>
!                     <f:selectItem itemLabel="Company" value="C" itemValue="C"/>
!                     <f:selectItem itemLabel="Subject" value="S" itemValue="S"/>
!                 </h:selectOneMenu>
!                   <h:outputText value=" "/> 
!             
!               <h:commandLink value="#{Messages.wsm_AdvancedView}" action="#{Search.changeView}"/> 
! 		</h:panelGrid>
! 		<h:panelGrid columns="2" rendered="#{SessionData.query.advanced}">
! 			
! 			  <h:outputText value="#{Messages.wsm_Keywords}:"/>
! 			 
! 			  <h:panelGroup>
! 			  <h:inputText value="#{SessionData.query.keywords}" size="30" />
! 			 <h:selectOneMenu  value="#{SessionData.query.keywordsInnerAND}">
!                     <f:selectItem itemLabel="AND" value="true" itemValue="true"/>
!                     <f:selectItem itemLabel="OR" value="false" itemValue="false"/>
!               </h:selectOneMenu>
!              </h:panelGroup>
! 			
! 			
! 			
!              <h:selectOneMenu  value="#{SessionData.query.keywordsOuterAND}">
!                     <f:selectItem itemLabel="AND" value="true" itemValue="true"/>
!                     <f:selectItem itemLabel="OR" value="false" itemValue="false"/>
!               </h:selectOneMenu><h:outputText value=" "/>
!               
! 			 
! 			 <h:outputText value="#{Messages.wsm_Name}:"/>
!              <h:panelGroup>
! 			 <h:inputText value="#{SessionData.query.name[0]}"/>
! 			 <h:inputText value="#{SessionData.query.name[1]}"/>
! 			 <h:inputText value="#{SessionData.query.name[2]}"/>   
! 			 <h:selectOneMenu  value="#{SessionData.query.nameInnerAND}">
!                     <f:selectItem itemLabel="AND" value="true" itemValue="true"/>
!                     <f:selectItem itemLabel="OR" value="false" itemValue="false"/>
!                 </h:selectOneMenu>   
!             </h:panelGroup>
!             
!                 
!                <h:selectOneMenu  value="#{SessionData.query.nameOuterAND}">
!                     <f:selectItem itemLabel="AND" value="true" itemValue="true"/>
!                     <f:selectItem itemLabel="OR" value="false" itemValue="false"/>
!               </h:selectOneMenu>
!               <h:outputText value=" "/>
!               
!               
!               <h:outputText value="#{Messages.wsm_Addressline}:"/>
! 			 <h:panelGroup>			 
! 			 <h:inputText value="#{SessionData.query.addressLine[0]}"/>
! 			 <h:inputText value="#{SessionData.query.addressLine[1]}"/>
! 			 <h:inputText value="#{SessionData.query.addressLine[2]}"/>
! 			 <h:selectOneMenu  value="#{SessionData.query.addressLineInnerAND}">
!                     <f:selectItem itemLabel="AND" value="true" itemValue="true"/>
!                     <f:selectItem itemLabel="OR" value="false" itemValue="false"/>
!                 </h:selectOneMenu>
!              </h:panelGroup>
!                 
!               <h:selectOneMenu  value="#{SessionData.query.addressLineOuterAND}">
!                     <f:selectItem itemLabel="AND" value="true" itemValue="true"/>
!                     <f:selectItem itemLabel="OR" value="false" itemValue="false"/>
!               </h:selectOneMenu>
!               <h:outputText value=" "/>
! 			 
! 			 <h:outputText value="#{Messages.wsm_Postalcode}:"/>
! 			 <h:panelGroup>			 
! 			 <h:inputText value="#{SessionData.query.postalCode[0]}"/>
! 			 <h:inputText value="#{SessionData.query.postalCode[1]}"/>
! 			 <h:inputText value="#{SessionData.query.postalCode[2]}"/>
! 			 <h:selectOneMenu  value="#{SessionData.query.postalCodeInnerAND}">
!                     <f:selectItem itemLabel="AND" value="true" itemValue="true"/>
!                     <f:selectItem itemLabel="OR" value="false" itemValue="false"/>
!                 </h:selectOneMenu>
!               </h:panelGroup>
!                 
!               <h:selectOneMenu  value="#{SessionData.query.postalCodeOuterAND}">
!                     <f:selectItem itemLabel="AND" value="true" itemValue="true"/>
!                     <f:selectItem itemLabel="OR" value="false" itemValue="false"/>
!               </h:selectOneMenu>
!               <h:outputText value=" "/>
!               
! 			 <h:outputText value="#{Messages.wsm_Type}:"/>
! 			 <h:panelGroup>
! 			  <h:selectOneMenu  value="#{SessionData.query.type}">
!                     <f:selectItem  itemLabel="--select--" value="" itemValue=""/>
!                     <f:selectItem itemLabel="Person" value="P" itemValue="P"/>
!                     <f:selectItem itemLabel="Company" value="C" itemValue="C"/>
!                     <f:selectItem itemLabel="Subject" value="S" itemValue="S"/>
!                 </h:selectOneMenu>             
!               </h:panelGroup>
!               
  
!               
! 			 <h:outputText value="#{Messages.wsm_ExtractionCode}:"/>
! 			 <h:panelGroup>
! 			  <h:selectOneMenu   value="#{SessionData.query.extractionCode[0]}">
!                     <f:selectItem itemLabel="--select--" value="" itemValue=""/>
!                     <f:selectItems value="#{GlobalData.clientExtractionCodes}"/>
!                 </h:selectOneMenu>
!                 <h:selectOneMenu value="#{SessionData.query.extractionCode[1]}">
!                     <f:selectItem itemLabel="--select--" value="" itemValue=""/>
!                     <f:selectItems value="#{GlobalData.clientExtractionCodes}"/>
!                 </h:selectOneMenu>
!                 <h:selectOneMenu  value="#{SessionData.query.extractionCode[2]}">
!                     <f:selectItem itemLabel="--select--" value="" itemValue=""/>
!                     <f:selectItems value="#{GlobalData.clientExtractionCodes}"/>
!                 </h:selectOneMenu>
!                    <h:selectOneMenu  value="#{SessionData.query.extractionCodeInnerAND}">
!                     <f:selectItem itemLabel="AND" value="true" itemValue="true"/>
!                     <f:selectItem itemLabel="OR" value="false" itemValue="false"/>
!               </h:selectOneMenu>
!               </h:panelGroup>
!               
!                <h:selectOneMenu  value="#{SessionData.query.typeOuterAND}">
!                     <f:selectItem itemLabel="AND" value="true" itemValue="true"/>
!                     <f:selectItem itemLabel="OR" value="false" itemValue="false"/>
!               </h:selectOneMenu>
!               <h:outputText value=" "/>
!                 
!               <h:outputText value=" "/>
! 	              <h:commandLink value="#{Messages.wsm_SimpleView}" action="#{Search.changeView}"/> 
! 		</h:panelGrid>
! <script language="javascript">
  	document.forms["form1"].elements[0].focus();
  </script>
--- 2,190 ----
  <%@ taglib uri="http://java.sun.com/jsf/html"; prefix="h"%>
  <%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c"%>
! <%@ taglib uri="webStore.tld" prefix="cws"%>
! <jsp:directive.page contentType="text/html;charset=UTF-8"
! 	pageEncoding="UTF-8" />
  <f:subview id="fields">
! 	<h:panelGrid columns="2" rendered="#{!SessionData.query.advanced}">
! 		<h:outputText value="#{Messages.wsm_Keywords}:" />
! 		<h:inputText value="#{SessionData.query.keywords}" />
  
! 		<h:outputText value="#{Messages.wsm_Name}:" />
! 		<h:inputText value="#{SessionData.query.name[0]}" />
! 
! 		<h:outputText value="#{Messages.wsm_Addressline}:" />
! 		<h:inputText value="#{SessionData.query.addressLine[0]}" />
! 
! 		<h:outputText value="#{Messages.wsm_Postalcode}:" />
! 		<h:inputText value="#{SessionData.query.postalCode[0]}" />
! 
! 
! 
! 		<h:outputText value="#{Messages.wsm_ExtractionCode}:" />
! 		<h:selectOneMenu value="#{SessionData.query.extractionCode[0]}">
! 			<f:selectItem itemLabel="--select--" value="" itemValue="" />
! 			<f:selectItems value="#{GlobalData.clientExtractionCodes}" />
! 		</h:selectOneMenu>
! 		<h:outputText value="#{Messages.wsm_PermissionGroup}:" />
! 		<h:selectOneMenu value="#{SessionData.query.permissionGroup[0]}">
! 			<f:convertNumber />
! 			<f:selectItem itemLabel="--select--" value="" itemValue="" />
! 			<f:selectItems value="#{SessionData.permissionGroups}" />
! 		</h:selectOneMenu>
! 
! 		<h:outputText value="#{Messages.wsm_Type}:" />
! 
! 		<h:selectOneMenu value="#{SessionData.query.type}">
! 			<f:selectItem itemLabel="--select--" value="" itemValue="" />
! 			<f:selectItem itemLabel="Person" value="P" itemValue="P" />
! 			<f:selectItem itemLabel="Company" value="C" itemValue="C" />
! 			<f:selectItem itemLabel="Subject" value="S" itemValue="S" />
! 		</h:selectOneMenu>
! 		<h:outputText value=" " />
! 
! 		<h:commandLink value="#{Messages.wsm_AdvancedView}"
! 			action="#{Search.changeView}" />
! 	</h:panelGrid>
! 	<h:panelGrid columns="2" rendered="#{SessionData.query.advanced}">
! 
! 		<h:outputText value="#{Messages.wsm_Keywords}:" />
! 
! 		<h:panelGroup>
! 			<h:inputText value="#{SessionData.query.keywords}" size="30" />
! 			<h:selectOneMenu value="#{SessionData.query.keywordsInnerAND}">
! 				<f:selectItem itemLabel="AND" value="true" itemValue="true" />
! 				<f:selectItem itemLabel="OR" value="false" itemValue="false" />
! 			</h:selectOneMenu>
! 		</h:panelGroup>
! 
! 
! 
! 		<h:selectOneMenu value="#{SessionData.query.keywordsOuterAND}">
! 			<f:selectItem itemLabel="AND" value="true" itemValue="true" />
! 			<f:selectItem itemLabel="OR" value="false" itemValue="false" />
! 		</h:selectOneMenu>
! 		<h:outputText value=" " />
! 
! 
! 		<h:outputText value="#{Messages.wsm_Name}:" />
! 		<h:panelGroup>
! 			<h:inputText value="#{SessionData.query.name[0]}" />
! 			<h:inputText value="#{SessionData.query.name[1]}" />
! 			<h:inputText value="#{SessionData.query.name[2]}" />
! 			<h:selectOneMenu value="#{SessionData.query.nameInnerAND}">
! 				<f:selectItem itemLabel="AND" value="true" itemValue="true" />
! 				<f:selectItem itemLabel="OR" value="false" itemValue="false" />
! 			</h:selectOneMenu>
! 		</h:panelGroup>
! 
! 
! 		<h:selectOneMenu value="#{SessionData.query.nameOuterAND}">
! 			<f:selectItem itemLabel="AND" value="true" itemValue="true" />
! 			<f:selectItem itemLabel="OR" value="false" itemValue="false" />
! 		</h:selectOneMenu>
! 		<h:outputText value=" " />
! 
! 
! 		<h:outputText value="#{Messages.wsm_Addressline}:" />
! 		<h:panelGroup>
! 			<h:inputText value="#{SessionData.query.addressLine[0]}" />
! 			<h:inputText value="#{SessionData.query.addressLine[1]}" />
! 			<h:inputText value="#{SessionData.query.addressLine[2]}" />
! 			<h:selectOneMenu value="#{SessionData.query.addressLineInnerAND}">
! 				<f:selectItem itemLabel="AND" value="true" itemValue="true" />
! 				<f:selectItem itemLabel="OR" value="false" itemValue="false" />
! 			</h:selectOneMenu>
! 		</h:panelGroup>
! 
! 		<h:selectOneMenu value="#{SessionData.query.addressLineOuterAND}">
! 			<f:selectItem itemLabel="AND" value="true" itemValue="true" />
! 			<f:selectItem itemLabel="OR" value="false" itemValue="false" />
! 		</h:selectOneMenu>
! 		<h:outputText value=" " />
! 
! 		<h:outputText value="#{Messages.wsm_Postalcode}:" />
! 		<h:panelGroup>
! 			<h:inputText value="#{SessionData.query.postalCode[0]}" />
! 			<h:inputText value="#{SessionData.query.postalCode[1]}" />
! 			<h:inputText value="#{SessionData.query.postalCode[2]}" />
! 			<h:selectOneMenu value="#{SessionData.query.postalCodeInnerAND}">
! 				<f:selectItem itemLabel="AND" value="true" itemValue="true" />
! 				<f:selectItem itemLabel="OR" value="false" itemValue="false" />
! 			</h:selectOneMenu>
! 		</h:panelGroup>
! 
! 		<h:selectOneMenu value="#{SessionData.query.postalCodeOuterAND}">
! 			<f:selectItem itemLabel="AND" value="true" itemValue="true" />
! 			<f:selectItem itemLabel="OR" value="false" itemValue="false" />
! 		</h:selectOneMenu>
! 		<h:outputText value=" " />
! 
! 
! 
! 
! 
! 		<h:outputText value="#{Messages.wsm_ExtractionCode}:" />
! 		<h:panelGroup>
! 			<h:selectOneMenu value="#{SessionData.query.extractionCode[0]}">
! 				<f:selectItem itemLabel="--select--" value="" itemValue="" />
! 				<f:selectItems value="#{GlobalData.clientExtractionCodes}" />
! 			</h:selectOneMenu>
! 			<h:selectOneMenu value="#{SessionData.query.extractionCode[1]}">
! 				<f:selectItem itemLabel="--select--" value="" itemValue="" />
! 				<f:selectItems value="#{GlobalData.clientExtractionCodes}" />
! 			</h:selectOneMenu>
! 			<h:selectOneMenu value="#{SessionData.query.extractionCode[2]}">
! 				<f:selectItem itemLabel="--select--" value="" itemValue="" />
! 				<f:selectItems value="#{GlobalData.clientExtractionCodes}" />
! 			</h:selectOneMenu>
! 			<h:selectOneMenu value="#{SessionData.query.extractionCodeInnerAND}">
! 				<f:selectItem itemLabel="AND" value="true" itemValue="true" />
! 				<f:selectItem itemLabel="OR" value="false" itemValue="false" />
! 			</h:selectOneMenu>
! 		</h:panelGroup>
! 		<h:outputText value="#{Messages.wsm_PermissionGroup}:" />
! 		<h:panelGroup>
! 			<h:selectOneMenu value="#{SessionData.query.permissionGroup[0]}">
! 				<f:convertNumber />
! 				<f:selectItem itemLabel="--select--" value="" itemValue="" />
! 				<f:selectItems value="#{SessionData.permissionGroups}" />
! 			</h:selectOneMenu>
! 			<h:selectOneMenu value="#{SessionData.query.permissionGroup[1]}">
! 				<f:convertNumber />
! 				<f:selectItem itemLabel="--select--" value="" itemValue="" />
! 				<f:selectItems value="#{SessionData.permissionGroups}" />
! 			</h:selectOneMenu>
! 			<h:selectOneMenu value="#{SessionData.query.permissionGroup[2]}">
! 				<f:convertNumber />
! 				<f:selectItem itemLabel="--select--" value="" itemValue="" />
! 				<f:selectItems value="#{SessionData.permissionGroups}" />
! 			</h:selectOneMenu>
! 			<h:selectOneMenu value="#{SessionData.query.permissionGroupInnerAND}">
! 				<f:selectItem itemLabel="AND" value="true" itemValue="true" />
! 				<f:selectItem itemLabel="OR" value="false" itemValue="false" />
! 			</h:selectOneMenu>
! 		</h:panelGroup>
! 		<h:selectOneMenu value="#{SessionData.query.typeOuterAND}">
! 			<f:selectItem itemLabel="AND" value="true" itemValue="true" />
! 			<f:selectItem itemLabel="OR" value="false" itemValue="false" />
! 		</h:selectOneMenu>
! 		<h:outputText value=" " />
! 		
! 		<h:outputText value="#{Messages.wsm_Type}:" />
! 		<h:panelGroup>
! 			<h:selectOneMenu value="#{SessionData.query.type}">
! 				<f:selectItem itemLabel="--select--" value="" itemValue="" />
! 				<f:selectItem itemLabel="Person" value="P" itemValue="P" />
! 				<f:selectItem itemLabel="Company" value="C" itemValue="C" />
! 				<f:selectItem itemLabel="Subject" value="S" itemValue="S" />
! 			</h:selectOneMenu>
! 		</h:panelGroup>
! 		
! 		
! 		<h:outputText value=" " />
! 		<h:commandLink value="#{Messages.wsm_SimpleView}"
! 			action="#{Search.changeView}" />
! 	</h:panelGrid>
! 	<script language="javascript">
  	document.forms["form1"].elements[0].focus();
  </script>

Index: SelectionContactResult.jsp
===================================================================
RCS file: /cvsroot/compiere/webStore/src/web/WEB-INF/ifm/Attic/SelectionContactResult.jsp,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -C2 -d -r1.1.2.12 -r1.1.2.13
*** SelectionContactResult.jsp	16 Mar 2005 09:36:30 -0000	1.1.2.12
--- SelectionContactResult.jsp	20 Mar 2005 01:48:46 -0000	1.1.2.13
***************
*** 99,103 ****
              	        <h:commandButton action="#{SelectionDetail.unionSelectedContacts}"  value="#{Messages.wsm_Union} [U]" accesskey="U"/>
                  	   	<h:commandButton action="#{Navigation.goBack}"  value="#{Messages.wsm_Back} [B]" accesskey="B"/>
!                    	</DIV>                  
                  </h:form>
                  <script>
--- 99,104 ----
              	        <h:commandButton action="#{SelectionDetail.unionSelectedContacts}"  value="#{Messages.wsm_Union} [U]" accesskey="U"/>
                  	   	<h:commandButton action="#{Navigation.goBack}"  value="#{Messages.wsm_Back} [B]" accesskey="B"/>
!                    	</DIV>   
!                    	<jsp:include page="CommonActions.jsp"/>                   	               
                  </h:form>
                  <script>

Index: SelectionMembers.jsp
===================================================================
RCS file: /cvsroot/compiere/webStore/src/web/WEB-INF/ifm/Attic/SelectionMembers.jsp,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -C2 -d -r1.1.2.11 -r1.1.2.12
*** SelectionMembers.jsp	16 Mar 2005 09:36:31 -0000	1.1.2.11
--- SelectionMembers.jsp	20 Mar 2005 01:48:46 -0000	1.1.2.12
***************
*** 84,91 ****
                      </DIV>
                      </div>
!                     <h:commandLink accesskey="C" action="#{Navigation.goSelectionSearch_action}" id="goSearchAction" style="">
!                     	<h:outputText id="goSearchActionText" value="."/>
!                     </h:commandLink>
!                             
                  </h:form>
                  <script>
--- 84,88 ----
                      </DIV>
                      </div>
!                 <jsp:include page="CommonActions.jsp"/>
                  </h:form>
                  <script>

Index: ContactList.jsp
===================================================================
RCS file: /cvsroot/compiere/webStore/src/web/WEB-INF/ifm/Attic/ContactList.jsp,v
retrieving revision 1.1.2.18
retrieving revision 1.1.2.19
diff -C2 -d -r1.1.2.18 -r1.1.2.19
*** ContactList.jsp	16 Mar 2005 09:36:31 -0000	1.1.2.18
--- ContactList.jsp	20 Mar 2005 01:48:46 -0000	1.1.2.19
***************
*** 75,82 ****
                      </div> 
                      </div>
!                        <h:commandLink accesskey="C" action="#{Navigation.goSearch_action}" id="goSearchAction" style="">
!                                 <h:outputText id="goSearchActionText" value="."/>
!                        </h:commandLink>
!                             
                  </h:form>
                  <script>
--- 75,79 ----
                      </div> 
                      </div>
!                 <jsp:include page="CommonActions.jsp"/>
                  </h:form>
                  <script>

Index: Search.jsp
===================================================================
RCS file: /cvsroot/compiere/webStore/src/web/WEB-INF/ifm/Attic/Search.jsp,v
retrieving revision 1.1.2.21
retrieving revision 1.1.2.22
diff -C2 -d -r1.1.2.21 -r1.1.2.22
*** Search.jsp	16 Mar 2005 09:36:31 -0000	1.1.2.21
--- Search.jsp	20 Mar 2005 01:48:46 -0000	1.1.2.22
***************
*** 21,75 ****
                  <div align="center">
                      <h:form binding="#{Search.form}" id="form1">
!                         <table>
!                         	
!                             <tr>
!                                 <td><cws:message txt='wsm_Keywords'/>:</td>
!                                 <td>
!                                     <h:inputText id="keywords" value="#{SessionData.query.keywords}"/>
!                                 </td>
!                             </tr>
!                             <tr>
!                                 <td><cws:message txt='wsm_Name'/>:</td>
!                                 <td>
!                                     <h:inputText id="name" value="#{SessionData.query.name}"/>
!                                 </td>
!                             </tr>
!                             <tr>
!                                 <td><cws:message txt='wsm_Addressline'/>:</td>
!                                 <td>
!                                     <h:inputText id="addressLine" value="#{SessionData.query.addressLine}"/>
!                                 </td>
!                             </tr>
!                             <tr>
!                                 <td><cws:message txt='wsm_Postalcode'/>:</td>
!                                 <td>
!                                     <h:inputText id="postalCode" value="#{SessionData.query.postalCode}"/>
!                                 </td>
!                             </tr>
!                             <tr>
!                                 <td><cws:message txt='wsm_Type'/>:</td>
!                                 <td>
!                                     <h:selectOneMenu  value="#{SessionData.query.type}">
!                                         <f:selectItem  itemLabel="--select--" value="" itemValue=""/>
!                                         <f:selectItem itemLabel="Person" value="P" itemValue="P"/>
!                                         <f:selectItem itemLabel="Company" value="C" itemValue="C"/>
!                                         <f:selectItem itemLabel="Subject" value="S" itemValue="S"/>
!                                     </h:selectOneMenu>
!                                 </td>
!                             </tr>
                              <tr>
!                                 <td><cws:message txt='wsm_ExtractionCode'/>:</td>
!                                 <td align="right">
!                                     <h:selectOneMenu  id="extractionCode" value="#{SessionData.query.extractionCode}">
!                                         <f:selectItem id="emptyCode" itemLabel="--select--" value="" itemValue=""/>
!                                         <f:selectItems id="extractionCodeItems" value="#{GlobalData.clientExtractionCodes}"/>
!                                     </h:selectOneMenu>
                                  </td>
                              </tr>
                              <tr>
                                  <td align="center" colspan="2">
                                  	<br>
                                    	<%--default button first--%><h:commandButton  style="position: absolute; left: -30px; top: -30px;width:0;height:0;" action="#{Search.search}" value="default"/>
!                                     <h:commandButton value="#{Messages.wsm_CreateNew}" accesskey="N" action="#{Search.newContact} [N]"  id="newContact"/>                                     
                                      <jsp:text> </jsp:text>
                                      <h:commandButton type="submit" accesskey="S" value="#{Messages.wsm_Search} [S]" action="#{Search.search}" id="search"/>
--- 21,45 ----
                  <div align="center">
                      <h:form binding="#{Search.form}" id="form1">
!                                             <table>
!                         	<tr><td align="center" colspan="2">
!       							<jsp:include page="ContactSearchSubview.jsp" />                               
!                             </td></tr>
                              <tr>
!                                 <td align="center" colspan="2">
!                                 	<br>
!                                   	<%--default button first--%><h:commandButton  style="position: absolute; left: -30px; top: -30px;width:0;height:0;" action="#{Search.search}" value="default"/>
!                                    <input type="reset" accesskey="R" value="<cws:message txt='wsm_Reset'/>"/>
!                    					 <h:commandButton value="#{Messages.wsm_CreateNew}" accesskey="N" action="#{Search.newContact}"  id="newContact"/>                                     
!                                     <jsp:text> </jsp:text>
!                                     <h:commandButton type="submit" accesskey="S" value="#{Messages.wsm_Search} [S]" action="#{Search.search}" id="search"/>
!                                      
                                  </td>
                              </tr>
+                         </table>
                              <tr>
                                  <td align="center" colspan="2">
                                  	<br>
                                    	<%--default button first--%><h:commandButton  style="position: absolute; left: -30px; top: -30px;width:0;height:0;" action="#{Search.search}" value="default"/>
!                                     <h:commandButton value="#{Messages.wsm_CreateNew} [N]" accesskey="N" action="#{Search.newContact}"  id="newContact"/>                                     
                                      <jsp:text> </jsp:text>
                                      <h:commandButton type="submit" accesskey="S" value="#{Messages.wsm_Search} [S]" action="#{Search.search}" id="search"/>
***************
*** 78,81 ****
--- 48,52 ----
                              </tr>
                          </table>
+                     <jsp:include page="CommonActions.jsp"/>
                      </h:form>
                  </div>

Index: CreateEditContact.jsp
===================================================================
RCS file: /cvsroot/compiere/webStore/src/web/WEB-INF/ifm/Attic/CreateEditContact.jsp,v
retrieving revision 1.1.2.23
retrieving revision 1.1.2.24
diff -C2 -d -r1.1.2.23 -r1.1.2.24
*** CreateEditContact.jsp	16 Mar 2005 09:36:31 -0000	1.1.2.23
--- CreateEditContact.jsp	20 Mar 2005 01:48:46 -0000	1.1.2.24
***************
*** 205,213 ****
                      <h:commandButton accesskey="S" action="#{CreateEditContact.save}" value="#{Messages.wsm_Save} [S]"/>
                  </div>
!                                        
!                 <h:commandLink accesskey="C" action="#{Navigation.goSearch_action}" style="">
!                 	<h:outputText value="."/>
!                 </h:commandLink>
!                 
  			</h:form>
  </f:view>
--- 205,209 ----
                      <h:commandButton accesskey="S" action="#{CreateEditContact.save}" value="#{Messages.wsm_Save} [S]"/>
                  </div>
! 	        <jsp:include page="CommonActions.jsp"/>			
  			</h:form>
  </f:view>

Index: SelectionLetterCreateEdit.jsp
===================================================================
RCS file: /cvsroot/compiere/webStore/src/web/WEB-INF/ifm/Attic/SelectionLetterCreateEdit.jsp,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -C2 -d -r1.1.2.8 -r1.1.2.9
*** SelectionLetterCreateEdit.jsp	16 Mar 2005 09:36:31 -0000	1.1.2.8
--- SelectionLetterCreateEdit.jsp	20 Mar 2005 01:48:46 -0000	1.1.2.9
***************
*** 43,51 ****
                  </table>
                  </div>
!                 <br>
!                    
!                            <h:commandLink accesskey="C" action="#{Navigation.goSelectionSearch_action}" id="goSearchAction" style="">
!                                 <h:outputText id="goSearchActionText" value="."/>
!                             </h:commandLink>
                  </h:form>
              </body>
--- 43,47 ----
                  </table>
                  </div>
!                 <jsp:include page="CommonActions.jsp"/>
                  </h:form>
              </body>

Index: ContactDetail.jsp
===================================================================
RCS file: /cvsroot/compiere/webStore/src/web/WEB-INF/ifm/Attic/ContactDetail.jsp,v
retrieving revision 1.1.2.21
retrieving revision 1.1.2.22
diff -C2 -d -r1.1.2.21 -r1.1.2.22
*** ContactDetail.jsp	21 Feb 2005 09:34:20 -0000	1.1.2.21
--- ContactDetail.jsp	20 Mar 2005 01:48:46 -0000	1.1.2.22
***************
*** 194,200 ****
  					  </tr>
  					</table>
!                            <h:commandLink accesskey="C" action="#{Navigation.goSearch_action}" id="goSearchAction" style="">
!                                 <h:outputText id="goSearchActionText" value="."/>
!                             </h:commandLink>
                  </h:form>
  	<script language="javascript">
--- 194,198 ----
  					  </tr>
  					</table>
!                 <jsp:include page="CommonActions.jsp"/>
                  </h:form>
  	<script language="javascript">

[Compiere-cvslog] CVS: webStore/src/web/ifm/actions editdoc.png,NONE,1.1.2.1 copy.png,NONE,1.1.2.1 delete.png,NONE,1.1.2.1

[Marek Mosiewicz <marekmosiewicz@us...>]

Update of /cvsroot/compiere/webStore/src/web/ifm/actions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31838/src/web/ifm/actions

Added Files:
      Tag: pbs_payment
	editdoc.png copy.png delete.png 
Log Message:
emails

--- NEW FILE: editdoc.png ---
‰PNG



„)
yÃLf¨†×÷®™a&“h/œÅÀœḯ¿³Èt‡
#ιµ²ÖÊx<–v»@v6â8^«N§#Æ©Õj…$×2
0X-qÿŠ¿s¢ÝÄøZØf«.0ö3
--- NEW FILE: copy.png ---
‰PNG




jý/ê~¼9
--- NEW FILE: delete.png ---
‰PNG



¼·m;É÷B$ ïܾ)¹7²¸¾"ó¹%ùâùCùóÅ3²~/„8[÷)_ÌC^¯wêï±?‘<|Âôtœäb†` ™ç‡Ù½»Uõàñx¸|å7„lÛNz
ÙlÓ܅ÅbXl¾]«FîŽpýê¼-4i­È€Bk(¾ªÍÆF‰b©ÈÄãÇ<ñ’r¹Ò
Ö¶´··þ~*úCC§qìO\ºt_‹Ž”.ÃÃ'q]‡~Ö××(—7Èå
·
F³—éstð$m¡0Ꮍ½ý˜f€`ЇiPՆí+`+HS=4‚C»Ð…ŠßïCUUEÙÖà@JÉÌÌ,µZš¬·ö[I)±¬
Rî