diff --git a/posterita/posterita/web/jsp/admin/listOrganisations.jsp b/posterita/posterita/web/jsp/admin/listOrganisations.jsp
index 432a5d380c..afa4d48e05 100644
--- a/posterita/posterita/web/jsp/admin/listOrganisations.jsp
+++ b/posterita/posterita/web/jsp/admin/listOrganisations.jsp
@@ -41,7 +41,7 @@
 			</html:form>
 		</td>
 	
-		<td align = "right"><html:link href="<%="UpdateOrCreateOrg.do"%>">
+		<td align = "right"><html:link href="UpdateOrCreateOrg.do">
 					<img src="images/tango/document-new.png" title="Create Organisation" alt="Create Organisation" border="0">
 				</html:link>
 		</td>
@@ -72,11 +72,11 @@
 				<bean:write name="org" property="isActive"/>
 			</td>
 			<td  align="center" class = "label">
-				<html:link href="<%="OrganisationAction.do?action=viewOrg&orgId=" + org.getOrgId()%>">
+				<html:link href="OrganisationAction.do?action=viewOrg&orgId=<%= org.getOrgId()%>">
 					<img src="images/tango/accessories-text-editor.png"  border="0" 
 					title = "update organisation" alt = "update organisation"> 
 				</html:link>
-				<html:link href="<%="OrganisationAction.do?action=activateOrg&orgId=" + org.getOrgId()%>">
+				<html:link href="OrganisationAction.do?action=activateOrg&orgId=<%= org.getOrgId()%>">
 					<img src="images/tango/edit-redo.png"  border="0"
 					title = "activate/deactivate organisation" alt = "activate/deactivate organisation"> 
 				</html:link>
diff --git a/posterita/posterita/web/jsp/admin/viewUsers.jsp b/posterita/posterita/web/jsp/admin/viewUsers.jsp
index 8d6236b754..d3f4aaa044 100644
--- a/posterita/posterita/web/jsp/admin/viewUsers.jsp
+++ b/posterita/posterita/web/jsp/admin/viewUsers.jsp
@@ -88,7 +88,7 @@
 						</td>
 						
 						<td class="<%=styleClass%>">
-							<html:link href="<%="ViewUserDetailsAction.do?action=viewUserDetails&userID=" + element.getUserId() %>">
+							<html:link href="ViewUserDetailsAction.do?action=viewUserDetails&userID=<%= element.getUserId() %>">
 		     					<bean:message key="admin.viewUsers.editDelete"/>
 		     				</html:link>
 						</td>
diff --git a/posterita/posterita/web/jsp/include/draftedPOSOrder.jsp b/posterita/posterita/web/jsp/include/draftedPOSOrder.jsp
index 3699ff99de..c1ac686b21 100644
--- a/posterita/posterita/web/jsp/include/draftedPOSOrder.jsp
+++ b/posterita/posterita/web/jsp/include/draftedPOSOrder.jsp
@@ -83,7 +83,7 @@
 					 <logic:notPresent name="<%= Constants.PARTIAL_POS_OREDR %>">			
 					 <logic:present name="<%= Constants.CURRENT_POS_ORDER_ID  %>">
 							<bean:define id="posOrderId" name="<%= Constants.CURRENT_POS_ORDER_ID  %>"/>								
-							<html:link href="<%="GetShoppingCartForOrder.do?action=getOrderShoppingCart&orderId="+posOrderId + "&orderType=" + orderType%>">
+							<html:link href="GetShoppingCartForOrder.do?action=getOrderShoppingCart&orderId=<%= posOrderId %>&orderType=<%= orderType%>">
 						   		<html:button property="btn" styleClass="edit smallbutton" accesskey="c">&nbsp;</html:button>				
 						   	</html:link>
 					 </logic:present>	
diff --git a/posterita/posterita/web/jsp/include/posHeader2.jsp b/posterita/posterita/web/jsp/include/posHeader2.jsp
index ac1dfda3e0..f1633242fc 100644
--- a/posterita/posterita/web/jsp/include/posHeader2.jsp
+++ b/posterita/posterita/web/jsp/include/posHeader2.jsp
@@ -172,7 +172,7 @@ if (isTerminalLocked)
 								<html:link href="PostingAction.do?action=resubmitPosting">
 									<image src="images/newUI/butn-system.gif" border="0" class="center"/>
 								</html:link>
-								<html:link href="<%="POSLogoutAction.do?action=logout"%>">
+								<html:link href="POSLogoutAction.do?action=logout">
 										<image src="images/newUI/butn-exit.gif" border="0" class="center"/>
 								</html:link>
 							</div>
diff --git a/posterita/posterita/web/jsp/include/posHeaderAdministration.jsp b/posterita/posterita/web/jsp/include/posHeaderAdministration.jsp
index 6275e9de85..9808635f81 100644
--- a/posterita/posterita/web/jsp/include/posHeaderAdministration.jsp
+++ b/posterita/posterita/web/jsp/include/posHeaderAdministration.jsp
@@ -149,7 +149,7 @@ if (isTerminalLocked)
 							<html:link href="PostingAction.do?action=resubmitPosting">
 								<image src="images/newUI/butn-system.gif" border="0"/>
 							</html:link>
-							<html:link href="<%="POSLogoutAction.do?action=logout"%>">
+							<html:link href="POSLogoutAction.do?action=logout">
 									<image src="images/newUI/butn-exit.gif" border="0"/>
 							</html:link>
 						</div>
diff --git a/posterita/posterita/web/jsp/include/posPaymentDetails.jsp b/posterita/posterita/web/jsp/include/posPaymentDetails.jsp
index 25f8e8fa42..c37da7d90e 100644
--- a/posterita/posterita/web/jsp/include/posPaymentDetails.jsp
+++ b/posterita/posterita/web/jsp/include/posPaymentDetails.jsp
@@ -264,7 +264,7 @@
 	<tr><td>&nbsp;</td></tr>  
 	<tr>	
 		<td align="right">
-			<html:link href="<%="CreatePOSOrder.do"%>">
+			<html:link href="CreatePOSOrder.do">
 		   		<img src="images/pos/buttons/button_edit.gif" styleClass="continue smallbutton"/>
 		   	</html:link>   	 	  	
 		</td>
diff --git a/posterita/posterita/web/jsp/include/posPaymentDetails2.jsp b/posterita/posterita/web/jsp/include/posPaymentDetails2.jsp
index bbb373f776..2424feaa4d 100644
--- a/posterita/posterita/web/jsp/include/posPaymentDetails2.jsp
+++ b/posterita/posterita/web/jsp/include/posPaymentDetails2.jsp
@@ -264,7 +264,7 @@
 	<tr><td>&nbsp;</td></tr>  
 	<tr>	
 		<td align="right">
-			<html:link href="<%="CreatePOSOrder2.do"%>">
+			<html:link href="CreatePOSOrder2.do">
 		   		<img src="images/pos/buttons/button_edit.gif" styleClass="continue smallbutton"/>
 		   	</html:link>   	 	  	
 		</td>
diff --git a/posterita/posterita/web/jsp/include/printOrderApplet2.jsp b/posterita/posterita/web/jsp/include/printOrderApplet2.jsp
index cbc67db52d..511e5f633a 100644
--- a/posterita/posterita/web/jsp/include/printOrderApplet2.jsp
+++ b/posterita/posterita/web/jsp/include/printOrderApplet2.jsp
@@ -30,26 +30,26 @@
 	<script>
 		try
 		{
-			document.applets[0].setPrinterName(<%="'" + cookie.getValue() + "'"%>);
+			document.applets[0].setPrinterName('<%= cookie.getValue() %>');
 		}
 		catch (e)
 		{}
 			
 		function print()
 		{
-			var url = '<%=basePath + "ReprintOrderAction.do?action=getPrintOrderData&orderId="%>';
+			var url = '<%= basePath %>ReprintOrderAction.do?action=getPrintOrderData&orderId=';
 			document.applets[0].printURL(url + '<c:out value='${morder._ID}'/>');
 		}
 		
 		function print(orderId)
 		{
-			var url = '<%=basePath + "ReprintOrderAction.do?action=getPrintOrderData&orderId="%>';
+			var url = '<%= basePath %>ReprintOrderAction.do?action=getPrintOrderData&orderId=';
 			document.applets[0].printURL(url + orderId);
 		}
 		
 		function printOrder(orderId)
 		{
-			var url = '<%=basePath + "ReprintOrderAction.do?action=getPrintOrderData&openDrawer=false&orderId="%>';
+			var url = '<%= basePath %>ReprintOrderAction.do?action=getPrintOrderData&openDrawer=false&orderId=';
 			document.applets[0].printURL(url + orderId);
 		}
 	</script>
diff --git a/posterita/posterita/web/jsp/login/chooseUser.jsp b/posterita/posterita/web/jsp/login/chooseUser.jsp
index ecfaf15005..4c0e4a83c1 100644
--- a/posterita/posterita/web/jsp/login/chooseUser.jsp
+++ b/posterita/posterita/web/jsp/login/chooseUser.jsp
@@ -67,7 +67,7 @@
 						<!--<ul>-->
 							<logic:iterate id="user" collection="<%=element.getOrgUsers()%>" type="org.compiere.model.MUser">
 							<!--<li>-->
-								&nbsp;&nbsp;&nbsp;&nbsp;<html:link href="<%="LoginUserAction.do?action=loginUser&userId=" + user.get_ID()%>" styleClass="submenu">
+								&nbsp;&nbsp;&nbsp;&nbsp;<html:link href="LoginUserAction.do?action=loginUser&userId=<%= user.get_ID() %>" styleClass="submenu">
 									<bean:write name="user" property="name"/>
 								</html:link>	
 								<br/>				
diff --git a/posterita/posterita/web/jsp/payment/viewPaymentHistory.jsp b/posterita/posterita/web/jsp/payment/viewPaymentHistory.jsp
index affc3992fb..b7c04c302f 100644
--- a/posterita/posterita/web/jsp/payment/viewPaymentHistory.jsp
+++ b/posterita/posterita/web/jsp/payment/viewPaymentHistory.jsp
@@ -81,7 +81,7 @@
 						%>
 						
 						<td class="<%=styleClass%>">	
-							<html:link href="<%="ViewPaymentAction.do?documentId="+element.getPaymentId()%>">	
+							<html:link href="ViewPaymentAction.do?documentId=<%= element.getPaymentId() %>">	
 								<bean:write name="element" property="paymentId"/>
 							</html:link>
 						</td>
diff --git a/posterita/posterita/web/jsp/pos/AllPOSCustomer.jsp b/posterita/posterita/web/jsp/pos/AllPOSCustomer.jsp
index 5849356121..10f55f1a86 100644
--- a/posterita/posterita/web/jsp/pos/AllPOSCustomer.jsp
+++ b/posterita/posterita/web/jsp/pos/AllPOSCustomer.jsp
@@ -78,7 +78,7 @@
 				</html:link>
 			</td>
 			<td>
-				<html:link href="<%="ImportPOSCustomers.do"%>">
+				<html:link href="ImportPOSCustomers.do">
 					<img src="images/tango/applications-system.png" title="Import POS Customers" alt="Import POS Customers" border="0">
 				</html:link>			
 			</td>
@@ -190,25 +190,25 @@
 		<bean:define id="bpartnerId" name="element" property="bpartnerId"/>
 
 			<logic:equal name="element" property="isEditable" value="true">		
-				<html:link href="<%="POSCustomerAction.do?action=initEditPOSCustomer&bpartnerId=" + bpartnerId%>">
+				<html:link href="POSCustomerAction.do?action=initEditPOSCustomer&bpartnerId=<%= bpartnerId %>">
 					<img src="images/tango/accessories-text-editor.png" title='<pos:message textOnly="true" key="edit.customer"/>' alt='<pos:message textOnly="true" key="edit.customer"/>' border="0">
 				</html:link>
 			</logic:equal>
 			
 			&nbsp;
