diff --git a/posterita/src/web/jsp/admin/changeEmail.jsp b/posterita/src/web/jsp/admin/changeEmail.jsp
new file mode 100644
index 0000000000..4e8dd54e03
--- /dev/null
+++ b/posterita/src/web/jsp/admin/changeEmail.jsp
@@ -0,0 +1,80 @@
+<%--
+ *  Product: Posterita Web-Based POS and Adempiere Plugin
+ *  Copyright (C) 2007  Posterita Ltd
+ *  This file is part of POSterita
+ *  
+ *  POSterita is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * @author tamak
+--%>
+
+<%@ page import="org.posterita.Constants" %>
+<%@ page import="org.posterita.user.*" %>
+
+<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%>
+<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic"%>	
+<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%>
+<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles"%>
+<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>	
+
+<logic:notPresent name="<%=WebUserInfo.NAME%>" scope="session">
+	<jsp:forward page="/LoginHome.do"/>
+</logic:notPresent>
+
+
+<tiles:insert page="/jsp/include/headerTableTop.jsp">
+  	<tiles:put name="title"><bean:message key="admin.changeEmail.title"/></tiles:put>
+</tiles:insert>
+ <%@ include file="/jsp/include/tabTop.jsp" %><bean:message key="admin.changeEmail.title"/><%@ include file="/jsp/include/tabBottom.jsp" %>
+		<table width="100%" border="0" cellpadding="5" cellspacing="1" align="center">
+			<tr>
+				<td> 
+					
+				</td>
+			</tr>
+				
+			<tr>
+				<td>				  			
+					<html:form action="/ChangeEmailAction">
+					<html:hidden property="action" value="<%=Constants.CHANGE%>"/>
+						
+						<table align="center" width="350" border="0" cellpadding="5" cellspacing="0" cols="2">
+							<tr>
+							<%@ include file="/jsp/include/errors.jsp" %>
+								<td><font class="bolddarkgraysmall"><bean:message key="admin.changeEmail.oldEmail"/></font></td>
+								<td><c:out value='${webUserInfo.user.email}'/></td>
+							</tr>
+							<tr>
+								<td colspan="1" nowrap><font class="bolddarkgraysmall"><bean:message key="admin.changeEmail.newEmail"/></font></td>
+								<td colspan="1"><html:text property="newEmail" size="30"/></td>
+							</tr>
+							<tr>
+								<td colspan="1" nowrap><font class="bolddarkgraysmall"><bean:message key="admin.changeEmail.confirmEmail"/></font></td>
+								<td colspan="1"><html:text property="confirmEmail" size="30"/></td>
+							</tr>
+							<tr>
+								<td colspan="2" align="right">
+									<html:submit styleClass="button"><bean:message key="button.submit"/></html:submit>
+								</td>
+							</tr>
+						</table>
+					
+					</html:form> 
+			
+				</td>
+			</tr>
+		</table>	    		
+	    
+	    <%@ include file="/jsp/include/footerTableBottom.jsp" %>				
\ No newline at end of file
diff --git a/posterita/src/web/jsp/admin/changePassword.jsp b/posterita/src/web/jsp/admin/changePassword.jsp
new file mode 100644
index 0000000000..34360a7031
--- /dev/null
+++ b/posterita/src/web/jsp/admin/changePassword.jsp
@@ -0,0 +1,79 @@
+<%--
+ *  Product: Posterita Web-Based POS and Adempiere Plugin
+ *  Copyright (C) 2007  Posterita Ltd
+ *  This file is part of POSterita
+ *  
+ *  POSterita is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * @author tamak
+--%>
+
+<%@ page import="org.posterita.Constants" %>
+<%@ page import="org.posterita.user.*" %>
+
+<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%>
+<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic"%>	
+<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%>
+<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles"%>	
+
+<logic:notPresent name="<%=WebUserInfo.NAME%>" scope="session">
+	<jsp:forward page="/LoginHome.do"/>
+</logic:notPresent>
+
+
+<tiles:insert page="/jsp/include/headerTableTop.jsp">
+  	<tiles:put name="title"><bean:message key="admin.changePassword.title"/></tiles:put>
+</tiles:insert>
+<%@ include file="/jsp/include/tabTop.jsp" %><bean:message key="admin.changePassword.title"/><%@ include file="/jsp/include/tabBottom.jsp" %> 
+		<table width="100%" border="0" cellpadding="5" cellspacing="1" align="center">
+			<tr>
+				<td> 
+								
+				</td>
+			</tr>
+				
+			<tr>
+				<td>				
+				   		<html:form action="/ChangePasswordAction">
+						<html:hidden property="action" value="<%=Constants.CHANGE%>"/>
+							
+							<table align="center" width="350" border="0" cellpadding="5" cellspacing="0" cols="2">
+						 		<tr>
+							 		<%@ include file="/jsp/include/errors.jsp" %>
+									<td><font class="bolddarkgraysmall"><bean:message key="admin.changePassword.old"/></font></td>
+									<td><html:password property="oldPassword"/></td>
+								</tr>
+								<tr>
+									<td colspan="1"><font class="bolddarkgraysmall"><bean:message key="admin.changePassword.new"/></font></td>
+									<td colspan="1"><html:password property="newPassword"/></td>
+								</tr>
+								<tr>
+									<td colspan="1"><font class="bolddarkgraysmall"><bean:message key="admin.changePassword.confirm"/></font></td>
+									<td colspan="1"><html:password property="confirmPassword"/></td>
+								</tr>
+								<tr>
+									<td colspan="2" align="right">
+										<html:submit styleClass="button"><bean:message key="button.submit"/></html:submit>
+									</td>
+								</tr>
+							</table>
+							
+						</html:form>    
+			    </td>
+			</tr>
+		</table>
+			   			
+	    <%@ include file="/jsp/include/footerTableBottom.jsp" %>
+				
\ No newline at end of file
diff --git a/posterita/src/web/jsp/admin/checkDataIntegritySuccess.jsp b/posterita/src/web/jsp/admin/checkDataIntegritySuccess.jsp
new file mode 100644
index 0000000000..4159b268d2
--- /dev/null
+++ b/posterita/src/web/jsp/admin/checkDataIntegritySuccess.jsp
@@ -0,0 +1,48 @@
+<%--
+ *  Product: Posterita Web-Based POS and Adempiere Plugin
+ *  Copyright (C) 2007  Posterita Ltd
+ *  This file is part of POSterita
+ *  
+ *  POSterita is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * @author Alok
+--%>
+
+<%@ page import="org.posterita.user.*" %>
+
+<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%>
+<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic"%>	
+<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%>
+<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles"%>	
+
+<logic:notPresent name="<%=WebUserInfo.NAME%>" scope="session">
+	<jsp:forward page="/LoginHome.do"/>
+</logic:notPresent>
+
+
+<tiles:insert page="/jsp/include/headerTableTop.jsp">
+  	<tiles:put name="title"><bean:message key="material.movement.success"/></tiles:put>
+</tiles:insert>
+
+	<table width="100%" boder="0" cellpadding="5" cellspacing="0">
+  		<tr>
+    		<td valign="top">
+ 	    			<div class="nb" align="center">
+		 				<bean:message key="data.integrity.success"/>
+		 			</div>  				
+	   		</td>
+   		</tr>
+	</table>
+<%@ include file="/jsp/include/footerTableBottom.jsp" %>
\ No newline at end of file
diff --git a/posterita/src/web/jsp/admin/checkSequenceSuccess.jsp b/posterita/src/web/jsp/admin/checkSequenceSuccess.jsp
new file mode 100644
index 0000000000..ca460fc900
--- /dev/null
+++ b/posterita/src/web/jsp/admin/checkSequenceSuccess.jsp
@@ -0,0 +1,55 @@
+<%--
+ *  Product: Posterita Web-Based POS and Adempiere Plugin
+ *  Copyright (C) 2007  Posterita Ltd
+ *  This file is part of POSterita
+ *  
+ *  POSterita is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * @author Alok
+--%>
+
+
+<%@ page import="org.posterita.Constants" %>
+<%@ page import="org.posterita.user.*" %>
+<%@ page import="org.posterita.beans.*" %>
+<%@ page import="org.posterita.struts.pos.CashBookAction" %>
+
+
+<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%>
+<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic"%>	
+<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%>
+<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles"%>	
+<%@ taglib uri="/WEB-INF/fmt.tld" prefix="fmt" %>
+
+<logic:notPresent name="<%=WebUserInfo.NAME%>" scope="session">
+	<jsp:forward page="/LoginHome.do"/>
+</logic:notPresent>
+
+<bean:define id="title">Update Sequence</bean:define>
+<%@ include file="/jsp/include/posHeader.jsp" %>	   
+<%@ include file="/jsp/include/errors.jsp" %>
+
+<table border="0">
+  <tr>
+    <td>
+    	The sequences have been updated successfully
+    </td>
+    
+  </tr>
+  
+</table>
+
+
+<%@ include file="/jsp/include/posFooter.jsp" %>
\ No newline at end of file
diff --git a/posterita/src/web/jsp/admin/createRole.jsp b/posterita/src/web/jsp/admin/createRole.jsp
new file mode 100644
index 0000000000..7997601fb0
--- /dev/null
+++ b/posterita/src/web/jsp/admin/createRole.jsp
@@ -0,0 +1,166 @@
+<%--
+ *  Product: Posterita Web-Based POS and Adempiere Plugin
+ *  Copyright (C) 2007  Posterita Ltd
+ *  This file is part of POSterita
+ *  
+ *  POSterita is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * @author praveen
+--%>
+
+
+<%@ page import="org.posterita.Constants" %>
+<%@ page import="org.posterita.user.*" %>
+<%@ page import="org.posterita.beans.UDIBean" %>
+<%@ page import="org.posterita.core.MenuItem" %>
+
+
+<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%>
+<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic"%>	
+<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%>
+<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles"%>	
+
+<logic:notPresent name="<%=WebUserInfo.NAME%>" scope="session">
+	<jsp:forward page="/LoginHome.do"/>
+</logic:notPresent>
+
+<tiles:insert page="/jsp/include/headerTableTop.jsp">
+  	<tiles:put name="title"><bean:message key="role.create"/></tiles:put>
+</tiles:insert>
+
+<%@ include file="/jsp/include/tabTop.jsp" %><bean:message key="role.create"/><%@ include file="/jsp/include/tabBottom.jsp" %>
+<table width="100%" border="0" cellpadding="5" cellspacing="1" align="center">
+		<tr>
+			<td> 
+				
+			</td>
+		</tr>
+		
+		<tr>
+			<td>		
+				<%@ include file="/jsp/include/errors.jsp" %>	
+				
+				<html:form action="/CreateRoleAction">
+					<html:hidden property="action" value="createRole"/>
+					
+						<table align="left" border="0" cellpadding="5" cellspacing="0" cols="2">
+						   <tr>
+						   		<td align="left"><bean:message key="role.name"/></td>
+						   		<td><html:text property="name"/></td>
+						   </tr>
+						   
+						   <%--
+						   <tr>
+						   		<td align="left"><bean:message key="role.accessibleToAll"/></td>
+						   		<td><html:checkbox property="isAccessAllOrgs" value="true"/></td>
+						   </tr>
+						   --%>
+						   
+						   <tr>
+						   		<td align="left">
+						   			Can Create Order
+						   		</td>
+						   		
+						   		<td>
+						   			<html:checkbox property="canCreateOrder" value="true"/>
+						   		</td>
+						   </tr>
+						
+						   
+						   <tr>
+						   		<td align="left">
+						   			Can Alter Order
+						   		</td>
+						   		
+						   		<td>
+						   			<html:checkbox property="canAlterOrder" value="true"/>
+						   		</td>
+						   </tr>
+						   
+						   
+						   <tr>
+						   		<td align="left">
+						   			Can View Order
+						   		</td>
+						   		
+						   		<td>
+						   			<html:checkbox property="canViewOrder" value="true"/>
+						   		</td>
+						   </tr>
+						   
+						  
+						   <tr>
+						   		<td colspan="2">
+						   			<br><br>
+						   			<strong>Available Menus</strong>
+						   			<hr>							   			 
+						   		</td>
+						   </tr>
+						    
+						    <tr>
+						    	<td>
+									<logic:present name="<%= Constants.ROLE_MENUS%>">
+										<table>
+											<logic:iterate id="element" indexId="count" name="<%= Constants.ROLE_MENUS%>" type="org.posterita.core.MenuItem">
+								   				<tr>
+								   					<td class="contentName">
+							   							<strong><bean:write name="element" property="name"/></strong>
+							   						</td>
+							   					</tr>
+						   						<logic:equal name="element" property="hasSubMenu" value="true">
+						   							<logic:iterate id="ele" collection="<%=element.getSubMenus()%>" type="org.posterita.core.MenuItem">
+													<tr>
+														<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+															<bean:write name="ele" property="name"/>
+														</td>
+														<td>
+															<input type="checkbox" name="checkBox" value="<bean:write name='ele' property='menuId'/>"/>
+														</td>
+													</tr>
+													</logic:iterate>  						
+							   						
+						   						</logic:equal>
+							   											   		
+								   			</logic:iterate>
+									   	</table>
+									</logic:present>
+						   		</td>
+						   	</tr>
+						   <tr>
+								<td colspan="2" align="right">
+									<html:button onclick="clearAll(this.form)" property="button">
+										Clear All
+									</html:button>
+									<html:button onclick="selectAll(this.form)" property="button">
+										Select All
+									</html:button>
+									<html:submit>
+	   	 		                       <bean:message key="button.save"/>
+			                         </html:submit>  
+								</td>
+							</tr>
+						   								
+						</table>
+						
+					</html:form>
+			</td>
+		</tr>
+		
+		
+	</table>	    		
+			 			        					
+ 							
+	    									 					 
+<%@ include file="/jsp/include/footerTableBottom.jsp" %> 
\ No newline at end of file
diff --git a/posterita/src/web/jsp/admin/emailChanged.jsp b/posterita/src/web/jsp/admin/emailChanged.jsp
new file mode 100644
index 0000000000..0a13ee080c
--- /dev/null
+++ b/posterita/src/web/jsp/admin/emailChanged.jsp
@@ -0,0 +1,48 @@
+<%--
+ *  Product: Posterita Web-Based POS and Adempiere Plugin
+ *  Copyright (C) 2007  Posterita Ltd
+ *  This file is part of POSterita
+ *  
+ *  POSterita is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * @author tamak
+--%>
+
+
+<%@ page import="org.posterita.Constants" %>
+<%@ page import="org.posterita.user.*" %>
+
+
+<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%>
+<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic"%>	
+<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%>
+<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles"%>	
+<%@ taglib uri="/WEB-INF/posterita.tld" prefix="posterita"%>
+
+
+<tiles:insert page="/jsp/include/headerTableTop.jsp">
+  	<tiles:put name="title"><bean:message key="admin.emailChanged.title"/> </tiles:put>
+</tiles:insert>
+	<%@ include file="/jsp/include/tabTop.jsp" %><bean:message key="admin.emailChanged.message"/><%@ include file="/jsp/include/tabBottom.jsp" %>
+      <table width="100%" border="0" cellpadding="5" cellspacing="1" align="center">
+			
+			<tr>
+				<td> 
+				
+				</td>
+			</tr>
+      </table>
+			
+<%@ include file="/jsp/include/footerTableBottom.jsp" %> 
\ No newline at end of file
diff --git a/posterita/src/web/jsp/admin/listRoles.jsp b/posterita/src/web/jsp/admin/listRoles.jsp
new file mode 100644
index 0000000000..9dbb4cf645
--- /dev/null
+++ b/posterita/src/web/jsp/admin/listRoles.jsp
@@ -0,0 +1,92 @@
+<%--
+ *  Product: Posterita Web-Based POS and Adempiere Plugin
+ *  Copyright (C) 2007  Posterita Ltd
+ *  This file is part of POSterita
+ *  
+ *  POSterita is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * @author Praveen
+--%>
+
+
+<%@ page import="org.posterita.Constants" %>
+<%@ page import="org.posterita.user.*" %>
+<%@ page import="org.posterita.beans.*" %>
+
+<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%>
+<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic"%>	
+<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%>
+<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles"%>	
+
+<logic:notPresent name="<%=WebUserInfo.NAME%>" scope="session">
+	<jsp:forward page="/LoginHome.do"/>
+</logic:notPresent>
+
+
+<tiles:insert page="/jsp/include/headerTableTop.jsp">
+  	<tiles:put name="title"><bean:message key="admin.viewRoles.title" /></tiles:put>
+</tiles:insert>
+	
+	<%@ include file="/jsp/include/tabTop.jsp" %><bean:message key="admin.viewRoles.title" /><%@ include file="/jsp/include/tabBottom.jsp" %>
+	<table width="100%" border="0" cellpadding="5" cellspacing="1" align="center">
+			<tr>
+				<td> 
+					
+				</td>
+			</tr>
+			
+			<tr>
+				<td>		
+					<%@ include file="/jsp/include/errors.jsp" %> 
+					
+					<div align="right">
+						<html:link href="RoleAction.do?action=initRole">Add Record</html:link>
+					</div>				
+					
+					<table class="display sortable" id="1111">
+					<tr>
+						<th><bean:message key="role.name"/></th>
+						<th><bean:message key="role.isActive"/></th>
+						<th>&nbsp;</th>
+					</tr>
+					<logic:iterate id="element" name="<%= Constants.ALL_ROLES %>">
+						<tr>
+							<td><bean:write name="element" property="name" /></td>
+							<td>
+								<bean:write name="element" property="isActive" />						
+							</td>
+							
+							<bean:define id="roleID" name="element" property="roleId"/>
+							
+							
+							<td><%--
+								<html:link href="<%= "RoleAction.do?action=viewRole&roleId=" + roleID %>">Edit</html:link>
+								--%>
+								<html:link href="<%= "RoleAction.do?action=viewRole&roleId=" + roleID %>">View</html:link>
+								<%--<html:link href="<%= "RoleAction.do?action=deleteRole&roleId=" + roleID %>">Delete</html:link>--%>								
+							</td>
+						</tr>
+					</logic:iterate>					
+					</table>							
+				</td>			
+						
+			</tr>
+			
+			
+		</table>	    		
+			 			        					
+ 							
+	    									 					 
+<%@ include file="/jsp/include/footerTableBottom.jsp" %>
diff --git a/posterita/src/web/jsp/admin/passwordChanged.jsp b/posterita/src/web/jsp/admin/passwordChanged.jsp
new file mode 100644
index 0000000000..aeffa1b345
--- /dev/null
+++ b/posterita/src/web/jsp/admin/passwordChanged.jsp
@@ -0,0 +1,52 @@
+<%--
+ *  Product: Posterita Web-Based POS and Adempiere Plugin
+ *  Copyright (C) 2007  Posterita Ltd
+ *  This file is part of POSterita
+ *  
+ *  POSterita is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * @author tamak
+--%>
+
+
+<%@ page import="org.posterita.Constants" %>
+<%@ page import="org.posterita.user.*" %>
+
+
+<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%>
+<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic"%>	
+<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%>
+<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles"%>	
+<%@ taglib uri="/WEB-INF/posterita.tld" prefix="posterita"%>
+
+<tiles:insert page="/jsp/include/tshirtHeader.jsp">
+	<tiles:put name="title">Change password</tiles:put>
+</tiles:insert>
+
+
+      <table width="100%" border="0" cellpadding="5" cellspacing="1" align="center">
+				
+		<%@ include file="/jsp/include/errors.jsp"%>
+		
+		
+			<tr>
+				<td> 
+					<bean:message key="admin.passwordChanged.message"/>
+				</td>
+			</tr>
+      </table>
+      
+
+<%@ include file="/jsp/include/tshirtFooter.jsp"%>				
diff --git a/posterita/src/web/jsp/admin/userDeleted.jsp b/posterita/src/web/jsp/admin/userDeleted.jsp
new file mode 100644
index 0000000000..19ff9c5030
--- /dev/null
+++ b/posterita/src/web/jsp/admin/userDeleted.jsp
@@ -0,0 +1,49 @@
+<%--
+ *  Product: Posterita Web-Based POS and Adempiere Plugin
+ *  Copyright (C) 2007  Posterita Ltd
+ *  This file is part of POSterita
+ *  
+ *  POSterita is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * @author tamak
+--%>
+
+<%@ page import="org.posterita.user.*" %>
+
+<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%>
+<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic"%>	
+<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%>
+<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles"%>	
+
+<logic:notPresent name="<%=WebUserInfo.NAME%>" scope="session">
+	<jsp:forward page="/LoginHome.do"/>
+</logic:notPresent>
+
+
+<tiles:insert page="/jsp/include/headerTableTop.jsp">
+  	<tiles:put name="title"><bean:message key="admin.userDeleted.title"/></tiles:put>
+</tiles:insert>
+
+		<table width="100%" border="0" cellpadding="5" cellspacing="1" align="center">
+			<tr>
+				<td>
+					<div class="nb" align="center">
+						<bean:message key="admin.userDeleted.message"/>
+					</div>	
+				</td>
+			</tr>
+		</table>		
+	   			
+		<%@ include file="/jsp/include/footerTableBottom.jsp" %>			
\ No newline at end of file
diff --git a/posterita/src/web/jsp/admin/viewMyDetails.jsp b/posterita/src/web/jsp/admin/viewMyDetails.jsp
new file mode 100644
index 0000000000..cccf499f12
--- /dev/null
+++ b/posterita/src/web/jsp/admin/viewMyDetails.jsp
@@ -0,0 +1,138 @@
+<%--
+ *  Product: Posterita Web-Based POS and Adempiere Plugin
+ *  Copyright (C) 2007  Posterita Ltd
+ *  This file is part of POSterita
+ *  
+ *  POSterita is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * @author tamak
+--%>
+
+<%@ page import="org.posterita.user.*" %>
+<%@ page import="org.posterita.beans.UDIBean" %>
+
+<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%>
+<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic"%>	
+<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%>
+<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles"%>
+<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>	
+
+<logic:notPresent name="<%=WebUserInfo.NAME%>" scope="session">
+	<jsp:forward page="/LoginHome.do"/>
+</logic:notPresent>
+
+
+<tiles:insert page="/jsp/include/headerTableTop.jsp">
+  	<tiles:put name="title"><bean:message key="admin.viewMyDetails.title"/></tiles:put>
+</tiles:insert>
+
+		<table width="100%" border="0" cellpadding="0" cellspacing="0" align="center">
+			<tr>
+				<td colspan=2>
+					<%@ include file="/jsp/include/tabTop.jsp" %><bean:message key="admin.viewMyDetails.title"/><%@ include file="/jsp/include/tabBottom.jsp" %>
+				</td>
+			</tr>
+			
+			<tr><td valign="bottom" align="right" bgcolor="#F6F6F6" width="40%"><img src="images/man2_lr.jpg"> </td>
+				<td bgcolor="#F6F6F6" align="left">			    			
+				    <table width="250" height="250" cellpadding="2"  cellspacing="0" border="0" align="left">
+				    	<tr bgcolor="#ECEAEA">
+				    		<td>
+				    			<font class="bolddarkgraysmall"> <bean:message key="user.username"/> </font> 
+							</td>			    			
+						    <td>
+						    	<c:out value='${webUserInfo.user.name}'/>						    						    				    			
+						    </td>			    			
+						</tr>
+						<tr>
+				    		<td>
+				    			<font class="bolddarkgraysmall"> <bean:message key="user.role"/> </font> 
+							</td>			    			
+						    <td >
+						    	<bean:write name="webUserInfo" property="roleName"/>						    						    				    			
+						    </td>			    			
+						</tr>						    		
+						<tr bgcolor="#ECEAEA">	    			  			
+						    <td>
+						    	<font class="bolddarkgraysmall"> <bean:message key="admin.viewMyDetails.email"/> </font>
+						    </td>
+						    <td>
+						    	<c:out value='${webUserInfo.user.email}'/>
+						    </td>			    			
+						</tr>
+						    		
+						<tr>	
+							<td>	  
+								<font class="bolddarkgraysmall"><bean:message key="admin.viewMyDetails.dealerName"/> </font>
+							</td>
+						    <td>
+								<c:out value ='${webUserInfo.orgName}'/>		
+							</td>					  	   
+						</tr>
+								  	
+						<tr bgcolor="#ECEAEA">	
+							<td> 		  
+								<font class="bolddarkgraysmall"><bean:message key="admin.viewMyDetails.dealerCode"/></font>
+							</td>					  	    
+							<td>
+								<c:out value='${webUserInfo.location.address4}'/>
+							</td>
+						</tr>
+								  	
+						<tr>	
+							<td>		  
+								<font class="bolddarkgraysmall"> <bean:message key="admin.viewMyDetails.phone"/> </font>
+							</td>					  	    
+							<td>
+								<c:out value='${webUserInfo.user.phone}'/>
+							</td>
+						</tr>
+						
+						<tr bgcolor="#ECEAEA">	
+							<td> 		  
+								<font class="bolddarkgraysmall"> <bean:message key="user.cellphone"/></font>
+							</td>					  	    
+							<td>
+								<c:out value='${webUserInfo.user.phone2}'/>
+							</td>
+						</tr>
+								  	
+						<tr>				
+							<td>		  
+								<font class="bolddarkgraysmall"><bean:message key="admin.viewMyDetails.fax"/></font>
+							</td>				  	    
+							<td>
+								<c:out value='${webUserInfo.user.fax}'/>
+							</td>
+						</tr>
+								  	    
+						<tr bgcolor="#ECEAEA">	
+							<td valign="top" nowrap> <br>		  
+								<font class="bolddarkgraysmall"><bean:message key="admin.viewMyDetails.deliveryAddress"/></font>
+							</td>					  	    
+							<td valign="top"> <br>
+								<c:out value='${webUserInfo.location.address1}'/><br>
+								<c:out value='${webUserInfo.location.city}'/><br>
+								<c:out value='${webUserInfo.location.country}'/>
+							</td>
+						</tr>
+								  	
+					</table>					
+				</td>			  	    
+		   	</tr>
+	   	</table>
+		      
+		   		   
+		<%@ include file="/jsp/include/footerTableBottom.jsp" %>				
\ No newline at end of file
diff --git a/posterita/src/web/jsp/admin/viewRole.jsp b/posterita/src/web/jsp/admin/viewRole.jsp
new file mode 100644
index 0000000000..adc2f66e82
--- /dev/null
+++ b/posterita/src/web/jsp/admin/viewRole.jsp
@@ -0,0 +1,96 @@
+<%--
+ *  Product: Posterita Web-Based POS and Adempiere Plugin
+ *  Copyright (C) 2007  Posterita Ltd
+ *  This file is part of POSterita
+ *  
+ *  POSterita is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * @author Praveen
+--%>
+
+
+<%@ page import="org.posterita.Constants" %>
+<%@ page import="org.posterita.user.*" %>
+<%@ page import="org.compiere.model.MOrg" %>
+
+<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%>
+<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%>
+<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles"%>	
+<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic"%>
+<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
+
+
+<tiles:insert page="/jsp/include/headerTableTop.jsp">
+  <tiles:put name="title"><bean:message key="admin.viewUsers.title"/></tiles:put>
+</tiles:insert>
+	 <%@ include file="/jsp/include/tabTop.jsp" %>View Role<%@ include file="/jsp/include/tabBottom.jsp" %>
+	<table width="100%" border="0" cellpadding="5" cellspacing="0">
+   		<tr>
+    		<td>
+				   								
+	   		</td>	   		   		
+		</tr>
+		
+		<tr>
+			<td>		
+				<%@ include file="/jsp/include/errors.jsp" %> 
+										
+				<table width="100%" border="0" cellpadding="5" cellspacing="0" cols="2">
+				<tr>
+					<td><strong>Role Name :</strong><bean:write name="<%= Constants.ROLE %>" property="name"/></td>
+				</tr>
+				<tr>
+					<td><hr></td>					
+				</tr>
+				<tr>
+					<td><strong>Menus</strong></td>					
+				</tr>
+				<tr>
+			    	<td>
+						<logic:present name="<%= Constants.ROLE_MENUS%>">
+							<table>
+								<logic:iterate id="element" indexId="count" name="<%= Constants.ROLE_MENUS%>" type="org.posterita.core.MenuItem">
+					   				<tr>
+					   					<td class="contentName">
+				   							<strong><bean:write name="element" property="name"/></strong>
+				   						</td>
+				   					</tr>
+			   						<logic:equal name="element" property="hasSubMenu" value="true">
+			   							<logic:iterate id="ele" collection="<%=element.getSubMenus()%>" type="org.posterita.core.MenuItem">
+										<tr>
+											<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+												<bean:write name="ele" property="name"/>
+											</td>
+										</tr>
+										</logic:iterate>  						
+				   						
+			   						</logic:equal>
+				   											   		
+					   			</logic:iterate>
+						   	</table>
+						</logic:present>
+			   		</td>
+				</tr>		
+				</table>
+			</td>
+		</tr>
+	</table>
+	    
+			
+						
+	<%@ include file="/jsp/include/footerTableBottom.jsp" %>
+	   
+	
+												
\ No newline at end of file
diff --git a/posterita/src/web/jsp/admin/viewUserDetails.jsp b/posterita/src/web/jsp/admin/viewUserDetails.jsp
new file mode 100644
index 0000000000..68d409baf7
--- /dev/null
+++ b/posterita/src/web/jsp/admin/viewUserDetails.jsp
@@ -0,0 +1,120 @@
+<%--
+ *  Product: Posterita Web-Based POS and Adempiere Plugin
+ *  Copyright (C) 2007  Posterita Ltd
+ *  This file is part of POSterita
+ *  
+ *  POSterita is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * @author tamak
+--%>
+
+
+<%@ page import="org.posterita.Constants" %>
+<%@ page import="org.posterita.user.*" %>
+<%@ page import="org.compiere.model.MOrg" %>
+
+<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%>
+<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%>
+<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles"%>	
+<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic"%>
+
+
+<tiles:insert page="/jsp/include/headerTableTop.jsp">
+  <tiles:put name="title"><bean:message key="admin.userDetails.title"/></tiles:put>
+</tiles:insert>
+	 <%@ include file="/jsp/include/tabTop.jsp" %><bean:message key="admin.userDetails.title"/><%@ include file="/jsp/include/tabBottom.jsp" %>
+		<table width="100%" border="0" cellpadding="5" cellspacing="0">
+	   		<tr>
+	    		<td>
+					   								
+		   		</td>
+		   	</tr>
+		   							
+		   	<tr>
+		   		<td>
+		   			<table width="100%" border="0" cellpadding="5" cellspacing="1" align="center" cols="5"> 		  		
+											
+						<tr>
+							<td width="100">
+								<bean:message key="user.username"/>
+							</td>
+							<td>
+								<bean:write name="<%=Constants.USER_DETAILS%>" property="username"/>
+							</td>
+						</tr>
+						<tr>
+							<td>
+								<bean:message key="user.role"/>
+							</td>
+												
+							<td>
+								<bean:write name="<%=Constants.USER_DETAILS%>" property="roleName"/>
+							</td>
+						</tr>
+						<%--
+						<tr>
+							<td>
+								<bean:message key="user.password"/>
+							</td>
+							<td>
+								<bean:write name="<%=Constants.USER_DETAILS%>" property="password"/>
+							</td>
+						</tr>
+						--%>
+						<tr>
+							<td>
+								<bean:message key="user.email"/>
+							</td>
+							<td>
+								<bean:write name="<%=Constants.USER_DETAILS%>" property="email"/>
+							</td>
+						</tr>
+						
+						<tr>
+							<td>
+								<bean:message key="user.phone"/>
+							</td>
+							<td>
+								<bean:write name="<%=Constants.USER_DETAILS%>" property="phone"/>
+							</td>
+						</tr>
+																															
+						<tr>
+							<td colspan="2" align="right">
+								<table>
+									<tr>
+									
+										
+										<html:form action="/DeleteUserAction">
+										<html:hidden property="action" value="delete"/>
+										<html:hidden property="userID"/>
+										<td>
+											<html:submit styleClass="button">
+											<bean:message key="button.delete"/>
+											</html:submit>
+										</td>
+										</html:form>									
+									</tr>
+								</table>
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>				
+		</table>			
+						
+		<%@ include file="/jsp/include/footerTableBottom.jsp" %>	   
+	
+												
\ No newline at end of file
diff --git a/posterita/src/web/jsp/admin/viewUsers.jsp b/posterita/src/web/jsp/admin/viewUsers.jsp
new file mode 100644
index 0000000000..091f0e7fe4
--- /dev/null
+++ b/posterita/src/web/jsp/admin/viewUsers.jsp
@@ -0,0 +1,110 @@
+<%--
+ *  Product: Posterita Web-Based POS and Adempiere Plugin
+ *  Copyright (C) 2007  Posterita Ltd
+ *  This file is part of POSterita
+ *  
+ *  POSterita is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * @author Alok
+--%>
+
+<%@ page import="org.posterita.Constants" %>
+<%@ page import="org.posterita.user.*" %>
+<%@ page import="org.compiere.model.MOrg" %>
+
+<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%>
+<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%>
+<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles"%>	
+<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic"%>
+<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
+
+
+<tiles:insert page="/jsp/include/headerTableTop.jsp">
+  <tiles:put name="title"><bean:message key="admin.viewUsers.title"/></tiles:put>
+</tiles:insert>
+	 <%@ include file="/jsp/include/tabTop.jsp" %><bean:message key="admin.viewUsers.title"/><%@ include file="/jsp/include/tabBottom.jsp" %>
+	<table width="100%" border="0" cellpadding="5" cellspacing="0">
+   		<tr>
+    		<td>
+				   								
+	   		</td>
+	   	</tr>
+	   	
+	   	<tr>
+	   		<td>
+	   			<table width="100%" border="0" class="content" cellpadding="5" cellspacing="1" align="center" cols="5"> 		  		
+					<tr>
+						<th colspan="1">
+							<bean:message key="admin.viewUsers.username"/>
+						</th>
+						<th colspan="1">
+							<bean:message key="admin.viewUsers.userRole"/>
+						</th>
+						<th colspan="1">
+							Active
+						</th>
+						
+						<th colspan="1">&nbsp;
+							
+						</th>
+					</tr>
+					
+					<logic:iterate indexId="count" name="<%=Constants.ALL_USERS%>" id="element" type="org.posterita.beans.UserBean">
+					<tr>
+						<%
+							String styleClass = "label";
+							if ((count.intValue()%2) != 0)
+								styleClass = "contentname";
+						%>
+					
+					
+						<td class="<%=styleClass%>">
+							<bean:write name="element" property="username"/>
+						</td>
+						
+						<td class="<%=styleClass%>">
+							<bean:write name="element" property="roleName"/>
+						</td>
+						
+						<td class="<%=styleClass%>">
+							<logic:equal name="element" property="isActive" value="true"> 
+								Yes
+							</logic:equal>
+							<logic:equal name="element" property="isActive" value="false"> 
+								No
+							</logic:equal>						
+						</td>
+						
+						<td class="<%=styleClass%>">
+							<html:link href="<%="ViewUserDetailsAction.do?action=viewUserDetails&userID=" + element.getUserId() %>">
+		     					<bean:message key="admin.viewUsers.editDelete"/>
+		     				</html:link>
+						</td>
+																	
+					</tr>
+					</logic:iterate>
+			
+					
+				</table>
+			</td>
+		</tr>
+	</table>
+	    
+			
+						
+	<%@ include file="/jsp/include/footerTableBottom.jsp" %>
+	   
+	
+												
\ No newline at end of file
diff --git a/posterita/src/web/jsp/attachment/createAttachment.jsp b/posterita/src/web/jsp/attachment/createAttachment.jsp
new file mode 100644
index 0000000000..9d84925850
--- /dev/null
+++ b/posterita/src/web/jsp/attachment/createAttachment.jsp
@@ -0,0 +1,87 @@
+<%--
+ *  Product: Posterita Web-Based POS and Adempiere Plugin
+ *  Copyright (C) 2007  Posterita Ltd
+ *  This file is part of POSterita
+ *  
+ *  POSterita is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * @author Praveen
+--%>
+
+<%@ page import="org.posterita.struts.attachment.AttachmentAction" %>
+<%@ page import="org.posterita.Constants" %>
+<%@ page import="org.posterita.user.*" %>
+<%@ page import="org.posterita.beans.UDIBean" %>
+
+<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%>
+<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic"%>	
+<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%>
+<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles"%>	
+
+
+<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%>
+<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%>
+<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles"%>	
+<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic"%>
+<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
+
+
+<tiles:insert page="/jsp/include/headerTableTop.jsp">
+<tiles:put name="title">Attach Logo</tiles:put>
+</tiles:insert>
+	 
+<html:form action="/CreateAttachmentAction" enctype="multipart/form-data">
+<html:hidden property="action" value="<%=AttachmentAction.CREATE_ATTACHMENT%>"/>
+	 
+	<table width="50%" border="0" cellpadding="5" cellspacing="0">
+	 	<tr>
+   			<td colspan="2">
+   				<%@ include file="/jsp/include/tabTop.jsp" %>Attach Logo<%@ include file="/jsp/include/tabBottom.jsp" %>
+   				<%@ include file="/jsp/include/errors.jsp" %>
+   			</td>
+   		</tr>
+   		
+   		<tr>
+   			 <td>	
+					find logo
+   			 </td>	
+   			 	
+   		
+ 			  <td>
+ 				  	<html:file property="logo"/>
+ 			  </td>  		
+   		</tr>
+   		
+		
+		<tr>
+					<td>Name</td>
+					<td colspan="2">
+						<html:text property="logoName" size="30"/>
+					</td>
+		</tr>
+		
+		<tr>
+				<td colspan="3" align="center">
+					<html:submit>
+						<bean:message key="button.save"/>
+					</html:submit>
+				</td>
+		</tr>
+	</table>
+</html:form>
+<%@ include file="/jsp/include/footerTableBottom.jsp" %>
+	   
+	
+												
\ No newline at end of file
diff --git a/posterita/src/web/jsp/bPartner/bPartnerCreated.jsp b/posterita/src/web/jsp/bPartner/bPartnerCreated.jsp
new file mode 100644
index 0000000000..128271235d
--- /dev/null
+++ b/posterita/src/web/jsp/bPartner/bPartnerCreated.jsp
@@ -0,0 +1,180 @@
+<%--
+ *  Product: Posterita Web-Based POS and Adempiere Plugin
+ *  Copyright (C) 2007  Posterita Ltd
+ *  This file is part of POSterita
+ *  
+ *  POSterita is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * @author Praveen
+--%>
+<!-- bPartnerCreated.jsp -->
+<%@ page import="org.posterita.user.*" %>
+<%@ page import="org.posterita.beans.*" %>
+<%@ page import ="org.posterita.Constants" %>
+
+
+<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%>
+<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic"%>	
+<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%>
+<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles"%>
+<%@ taglib uri="/WEB-INF/posterita.tld" prefix="posterita"%>
+<%@ taglib uri="/WEB-INF/pos.tld" prefix="pos"%>
+
+<logic:notPresent name="<%=WebUserInfo.NAME%>" scope="session">
+	<jsp:forward page="/LoginHome.do"/>
+</logic:notPresent>
+
+<bean:define id="title"><pos:element columnName="C_BPartner_ID" textOnly="true"/></bean:define>
+<%@ include file="/jsp/include/posHeader.jsp" %>
+<%@ include file="/jsp/include/errors.jsp" %> 
+
+	<table width="100%" border="0" cellpadding="5" cellspacing="1" align="center">
+			<tr>
+				<td> 
+					
+				</td>
+			</tr>
+			
+			<tr>
+				<td>			    			
+				    <table width="300" border="0">
+		           	   <tr>
+   			              <td no wrap">	
+   			            	<pos:element columnName="Name"/>
+   			              </td>
+   			              <td>
+								<bean:write name="<%=Constants.BUSINESSPARTNER%>" property="partnerName"/>
+								&nbsp;<bean:write name="<%=Constants.BUSINESSPARTNER%>" property="name2"/>
+						  </td>
+					   </tr>
+					   
+					   <tr>
+   			              <td no wrap">	
+   			            	<pos:element columnName="address1" />
+   			              </td>
+   			              <td>
+								<bean:write name="<%=Constants.BUSINESSPARTNER%>" property="address1"/>
+						  </td>
+					   </tr>
+
+					   <tr>
+   			              <td no wrap">	
+   			            	<pos:element columnName="address2" />
+   			              </td>
+   			              <td>
+								<bean:write name="<%=Constants.BUSINESSPARTNER%>" property="address2"/>
+						  </td>
+					   </tr>
+					   					   
+					   <tr>
+   			              <td no wrap">	
+   			            	<pos:element columnName="city" />
+   			              </td>
+   			              <td>
+								<bean:write name="<%=Constants.BUSINESSPARTNER%>" property="city"/>
+						  </td>
+					   </tr>
+					   
+					   <tr>
+   			              <td no wrap">	
+   			            	<pos:element columnName="postalAddr" />
+   			              </td>
+   			              <td>
+								<bean:write name="<%=Constants.BUSINESSPARTNER%>" property="postalAddress"/>
+						  </td>
+					   </tr>
+					   
+					   <tr>
+   			              <td no wrap">	
+   			            	<pos:element columnName="phone" />
+   			              </td>
+   			              <td>
+								<bean:write name="<%=Constants.BUSINESSPARTNER%>" property="phone"/>
+						  </td>
+					   </tr>
+					   
+					   <tr>
+   			              <td no wrap">	
+   			            	<pos:element columnName="fax" />
+   			              </td>
+   			              <td>
+								<bean:write name="<%=Constants.BUSINESSPARTNER%>" property="fax"/>
+						  </td>
+					   </tr>
+					   
+					   <tr>
+				  			<td><pos:element columnName="isCustomer" /></td> 
+							<td no wrap>
+								<logic:equal name="<%=Constants.BUSINESSPARTNER%>" property="isCustomer" value="true"> 
+								Yes
+								</logic:equal>
+								<logic:equal name="<%=Constants.BUSINESSPARTNER%>" property="isCustomer" value="false"> 
+								No
+								</logic:equal>						
+				    		</td>
+			   			</tr>
+			   			
+			   			<tr>
+				  			<td><pos:element columnName="isVendor" /></td> 
+							<td no wrap>
+								<logic:equal name="<%=Constants.BUSINESSPARTNER%>" property="isVendor" value="true"> 
+								Yes
+								</logic:equal>
+								<logic:equal name="<%=Constants.BUSINESSPARTNER%>" property="isVendor" value="false"> 
+								No
+								</logic:equal>						
+				    		</td>
+			   			</tr>
+			   			
+			   			<tr>
+				  			<td><pos:element columnName="isEmployee" /></td> 
+							<td no wrap>
+								<logic:equal name="<%=Constants.BUSINESSPARTNER%>" property="isEmployee" value="true"> 
+								Yes
+								</logic:equal>
+								<logic:equal name="<%=Constants.BUSINESSPARTNER%>" property="isEmployee" value="false"> 
+								No
+								</logic:equal>						
+				    		</td>
+			   			</tr>
+			   			
+			   			<tr>
+				  			<td><pos:element columnName="isSalesRep" /></td> 
+							<td no wrap> 
+								<logic:equal name="<%=Constants.BUSINESSPARTNER%>" property="isSalesRep" value="true"> 
+								Yes
+								</logic:equal>
+								<logic:equal name="<%=Constants.BUSINESSPARTNER%>" property="isSalesRep" value="false"> 
+								No
+								</logic:equal>						
+				    		</td>
+			   			</tr>
+			   			<%--
+			   			<tr>
+						    <td>
+						        <bean:message key="region"/>
+						    </td>
+						    <td no wrap>
+						        <posterita:regionName name="<%=Constants.BUSINESSPARTNER%>" scope="session" property="regionId"/>
+						    </td>
+						 </tr>
+						--%>
+				  </table>
+				</td>
+			</tr>		
+	</table>
+	
+	    									 					 
+<%@ include file="/jsp/include/posFooter.jsp" %>
\ No newline at end of file
diff --git a/posterita/src/web/jsp/bPartner/bPartnerDetails.jsp b/posterita/src/web/jsp/bPartner/bPartnerDetails.jsp
new file mode 100644
index 0000000000..b9715c06b9
--- /dev/null
+++ b/posterita/src/web/jsp/bPartner/bPartnerDetails.jsp
@@ -0,0 +1,184 @@
+<%--
+ *  Product: Posterita Web-Based POS and Adempiere Plugin
+ *  Copyright (C) 2007  Posterita Ltd
+ *  This file is part of POSterita
+ *  
+ *  POSterita is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * @author Praveen
+--%>
+
+<!-- bPartnerDetails.jsp -->
+<%@ page import="org.posterita.user.*" %>
+<%@ page import="org.posterita.beans.*" %>
+<%@ page import ="org.posterita.Constants" %>
+
+
+<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%>
+<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic"%>	
+<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%>
+<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles"%>
+<%@ taglib uri="/WEB-INF/posterita.tld" prefix="posterita"%>
+
+<bean:define id="title"><bean:message key="bpartner.details"/></bean:define>
+<%@ include file="/jsp/include/posHeader.jsp" %>
+<%@ include file="/jsp/include/errors.jsp" %> 
+
+<table width="100%" border="0" cellpadding="5" cellspacing="1" align="center">
+			<tr>
+				<td> 
+					
+				</td>
+			</tr>
+			
+			<tr>
+				<td>			    			
+				    <table width="300" border="0">
+		           	   <tr>
+   			              <td no wrap">	
+   			            	<bean:message key="bpartner.name"/>
+   			              </td>
+   			              <td>
+								<bean:write name="<%=Constants.BUSINESSPARTNERSDETAILS%>" property="partnerName"/>
+								&nbsp;<bean:write name="<%=Constants.BUSINESSPARTNERSDETAILS%>" property="name2"/>
+						  </td>
+					   </tr>
+					   
+					   <tr>
+   			              <td no wrap">	
+   			            	<bean:message key="bPartner.address1"/>
+   			              </td>
+   			              <td>
+								<bean:write name="<%=Constants.BUSINESSPARTNERSDETAILS%>" property="address1"/>
+						  </td>
+					   </tr>
+					   
+					   <tr>
+   			              <td no wrap">	
+   			            	<bean:message key="bPartner.address2"/>
+   			              </td>
+   			              <td>
+								<bean:write name="<%=Constants.BUSINESSPARTNERSDETAILS%>" property="address2"/>
+						  </td>
+					   </tr>					   
+					   
+					   <tr>
+   			              <td no wrap">	
+   			            	<bean:message key="city"/>
+   			              </td>
+   			              <td>
+								<bean:write name="<%=Constants.BUSINESSPARTNERSDETAILS%>" property="city"/>
+						  </td>
+					   </tr>
+					   
+					   <tr>
+   			              <td no wrap">	
+   			            	<bean:message key="postaladdress"/>
+   			              </td>
+   			              <td>
+								<bean:write name="<%=Constants.BUSINESSPARTNERSDETAILS%>" property="postalAddress"/>
+						  </td>
+					   </tr>
+					   
+					   <tr>
+   			              <td no wrap">	
+   			            		<bean:message key="bPartner.phone"/>:
+   			              </td>
+   			              <td>
+								<bean:write name="<%=Constants.BUSINESSPARTNERSDETAILS%>" property="phone"/>
+						  </td>
+					   </tr>
+					   
+					   <tr>
+   			              <td no wrap">	
+   			            		<bean:message key="bPartner.fax"/>:
+   			              </td>
+   			              <td>
+								<bean:write name="<%=Constants.BUSINESSPARTNERSDETAILS%>" property="fax"/>
+						  </td>
+					   </tr>
+					   
+					 <tr>
+						  <td><bean:message key="bPartner.isActive"/></td>
+						    <td>
+							   <logic:equal name="<%=Constants.BUSINESSPARTNERSDETAILS%>" property="isActive" value="true"> 
+								Yes
+							   </logic:equal>
+							   <logic:equal name="<%=Constants.BUSINESSPARTNERSDETAILS%>" property="isActive" value="false"> 
+								No
+							   </logic:equal>						
+						    </td>
+						 </tr>
+						 
+						 <tr>
+						  <td><bean:message key="bPartner.isCustomer"/></td>
+						    <td>
+							   <logic:equal name="<%=Constants.BUSINESSPARTNERSDETAILS%>" property="isCustomer" value="true"> 
+								Yes
+							   </logic:equal>
+							   <logic:equal name="<%=Constants.BUSINESSPARTNERSDETAILS%>" property="isCustomer" value="false"> 
+								No
+							   </logic:equal>						
+						    </td>
+						 </tr>
+						 
+						 <tr>
+						  <td><bean:message key="bPartner.isEmployee"/></td>
+						    <td>
+							   <logic:equal name="<%=Constants.BUSINESSPARTNERSDETAILS%>" property="isEmployee" value="true"> 
+								Yes
+							   </logic:equal>
+							   <logic:equal name="<%=Constants.BUSINESSPARTNERSDETAILS%>" property="isEmployee" value="false"> 
+								No
+							   </logic:equal>						
+						    </td>
+						 </tr>
+						 
+						 <tr>
+						  <td><bean:message key="bPartner.isVendor"/></td>
+						    <td>
+							   <logic:equal name="<%=Constants.BUSINESSPARTNERSDETAILS%>" property="isVendor" value="true"> 
+								Yes
+							   </logic:equal>
+							   <logic:equal name="<%=Constants.BUSINESSPARTNERSDETAILS%>" property="isVendor" value="false"> 
+								No
+							   </logic:equal>						
+						    </td>
+						 </tr>
+						 
+						 <tr>
+						  <td><bean:message key="bPartner.isSalesRep"/></td>
+						    <td>
+							   <logic:equal name="<%=Constants.BUSINESSPARTNERSDETAILS%>" property="isSalesRep" value="true"> 
+								Yes
+							   </logic:equal>
+							   <logic:equal name="<%=Constants.BUSINESSPARTNERSDETAILS%>" property="isSalesRep" value="false"> 
+								No
+							   </logic:equal>						
+						    </td>
+						 </tr>
+			   			
+				  </table>
+				  <table width="100%">
+					<td align="right">
+											
+					</td>
+				  </table>
+				</td>
+			</tr>		
+	</table>
+	
+	    									 					 
+<%@ include file="/jsp/include/posFooter.jsp" %>
\ No newline at end of file
diff --git a/posterita/src/web/jsp/bPartner/createBPartner.jsp b/posterita/src/web/jsp/bPartner/createBPartner.jsp
new file mode 100644
index 0000000000..572001a016
--- /dev/null
+++ b/posterita/src/web/jsp/bPartner/createBPartner.jsp
@@ -0,0 +1,206 @@
+<%--
+ *  Product: Posterita Web-Based POS and Adempiere Plugin
+ *  Copyright (C) 2007  Posterita Ltd
+ *  This file is part of POSterita
+ *  
+ *  POSterita is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * @author Praveen
+--%>
+
+<!-- createBPartner.jsp -->
+<%@ page import="org.posterita.struts.bPartner.BPartnerAction" %>
+<%@ page import ="org.posterita.Constants" %>
+
+<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%>
+<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%>
+<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles"%>	
+<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic"%>
+<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/pos.tld" prefix="pos"%>
+
+<bean:define id="title"><pos:element columnName="create.bpartner" textOnly="true"/></bean:define>
+<%@ include file="/jsp/include/posHeader.jsp" %>
+<%@ include file="/jsp/include/errors.jsp" %>
+	 
+<html:form action="/CreateBPartnerAction">
+<html:hidden property="action" value="<%=BPartnerAction.CREATE_BPARTNER%>"/>
+	 
+	<table width="100%" border="0" cellpadding="5" cellspacing="0">
+	 <tr>
+   			 <td>	
+   			 	<pos:element columnName="Name"/><mandatory>*</mandatory>
+   			 </td>	
+   			 	
+   		
+ 			  <td>
+ 				  <html:text property="partnerName"/>
+ 			  </td>  		
+   		</tr>
+   		
+   		<tr>
+   			 <td>	
+   			 	<pos:element columnName="Name2" /><mandatory>*</mandatory>
+   			 </td>	
+   			 	
+   		
+ 			  <td>
+ 				  <html:text property="name2"/>
+ 			  </td>  		
+   		</tr>
+   		
+   		
+   		<tr>
+    		<td width="15%">
+				<pos:element columnName="address1" /><mandatory>*</mandatory>
+			</td>
+				
+			<td>	
+				<html:text property="address1"/>
+			</td>	
+		</tr>	
+	   	 
+	   	 
+   		<tr>
+    		<td width="15%">
+				<pos:element columnName="address2" />
+			</td>
+				
+			<td>	
+				<html:text property="address2"/>
+			</td>	
+		</tr>	
+			   	 
+	   	<tr>
+	   	 	<td width="15%">
+	   	 		<pos:element columnName="postalAddr" />
+	   	 	</td>
+	   	 	
+	   	 	<td>
+	   	 		<html:text property="postalAddress"/>
+	   	 	</td>
+	   	 </tr>	
+	   	 
+	   	 <tr>
+	   	 	<td width="15%">
+	   	 		<pos:element columnName="city" />
+	   	 	</td>
+	   	 	
+	   	 	<td>
+	   	 		<html:text property="city"/>
+	   	 	</td>	   	 	
+	   	 </tr>   	 
+	   	 	   	 
+	   	 <tr>
+	   	 	<td width="15%">
+	   	 		<pos:element columnName="phone" />
+	   	 	</td>
+	   	 	
+	   	 	<td>
+	   	 		<html:text property="phone"/>
+	   	 	</td>	   	 	
+	   	 </tr>
+	   	 		
+	   	 <tr>
+	   	 	<td width="15%">
+	   	 		<pos:element columnName="fax" />
+	   	 	</td>
+	   	 	
+	   	 	<td>
+	   	 		<html:text property="fax"/>
+	   	 	</td>	   	 	
+	   	 </tr>
+	   	 
+	   	 <tr>
+			<td width="15%">
+		   		<pos:element columnName="isCustomer" />
+		   	</td>
+		   	
+		   			   	
+		   	<td> 	
+		   		
+	   	 		<html:checkbox property="isCustomer" value="true">
+	   	 		<input type="hidden" name="isCustomer" value="false">	
+	   	 		</html:checkbox>	
+		   	 </td>
+		 </tr>
+		
+		 <tr>
+				<td width="15%">
+					<pos:element columnName="isVendor" />
+				</td>
+				
+				<td>
+					<html:checkbox property="isVendor" value="true">
+					<input type="hidden" name="isVendor" value="false">
+					</html:checkbox>
+				</td>		
+		 </tr>
+	<%--	
+		 <tr>
+				<td width="15%">
+					<pos:element columnName="isEmployee" />
+				</td>
+				
+				<td>
+					<html:checkbox property="isEmployee" value="true">
+					<input type="hidden" name="isEmployee" value="false">
+					</html:checkbox>
+				</td>		
+		 </tr>
+		
+		 <tr>
+				<td width="15%">
+					<pos:element columnName="isSalesRep" />
+				</td>
+				
+				<td>
+					<html:checkbox property="isSalesRep" value="true">
+					<input type="hidden" name="isSalesRep" value="false">
+					</html:checkbox>
+				</td>		
+		 </tr>
+		
+		 <tr>
+				<td width = "15%">
+					<bean:message key="bPartner.region"/>
+				</td>
+				
+				<td>
+					<html:select property="regionId">
+	   	 				<html:options collection="<%=Constants.REGIONS%>" property="key" labelProperty="name"/>
+	   	 			</html:select>	
+	   	 		</td>
+	   	 </tr>
+	   	 --%>			
+		 <tr>
+		 		<td>
+					&nbsp;
+				</td>
+			
+	   	    	<td>
+			   		<html:submit styleClass="smallbutton save">
+			   	 		&nbsp;
+					</html:submit>
+		 		</td>
+	     </tr>
+	   	 
+	</table>
+	
+</html:form>				
+<%@ include file="/jsp/include/posFooter.jsp" %>
+	   
+	
+												
\ No newline at end of file
diff --git a/posterita/src/web/jsp/bPartner/editBPartner.jsp b/posterita/src/web/jsp/bPartner/editBPartner.jsp
new file mode 100644
index 0000000000..511310fba8
--- /dev/null
+++ b/posterita/src/web/jsp/bPartner/editBPartner.jsp
@@ -0,0 +1,207 @@
+<%--
+ *  Product: Posterita Web-Based POS and Adempiere Plugin
+ *  Copyright (C) 2007  Posterita Ltd
+ *  This file is part of POSterita
+ *  
+ *  POSterita is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * @author Praveen
+--%>
+
+<!-- editBPartner.jsp -->
+<%@ page import="org.posterita.struts.bPartner.BPartnerAction" %>
+<%@ page import ="org.posterita.Constants" %>
+
+<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%>
+<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%>
+<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles"%>	
+<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic"%>
+<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/pos.tld" prefix="pos"%>
+
+
+<bean:define id="title"><pos:element columnName="create.bpartner" textOnly="true"/></bean:define>
+<%@ include file="/jsp/include/posHeader.jsp" %>
+<%@ include file="/jsp/include/errors.jsp" %> 
+
+	 
+<html:form action="/EditBPartnerDetailsAction">
+<html:hidden property="action" value="<%=BPartnerAction.EDIT_BPARTNER_DETAILS%>"/>
+<html:hidden property="bpartnerId"/>
+	 
+	<table width="100%" border="0" cellpadding="5" cellspacing="0">
+	 	<tr>
+   			 <td>	
+   			 	<pos:element columnName="Name"/>
+   			 </td>	
+   			 	
+   		
+ 			  <td>
+ 				  <html:text property="partnerName"/>
+ 			  </td>  		
+   		</tr>
+   		
+   		<tr>
+   			 <td>	
+   			 	<pos:element columnName="Name2"/>
+   			 </td>	
+   			 	
+   		
+ 			  <td>
+ 				  <html:text property="name2"/>
+ 			  </td>  		
+   		</tr>
+   		
+   		
+   		<tr>
+    		<td width="15%">
+				<pos:element columnName="address1"/>
+			</td>
+				
+			<td>	
+				<html:text property="address1"/>
+			</td>	
+		</tr>	
+	   	 
+	   	 
+   		<tr>
+    		<td width="15%">
+				<pos:element columnName="address2"/>
+			</td>
+				
+			<td>	
+				<html:text property="address2"/>
+			</td>	
+		</tr>	
+			   	 
+	   	<tr>
+	   	 	<td width="15%">
+	   	 		<pos:element columnName="postalAddr"/>
+	   	 	</td>
+	   	 	
+	   	 	<td>
+	   	 		<html:text property="postalAddress"/>
+	   	 	</td>
+	   	 </tr>	
+	   	 
+	   	 <tr>
+	   	 	<td width="15%">
+	   	 		<pos:element columnName="city"/>	   	 		
+	   	 	</td>
+	   	 	
+	   	 	<td>
+	   	 		<html:text property="city"/>
+	   	 	</td>	   	 	
+	   	 </tr>   	 
+	   	 	   	 
+	   	 <tr>
+	   	 	<td width="15%">
+	   	 		<pos:element columnName="phone"/>	   	 		
+	   	 	</td>
+	   	 	
+	   	 	<td>
+	   	 		<html:text property="phone"/>
+	   	 	</td>	   	 	
+	   	 </tr>
+	   	 		
+	   	 <tr>
+	   	 	<td width="15%">
+	   	 		<pos:element columnName="fax"/>
+	   	 	</td>
+	   	 	
+	   	 	<td>
+	   	 		<html:text property="fax"/>
+	   	 	</td>	   	 	
+	   	 </tr>
+	   	 
+	   	 <tr>
+			<td width="15%">
+		   		<pos:element columnName="isCustomer"/>
+		   	</td>
+		   	
+		   			   	
+		   	<td> 	
+		   		
+	   	 		<html:checkbox property="isCustomer" value="true">
+	   	 		<input type="hidden" name="isCustomer" value="false">	
+	   	 		</html:checkbox>	
+		   	 </td>
+		 </tr>
+		
+		 <tr>
+				<td width="15%">
+					<pos:element columnName="isVendor"/>
+				</td>
+				
+				<td>
+					<html:checkbox property="isVendor" value="true">
+					<input type="hidden" name="isVendor" value="false">
+					</html:checkbox>
+				</td>		
+		 </tr>
+		<%--
+		 <tr>
+				<td width="15%">
+					<pos:element columnName="isEmployee"/>
+				</td>
+				
+				<td>
+					<html:checkbox property="isEmployee" value="true">
+					<input type="hidden" name="isEmployee" value="false">
+					</html:checkbox>
+				</td>		
+		 </tr>
+		
+		 <tr>
+				<td width="15%">
+					<pos:element columnName="isSalesRep"/>
+				</td>
+				
+				<td>
+					<html:checkbox property="isSalesRep" value="true">
+					<input type="hidden" name="isSalesRep" value="false">
+					</html:checkbox>
+				</td>		
+		 </tr>
+		
+		 <tr>
+				<td width = "15%">
+					<bean:message key="bPartner.region"/>
+				</td>
+				
+				<td>				
+					<html:select property="regionId">
+	   	 				<html:options collection="<%=Constants.REGIONS%>" property="key" labelProperty="name"/>
+	   	 			</html:select>	   	 			
+	   	 		</td>
+	   	 </tr>	
+	   	 --%>		
+		 <tr>
+		 		<td>
+					&nbsp;
+				</td>
+			
+	   	    	<td>
+			   		<html:submit styleClass="smallbutton save">
+			   	 		&nbsp;
+					</html:submit>
+		 		</td>
+	     </tr>
+	   	 
+	</table>
+	
+</html:form>				
+
+<%@ include file="/jsp/include/posFooter.jsp" %>												
\ No newline at end of file
diff --git a/posterita/src/web/jsp/bPartner/viewBPartner.jsp b/posterita/src/web/jsp/bPartner/viewBPartner.jsp
new file mode 100644
index 0000000000..69e179a2e1
--- /dev/null
+++ b/posterita/src/web/jsp/bPartner/viewBPartner.jsp
@@ -0,0 +1,185 @@
+<%--
+ *  Product: Posterita Web-Based POS and Adempiere Plugin
+ *  Copyright (C) 2007  Posterita Ltd
+ *  This file is part of POSterita
+ *  
+ *  POSterita is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * @author Praveen
+--%>
+
+<!-- viewBPartner.jsp -->
+<%@ page import="org.posterita.user.*" %>
+<%@ page import="org.posterita.beans.*" %>
+<%@ page import ="org.posterita.Constants" %>
+<%@ page import="org.compiere.model.MOrg" %>
+
+<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%>
+<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%>
+<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles"%>	
+<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic"%>
+<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/pos.tld" prefix="pos"%>
+
+<bean:define id="title"><pos:element columnName="smenu.bpartners" textOnly="true"/></bean:define>
+<%@ include file="/jsp/include/posHeader.jsp" %>
+<%@ include file="/jsp/include/errors.jsp" %> 
+
+<div>
+	<table border="0" cellpadding="0" cellspacing="0" width="100%">
+		<tr>		
+			<td align="left">
+				<html:form action="SearchBPartnerAction" focus="name">
+					<html:hidden property="action" value="searchBPartner"/>
+					<html:text property="name" styleClass="text searchBox"/>
+				
+					<html:submit styleClass="tangoSearch tangoButton">
+					&nbsp;
+					</html:submit>
+				</html:form>
+			</td>
+			
+				
+			<td align="right">	
+				<html:link href="createBPartner.do">
+					<img src="images/tango/document-new.png" title="Add Business Partner" alt="Add Business Partner" border="0">
+				</html:link>
+			</td>
+		</tr>
+	</table>
+</div>
+	   	
+<logic:present name="<%=Constants.ALLBUSINESSPARTNERS%>">
+<table class="display sortable" border="1" id="1111"> 		  		
+	<tr>
+		<th colspan="1">
+			<pos:element columnName="Name" textOnly="true"/>
+		</th>
+		<th colspan="1">
+			<pos:element columnName="isCustomer" textOnly="true"/>
+		</th>
+		<th colspan="1">
+			<pos:element columnName="IsEmployee" textOnly="true"/>
+		</th>
+		<th colspan="1">
+			<pos:element columnName="IsVendor" textOnly="true"/>
+		</th>
+		<th colspan="1">
+			<pos:element columnName="IsSalesRep" textOnly="true"/>
+		</th>
+		<th colspan="1">
+			<pos:element columnName="IsActive" textOnly="true"/>
+		</th>
+		<th colspan="1">
+			&nbsp;
+		</th>						
+	</tr>
+	
+	<%
+		String url = "BusinessPartners.do";
+		String collection = Constants.ALLBUSINESSPARTNERS;
+	%>
+	
+	<logic:iterate offset="<%=offset%>" length="<%=length%>" indexId="count" id="element" name="<%=Constants.ALLBUSINESSPARTNERS%>" type="org.posterita.beans.BPartnerBean">  
+	<tr>
+		<%
+			String styleClass = "label";
+			if ((count.intValue()%2) != 0)
+				styleClass = "contentname";
+		%>
+	
+	
+		<td class="<%=styleClass%>">
+			<bean:write name="element" property="partnerName"/>
+			&nbsp;<bean:write name="element" property="name2"/>
+		</td>
+		
+		<td class="<%=styleClass%>">
+			<logic:equal name="element" property="isCustomer" value="true"> 
+				Yes
+			</logic:equal>
+			<logic:equal name="element" property="isCustomer" value="false"> 
+				No
+			</logic:equal>						
+		</td>
+		
+		<td class="<%=styleClass%>">
+			<logic:equal name="element" property="isEmployee" value="true"> 
+				Yes
+			</logic:equal>
+			<logic:equal name="element" property="isEmployee" value="false"> 
+				No
+			</logic:equal>						
+		</td>
+		
+		<td class="<%=styleClass%>">
+			<logic:equal name="element" property="isVendor" value="true"> 
+				Yes
+			</logic:equal>
+			<logic:equal name="element" property="isVendor" value="false"> 
+				No
+			</logic:equal>						
+		</td>
+		
+		<td class="<%=styleClass%>">
+			<logic:equal name="element" property="isSalesRep" value="true"> 
+				Yes
+			</logic:equal>
+			<logic:equal name="element" property="isSalesRep" value="false"> 
+				No
+			</logic:equal>						
+		</td>
+		
+		<td class="<%=styleClass%>">
+			<logic:equal name="element" property="isActive" value="true"> 
+				Yes
+			</logic:equal>
+			<logic:equal name="element" property="isActive" value="false"> 
+				No
+			</logic:equal>						
+		</td>
+		
+		<td class="<%=styleClass%>">
+			<html:link href="<%="EditBPartnerAction.do?action=viewBpartnerDetails&bpartnerId=" + element.getBpartnerId()%>">
+ 					<img src="images/tango/edit-find.png" title="View Business Partner" alt="View Business Partner" border="0">
+ 				</html:link>
+ 				&nbsp;
+ 				<html:link href="<%="InitEditBPartnerAction.do?action=initEditBpartnerDetails&bpartnerId=" + element.getBpartnerId()%>">
+ 					<img src="images/tango/accessories-text-editor.png" title="Edit Business Partner" alt="Edit Business Partner" border="0">
+ 				</html:link>
+ 				&nbsp;
+ 			
+ 				<logic:equal name="element" property="isActive" value="true">
+					<html:link href="<%="ActivateBPartnerAction.do?action=activateBPartner&bpartnerId=" + element.getBpartnerId()+"&isActive=true" %>">
+						<img src="images/tango/edit-redo.png" title="Deactivate" alt="Deactivate" border="0">
+					</html:link>
+				</logic:equal>
+
+				<logic:notEqual name="element" property="isActive" value="true">
+					<html:link href="<%="ActivateBPartnerAction.do?action=activateBPartner&bpartnerId=" + element.getBpartnerId()+ "&isActive=false" %>">
+						<img src="images/tango/edit-undo.png" title="Activate" alt="Activate" border="0">
+					</html:link>
+				</logic:notEqual>
+		</td>
+		
+	</tr>		
+</logic:iterate>
+</table>
+<%@ include file="/jsp/include/pager.jsp" %>
+</logic:present>
+
+<%@ include file="/jsp/include/posFooter.jsp" %>
+	   	
+
diff --git a/posterita/src/web/jsp/bPartner/viewDealersDetail.jsp b/posterita/src/web/jsp/bPartner/viewDealersDetail.jsp
new file mode 100644
index 0000000000..0d0f6726d7
--- /dev/null
+++ b/posterita/src/web/jsp/bPartner/viewDealersDetail.jsp
@@ -0,0 +1,79 @@
+<%--
+ *  Product: Posterita Web-Based POS and Adempiere Plugin
+ *  Copyright (C) 2007  Posterita Ltd
+ *  This file is part of POSterita
+ *  
+ *  POSterita is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * @author Praveen
+--%>
+
+<%@ page import="org.posterita.Constants" %>
+<%@ page import="org.posterita.user.*" %>
+<%@ page import="org.compiere.model.MOrg" %>
+<%@ page import="org.posterita.struts.bPartner.BPartnerAction" %>
+<%@ page import="java.util.Calendar" %>
+
+
+<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%>
+<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%>
+<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles"%>	
+<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic"%>
+<%@ taglib uri="/WEB-INF/fmt.tld" prefix="fmt" %>
+
+<bean:define id="title"><bean:message key="dealer.details"/></bean:define>
+<%@ include file="/jsp/include/posHeader.jsp" %>
+<%@ include file="/jsp/include/errors.jsp" %> 
+
+<table width="100%" border="0" class="content" cellpadding="5" cellspacing="1" align="center" cols="5"> 		  		
+	<tr>
+		<th colspan="1"><bean:message key="dealer.name"/></th>
+		<th colspan="1"><bean:message key="dealer.location"/></th>
+		<th colspan="1"><bean:message key="dealer.phone"/></th>
+		<th colspan="1"><bean:message key="dealer.fax"/></th>
+	</tr>
+
+	<logic:iterate indexId="count" name="<%=Constants.DEALER_DETAILS%>" id="element" type="org.posterita.beans.DealerDetailBean">
+	<tr>
+		<%
+			String styleClass = "label";
+			if ((count.intValue()%2) != 0)
+				styleClass = "contentname";											
+		%>
+		
+		<td class="<%=styleClass%>">	
+			<bean:write name="element" property="dealerName"/>
+		</td>
+		
+		<td class="<%=styleClass%>">	
+			<bean:write name="element" property="location"/>
+		</td>
+			
+		<td class="<%=styleClass%>">
+			<bean:write name="element" property="phone1"/>
+		</td>						
+								
+		<td class="<%=styleClass%>">	
+			<bean:write name="element" property="fax"/>
+		</td>						
+	</tr>
+	</logic:iterate>
+</table>
+					
+<%@ include file="/jsp/include/posFooter.jsp" %>
+	   
+	
+												
+