-			<html:link href="<%="POSCustomerAction.do?action=viewPOSCustomer&bpartnerId=" + bpartnerId%>">
+			<html:link href="POSCustomerAction.do?action=viewPOSCustomer&bpartnerId=<%= bpartnerId %>">
 				<img src="images/tango/edit-find.png" title='<pos:message textOnly="true" key="view"/>' alt='<pos:message textOnly="true" key="view"/>' border="0">
 			</html:link>
 
 			<logic:equal name="element" property="isEditable" value="true">
 				&nbsp;
 				<logic:equal name="element" property="isActive" value="true">
-					<html:link href="<%="POSCustomerAction.do?action=deactivatePOSCustomer&bpartnerId=" + bpartnerId%>">	
+					<html:link href="POSCustomerAction.do?action=deactivatePOSCustomer&bpartnerId=<%= bpartnerId %>">	
 						<img src="images/tango/edit-redo.png" title='<pos:message textOnly="true" key="deactivate"/>' alt='<pos:message textOnly="true" key="deactivate"/>' border="0">
 					</html:link>
 				</logic:equal>
 				<logic:notEqual name="element" property="isActive" value="true">
-					<html:link href="<%="POSCustomerAction.do?action=activatePOSCustomer&bpartnerId=" + bpartnerId%>">
+					<html:link href="POSCustomerAction.do?action=activatePOSCustomer&bpartnerId=<%= bpartnerId %>">
 						<img src="images/tango/edit-undo.png" title='<pos:message textOnly="true" key="activate"/>' alt='<pos:message textOnly="true" key="activate"/>' border="0">
 					</html:link>
 				</logic:notEqual> 
diff --git a/posterita/posterita/web/jsp/pos/ViewAllPosVendors.jsp b/posterita/posterita/web/jsp/pos/ViewAllPosVendors.jsp
index 883245fa6b..2abd94c9f5 100644
--- a/posterita/posterita/web/jsp/pos/ViewAllPosVendors.jsp
+++ b/posterita/posterita/web/jsp/pos/ViewAllPosVendors.jsp
@@ -138,22 +138,22 @@
 	</td>
 	
 	<td nowrap="nowrap" class="<%=styleClass%>">
-		<html:link href="<%="POSVendorAction.do?action=initEditVendor&bpartnerId=" + element.getBpartnerId()%>">
+		<html:link href="POSVendorAction.do?action=initEditVendor&bpartnerId=<%= element.getBpartnerId() %>">
 			<img src="images/tango/accessories-text-editor.png" title='<%= editmsg %>' alt='<%=editmsg%>' border="0">
 		</html:link>
 		
-		<html:link href="<%="POSVendorAction.do?action=viewVendorDetails1&bpartnerId=" + element.getBpartnerId()%>">
+		<html:link href="POSVendorAction.do?action=viewVendorDetails1&bpartnerId=<%= element.getBpartnerId() %>">
 			<img src="images/tango/edit-find.png" title='<%=viewmsg%>' alt='<%=viewmsg%>' border="0">
 		</html:link>
 		
 		<logic:equal name="element" property="isActive" value="true">
-		<html:link href="<%="POSVendorAction.do?action=deactivateVendor&bpartnerId=" + element.getBpartnerId()%>">
+		<html:link href="POSVendorAction.do?action=deactivateVendor&bpartnerId=<%= element.getBpartnerId() %>">
 			<img src="images/tango/edit-redo.png" title='<%=deactivatemsg%>' alt='<%=deactivatemsg%>' border="0">
 		</html:link>
 		</logic:equal>
 
 		<logic:notEqual name="element" property="isActive" value="true">
-		<html:link href="<%="POSVendorAction.do?action=activateVendor&bpartnerId=" + element.getBpartnerId()%>">
+		<html:link href="POSVendorAction.do?action=activateVendor&bpartnerId=<%= element.getBpartnerId() %>">
 			<img src="images/tango/edit-undo.png" title='<%=activatemsg%>' alt='<%=activatemsg%>' border="0">
 		</html:link>
 		</logic:notEqual>
diff --git a/posterita/posterita/web/jsp/pos/adjustStock.jsp b/posterita/posterita/web/jsp/pos/adjustStock.jsp
index 2d50a11666..a2ad098c7f 100644
--- a/posterita/posterita/web/jsp/pos/adjustStock.jsp
+++ b/posterita/posterita/web/jsp/pos/adjustStock.jsp
@@ -228,12 +228,12 @@
     <tr height="100%">
 	 	<html:form action="/InventoryCartAction" styleId="inventoryForm" onsubmit="return false;">
 			<html:hidden property="action" value="completeInventoryAdjustment"/>
-			<html:hidden property="priceListId" value="<%=m_pricelist_id + ""%>" styleId="priceListId"/>
-			<html:hidden property="description" value="<%=description + ""%>" styleId="invdescription"/>
-			<html:hidden property="inventoryId" value="<%=inventoryId + ""%>" styleId="inventoryId"/>
-			<html:hidden property = "roundOffFactor" value = "<%= roundOffFactor + ""%>" styleId = "roundOffFactor" />
-			<input type="hidden" name="searchProductBy" value="<%=searchProductBy%>" id="searchProductBy"/>
-			<input type="hidden" name="isCustomerCompulsory" value="<%=isCustomerCompulsory + ""%>" id="isCustomerCompulsory"/>
+			<html:hidden property="priceListId" value="<%= m_pricelist_id %>" styleId="priceListId"/>
+			<html:hidden property="description" value="<%= description %>" styleId="invdescription"/>
+			<html:hidden property="inventoryId" value="<%= inventoryId %>" styleId="inventoryId"/>
+			<html:hidden property = "roundOffFactor" value = "<%= roundOffFactor %>" styleId = "roundOffFactor" />
+			<input type="hidden" name="searchProductBy" value="<%= searchProductBy %>" id="searchProductBy"/>
+			<input type="hidden" name="isCustomerCompulsory" value="<%= isCustomerCompulsory %>" id="isCustomerCompulsory"/>
 			<td width="75%" valign="top" height="100%">
 	    		<div id="contentContainer">
 	    			<div id="content">
@@ -431,8 +431,8 @@
 		{
 			try
 			{
-				document.applets[0].setPrinterName(<%="'" + cookie.getValue() + "'"%>);
-				var url = '<%=basePath + "InventoryCartAction.do?action=printInventory"%>';
+				document.applets[0].setPrinterName('<%= cookie.getValue() %>');
+				var url = '<%=basePath %>InventoryCartAction.do?action=printInventory';
 				document.applets[0].printURL(url);
 			}
 			catch(e)
@@ -452,8 +452,8 @@
 	{
 		try
 		{
-			document.applets[0].setPrinterName(<%="'" + cookie.getValue() + "'"%>);
-			var url = '<%=basePath + "InventoryCartAction.do?action=printInventory"%>';
+			document.applets[0].setPrinterName('<%= cookie.getValue() %>');
+			var url = '<%=basePath %>InventoryCartAction.do?action=printInventory';
 			document.applets[0].printURL(url);
 		}
 		catch(e)
diff --git a/posterita/posterita/web/jsp/pos/allBlackListCheque.jsp b/posterita/posterita/web/jsp/pos/allBlackListCheque.jsp
index 0748d3271e..4ecd5b035f 100644
--- a/posterita/posterita/web/jsp/pos/allBlackListCheque.jsp
+++ b/posterita/posterita/web/jsp/pos/allBlackListCheque.jsp
@@ -99,9 +99,9 @@
 		
 		<td class="<%=styleClass%>">
 		<bean:define id="blackListedId" name="element" property="blackListedId"/>
-			<html:link href="<%="BlackListChequeAction.do?action=initEditCheque&blackListedId="+ blackListedId%>">Edit</html:link>
+			<html:link href="BlackListChequeAction.do?action=initEditCheque&blackListedId=<%= blackListedId %>">Edit</html:link>
 			&nbsp;
-			<html:link href="<%="BlackListChequeAction.do?action=deactivateCheque&blackListedId=" + blackListedId%>">Delete</html:link>
+			<html:link href="BlackListChequeAction.do?action=deactivateCheque&blackListedId=<%= blackListedId %>">Delete</html:link>
 						
 		</td>						
 	</tr>
diff --git a/posterita/posterita/web/jsp/pos/closeCashBook.jsp b/posterita/posterita/web/jsp/pos/closeCashBook.jsp
index 1d2b0071e5..1841509920 100644
--- a/posterita/posterita/web/jsp/pos/closeCashBook.jsp
+++ b/posterita/posterita/web/jsp/pos/closeCashBook.jsp
@@ -90,13 +90,13 @@
 	<td class="<%=styleClass%>">
 		<bean:define id="beginingBalance" name="element" property="beginingBalance"/>
 		<fmt:formatNumber value='${beginingBalance}'type="currency" currencySymbol='${currSymbole}'/>
-		<html:hidden property="beginingBalanceAsString" value="<%=""+beginingBalance%>"/>
+		<html:hidden property="beginingBalanceAsString" value="<%= beginingBalance.toString() %>"/>
 	</td>
 	
 	<td class="<%=styleClass%>">						     
 		 <bean:define id="endingBalance" name="element" property="endingBalance"/>
 		<fmt:formatNumber value='${endingBalance}' type="currency" currencySymbol='${currSymbole}'/>
-		<html:hidden property="endingBalanceAsString" value="<%=""+endingBalance%>"/>							
+		<html:hidden property="endingBalanceAsString" value="<%= endingBalance.toString() %>"/>							
 	 </td>
 	
 	<td class="<%=styleClass%>">
diff --git a/posterita/posterita/web/jsp/pos/closedPOSTill.jsp b/posterita/posterita/web/jsp/pos/closedPOSTill.jsp
index 72fa54e41a..02c0372331 100644
--- a/posterita/posterita/web/jsp/pos/closedPOSTill.jsp
+++ b/posterita/posterita/web/jsp/pos/closedPOSTill.jsp
@@ -172,8 +172,8 @@
 		<script>
 		function printTillData()
 		{
-			document.applets[0].setPrinterName(<%="'" + cookie.getValue() + "'"%>);
-			var url = '<%=basePath + "ClosePOSTillAction.do?action=getClosedTillData"%>';
+			document.applets[0].setPrinterName('<%= cookie.getValue() %>');
+			var url = '<%=basePath %>ClosePOSTillAction.do?action=getClosedTillData';
 			document.applets[0].printURL(url);
 		}
 	
diff --git a/posterita/posterita/web/jsp/pos/createCreditOrder.jsp b/posterita/posterita/web/jsp/pos/createCreditOrder.jsp
index 35d514632a..56c6d76e06 100644
--- a/posterita/posterita/web/jsp/pos/createCreditOrder.jsp
+++ b/posterita/posterita/web/jsp/pos/createCreditOrder.jsp
@@ -44,7 +44,7 @@
 <bean:define id="title"><pos:message textOnly="true" key="smenu.credit.sales"/></bean:define>
 <table width="100%">
 	<td align="right">
-		<html:link href="<%="CreateNewOrderAction.do?action=removeSessionForNewOrder&orderType=" + UDIOrderTypes.CREDIT_ORDER.getOrderType() %>">
+		<html:link href="CreateNewOrderAction.do?action=removeSessionForNewOrder&orderType=<%= UDIOrderTypes.CREDIT_ORDER.getOrderType() %>">
 			Create New
 		</html:link>			
 	</td>
diff --git a/posterita/posterita/web/jsp/pos/createOrUpdatePriceList.jsp b/posterita/posterita/web/jsp/pos/createOrUpdatePriceList.jsp
index fe6c49ca2b..b83dc33b39 100644
--- a/posterita/posterita/web/jsp/pos/createOrUpdatePriceList.jsp
+++ b/posterita/posterita/web/jsp/pos/createOrUpdatePriceList.jsp
@@ -41,13 +41,13 @@
 			<table align="left" cellpadding="5" width="100%">	
 				<tr>
 			<td colspan="3" align="right">
-				<html:link href='<%="PriceListAction.do?action=viewPriceList&isNext=false&priceListId=" + priceListId%>'>
+				<html:link href='PriceListAction.do?action=viewPriceList&isNext=false&priceListId=<%= priceListId %>'>
 					<img src="images/tango/go-previous.png" title="Previous" alt="Previous" border="0">
 				</html:link>
-				<html:link href="<%="PriceListAction.do?action=viewPriceList&isNext=true&priceListId=" + priceListId%>">
+				<html:link href="PriceListAction.do?action=viewPriceList&isNext=true&priceListId=<%= priceListId %>">
 					<img src="images/tango/go-next.png" title="Next" alt="Next" border="0">
 				</html:link>			
-				<html:link href="<%="PriceListAction.do?action=viewPriceList&priceListId=0"%>">
+				<html:link href="PriceListAction.do?action=viewPriceList&priceListId=0">
 					<img src="images/tango/document-new.png" title="Create PriceList" alt="Create PriceList" border="0">
 				</html:link>
 			</td>
diff --git a/posterita/posterita/web/jsp/pos/createOrUpdateProduct2.jsp b/posterita/posterita/web/jsp/pos/createOrUpdateProduct2.jsp
index c56f89c440..96648c0611 100644
--- a/posterita/posterita/web/jsp/pos/createOrUpdateProduct2.jsp
+++ b/posterita/posterita/web/jsp/pos/createOrUpdateProduct2.jsp
@@ -41,7 +41,7 @@
 	<table>
 		<tr>			
 			<td colspan="3" align="right">
-				<html:link href="<%="POSProductAction3.do?action=getCreateProductForm&productId=0"%>">
+				<html:link href="POSProductAction3.do?action=getCreateProductForm&productId=0">
 					<img src="images/tango/document-new.png" title="Create Product" alt="Create Product" border="0">
 				</html:link>
 			</td>
diff --git a/posterita/posterita/web/jsp/pos/creditorHistory.jsp b/posterita/posterita/web/jsp/pos/creditorHistory.jsp
index a6c386192f..cd06009be6 100644
--- a/posterita/posterita/web/jsp/pos/creditorHistory.jsp
+++ b/posterita/posterita/web/jsp/pos/creditorHistory.jsp
@@ -66,15 +66,15 @@ if(partner.getName2() != null)
 		<td><bean:write name="element" property="date" format="dd/MM/yyyy"/></td>
 		<td>
 			<logic:equal value="Order" name="element" property="docType">
-			<html:link action="<%="/ViewPOSOrderAction.do?action=viewPOSOrders&orderId=" + element.getDocId()%>"><bean:write name="element" property="reference"/></html:link>
+			<html:link action="/ViewPOSOrderAction.do?action=viewPOSOrders&orderId=<%= element.getDocId()%>"><bean:write name="element" property="reference"/></html:link>
 			</logic:equal>
 			
 			<logic:equal value="Payment" name="element" property="docType">
-			<html:link action="<%="/ViewWebstorePaymentAction.do?action=viewOrder&documentId=" + element.getDocId()%>"><bean:write name="element" property="reference"/></html:link>
+			<html:link action="/ViewWebstorePaymentAction.do?action=viewOrder&documentId=<%= element.getDocId()%>"><bean:write name="element" property="reference"/></html:link>
 			</logic:equal>
 			
 			<logic:equal value="CashLine" name="element" property="docType">
-			<html:link action="<%="/ViewWebstoreCashPaymentAction.do?action=viewOrder&documentId=" + element.getDocId()%>"><bean:write name="element" property="reference"/></html:link>
+			<html:link action="/ViewWebstoreCashPaymentAction.do?action=viewOrder&documentId=<%= element.getDocId()%>"><bean:write name="element" property="reference"/></html:link>
 			</logic:equal>
 		</td>
 		<td><bean:write name="element" property="details"/></td>
diff --git a/posterita/posterita/web/jsp/pos/custRetShoppingCart.jsp b/posterita/posterita/web/jsp/pos/custRetShoppingCart.jsp
index b35d0295e0..5af23b2990 100644
--- a/posterita/posterita/web/jsp/pos/custRetShoppingCart.jsp
+++ b/posterita/posterita/web/jsp/pos/custRetShoppingCart.jsp
@@ -85,17 +85,16 @@
 		<bean:define id="grandTotal" name="element" property="grandTotal"/>
 	</td>			
 	<td class="<%=styleClass%>" align="right">
-		<img src="images/pos/buttons/button_plus.gif" class="cartBtn" onclick="<%="incrementCart("+element.getProductId()+")"%>">
+		<img src="images/pos/buttons/button_plus.gif" class="cartBtn" onclick="incrementCart(<%= element.getProductId() %>)">
 	</td>
 
 	<td class="<%=styleClass%>" align="right">
-  		<img src="images/pos/buttons/button_minus.gif" class="cartBtn" onclick="<%="decrementCart("+element.getProductId()+")"%>">
+  		<img src="images/pos/buttons/button_minus.gif" class="cartBtn" onclick="decrementCart(<%= element.getProductId() %>)">
 	</td>
 	
 	
 	<td class="<%=styleClass%>" align="center">
-						<html:link href="<%="DeleteFromShoppingCartAction.do?action=deleteFromCustRetCart&productId="
-						+ element.getProductId()%>">X</html:link>
+						<html:link href="DeleteFromShoppingCartAction.do?action=deleteFromCustRetCart&productId=<%= element.getProductId()%>">X</html:link>
    </td>						
 </tr>
 </logic:iterate>
diff --git a/posterita/posterita/web/jsp/pos/customSalesByPeriodReport.jsp b/posterita/posterita/web/jsp/pos/customSalesByPeriodReport.jsp
index a7a0ced048..bdf19bfe99 100644
--- a/posterita/posterita/web/jsp/pos/customSalesByPeriodReport.jsp
+++ b/posterita/posterita/web/jsp/pos/customSalesByPeriodReport.jsp
@@ -42,14 +42,14 @@
 <%@ include file="/jsp/include/errors.jsp" %> 
 <div class="spacingSubmenu"/>
 	<pos:message key="select"/>:<br>
-	<html:link action="<%="/CustomSalesReportAction.do?action=initCustomSalesReport&timePeriod="+ReportDateManager.TODAY%>" styleClass="submenu"><pos:message key="today"/></html:link><br>					
-	<html:link action="<%="/CustomSalesReportAction.do?action=initCustomSalesReport&timePeriod="+ReportDateManager.CURRENT_WEEK%>" styleClass="submenu"><pos:message key="current.week"/></html:link><br>							
-	<html:link action="<%="/CustomSalesReportAction.do?action=initCustomSalesReport&timePeriod="+ReportDateManager.LAST_2WEEKS%>" styleClass="submenu"><pos:message key="last.2.weeks"/></html:link><br>						
-	<html:link action="<%="/CustomSalesReportAction.do?action=initCustomSalesReport&timePeriod="+ReportDateManager.LAST_3WEEKS%>" styleClass="submenu"><pos:message key="last.3.weeks"/></html:link><br>
-	<html:link action="<%="/CustomSalesReportAction.do?action=initCustomSalesReport&timePeriod="+ReportDateManager.CURRENT_MONTH%>" styleClass="submenu"><pos:message key="current.month"/></html:link><br>
-	<html:link action="<%="/CustomSalesReportAction.do?action=initCustomSalesReport&timePeriod="+ReportDateManager.LAST_3MONTHS%>" styleClass="submenu"><pos:message key="last.3.months"/></html:link><br>
-	<html:link action="<%="/CustomSalesReportAction.do?action=initCustomSalesReport&timePeriod="+ReportDateManager.LAST_6MONTHS%>" styleClass="submenu"><pos:message key="last.6.month"/></html:link><br>
-	<html:link action="<%="/CustomSalesReportAction.do?action=initCustomSalesReport&timePeriod="+ReportDateManager.CURRENT_YEAR%>" styleClass="submenu"><pos:message key="current.year"/></html:link><br>
+	<html:link action="/CustomSalesReportAction.do?action=initCustomSalesReport&timePeriod=<%= ReportDateManager.TODAY %>" styleClass="submenu"><pos:message key="today"/></html:link><br>					
+	<html:link action="/CustomSalesReportAction.do?action=initCustomSalesReport&timePeriod=<%= ReportDateManager.CURRENT_WEEK %>" styleClass="submenu"><pos:message key="current.week"/></html:link><br>							
+	<html:link action="/CustomSalesReportAction.do?action=initCustomSalesReport&timePeriod=<%= ReportDateManager.LAST_2WEEKS %>" styleClass="submenu"><pos:message key="last.2.weeks"/></html:link><br>						
+	<html:link action="/CustomSalesReportAction.do?action=initCustomSalesReport&timePeriod=<%= ReportDateManager.LAST_3WEEKS %>" styleClass="submenu"><pos:message key="last.3.weeks"/></html:link><br>
+	<html:link action="/CustomSalesReportAction.do?action=initCustomSalesReport&timePeriod=<%= ReportDateManager.CURRENT_MONTH %>" styleClass="submenu"><pos:message key="current.month"/></html:link><br>
+	<html:link action="/CustomSalesReportAction.do?action=initCustomSalesReport&timePeriod=<%= ReportDateManager.LAST_3MONTHS %>" styleClass="submenu"><pos:message key="last.3.months"/></html:link><br>
+	<html:link action="/CustomSalesReportAction.do?action=initCustomSalesReport&timePeriod=<%= ReportDateManager.LAST_6MONTHS %>" styleClass="submenu"><pos:message key="last.6.month"/></html:link><br>
+	<html:link action="/CustomSalesReportAction.do?action=initCustomSalesReport&timePeriod=<%= ReportDateManager.CURRENT_YEAR %>" styleClass="submenu"><pos:message key="current.year"/></html:link><br>
 	<html:link action="/CustomSalesReport.do" styleClass="submenu"><pos:message key="custom"/></html:link><br>
 		    									 					 
 <%@ include file="/jsp/include/posFooter.jsp" %>
diff --git a/posterita/posterita/web/jsp/pos/debtorHistory.jsp b/posterita/posterita/web/jsp/pos/debtorHistory.jsp
index 9527c28e69..4c3201e33e 100644
--- a/posterita/posterita/web/jsp/pos/debtorHistory.jsp
+++ b/posterita/posterita/web/jsp/pos/debtorHistory.jsp
@@ -66,15 +66,15 @@ if(partner.getName2() != null)
 		<td><bean:write name="element" property="date" format="dd/MM/yyyy"/></td>
 		<td>
 			<logic:equal value="Order" name="element" property="docType">
-			<html:link action="<%="/ViewPOSOrderAction.do?action=viewPOSOrders&orderId=" + element.getDocId()%>"><bean:write name="element" property="reference"/></html:link>
+			<html:link action="/ViewPOSOrderAction.do?action=viewPOSOrders&orderId=<%= element.getDocId() %>"><bean:write name="element" property="reference"/></html:link>
 			</logic:equal>
 			
 			<logic:equal value="Payment" name="element" property="docType">
-			<html:link action="<%="/ViewWebstorePaymentAction.do?action=viewOrder&documentId=" + element.getDocId()%>"><bean:write name="element" property="reference"/></html:link>
+			<html:link action="/ViewWebstorePaymentAction.do?action=viewOrder&documentId=<%= element.getDocId() %>"><bean:write name="element" property="reference"/></html:link>
 			</logic:equal>
 			
 			<logic:equal value="CashLine" name="element" property="docType">
-			<html:link action="<%="/ViewWebstoreCashPaymentAction.do?action=viewOrder&documentId=" + element.getDocId()%>"><bean:write name="element" property="reference"/></html:link>
+			<html:link action="/ViewWebstoreCashPaymentAction.do?action=viewOrder&documentId=<%= element.getDocId() %>"><bean:write name="element" property="reference"/></html:link>
 			</logic:equal>
 		</td>
 		<td><bean:write name="element" property="details"/></td>
diff --git a/posterita/posterita/web/jsp/pos/detailedSalesReport.jsp b/posterita/posterita/web/jsp/pos/detailedSalesReport.jsp
index 5c079305c5..160f710bbb 100644
--- a/posterita/posterita/web/jsp/pos/detailedSalesReport.jsp
+++ b/posterita/posterita/web/jsp/pos/detailedSalesReport.jsp
@@ -108,7 +108,7 @@
 			<html:hidden property="orderType" value="<%=UDIOrderTypes.CREDIT_MEMO.getOrderType() %>"/>				
 		</logic:equal>
 		   <td class=<%=styleClass%> >
-		   		<html:link href="<%="ViewPOSOrderAction.do?action=viewPOSOrders&orderId=" + element.getOrderId() + "&isFullDetails=" + isFullDetails %>">
+		   		<html:link href="ViewPOSOrderAction.do?action=viewPOSOrders&orderId=<%= element.getOrderId() %>&isFullDetails=<%= isFullDetails %>">
 					<bean:write name="element" property="documentNo"/>
 				</html:link>		
 		   </td>
@@ -155,14 +155,14 @@
 		   %>
 		   
 			<logic:equal name="element" property="isCustomer" value="Yes">
-				<html:link href="<%="POSCustomerAction.do?action=viewPOSCustomer&bpartnerId=" + partnerId %>">
+				<html:link href="POSCustomerAction.do?action=viewPOSCustomer&bpartnerId=<%= partnerId %>">
 		   			<bean:write name="element" property="partnerName"/>
 		   		</html:link>			
 			</logic:equal>
 			
 			
 			<logic:equal name="element" property="isCustomer" value="No">
-				<html:link href="<%="POSVendorAction.do?action=viewVendorDetails1&bpartnerId=" + partnerId %>">
+				<html:link href="POSVendorAction.do?action=viewVendorDetails1&bpartnerId=<%= partnerId %>">
 		   			<bean:write name="element" property="partnerName"/>
 		   		</html:link>			
 			</logic:equal>
@@ -209,14 +209,14 @@
 				</a>
 		   </logic:equal>
 		   <logic:notEqual cookie="preference.printing" property="value" value="true">
-		   		<html:link href="<%="ReprintOrderAction.do?action=reprintOrder&orderId=" + element.getOrderId() %>">
+		   		<html:link href="ReprintOrderAction.do?action=reprintOrder&orderId=<%= element.getOrderId() %>">
 					<pos:message key="reprint"/>
 				</html:link>
 		   </logic:notEqual>
 		   </logic:present>
 		   
 		   <logic:notPresent cookie="preference.printing">
-		   		<html:link href="<%="ReprintOrderAction.do?action=reprintOrder&orderId=" + element.getOrderId() %>">
+		   		<html:link href="ReprintOrderAction.do?action=reprintOrder&orderId=<%= element.getOrderId() %>">
 					<pos:message key="reprint"/>
 				</html:link>
 		   </logic:notPresent>	
diff --git a/posterita/posterita/web/jsp/pos/draftedCreditOrder.jsp b/posterita/posterita/web/jsp/pos/draftedCreditOrder.jsp
index de7636907a..e56c5339bd 100644
--- a/posterita/posterita/web/jsp/pos/draftedCreditOrder.jsp
+++ b/posterita/posterita/web/jsp/pos/draftedCreditOrder.jsp
@@ -37,7 +37,7 @@
 	<bean:write name="<%= Constants.CURRENT_POS_ORDER_ID  %>"/>
 </bean:define>
 $FElement('edit').onclick = function(){
-	window.location ='<%="GetShoppingCartForOrder.do?action=getOrderShoppingCart&orderId="+posOrderId%>';
+	window.location ='GetShoppingCartForOrder.do?action=getOrderShoppingCart&orderId=<%= posOrderId %>';
 };				
 </logic:present>	
 
diff --git a/posterita/posterita/web/jsp/pos/draftedCustomerReturnOrder.jsp b/posterita/posterita/web/jsp/pos/draftedCustomerReturnOrder.jsp
index 67b2066b63..b0eacb7210 100644
--- a/posterita/posterita/web/jsp/pos/draftedCustomerReturnOrder.jsp
+++ b/posterita/posterita/web/jsp/pos/draftedCustomerReturnOrder.jsp
@@ -89,7 +89,7 @@ $FElement('edit').onclick = function(e)
 	<bean:define id="posOrderId">
 		<bean:write name="<%= Constants.CUSTOMER_RETURN_ORDER_ID  %>"/>
 	</bean:define>
-	window.location = '<%="GetShoppingCartForOrder.do?action=getCustomerReturnOrderShoppingCart2&orderId="+posOrderId%>';				   		
+	window.location = 'GetShoppingCartForOrder.do?action=getCustomerReturnOrderShoppingCart2&orderId=<%= posOrderId %>';				   		
 	</logic:present>	
 };
 
diff --git a/posterita/posterita/web/jsp/pos/draftedCustomerReturnOrder2.jsp b/posterita/posterita/web/jsp/pos/draftedCustomerReturnOrder2.jsp
index ab188821b9..a9e65870be 100644
--- a/posterita/posterita/web/jsp/pos/draftedCustomerReturnOrder2.jsp
+++ b/posterita/posterita/web/jsp/pos/draftedCustomerReturnOrder2.jsp
@@ -94,7 +94,7 @@ $FElement('edit').onclick = function(e)
 	<bean:define id="posOrderId">
 		<bean:write name="<%= Constants.CUSTOMER_RETURN_ORDER_ID  %>"/>
 	</bean:define>
-	window.location = '<%="GetShoppingCartForOrder.do?action=getCustomerReturnOrderShoppingCart&orderId="+posOrderId%>';				   		
+	window.location = 'GetShoppingCartForOrder.do?action=getCustomerReturnOrderShoppingCart&orderId=<%= posOrderId %>';				   		
 	</logic:present>	
 };
 
diff --git a/posterita/posterita/web/jsp/pos/draftedGoodsReceiveNote.jsp b/posterita/posterita/web/jsp/pos/draftedGoodsReceiveNote.jsp
index e90388f296..688b3d16e9 100644
--- a/posterita/posterita/web/jsp/pos/draftedGoodsReceiveNote.jsp
+++ b/posterita/posterita/web/jsp/pos/draftedGoodsReceiveNote.jsp
@@ -96,7 +96,7 @@
 
 $FElement('edit').onclick = function(e)
 { 
-	window.location = "<%="GetShoppingCartForOrder.do?action=getOrderShoppingCart&orderId="+posOrderId%>"; 
+	window.location = "GetShoppingCartForOrder.do?action=getOrderShoppingCart&orderId=<%= posOrderId %>"; 
 };
 </logic:present>
 
diff --git a/posterita/posterita/web/jsp/pos/draftedGoodsReturnNote.jsp b/posterita/posterita/web/jsp/pos/draftedGoodsReturnNote.jsp
index 6274778854..5bbea7e549 100644
--- a/posterita/posterita/web/jsp/pos/draftedGoodsReturnNote.jsp
+++ b/posterita/posterita/web/jsp/pos/draftedGoodsReturnNote.jsp
@@ -115,7 +115,7 @@ window.onload = function(e)
 </bean:define>
 $FElement('edit').onclick = function(e)
 {
-	window.location = "<%="GetShoppingCartForOrder.do?action=getOrderShoppingCart&orderId="+posOrderId%>";
+	window.location = "GetShoppingCartForOrder.do?action=getOrderShoppingCart&orderId=<%= posOrderId %>";
 };
 </logic:present>
 
diff --git a/posterita/posterita/web/jsp/pos/goodsReturnNote.jsp b/posterita/posterita/web/jsp/pos/goodsReturnNote.jsp
index f32098f0c4..f4bbd15e68 100644
--- a/posterita/posterita/web/jsp/pos/goodsReturnNote.jsp
+++ b/posterita/posterita/web/jsp/pos/goodsReturnNote.jsp
@@ -45,7 +45,7 @@
 <bean:define id="title"><pos:message textOnly="true" key="goods.returned.note"/></bean:define>
 <table width="100%">
 	<td align="right">
-		<html:link href="<%="CreateNewOrderAction.do?action=removeSessionForNewOrder&orderType=" + UDIOrderTypes.POS_GOODS_RETURN_NOTE.getOrderType() %>">
+		<html:link href="CreateNewOrderAction.do?action=removeSessionForNewOrder&orderType=<%= UDIOrderTypes.POS_GOODS_RETURN_NOTE.getOrderType() %>">
 			Create New
 		</html:link>			
 	</td>
diff --git a/posterita/posterita/web/jsp/pos/listCashBooks.jsp b/posterita/posterita/web/jsp/pos/listCashBooks.jsp
index 0f6077f530..2b334d0931 100644
--- a/posterita/posterita/web/jsp/pos/listCashBooks.jsp
+++ b/posterita/posterita/web/jsp/pos/listCashBooks.jsp
@@ -82,13 +82,13 @@
 			</html:link>
 			
 			<logic:equal name="row" property="isActive" value="true">
-				<html:link href='<%="SearchCashBookAction.do?action=deactivateCashBook&cashBookId=" + ((CashBookBean)row).getCashBookId().intValue()%>' paramName="CashBookForm" paramId="searchText" paramProperty="searchText">
+				<html:link href='SearchCashBookAction.do?action=deactivateCashBook&cashBookId=<%= ((CashBookBean)row).getCashBookId().intValue() %>' paramName="CashBookForm" paramId="searchText" paramProperty="searchText">
 					<img src="images/tango/edit-redo.png" title="Deactivate CashBook" alt="Deactivate" border="0">
 				</html:link>
 			</logic:equal>
 			
 			<logic:notEqual name="row" property="isActive" value="true">
-				<html:link href='<%="SearchCashBookAction.do?action=activateCashBook&cashBookId=" + ((CashBookBean)row).getCashBookId().intValue()%>' paramName="CashBookForm" paramId="searchText" paramProperty="searchText">
+				<html:link href='SearchCashBookAction.do?action=activateCashBook&cashBookId=<%= ((CashBookBean)row).getCashBookId().intValue() %>' paramName="CashBookForm" paramId="searchText" paramProperty="searchText">
 					<img src="images/tango/edit-undo.png" title="Activate CashBook" alt="Activate" border="0">
 				</html:link>
 			</logic:notEqual>
diff --git a/posterita/posterita/web/jsp/pos/listCurrencies.jsp b/posterita/posterita/web/jsp/pos/listCurrencies.jsp
index 8ba6893712..278e517489 100644
--- a/posterita/posterita/web/jsp/pos/listCurrencies.jsp
+++ b/posterita/posterita/web/jsp/pos/listCurrencies.jsp
@@ -79,7 +79,7 @@
 				<bean:write name="currencyList" property="isActive"/>
 			</td>
 			<td  align="center" class = "label">
-				<html:link href="<%="CurrencyAction.do?action=viewCurrency&currencyId=" + currencyList.getCurrencyId()%>">
+				<html:link href="CurrencyAction.do?action=viewCurrency&currencyId=<%= currencyList.getCurrencyId() %>">
 					<img src="images/tango/accessories-text-editor.png"  border="0"> 
 				</html:link>
 		 	</td>	 	
diff --git a/posterita/posterita/web/jsp/pos/listPriceLists.jsp b/posterita/posterita/web/jsp/pos/listPriceLists.jsp
index fb5ffafb1f..fffa93f9a3 100644
--- a/posterita/posterita/web/jsp/pos/listPriceLists.jsp
+++ b/posterita/posterita/web/jsp/pos/listPriceLists.jsp
@@ -50,7 +50,7 @@
 			</html:form>
 		</td>
 		<logic:notPresent name = "<%= Constants.IS_FROM_DELETE_PRODUCT_PRICE %>" >
-			<td align = "right"><html:link href="<%="PriceListAction.do?action=viewPriceList&priceListId=0"%>">
+			<td align = "right"><html:link href="PriceListAction.do?action=viewPriceList&priceListId=0">
 					<img src="images/tango/document-new.png" border="0">
 				</html:link>
 			</td>
@@ -100,13 +100,13 @@
 			</td>
 			<td  align="center" class = "label">
 				<logic:present name = "<%= Constants.IS_FROM_DELETE_PRODUCT_PRICE %>">
-					<html:link href="<%="POSProductAction2.do?action=viewAllPOSProducts&isFromDeletePriceOnPriceList=true&priceListId=" + priceList.getPriceListId()%>">
+					<html:link href="POSProductAction2.do?action=viewAllPOSProducts&isFromDeletePriceOnPriceList=true&priceListId=<%= priceList.getPriceListId() %>">
 						<img src="images/tango/edit-delete.png"  border="0"> 
 					</html:link>
 				</logic:present>
 				
 				<logic:notPresent name = "<%= Constants.IS_FROM_DELETE_PRODUCT_PRICE %>">
-					<html:link href="<%="PriceListAction.do?action=viewPriceList&priceListId=" + priceList.getPriceListId().toString()%>">
+					<html:link href="PriceListAction.do?action=viewPriceList&priceListId=<%= priceList.getPriceListId().toString() %>">
 						<img src="images/tango/accessories-text-editor.png"  border="0"> 
 					</html:link>
 					
@@ -115,7 +115,7 @@
 					</logic:equal>
 					
 					<logic:equal name="priceList" property="isDefault" value="false">
-						<html:link href="<%="PriceListAction.do?action=setDefaultPriceList&priceListId=" + priceList.getPriceListId().toString()%>">
+						<html:link href="PriceListAction.do?action=setDefaultPriceList&priceListId=<%= priceList.getPriceListId().toString() %>">
 							<img src="images/tango/edit-redo.png"  border="0" title="Set Default Price List">
 						</html:link> 
 					</logic:equal>
diff --git a/posterita/posterita/web/jsp/pos/listTerminals.jsp b/posterita/posterita/web/jsp/pos/listTerminals.jsp
index b0404ae9b6..330e871261 100644
--- a/posterita/posterita/web/jsp/pos/listTerminals.jsp
+++ b/posterita/posterita/web/jsp/pos/listTerminals.jsp
@@ -99,18 +99,18 @@
 			%>
 
 			<logic:equal name="row" property="isActive" value="true">
-				<html:link href='<%="SearchTerminalAction.do?action=deactivateTerminal&terminalId=" + ((TerminalBean)row).getTerminalId().intValue()%>' paramName="TerminalForm" paramId="searchText" paramProperty="searchText">
+				<html:link href='SearchTerminalAction.do?action=deactivateTerminal&terminalId=<%= ((TerminalBean)row).getTerminalId().intValue() %>' paramName="TerminalForm" paramId="searchText" paramProperty="searchText">
 					<img src="images/tango/edit-redo.png" title="Deactivate Terminal" alt="Deactivate" border="0">
 				</html:link>
 			</logic:equal>
 			
 			<logic:notEqual name="row" property="isActive" value="true">
-				<html:link href='<%="SearchTerminalAction.do?action=activateTerminal&terminalId=" + ((TerminalBean)row).getTerminalId().intValue()%>' paramName="TerminalForm" paramId="searchText" paramProperty="searchText">
+				<html:link href='SearchTerminalAction.do?action=activateTerminal&terminalId=<%= ((TerminalBean)row).getTerminalId().intValue() %>' paramName="TerminalForm" paramId="searchText" paramProperty="searchText">
 					<img src="images/tango/edit-undo.png" title="Activate Terminal" alt="Activate" border="0">
 				</html:link>
 			</logic:notEqual>
 			<logic:notEqual name="row" property="isCurrentTerminal" value="true">
-				<html:link href='<%="SearchTerminalAction.do?action=updateCurrentTerminal&terminalId=" + ((TerminalBean)row).getTerminalId().intValue()%>' paramName="TerminalForm" paramId="searchText" paramProperty="searchText">
+				<html:link href='SearchTerminalAction.do?action=updateCurrentTerminal&terminalId=<%= ((TerminalBean)row).getTerminalId().intValue() %>' paramName="TerminalForm" paramId="searchText" paramProperty="searchText">
 					<img src="images/tango/go-jump.png" title='<pos:message textOnly="true" key="UpdateCurrentPOSTerminal"/>' alt='<pos:message textOnly="true" key="UpdateCurrentPOSTerminal"/>' border="0">
 				</html:link>
 			</logic:notEqual>
diff --git a/posterita/posterita/web/jsp/pos/productBarcodeCart.jsp b/posterita/posterita/web/jsp/pos/productBarcodeCart.jsp
index 9064932e9e..f8e154c835 100644
--- a/posterita/posterita/web/jsp/pos/productBarcodeCart.jsp
+++ b/posterita/posterita/web/jsp/pos/productBarcodeCart.jsp
@@ -329,7 +329,7 @@
 			try
 			{				
 				
-				document.applets[0].setPrinterName(<%="'" + cookie.getValue() + "'"%>);
+				document.applets[0].setPrinterName(<%= cookie.getValue() %>');
 				var url = '<%=basePath + "BarcodeAction.do?action=printProductBarcode"%>' + '&isPrintPrices=' + isPrintPrices + '&isPrintProductName=' + isPrintProductName + '&isPrintProductDescription=' + isPrintProductDescription;
 				document.applets[0].printURL(url);
 			}
@@ -361,8 +361,8 @@
 		try
 		{
 			
-			document.applets[0].setPrinterName(<%="'" + cookie.getValue() + "'"%>);
-			var url = '<%=basePath + "BarcodeAction.do?action=printProductBarcode"%>' + '&isPrintPrices=' + isPrintPrices + '&isPrintProductName=' + isPrintProductName + '&isPrintProductDescription=' + isPrintProductDescription;
+			document.applets[0].setPrinterName('<%= cookie.getValue() %>');
+			var url = '<%=basePath %>BarcodeAction.do?action=printProductBarcode' + '&isPrintPrices=' + isPrintPrices + '&isPrintProductName=' + isPrintProductName + '&isPrintProductDescription=' + isPrintProductDescription;
 			document.applets[0].printURL(url);
 		}
 		catch(e)
diff --git a/posterita/posterita/web/jsp/pos/retShoppingCart.jsp b/posterita/posterita/web/jsp/pos/retShoppingCart.jsp
index 972b5b144f..ff65ff593e 100644
--- a/posterita/posterita/web/jsp/pos/retShoppingCart.jsp
+++ b/posterita/posterita/web/jsp/pos/retShoppingCart.jsp
@@ -107,7 +107,7 @@
 		<html:hidden property="action" value="addToShoppingCart"/>
 		<html:hidden property="ifAdd" value="true"/> 
 		<html:hidden property="isSales" value="false"/>
-   		<html:hidden property="productId" value="<%=element.getProductId()+""%>"/> 
+   		<html:hidden property="productId" value="<%= element.getProductId().toString() %>"/> 
    		<html:hidden property="bpartnerId" value=""/>
 		<html:image property="btn" src="images/pos/buttons/button_plus.gif" onclick="this.form.submit();" style="width:28px;height:28px;border:0px"/>
 	</html:form>
@@ -118,15 +118,14 @@
 		<html:hidden property="action" value="addToShoppingCart"/>
 		<html:hidden property="ifAdd" value="false"/> 
 		<html:hidden property="isSales" value="false"/>
-   		<html:hidden property="productId" value="<%=element.getProductId()+""%>"/> 
+   		<html:hidden property="productId" value="<%= element.getProductId().toString() %>"/> 
    		<html:hidden property="bpartnerId" value=""/>
 	 	<html:image property="btn" src="images/pos/buttons/button_minus.gif" onclick="this.form.submit();" style="width:28px;height:28px;border:0px"/>
 	</html:form>
 	</td>
 	
 		<td class="<%=styleClass%>" align="center">
-							<html:link href="<%="DeleteFromShoppingCartAction.do?action=deleteFromPOSRetCart&productId="
-							+ element.getProductId()%>">X</html:link>
+							<html:link href="DeleteFromShoppingCartAction.do?action=deleteFromPOSRetCart&productId=<%= element.getProductId() %>">X</html:link>
 		</td>
 </tr>
 </logic:iterate>
diff --git a/posterita/posterita/web/jsp/pos/settleAPPayment.jsp b/posterita/posterita/web/jsp/pos/settleAPPayment.jsp
index 958e919408..cce74394ac 100644
--- a/posterita/posterita/web/jsp/pos/settleAPPayment.jsp
+++ b/posterita/posterita/web/jsp/pos/settleAPPayment.jsp
@@ -142,26 +142,26 @@
 				</tr>
 					<logic:iterate indexId="count" id="element" name="<%=Constants.OPEN_ITEMS%>" type="org.posterita.beans.OpenItemBean">		
 						<tr>
-							<%	
+							<%
 								String styleClass = "";
 							%>
 							<logic:equal name="element" property="allocationStatus" value="<%=Constants.PAID%>">
 							<%
-									styleClass = "green";
+								styleClass = "green";
 							%>	
 							</logic:equal>
 							
 							<logic:equal name="element" property="allocationStatus" value="<%=Constants.UNPAID%>">
 							<%
-									styleClass = "red";
+								styleClass = "red";
 							%>	
 							</logic:equal>
 							
 							<logic:equal name="element" property="allocationStatus" value="<%=Constants.PARTIALLY_PAID%>">
 								
 									<%
-											styleClass = "yellow";
-									%>	
+																		styleClass = "yellow";
+																	%>	
 								
 							</logic:equal>
 							
@@ -170,38 +170,35 @@
 							<logic:equal name="element" property="allocationStatus" value="<%=Constants.OVER_PAID%>">
 								
 									<%
-											styleClass = "blue";
-									%>	
+																		styleClass = "blue";
+																	%>	
 								
 							</logic:equal>
 							<logic:lessThan name="element" property="openAmt" value="0">
 									<%
-											styleClass = "blue";
+										styleClass = "blue";
 									%>	
 							</logic:lessThan>
 							<td class=<%=styleClass%> >
 							<logic:notEqual name="element" property="allocationStatus" value="<%=Constants.PAID%>">
 				
 								<logic:greaterThan name="element" property="openAmt" value="0">
-								  	<html:link href="<%="InitCreatePaymentAction.do?action=initCreatePayment&invoiceId=" + element.getInvoiceId()+
-								  						"&invoiceNo="+element.getInvoiceNo()+"&invoiceGrandTotal="+element.getInvoiceGrandTotal()+
-								  						"&paidAmt="+element.getPaidAmt()+"&openAmt="+element.getOpenAmt()+
-								  						"&discountAmt="+element.getDiscountAmt()%>">
+									<html:link href="InitCreatePaymentAction.do?action=initCreatePayment&invoiceId=<%= element.getInvoiceId() %>&invoiceNo=<%= element.getInvoiceNo() %>&invoiceGrandTotal=<%= element.getInvoiceGrandTotal() %>&paidAmt=<%=element.getPaidAmt() %>&openAmt=<%= element.getOpenAmt() %>&discountAmt=<%= element.getDiscountAmt()%>">
 									 	Pay
 									
-									 </html:link>	
-								 </logic:greaterThan>
+									 </html:link>
+								</logic:greaterThan>
 							</logic:notEqual>								 	
 							</td>
 						
 							<td class=<%=styleClass%> >
-									<html:link href="<%="ViewInvoiceAction.do?action=viewOrder&documentId=" + element.getInvoiceId() %>">
+									<html:link href="ViewInvoiceAction.do?action=viewOrder&documentId=<%= element.getInvoiceId() %>">
 										<bean:write name="element" property="invoiceNo"/>
 									</html:link>
 							</td>
 							
 							<td class=<%=styleClass%> >
-								<html:link href="<%="ViewPOSOrderAction.do?action=viewPOSOrders&orderId=" + element.getOrderId() %>">
+								<html:link href="ViewPOSOrderAction.do?action=viewPOSOrders&orderId=<%= element.getOrderId() %>">
 									<bean:write name="element" property="documentNo"/>
 								</html:link>
 							</td>
@@ -233,7 +230,7 @@
 							</td>
 							<td class=<%=styleClass%> >
 							
-								<html:link href="<%="ViewPaymentAllocationAction.do?action=getAllocationDetailsForPartner&invoiceNo=" + element.getInvoiceNo()%>">
+								<html:link href="ViewPaymentAllocationAction.do?action=getAllocationDetailsForPartner&invoiceNo=<%= element.getInvoiceNo() %>">
 								 	<bean:write name="element" property="paidAmt"/>
 								 </html:link>	
 							</td>
@@ -313,7 +310,7 @@
 					<logic:iterate indexId="count" id="element" name="<%=Constants.UNALLOCATED_PAYMENTS%>" type="org.posterita.beans.OpenItemBean">		
 						<tr>
 							<td>
-						   		<html:link href="<%="ViewWebstorePaymentAction.do?action=viewOrder&documentId=" + element.getPaymentId() %>">
+						   		<html:link href="ViewWebstorePaymentAction.do?action=viewOrder&documentId=<%= element.getPaymentId() %>">
 									<bean:write name="element" property="paymentId"/>
 								</html:link>
 	  					 	</td>
diff --git a/posterita/posterita/web/jsp/pos/settlePayment.jsp b/posterita/posterita/web/jsp/pos/settlePayment.jsp
index 06ca5c6dc8..11f25f045c 100644
--- a/posterita/posterita/web/jsp/pos/settlePayment.jsp
+++ b/posterita/posterita/web/jsp/pos/settlePayment.jsp
@@ -207,10 +207,7 @@
 							<logic:notEqual name="element" property="allocationStatus" value="<%=Constants.PAID%>">
 				
 								<logic:greaterThan name="element" property="openAmt" value="0">
-								  	<html:link href="<%="InitCreatePaymentAction.do?action=initCreatePayment&invoiceId=" + element.getInvoiceId()+
-								  						"&invoiceNo="+element.getInvoiceNo()+"&invoiceGrandTotal="+element.getInvoiceGrandTotal()+
-								  						"&paidAmt="+element.getPaidAmt()+"&openAmt="+element.getOpenAmt()+
-								  						"&discountAmt="+element.getDiscountAmt()%>">
+								  	<html:link href="InitCreatePaymentAction.do?action=initCreatePayment&invoiceId=<%= element.getInvoiceId() %>&invoiceNo=<%= element.getInvoiceNo() %>&invoiceGrandTotal=<%= element.getInvoiceGrandTotal() %>&paidAmt=<%= element.getPaidAmt() %>&openAmt=<%= element.getOpenAmt() %>&discountAmt=<%= element.getDiscountAmt()%>">
 									 	Pay
 									
 									 </html:link>	
@@ -219,13 +216,13 @@
 							</td>
 						
 							<td class=<%=styleClass%> >
-									<html:link href="<%="ViewInvoiceAction.do?action=viewOrder&documentId=" + element.getInvoiceId() %>">
+									<html:link href="ViewInvoiceAction.do?action=viewOrder&documentId=<%= element.getInvoiceId() %>">
 										<bean:write name="element" property="invoiceNo"/>
 									</html:link>
 							</td>
 							
 							<td class=<%=styleClass%> >
-								<html:link href="<%="ViewPOSOrderAction.do?action=viewPOSOrders&orderId=" + element.getOrderId() %>">
+								<html:link href="ViewPOSOrderAction.do?action=viewPOSOrders&orderId=<%= element.getOrderId() %>">
 									<bean:write name="element" property="documentNo"/>
 								</html:link>
 							</td>
@@ -257,7 +254,7 @@
 							</td>
 							<td class=<%=styleClass%> >
 							
-								<html:link href="<%="ViewPaymentAllocationAction.do?action=getAllocationDetailsForPartner&invoiceNo=" + element.getInvoiceNo()%>">
+								<html:link href="ViewPaymentAllocationAction.do?action=getAllocationDetailsForPartner&invoiceNo=<%= element.getInvoiceNo()%>">
 								 	<bean:write name="element" property="paidAmt"/>
 								 </html:link>	
 							</td>
@@ -337,7 +334,7 @@
 					<logic:iterate indexId="count" id="element" name="<%=Constants.UNALLOCATED_PAYMENTS%>" type="org.posterita.beans.OpenItemBean">		
 						<tr>
 							<td>
-						   		<html:link href="<%="ViewWebstorePaymentAction.do?action=viewOrder&documentId=" + element.getPaymentId() %>">
+						   		<html:link href="ViewWebstorePaymentAction.do?action=viewOrder&documentId=<%= element.getPaymentId() %>">
 									<bean:write name="element" property="paymentId"/>
 								</html:link>
 	  					 	</td>
diff --git a/posterita/posterita/web/jsp/pos/updateCurrency.jsp b/posterita/posterita/web/jsp/pos/updateCurrency.jsp
index 88fb1fafaa..7e28fd4739 100644
--- a/posterita/posterita/web/jsp/pos/updateCurrency.jsp
+++ b/posterita/posterita/web/jsp/pos/updateCurrency.jsp
@@ -45,10 +45,10 @@
 			<table align="left" cellpadding="5" width="100%">	
 				<tr>
 			<td colspan="3" align="right">
-				<html:link href='<%="CurrencyAction.do?action=viewCurrency&isNext=false&currencyId=" + currencyId%>'>
+				<html:link href='CurrencyAction.do?action=viewCurrency&isNext=false&currencyId=<%= currencyId %>'>
 					<img src="images/tango/go-previous.png" title="Previous" alt="Previous" border="0">
 				</html:link>
-				<html:link href="<%="CurrencyAction.do?action=viewCurrency&isNext=true&currencyId=" + currencyId%>">
+				<html:link href="CurrencyAction.do?action=viewCurrency&isNext=true&currencyId=<%= currencyId %>">
 					<img src="images/tango/go-next.png" title="Next" alt="Next" border="0">
 				</html:link>			
 			</td>
diff --git a/posterita/posterita/web/jsp/pos/viewAPPaymentAllocation.jsp b/posterita/posterita/web/jsp/pos/viewAPPaymentAllocation.jsp
index 9be514abd9..386fd21ffe 100644
--- a/posterita/posterita/web/jsp/pos/viewAPPaymentAllocation.jsp
+++ b/posterita/posterita/web/jsp/pos/viewAPPaymentAllocation.jsp
@@ -90,37 +90,37 @@
 						
 	   <td class=<%=styleClass%>>
 	   		
-	   		<html:link href="<%="POSCustomerAction.do?action=viewPOSCustomer&bpartnerId="+ element.getBpartnerId() %>">
+	   		<html:link href="POSCustomerAction.do?action=viewPOSCustomer&bpartnerId=<%= element.getBpartnerId() %>">
    						<bean:write name="element" property="partnerName"/>
    			</html:link>	
 	   				
 	   </td>						
 	   						   
 	   <td class=<%=styleClass%>>
-			<html:link href="<%="ViewPOSOrderAction.do?action=viewPOSOrders&orderId=" + element.getOrderId() %>">
+			<html:link href="ViewPOSOrderAction.do?action=viewPOSOrders&orderId=<%= element.getOrderId() %>">
 				<bean:write name="element" property="documentNo"/>
 			</html:link>
 	   </td>	
 	   <td class=<%=styleClass%>>
-	   		<html:link href="<%="ViewInvoiceAction.do?action=viewOrder&documentId=" + element.getInvoiceId() %>">
+	   		<html:link href="ViewInvoiceAction.do?action=viewOrder&documentId=<%= element.getInvoiceId() %>">
 				<bean:write name="element" property="invoiceNo"/>
 			</html:link>
 			
 	   </td>					   
 	   <td class=<%=styleClass%>>
-	   		<html:link href="<%="ViewWebstorePaymentAction.do?action=viewOrder&documentId=" + element.getPaymentId() %>">
+	   		<html:link href="ViewWebstorePaymentAction.do?action=viewOrder&documentId=<%= element.getPaymentId() %>">
 				<bean:write name="element" property="paymentId"/>
 			</html:link>
 			
 	   </td>
 	   <td class=<%=styleClass%>>
-		   <html:link href="<%="ViewWebstoreCashPaymentAction.do?action=viewOrder&documentId=" + element.getCashLineId() %>">
+		   <html:link href="ViewWebstoreCashPaymentAction.do?action=viewOrder&documentId=<%= element.getCashLineId() %>">
 				<bean:write name="element" property="cashLineId"/>
 			</html:link>
 	   </td>
 	   
 	   <td class=<%=styleClass%>>
-	   		<html:link href="<%="ViewInvoiceAction.do?action=viewOrder&documentId=" + element.getCreditMemoId() %>">
+	   		<html:link href="ViewInvoiceAction.do?action=viewOrder&documentId=<%= element.getCreditMemoId() %>">
 				<bean:write name="element" property="creditMemoNumber"/>
 			</html:link>
 	   </td>	
diff --git a/posterita/posterita/web/jsp/pos/viewAllPaymentTerm.jsp b/posterita/posterita/web/jsp/pos/viewAllPaymentTerm.jsp
index 56c7ee6161..ab79aa9e3d 100644
--- a/posterita/posterita/web/jsp/pos/viewAllPaymentTerm.jsp
+++ b/posterita/posterita/web/jsp/pos/viewAllPaymentTerm.jsp
@@ -95,19 +95,19 @@
 			</td>
 			
 			<td class="<%=styleClass%>" align="center">
-				<html:link href="<%="InitEditPaymentTermAction.do?action=initEditPaymentTerm&paymentTermId=" + element.getPaymentTermId()%>">
+				<html:link href="InitEditPaymentTermAction.do?action=initEditPaymentTerm&paymentTermId=<%= element.getPaymentTermId() %>">
 					<img src="images/tango/accessories-text-editor.png" title="Edit" alt="Edit" border="0">
 				</html:link>
 				&nbsp;
 				
 				<logic:equal name="element" property="isActive" value="true">
-					<html:link href="<%="ActivateDeactivatePaymentTermAction.do?action=deActivatePaymentTerm&paymentTermId=" + element.getPaymentTermId()%>">
+					<html:link href="ActivateDeactivatePaymentTermAction.do?action=deActivatePaymentTerm&paymentTermId=<%= element.getPaymentTermId() %>">
 						<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="<%="ActivateDeactivatePaymentTermAction.do?action=activatePaymentTerm&paymentTermId=" + element.getPaymentTermId()%>">
+					<html:link href="ActivateDeactivatePaymentTermAction.do?action=activatePaymentTerm&paymentTermId=<%= element.getPaymentTermId() %>">
 						<img src="images/tango/edit-undo.png" title="Activate" alt="Activate" border="0">
 					</html:link>
 				</logic:notEqual>
diff --git a/posterita/posterita/web/jsp/pos/viewBPartnerTrxDetails.jsp b/posterita/posterita/web/jsp/pos/viewBPartnerTrxDetails.jsp
index 95d8ab4be2..78f71584c1 100644
--- a/posterita/posterita/web/jsp/pos/viewBPartnerTrxDetails.jsp
+++ b/posterita/posterita/web/jsp/pos/viewBPartnerTrxDetails.jsp
@@ -48,13 +48,13 @@
 
 <div>
 	<logic:present name="<%=Constants.BUSINESSPARTNER%>">
-		<html:link href="<%="ViewPOSBPartnerInfo.do"%>">
+		<html:link href="ViewPOSBPartnerInfo.do">
 		 <pos:message key="back"/>
 		</html:link>
 	</logic:present>
 	
 	<logic:present name="<%=Constants.DEBTORS%>">
-		<html:link href="<%="InitPrintDunningAction.do?action=initPrintDunning"%>">
+		<html:link href="InitPrintDunningAction.do?action=initPrintDunning">
 		 <pos:message key="back"/>
 	</html:link>
 	</logic:present>
@@ -157,7 +157,7 @@
 				styleClass1 = "contentname";
 		%>							
 		   <td class=<%=styleClass1%>>
-		   		<html:link href="<%="ViewPOSOrderAction.do?action=viewPOSOrders&orderId=" + element.getOrderId() %>">
+		   		<html:link href="ViewPOSOrderAction.do?action=viewPOSOrders&orderId=<%= element.getOrderId() %>">
 					<bean:write name="element" property="documentNo"/>
 				</html:link>		
 		   </td>						
diff --git a/posterita/posterita/web/jsp/pos/viewCommission.jsp b/posterita/posterita/web/jsp/pos/viewCommission.jsp
index fcdf0c85e0..c9f691482d 100644
--- a/posterita/posterita/web/jsp/pos/viewCommission.jsp
+++ b/posterita/posterita/web/jsp/pos/viewCommission.jsp
@@ -86,7 +86,7 @@
 											<bean:write name="element" property="periodAndCurrencyDesc"/>
 									   </td>
 									   <td class="<%=styleClass%>">
-									   <html:link href="<%="ViewCommissionAction.do?action=viewCommissionDetails&commissionAmtId="+element.getCommissionAmtId() %>">
+									   <html:link href="ViewCommissionAction.do?action=viewCommissionDetails&commissionAmtId=<%= element.getCommissionAmtId() %>">
 											<bean:define id="convertedAmt" name="element" property="convertedAmt"/>
 											<fmt:formatNumber value='${convertedAmt}' maxFractionDigits="2" type="currency" currencySymbol='${symbol}'/>	
 										</html:link>
diff --git a/posterita/posterita/web/jsp/pos/viewCreditors.jsp b/posterita/posterita/web/jsp/pos/viewCreditors.jsp
index 7ff324c40c..58e7919e2d 100644
--- a/posterita/posterita/web/jsp/pos/viewCreditors.jsp
+++ b/posterita/posterita/web/jsp/pos/viewCreditors.jsp
@@ -76,7 +76,7 @@
 				styleClass = "contentname";
 		%>						
 	   <td class=<%=styleClass%>>	   			
-	   		<html:link href="<%="CreditorDebtorAction.do?action=getCreditorHistory&bpartnerId=" + element.getBpartnerId() %>">
+	   		<html:link href="CreditorDebtorAction.do?action=getCreditorHistory&bpartnerId=<%= element.getBpartnerId() %>">
 				<bean:write name="element" property="partnerName"/>
 			</html:link>		
 	   </td>
diff --git a/posterita/posterita/web/jsp/pos/viewDocumentHistory.jsp b/posterita/posterita/web/jsp/pos/viewDocumentHistory.jsp
index a7d1755730..c9c8164ae6 100644
--- a/posterita/posterita/web/jsp/pos/viewDocumentHistory.jsp
+++ b/posterita/posterita/web/jsp/pos/viewDocumentHistory.jsp
@@ -90,14 +90,14 @@
 								%>
 								   
 									<logic:equal name="element" property="isCustomer" value="true">
-										<html:link href="<%="POSCustomerAction.do?action=viewPOSCustomer&bpartnerId=" + partnerId %>">
+										<html:link href="POSCustomerAction.do?action=viewPOSCustomer&bpartnerId=<%= partnerId %>">
 								   			<bean:write name="element" property="partnerName"/>
 								   		</html:link>			
 									</logic:equal>
 									
 									
 									<logic:equal name="element" property="isCustomer" value="false">
-										<html:link href="<%="POSVendorAction.do?action=viewVendorDetails1&bpartnerId=" + partnerId %>">
+										<html:link href="POSVendorAction.do?action=viewVendorDetails1&bpartnerId=<%= partnerId %>">
 								   			<bean:write name="element" property="partnerName"/>
 								   		</html:link>			
 									</logic:equal>
@@ -112,19 +112,19 @@
 	
 								<td class="<%=styleClass%>"> 
 								
-									<html:link href="<%="ViewPOSOrderAction.do?action=viewPOSOrders&orderId=" + element.getOrderId() %>">
+									<html:link href="ViewPOSOrderAction.do?action=viewPOSOrders&orderId=<%= element.getOrderId() %>">
 					     				<bean:write name="element" property="documentNo"/>
 					     			</html:link>					
 								</td>	
 
 								<td align="left" class="<%=styleClass%>">
-									<html:link href="<%="ViewWebstorePaymentAction.do?action=viewOrder&documentId=" + element.getPaymentId() %>">
+									<html:link href="ViewWebstorePaymentAction.do?action=viewOrder&documentId=<%= element.getPaymentId() %>">
 										<bean:write name="element" property="paymentId"/>
 									</html:link>
 								</td>
 						
 								<td align="left" class="<%=styleClass%>">
-									<html:link href="<%="ViewInvoiceAction.do?action=viewOrder&documentId=" + element.getInvoiceId() %>">
+									<html:link href="ViewInvoiceAction.do?action=viewOrder&documentId=<%= element.getInvoiceId() %>">
 										<bean:write name="element" property="invoiceNo"/>
 									</html:link>
 								</td>
@@ -132,7 +132,7 @@
 								<logic:notPresent name="element" property="shipmentNo">	
 								 	<logic:present name="element" property="invoiceNo">	
 										<td align="left" class="<%=styleClass%>">		
-										<html:link href="<%="CreateShipmentForCreditOrderAction.do?action=createShipmentForCreditOrder&invoiceId=" + element.getInvoiceId() %>">
+										<html:link href="CreateShipmentForCreditOrderAction.do?action=createShipmentForCreditOrder&invoiceId=<%= element.getInvoiceId() %>">
 											Create Shipment
 										</html:link>
 										</td>	
@@ -140,7 +140,7 @@
 								</logic:notPresent>	
 						
 							<td align="left" class="<%=styleClass%>">
-									<html:link href="<%="ViewMinOutAction.do?action=viewOrder&documentId=" + element.getMinOutId() %>">
+									<html:link href="ViewMinOutAction.do?action=viewOrder&documentId=<%= element.getMinOutId() %>">
 										<bean:write name="element" property="shipmentNo"/>
 									</html:link>
 								</td>	
diff --git a/posterita/posterita/web/jsp/pos/viewPOSBPartnerInfo.jsp b/posterita/posterita/web/jsp/pos/viewPOSBPartnerInfo.jsp
index 0e3e9adf66..07d676c9de 100644
--- a/posterita/posterita/web/jsp/pos/viewPOSBPartnerInfo.jsp
+++ b/posterita/posterita/web/jsp/pos/viewPOSBPartnerInfo.jsp
@@ -101,7 +101,7 @@
 						
 	   <td class=<%=styleClass%>>
 	   			
-	   		<html:link href="<%="ViewBPartnerTrxDetailsAction.do?action=getBpartnerTrxDetails&isCustomer="+element.getIsCustomer()+"&bpartnerId=" + element.getBpartnerId() %>">
+	   		<html:link href="ViewBPartnerTrxDetailsAction.do?action=getBpartnerTrxDetails&isCustomer=<%= element.getIsCustomer() %>&bpartnerId=<%= element.getBpartnerId() %>">
 				<bean:write name="element" property="partnerName"/>
 				
 			</html:link>		
diff --git a/posterita/posterita/web/jsp/pos/viewPOSCustomer.jsp b/posterita/posterita/web/jsp/pos/viewPOSCustomer.jsp
index b0b307404a..a60ae78994 100644
--- a/posterita/posterita/web/jsp/pos/viewPOSCustomer.jsp
+++ b/posterita/posterita/web/jsp/pos/viewPOSCustomer.jsp
@@ -196,7 +196,7 @@
 									<bean:define id="bpartnerId" name="<%=Constants.CUSTOMER_DETAILS%>" property="bpartnerId"/>
 									<bean:define id="partnerName" name="<%=Constants.CUSTOMER_DETAILS%>" property="partnerName"/>
 								
-									<html:link href="<%="GetBpartnerPaymentStatus.do?action=getBpartnerPaymentStatus&forward=/ViewPOSCustomer.do&bpartnerId=" + bpartnerId+"&partnerName="+partnerName%>">
+									<html:link href="GetBpartnerPaymentStatus.do?action=getBpartnerPaymentStatus&forward=/ViewPOSCustomer.do&bpartnerId=<%= bpartnerId %>&partnerName=<%= partnerName%>">
 										<pos:message key="settle.payment"/>
 									</html:link>
 								
diff --git a/posterita/posterita/web/jsp/pos/viewPOSCustomerCart.jsp b/posterita/posterita/web/jsp/pos/viewPOSCustomerCart.jsp
index 0ee0e3bd50..5a5f10c4fa 100644
--- a/posterita/posterita/web/jsp/pos/viewPOSCustomerCart.jsp
+++ b/posterita/posterita/web/jsp/pos/viewPOSCustomerCart.jsp
@@ -132,7 +132,7 @@
 </logic:notEmpty>
 </logic:present>
 <div>
-	<applet archive="<%= basePath + "applets/printOrderApplet.jar"%>" code="org.posterita.core.PrintOrderApplet.class" width="0" height="0"></applet>
+	<applet archive="<%= basePath %>applets/printOrderApplet.jar" code="org.posterita.core.PrintOrderApplet.class" width="0" height="0"></applet>
 </div>
 
 <logic:present cookie="preference.printing">
@@ -146,8 +146,8 @@
 			try
 			{				
 				
-				document.applets[0].setPrinterName(<%="'" + cookie.getValue() + "'"%>);
-				var url = '<%=basePath + "POSCustomerAction.do?action=generateCustomerBarcode"%>';
+				document.applets[0].setPrinterName('<%= cookie.getValue()%>');
+				var url = '<%=basePath %>POSCustomerAction.do?action=generateCustomerBarcode';
 				document.applets[0].printURL(url);
 			}
 			catch(e)
@@ -168,8 +168,8 @@
 		try
 		{
 			
-			document.applets[0].setPrinterName(<%="'" + cookie.getValue() + "'"%>);
-			var url = '<%=basePath + "POSCustomerAction.do?action=generateCustomerBarcode"%>';
+			document.applets[0].setPrinterName('<%= cookie.getValue() %>');
+			var url = '<%=basePath %>POSCustomerAction.do?action=generateCustomerBarcode';
 			document.applets[0].printURL(url);
 		}
 		catch(e)
diff --git a/posterita/posterita/web/jsp/pos/viewPOSHistoryForAll.jsp b/posterita/posterita/web/jsp/pos/viewPOSHistoryForAll.jsp
index 264ab24dad..02ecbfdd79 100644
--- a/posterita/posterita/web/jsp/pos/viewPOSHistoryForAll.jsp
+++ b/posterita/posterita/web/jsp/pos/viewPOSHistoryForAll.jsp
@@ -90,7 +90,7 @@
 			%>
 	
 		   <td class=<%=styleClass%> >
-		   		<html:link href="<%="ViewPOSOrderAction.do?action=viewPOSOrders&orderId=" + element.getOrderId() %>">
+		   		<html:link href="ViewPOSOrderAction.do?action=viewPOSOrders&orderId=<%= element.getOrderId() %>">
 					<bean:write name="element" property="documentNo"/>
 				</html:link>		
 		   </td>
@@ -137,14 +137,14 @@
 		   %>
 		   
 			<logic:equal name="element" property="isCustomer" value="Yes">
-				<html:link href="<%="POSCustomerAction.do?action=viewPOSCustomer&bpartnerId=" + partnerId %>">
+				<html:link href="POSCustomerAction.do?action=viewPOSCustomer&bpartnerId=<%= partnerId %>">
 		   			<bean:write name="element" property="partnerName"/>
 		   		</html:link>			
 			</logic:equal>
 			
 			
 			<logic:equal name="element" property="isCustomer" value="No">
-				<html:link href="<%="POSVendorAction.do?action=viewVendorDetails1&bpartnerId=" + partnerId %>">
+				<html:link href="POSVendorAction.do?action=viewVendorDetails1&bpartnerId=<%= partnerId %>">
 		   			<bean:write name="element" property="partnerName"/>
 		   		</html:link>			
 			</logic:equal>
@@ -185,14 +185,14 @@
 				</a>
 		   </logic:equal>
 		   <logic:notEqual cookie="preference.printing" property="value" value="true">
-		   		<html:link href="<%="ReprintOrderAction.do?action=reprintOrder&orderId=" + element.getOrderId() %>">
+		   		<html:link href="ReprintOrderAction.do?action=reprintOrder&orderId=<%= element.getOrderId() %>">
 					<pos:message key="reprint"/>
 				</html:link>
 		   </logic:notEqual>
 		   </logic:present>
 		   
 		   <logic:notPresent cookie="preference.printing">
-		   		<html:link href="<%="ReprintOrderAction.do?action=reprintOrder&orderId=" + element.getOrderId() %>">
+		   		<html:link href="ReprintOrderAction.do?action=reprintOrder&orderId=<%= element.getOrderId() %>">
 					<pos:message key="reprint"/>
 				</html:link>
 		   </logic:notPresent>	
diff --git a/posterita/posterita/web/jsp/pos/viewPartialPOSOrderHistory.jsp b/posterita/posterita/web/jsp/pos/viewPartialPOSOrderHistory.jsp
index c274c9a6b0..5e393ef302 100644
--- a/posterita/posterita/web/jsp/pos/viewPartialPOSOrderHistory.jsp
+++ b/posterita/posterita/web/jsp/pos/viewPartialPOSOrderHistory.jsp
@@ -79,7 +79,7 @@
 		
 							
 		   <td class=<%=styleClass%>>
-		   		<html:link href="<%="ViewPOSOrderAction.do?action=viewPOSOrders&orderId=" + element.getOrderId() %>">
+		   		<html:link href="ViewPOSOrderAction.do?action=viewPOSOrders&orderId=<%= element.getOrderId() %>">
 					<bean:write name="element" property="documentNo"/>
 				</html:link>		
 		   </td>						
diff --git a/posterita/posterita/web/jsp/pos/viewPaymentAllocation.jsp b/posterita/posterita/web/jsp/pos/viewPaymentAllocation.jsp
index 142c8eac42..f82fc3ffa4 100644
--- a/posterita/posterita/web/jsp/pos/viewPaymentAllocation.jsp
+++ b/posterita/posterita/web/jsp/pos/viewPaymentAllocation.jsp
@@ -90,37 +90,37 @@
 						
 	   <td class=<%=styleClass%>>
 	   		
-	   		<html:link href="<%="POSCustomerAction.do?action=viewPOSCustomer&bpartnerId="+ element.getBpartnerId() %>">
+	   		<html:link href="POSCustomerAction.do?action=viewPOSCustomer&bpartnerId=<%= element.getBpartnerId() %>">
    						<bean:write name="element" property="partnerName"/>
    			</html:link>	
 	   				
 	   </td>						
 	   						   
 	   <td class=<%=styleClass%>>
-			<html:link href="<%="ViewPOSOrderAction.do?action=viewPOSOrders&orderId=" + element.getOrderId() %>">
+			<html:link href="ViewPOSOrderAction.do?action=viewPOSOrders&orderId=<%= element.getOrderId() %>">
 				<bean:write name="element" property="documentNo"/>
 			</html:link>
 	   </td>	
 	   <td class=<%=styleClass%>>
-	   		<html:link href="<%="ViewInvoiceAction.do?action=viewOrder&documentId=" + element.getInvoiceId() %>">
+	   		<html:link href="ViewInvoiceAction.do?action=viewOrder&documentId=<%= element.getInvoiceId() %>">
 				<bean:write name="element" property="invoiceNo"/>
 			</html:link>
 			
 	   </td>					   
 	   <td class=<%=styleClass%>>
-	   		<html:link href="<%="ViewWebstorePaymentAction.do?action=viewOrder&documentId=" + element.getPaymentId() %>">
+	   		<html:link href="ViewWebstorePaymentAction.do?action=viewOrder&documentId=<%= element.getPaymentId() %>">
 				<bean:write name="element" property="paymentId"/>
 			</html:link>
 			
 	   </td>
 	   <td class=<%=styleClass%>>
-		   <html:link href="<%="ViewWebstoreCashPaymentAction.do?action=viewOrder&documentId=" + element.getCashLineId() %>">
+		   <html:link href="ViewWebstoreCashPaymentAction.do?action=viewOrder&documentId=<%= element.getCashLineId() %>">
 				<bean:write name="element" property="cashLineId"/>
 			</html:link>
 	   </td>
 	   
 	   <td class=<%=styleClass%>>
-	   		<html:link href="<%="ViewInvoiceAction.do?action=viewOrder&documentId=" + element.getCreditMemoId() %>">
+	   		<html:link href="ViewInvoiceAction.do?action=viewOrder&documentId=<%= element.getCreditMemoId() %>">
 				<bean:write name="element" property="creditMemoNumber"/>
 			</html:link>
 	   </td>	
diff --git a/posterita/posterita/web/jsp/pos/viewPaymentDetails.jsp b/posterita/posterita/web/jsp/pos/viewPaymentDetails.jsp
index 858cf85071..1bc27d1f9c 100644
--- a/posterita/posterita/web/jsp/pos/viewPaymentDetails.jsp
+++ b/posterita/posterita/web/jsp/pos/viewPaymentDetails.jsp
@@ -95,7 +95,7 @@
 							</td>
 							
 							<td>
-								<html:link href="<%="ViewWebstorePaymentAction.do?action=viewOrder&documentId="+ element.getPaymentId() %>">
+								<html:link href="ViewWebstorePaymentAction.do?action=viewOrder&documentId=<%= element.getPaymentId() %>">
 					     				<bean:write name="element" property="paymentId"/>
 					     		</html:link>
 								
@@ -137,7 +137,7 @@
 							</td>
 							
 							<td>
-								<html:link href="<%="ViewWebstoreCashPaymentAction.do?action=viewOrder&documentId=" + element.getCashLineId() %>">
+								<html:link href="ViewWebstoreCashPaymentAction.do?action=viewOrder&documentId=<%= element.getCashLineId() %>">
 					     				<bean:write name="element" property="cashLineId"/>
 					     		</html:link>
 							</td>
diff --git a/posterita/posterita/web/jsp/pos/viewProductSalesDetails.jsp b/posterita/posterita/web/jsp/pos/viewProductSalesDetails.jsp
index 160287e418..aeab580ddb 100644
--- a/posterita/posterita/web/jsp/pos/viewProductSalesDetails.jsp
+++ b/posterita/posterita/web/jsp/pos/viewProductSalesDetails.jsp
@@ -47,7 +47,7 @@
 <%@ include file="/jsp/include/errors.jsp" %> 
 
 <div>
-	<html:link href="<%="ViewAllPOSProduct.do"%>">
+	<html:link href="ViewAllPOSProduct.do">
 	 <pos:message key="back" textOnly="true"/>
 	</html:link>
 </div>	
@@ -126,7 +126,7 @@
 				styleClass1 = "contentname";
 		%>							
 		   <td class=<%=styleClass1%>>
-		   		<html:link href="<%="ViewPOSOrderAction.do?action=viewPOSOrders&orderId=" + element.getOrderId() %>">
+		   		<html:link href="ViewPOSOrderAction.do?action=viewPOSOrders&orderId=<%= element.getOrderId() %>">
 					<bean:write name="element" property="documentNo"/>
 				</html:link>		
 		   </td>						
diff --git a/posterita/posterita/web/jsp/pos/webDocumentHeader.jsp b/posterita/posterita/web/jsp/pos/webDocumentHeader.jsp
index e2009fa2d3..6bc7def512 100644
--- a/posterita/posterita/web/jsp/pos/webDocumentHeader.jsp
+++ b/posterita/posterita/web/jsp/pos/webDocumentHeader.jsp
@@ -57,7 +57,7 @@
 										<bean:write name="<%=Constants.WEB_DOCUMENT_HEADER_BEAN%>" property="from"/>
 									</td>								
 									<td width="200px">
-										<html:link href="<%="POSCustomerAction.do?action=viewPOSCustomer&bpartnerId="+ partnerId %>">
+										<html:link href="POSCustomerAction.do?action=viewPOSCustomer&bpartnerId=<%= partnerId %>">
 										<c:out value='${you.name}'/>
 										<c:out value='${you.name2}'/>
 										</html:link>
diff --git a/posterita/posterita/web/jsp/user/listUsers.jsp b/posterita/posterita/web/jsp/user/listUsers.jsp
index 5f5c0f8ea0..013b76b24f 100644
--- a/posterita/posterita/web/jsp/user/listUsers.jsp
+++ b/posterita/posterita/web/jsp/user/listUsers.jsp
@@ -79,15 +79,15 @@
 							</td>
 							
 							<td class="<%=styleClass%>">
-								<html:link href="<%="UserAction.do?action=initEditUser&userId=" + element.getUserId()%>">Edit</html:link>
+								<html:link href="UserAction.do?action=initEditUser&userId=<%= element.getUserId()%>">Edit</html:link>
 								&nbsp;
-								<html:link href="<%="UserAction.do?action=viewUser&userId=" + element.getUserId()%>">View</html:link>
+								<html:link href="UserAction.do?action=viewUser&userId=<%= element.getUserId()%>">View</html:link>
 								&nbsp;
 								<logic:equal name="element" property="isActive" value="true">
-								<html:link href="<%="UserAction.do?action=deleteUser&userId=" + element.getUserId()%>">Deactivate</html:link>
+								<html:link href="UserAction.do?action=deleteUser&userId=<%= element.getUserId()%>">Deactivate</html:link>
 								</logic:equal>
 								<logic:notEqual name="element" property="isActive" value="true">
-								<html:link href="<%="UserAction.do?action=activateUser&userId=" + element.getUserId()%>">Activate</html:link>
+								<html:link href="UserAction.do?action=activateUser&userId=<%= element.getUserId()%>">Activate</html:link>
 								</logic:notEqual>
 							</td>
 						</tr>