BF [2979271] - Improve Posterita

https://sourceforge.net/tracker/?func=detail&aid=2979271&group_id=176962&atid=883808
This commit is contained in:
trifonnt 2010-03-30 10:44:50 +00:00
parent 7fb2a677c5
commit cd377666f8
34 changed files with 2623 additions and 96 deletions

View File

@ -89,7 +89,7 @@ error.invalid.orderType=The Order is not a POS Order, Please check the Document
error.no.checkbox.selected=Please select a checkbox
error.client.alreadyexist=Client with the name provided already exist
error.client.create=Could not create client with the details provided.<br />Please contact POSterita (info@posterita.org) for support.<br />Cause:{0}
error.client.create=Could not create client with the details provided.<br />Please contact POSterita (support@posterita.org) for support.<br />Cause:{0}
error.allocation.notclosable=Cannot close allocation because one or more lines are not Accepted yet
@ -1013,6 +1013,7 @@ pricelist.listPrice = List Price
error.required.currentBalance = Current Balance is required
error.required.accountNo = Account Number is required
error.required.accountType = Account Type is required
error.required.accountFile = Accounting File is required
error.required.partnerName = Business Partner Name is required
error.required.supplierName = Vendor Name is required
error.required.sizes = Please select some sizes or enter a custom size
@ -1236,6 +1237,8 @@ pos.continue=Continue
################### Messages for POS ######################
message.product.saved = Product updated successfully
message.saved = Saved
config.message.saved = Settings saved successfully.
################## User Registration ######################
success.userRegistration.successful = Registration Successful
@ -1260,3 +1263,4 @@ error.operation=An error has occured while executing the operation you requested
error.terminal.cashbook=The cash book assigned on this terminal is already assigned to another terminal
error.deactivate.cashbook=Cash book cannot be deactivated as it is being used on a terminal
error.deactivate.terminal=Terminal cannot be deactivated as no active terminal will be available for login

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -267,7 +267,7 @@ td.yellow
#messagebox div, .errormsg
{
background-image: url("<%= path + "images/newUI/icon-err.gif" %>");
background-image: url("<%= path %> + "images/newUI/icon-err.gif");
background-repeat: no-repeat;
background-position: left center;
font-family: arial,sans-serif;
@ -280,7 +280,7 @@ td.yellow
.successmsg
{
background-image: url("<%= path + "images/pos/success.gif" %>");
background-image: url("<%= path %> + "images/pos/success.gif");
background-repeat: no-repeat;
background-position: left top;
font-family: arial,sans-serif;
@ -373,7 +373,7 @@ font
li.submenu
{
list-style-image: url("<%= path + "images/pos/buttons/bullet_red.gif" %>");
list-style-image: url("<%= path %> + "images/pos/buttons/bullet_red.gif");
font-family: arial,sans-serif;
font-size: 10pt;
/*font-weight: bold;*/
@ -868,142 +868,142 @@ caption
/* buttons styles */
.advanced
{
background-image: url("<%= path + "images/pos/buttons/button_advanced.gif" %>");
background-image: url("<%= path %> + "images/pos/buttons/button_advanced.gif");
}
.continue
{
background-image: url("<%= path + "images/pos/buttons/button_continue.gif" %>");
background-image: url("<%= path %> + "images/pos/buttons/button_continue.gif");
}
.create
{
background-image: url("<%= path + "images/pos/buttons/button_create.gif" %>");
background-image: url("<%= path %> + "images/pos/buttons/button_create.gif");
}
.complete
{
background-image: url("<%= path + "images/pos/buttons/button_complete.gif" %>");
background-image: url("<%= path %> + "images/pos/buttons/button_complete.gif");
}
.addtocart
{
background-image: url("<%= path + "images/pos/buttons/button_addtocart.gif" %>");
background-image: url("<%= path %> + "images/pos/buttons/button_addtocart.gif");
}
.newcustomer
{
background-image: url("<%= path + "images/pos/buttons/button_newcustomer.gif" %>");
background-image: url("<%= path %> + "images/pos/buttons/button_newcustomer.gif");
}
.checkout
{
background-image: url("<%= path + "images/pos/buttons/button_checkout.gif" %>");
background-image: url("<%= path %> + "images/pos/buttons/button_checkout.gif");
}
.delete
{
background-image: url("<%= path + "images/pos/buttons/button_delete.gif" %>");
background-image: url("<%= path %> + "images/pos/buttons/button_delete.gif");
}
.neworder
{
background-image: url("<%= path + "images/pos/buttons/button_neworder.gif" %>");
background-image: url("<%= path %> + "images/pos/buttons/button_neworder.gif");
}
.newnote
{
background-image: url("<%= path + "images/pos/buttons/button_newnote.gif" %>");
background-image: url("<%= path %> + "images/pos/buttons/button_newnote.gif");
}
.cash
{
background-image: url("<%= path + "images/pos/buttons/button_cash.gif" %>");
background-image: url("<%= path %> + "images/pos/buttons/button_cash.gif");
}
.card
{
background-image: url("<%= path + "images/pos/buttons/button_card.gif" %>");
background-image: url("<%= path %> + "images/pos/buttons/button_card.gif");
}
.cheque
{
background-image: url("<%= path + "images/pos/buttons/button_cheque.gif" %>");
background-image: url("<%= path %> + "images/pos/buttons/button_cheque.gif");
}
.mixed
{
background-image: url("<%= path + "images/pos/buttons/button_mixed.gif" %>");
background-image: url("<%= path %> + "images/pos/buttons/button_mixed.gif");
}
.save
{
background-image: url("<%= path + "images/pos/buttons/button_save.gif" %>");
background-image: url("<%= path %> + "images/pos/buttons/button_save.gif");
}
.search
{
background-image: url("<%= path + "images/pos/buttons/button_search.gif" %>");
background-image: url("<%= path %> + "images/pos/buttons/button_search.gif");
}
.edit
{
background-image: url("<%= path + "images/pos/buttons/button_edit.gif" %>");
background-image: url("<%= path %> + "images/pos/buttons/button_edit.gif");
}
.tangoSearch
{
background-image: url("<%= path + "images/tango/system-search.png" %>");
background-image: url("<%= path %> + "images/tango/system-search.png");
margin-top: -3px;
}
.selectall
{
background-image: url("<%= path + "images/pos/buttons/button_selectall.gif" %>");
background-image: url("<%= path %> + "images/pos/buttons/button_selectall.gif");
}
.submit
{
background-image: url("<%= path + "images/pos/buttons/button_submit.gif" %>");
background-image: url("<%= path %> + "images/pos/buttons/button_submit.gif");
}
.refresh
{
background-image: url("<%= path + "images/pos/buttons/button_refresh.gif" %>");
background-image: url("<%= path %> + "images/pos/buttons/button_refresh.gif");
}
.piechart
{
background-image: url("<%= path + "images/pos/buttons/button_piechart.gif" %>");
background-image: url("<%= path %> + "images/pos/buttons/button_piechart.gif");
}
.barchart
{
background-image: url("<%= path + "images/pos/buttons/button_barchart.gif" %>");
background-image: url("<%= path %> + "images/pos/buttons/button_barchart.gif");
}
.timeseries
{
background-image: url("<%= path + "images/pos/buttons/button_timeseries.gif" %>");
background-image: url("<%= path %> + "images/pos/buttons/button_timeseries.gif");
}
.tabular
{
background-image: url("<%= path + "images/pos/buttons/button_tabular.gif" %>");
background-image: url("<%= path %> + "images/pos/buttons/button_tabular.gif");
}
.saveascsv
{
background-image: url("<%= path + "images/pos/buttons/button_saveascsv.gif" %>");
background-image: url("<%= path %> + "images/pos/buttons/button_saveascsv.gif");
}
.saveaspdf
{
background-image: url("<%= path + "images/pos/buttons/button_saveaspdf.gif" %>");
background-image: url("<%= path %> + "images/pos/buttons/button_saveaspdf.gif");
}
.blank
{
background-image: url("<%= path + "images/pos/buttons/button_blank.gif" %>");
background-image: url("<%= path %> + "images/pos/buttons/button_blank.gif");
}
.bigbutton
@ -1276,7 +1276,7 @@ div#PINPanel
div#divBack
{
background-image: url("<%= path + "images/pos/maskBG.png" %>");
background-image: url("<%= path %> + "images/pos/maskBG.png");
filter: alpha(opacity=40);
}
@ -1440,7 +1440,7 @@ fieldset.submenu{
color: #666666;
height: 42px;
/*min-width:87px;*/
background-image: url("<%= path + "images/pos/buttons/button_middle.gif" %>");
background-image: url("<%= path %> + "images/pos/buttons/button_middle.gif");
border-left: solid 1px #9b9b9b;
border-right: solid 1px #9b9b9b;
border-top-width: 0px;
@ -1455,7 +1455,7 @@ fieldset#createcustomer{
/*
.searchBox{
background-image:url("<%= path + "images/pos/magnifying-glass.gif" %>");
background-image:url("<%= path %> + "images/pos/magnifying-glass.gif");
background-repeat:no-repeat;
padding-left:20px;
}
@ -1541,7 +1541,7 @@ div#customerInfoPanel{
div.disableMask
{
background-image: url("<%= path + "images/pos/maskBG.png" %>");
background-image: url("<%= path %> + "images/pos/maskBG.png");
filter: alpha(opacity=40);
}
@ -1551,7 +1551,7 @@ div.ajaxindicator
padding:10px;
border:solid 1px #000000;
background-color:#FFFFFF;
/*background-image: url("<%= path + "images/ajax-indicators/indicator.gif" %>");*/
/*background-image: url("<%= path %> + "images/ajax-indicators/indicator.gif");*/
background-repeat:no-repeat;
background-position:left center;
padding-left:20px;
@ -1567,14 +1567,14 @@ td.loginHeader
{
height: 210px;
width: 800px;
background-image: url("<%= path + "images/pos/logo.jpg" %>");
background-image: url("<%= path %> + "images/pos/logo.jpg");
background-position:center center;
background-repeat:no-repeat;
}
td.headerLogo
{
background-image: url("<%= path + "images/pos/logo.gif" %>");
background-image: url("<%= path %> + "images/pos/logo.gif");
background-position:top left;
background-repeat:no-repeat;
height: 40px;
@ -1596,7 +1596,7 @@ input.calendar-icon
{
width: 28px;
height: 22px;
background-image: url("<%= path + "images/pos/calendar.gif" %>");
background-image: url("<%= path %> + "images/pos/calendar.gif");
}
.floatleft

View File

@ -72,10 +72,10 @@
<td><%--
<html:link href="<%= "RoleAction.do?action=viewRole&roleId=" + roleID %>">Edit</html:link>
<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>--%>
<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>

View File

@ -152,23 +152,23 @@
</td>
<td class="<%=styleClass%>">
<html:link href="<%="EditBPartnerAction.do?action=viewBpartnerDetails&bpartnerId=" + element.getBpartnerId()%>">
<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()%>">
<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" %>">
<html:link href="ActivateBPartnerAction.do?action=activateBPartner&isActive=true&bpartnerId=<%= element.getBpartnerId() %>">
<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" %>">
<html:link href="ActivateBPartnerAction.do?action=activateBPartner&isActive=false&bpartnerId=<%= element.getBpartnerId() %>">
<img src="images/tango/edit-undo.png" title="Activate" alt="Activate" border="0">
</html:link>
</logic:notEqual>

View File

@ -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>

View File

@ -94,7 +94,7 @@
<table border="0">
<tr>
<td align="center">
<html:link action="<%= "/ViewReportAction.do?action=viewReport&" + requestParams %>" target="_blank">
<html:link action="/ViewReportAction.do?action=viewReport&<%= requestParams %>" target="_blank">
<img src="<%= imgSrc %>" name="image" width="210" height="140">
</html:link>
</td>

View File

@ -58,7 +58,7 @@
<bean:write name="stock" property="moveConfirmId" />
</td>
<td class = "label">
<html:link action="<%="StockMovementAction.do?action=viewMoveConfirmLines&movementId=" + stock.getMovementId().toString() + "&moveConfirmId=" + stock.getMoveConfirmId().toString() %>"><bean:write name="stock" property="documentNo"/></html:link>
<html:link action="StockMovementAction.do?action=viewMoveConfirmLines&movementId=<%= stock.getMovementId().toString() %>&moveConfirmId=<%= stock.getMoveConfirmId().toString() %>"><bean:write name="stock" property="documentNo"/></html:link>
</td>
<td class = "label">
<bean:write name="stock" property="orgFromName"/>
@ -77,7 +77,7 @@
<% if (!stock.getDocStatus().equals("CO"))
{
%>
<html:link action="<%= "StockMovementAction.do?action=completeMoveConfirm&moveConfirmId=" + stock.getMoveConfirmId().toString()%>">Complete</html:link>
<html:link action="StockMovementAction.do?action=completeMoveConfirm&moveConfirmId=<%= stock.getMoveConfirmId().toString() %>">Complete</html:link>
<%
}
%>

View File

@ -127,7 +127,7 @@
<html:text name="stock" property="qtyToMove" indexed="true" value="<%=stock.getQtyToMove().toString()%>"></html:text>
</td>
<td align="right" class="<%=styleClass%>">
<html:link action="<%= "StockMovementAction.do?action=remove&index=" + index.intValue() %>">Remove</html:link>
<html:link action="StockMovementAction.do?action=remove&index=<%= index.intValue() %>">Remove</html:link>
</td>
</tr>
</logic:iterate>

View File

@ -187,7 +187,7 @@
trStyleClass = "oddRow";
}
%>
<tr class="<%=trStyleClass%> productId="<%=element.getProductId()%>" qty="<%=element.getQty()%>" id="<%= "row" + (count.intValue()+1)%>">
<tr class="<%=trStyleClass%> productId="<%=element.getProductId()%>" qty="<%=element.getQty()%>" id="row<%= (count.intValue()+1)%>">
<td>
<bean:write name="element" property="description"/>
</td>
@ -232,7 +232,7 @@
</logic:present>
</tbody>
<bean:size id="size" name="<%= Constants.SHOPPING_ORDER_CART_ITEMS %>"/>
<tr class="itemsTotal" id="<%= "row" + (size.intValue() + 1) %>">
<tr class="itemsTotal" id="row<%= (size.intValue() + 1) %>">
<td>&nbsp;</td>
<td><fmt:formatNumber value='${qtyTotal}'/></td>
<td colspan="4">&nbsp;</td>

View File

@ -92,7 +92,7 @@
%>
<td class=<%=styleClass%>>
<html:link href="<%="CashLineReportAction.do?action=getCashLineDetails&cashId=" + element.getCashId() %>">
<html:link href="CashLineReportAction.do?action=getCashLineDetails&cashId=<%= element.getCashId() %>">
<bean:write name="element" property="name"/>
</html:link>
</td>

View File

@ -56,11 +56,11 @@
<bean:define id="productId" name="POSProductForm" property="productId" ></bean:define>
<script>
$('previousItem').onclick = function(e){
get('<%="POSProductAction.do?action=viewProduct&isNext=false&productId=" + productId%>');
get('POSProductAction.do?action=viewProduct&isNext=false&productId=<%= productId %>');
};
$('nextItem').onclick = function(e){
get('<%="POSProductAction.do?action=viewProduct&isNext=true&productId=" + productId%>');
get('POSProductAction.do?action=viewProduct&isNext=true&productId=<%= productId %>');
}
</script>
@ -337,7 +337,7 @@
%>
<tr id="<%= "row" + (index.intValue()+1)%>" class="<%=styleClass%>" onMouseOver="this.className='highlight'" onMouseOut="this.className='oddRow'"">
<tr id="row<%= (index.intValue()+1) %>" class="<%=styleClass%>" onMouseOver="this.className='highlight'" onMouseOut="this.className='oddRow'"">
<td class="bold11" width="100">
<bean:write name="productBean" property="priceListName"/>
<logic:equal name="productBean" property="isMandatory" value="true">

View File

@ -191,7 +191,7 @@
<html:hidden name="productBean" property="productId" value="<%=productBean.getProductId().toString()%>" indexed="true"/>
<html:hidden name="productBean" property="priceListVersionId" value="<%=productBean.getPriceListVersionId().toString()%>" indexed="true"/>
<tr id="<%= "row" + (index.intValue()+1)%>">
<tr id="row<%= (index.intValue()+1) %>">
<td><bean:write name="productBean" property="priceListName"/>
<logic:equal name="productBean" property="isMandatory" value="true">
<mandatory>*</mandatory>

View File

@ -47,7 +47,7 @@
<!--
<table width="100%">
<td align="right">
<html:link href="<%="CreateNewOrderAction.do?action=removeSessionForNewOrder&orderType=" + UDIOrderTypes.POS_ORDER.getOrderType() %>">
<html:link href="CreateNewOrderAction.do?action=removeSessionForNewOrder&orderType=<%= UDIOrderTypes.POS_ORDER.getOrderType() %>">
Create New
</html:link>
</td>

View File

@ -68,7 +68,7 @@
<table>
<tr>
<td colspan="4" 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>
@ -206,7 +206,7 @@
<html:hidden name="productBean" property="productId" value="<%=productBean.getProductId().toString()%>" indexed="true"/>
<html:hidden name="productBean" property="priceListVersionId" value="<%=productBean.getPriceListVersionId().toString()%>" indexed="true"/>
<tr id="<%= "row" + (index.intValue()+1)%>">
<tr id="row<%= (index.intValue()+1)%>">
<td><bean:write name="productBean" property="priceListName"/>
<logic:equal name="productBean" property="isMandatory" value="true">
<mandatory>*</mandatory>

View File

@ -51,7 +51,7 @@
</logic:notPresent>
<table width="100%">
<td align="right">
<html:link href="<%="CreateNewOrderAction.do?action=removeSessionForNewOrder&orderType=" + UDIOrderTypes.CUSTOMER_RETURN_ORDER.getOrderType() %>">
<html:link href="CreateNewOrderAction.do?action=removeSessionForNewOrder&orderType=<%= UDIOrderTypes.CUSTOMER_RETURN_ORDER.getOrderType() %>">
Create New
</html:link>
</td>

View File

@ -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=getCreditMemoShoppingCart&orderId="+posOrderId%>';
window.location = 'GetShoppingCartForOrder.do?action=getCreditMemoShoppingCart&orderId=<%= posOrderId %>';
</logic:present>
};

View File

@ -108,7 +108,7 @@
<logic:present name="orderType">
<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>
@ -117,7 +117,7 @@
<logic:notPresent name="orderType">
<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%>">
<html:link href="GetShoppingCartForOrder.do?action=getOrderShoppingCart&orderId=<%= posOrderId %>">
<html:button property="btn" styleClass="edit smallbutton" accesskey="c">&nbsp;</html:button>
</html:link>
</logic:present>

View File

@ -108,23 +108,23 @@
</td>
<td class="<%=styleClass%>" width="110px">
<html:link href="<%="POSUserAction.do?action=initEditUser&userId=" + element.getUserId()%>">
<html:link href="POSUserAction.do?action=initEditUser&userId=<%= element.getUserId() %>">
<img src="images/tango/accessories-text-editor.png" title="Edit Customer" alt="Edit Customer" border="0">
</html:link>
<html:link href="<%="POSUserAction.do?action=viewUser&userId=" + element.getUserId()%>">
<html:link href="POSUserAction.do?action=viewUser&userId=<%= element.getUserId() %>">
<img src="images/tango/edit-find.png" title="View Customer" alt="View Customer" border="0">
</html:link>
<logic:equal name="element" property="isActive" value="true">
<html:link href="<%="POSUserAction.do?action=deleteUser&userId=" + element.getUserId()%>">
<html:link href="POSUserAction.do?action=deleteUser&userId=<%= element.getUserId() %>">
<img src="images/tango/edit-redo.png" title="Deactivate User" alt="User Customer" border="0">
</html:link>
</logic:equal>
<logic:notEqual name="element" property="isActive" value="true">
<html:link href="<%="POSUserAction.do?action=activateUser&userId=" + element.getUserId()%>">
<html:link href="POSUserAction.do?action=activateUser&userId=<%= element.getUserId()%>">
<img src="images/tango/edit-undo.png" title="Activate User" alt="Activate User" border="0">
</html:link>
</logic:notEqual>

View File

@ -97,19 +97,19 @@
<bean:define id="name" name="element" property="name"/>
</td>
<td class="<%=styleClass%>" width="120px">
<html:link href="<%= "POSRoleAction.do?action=initEditRole&roleId=" + roleID %>">
<html:link href="POSRoleAction.do?action=initEditRole&roleId=<%= roleID %>">
<img src="images/tango/accessories-text-editor.png" title="Edit Role" alt="Edit Role" border="0">
</html:link>
<html:link href="<%= "POSRoleAction.do?action=viewRole&roleId=" + roleID %>">
<html:link href="POSRoleAction.do?action=viewRole&roleId=<%= roleID %>">
<img src="images/tango/edit-find.png" title="View Role" alt="View Role" border="0">
</html:link>
<html:link href="<%= "RoleOrgAccessAction.do?action=initEditRoleOrgAccess&roleId=" + roleID + "&name=" + name %>">
<html:link href="RoleOrgAccessAction.do?action=initEditRoleOrgAccess&roleId=<%= roleID %>&name=<%= name %>">
<img src="images/tango/edit-find.png" title="Edit Organisation Access" alt="Edit Organisation Access" border="0">
</html:link>
<%--<html:link href="<%= "POSRoleAction.do?action=deleteRole&roleId=" + roleID %>">Delete</html:link>--%>
<%--<html:link href="POSRoleAction.do?action=deleteRole&roleId=<%= roleID %>">Delete</html:link>--%>
</td>
</tr>
</logic:iterate>

View File

@ -222,7 +222,7 @@
<html:hidden property="cardNo" value=""/>
<html:hidden property="chequeNo" value=""/>
<html:hidden property="discountOnTotal" styleId="discountOnTotal" value=""/>
<html:hidden property="roundOffFactor" value = "<%=roundOffFactor + ""%>" styleId="roundOffFactor"/>
<html:hidden property="roundOffFactor" value = "<%= roundOffFactor.toString() %>" styleId="roundOffFactor"/>
<html:hidden property="isDiscountApplied" value="" styleId="isDiscountApplied"/>
<logic:equal name="<%= Constants.DISCOUNT_ON_ORDER_TOTAL_PERCENT%>" value="true">
<html:hidden property="discountOnTotalPercent" styleId="discountOnTotalPercent" value="true"/>
@ -237,7 +237,7 @@
<html:hidden property="discountOnTotal" styleId="discountOnTotal" value="false"/>
</logic:equal>
<input type="hidden" name="searchProductBy" value="<%=searchProductBy%>" id="searchProductBy"/>
<input type="hidden" name="isCustomerCompulsory" value="<%=isCustomerCompulsory + ""%>" id="isCustomerCompulsory"/>
<input type="hidden" name="isCustomerCompulsory" value="<%= isCustomerCompulsory %>" id="isCustomerCompulsory"/>
<input type="hidden" id="bpartnerId" name="bpartnerId" value="<%=bPartnerId%>"/>
<td width="75%" valign="top" height="100%">
<div id="contentContainer">
@ -704,7 +704,7 @@
<script>
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);
}

View File

@ -106,15 +106,15 @@
</td>
<td class="<%=styleClass%>" align="right">
<img src="images/pos/buttons/button_plus.gif" class="button" onclick="<%="incrementCart("+element.getProductId()+")"%>">
<img src="images/pos/buttons/button_plus.gif" class="button" onclick="incrementCart(<%= element.getProductId() %>)">
</td>
<td class="<%=styleClass%>" align="right">
<img src="images/pos/buttons/button_minus.gif" class="button" onclick="<%="decrementCart("+element.getProductId()+")"%>">
<img src="images/pos/buttons/button_minus.gif" class="button" onclick="decrementCart(<%= element.getProductId() %>)">
</td>
<td class="<%=styleClass%>" align="right">
<img src="images/pos/cross.gif" class="button" onclick="<%="deleteItemFromCart("+element.getProductId()+")"%>">
<img src="images/pos/cross.gif" class="button" onclick="deleteItemFromCart(<%= element.getProductId() %>)">
</td>

View File

@ -210,7 +210,7 @@
<tr id="row<%=count%>" class="<%=styleClass%>" itemId="<%=element.getProductId()%>">
<td style="color: #669ACF;">
<html:link action="<%= "POSProductSalesAnalysisAction.do?action=viewProductSalesDetails&productId=" + element.getProductId() %>">
<html:link action="POSProductSalesAnalysisAction.do?action=viewProductSalesDetails&productId=<%= element.getProductId() %>">
<bean:write name="element" property="productName" filter="false"/>
</html:link>
</td>

View File

@ -81,19 +81,19 @@
</td>
<td class="<%=styleClass%>" width="10%" align="center">
<html:link href="<%="EditTaxAction.do?action=initEditTax&taxId=" + element.getTaxId()%>">
<html:link href="EditTaxAction.do?action=initEditTax&taxId=<%= element.getTaxId() %>">
<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="<%="ActivateDeactivateTaxAction.do?action=deActivateTax&taxId=" + element.getTaxId()%>">
<html:link href="ActivateDeactivateTaxAction.do?action=deActivateTax&taxId=<%= element.getTaxId() %>">
<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="<%="ActivateDeactivateTaxAction.do?action=activateTax&taxId=" + element.getTaxId()%>">
<html:link href="ActivateDeactivateTaxAction.do?action=activateTax&taxId=<%= element.getTaxId() %>">
<img src="images/tango/edit-undo.png" title="Activate" alt="Activate" border="0">
</html:link>
</logic:notEqual>

View File

@ -50,7 +50,7 @@
<table class="main">
<tr>
<td>
<html:link href="<%="ViewCommissionAction.do?action=viewCommission" %>">
<html:link href="ViewCommissionAction.do?action=viewCommission">
<pos:message key="back"/>
</html:link>
@ -79,7 +79,7 @@
<logic:notEqual name="element" property="orderLineId" value="0">
<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="reference"/>
</html:link>
</td>
@ -87,7 +87,7 @@
<logic:notEqual name="element" property="invoiceLineId" value="0">
<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="reference"/>
</html:link>
</td>

View File

@ -77,7 +77,7 @@
%>
<td class=<%=styleClass%>>
<html:link href="<%="CreditorDebtorAction.do?action=getDebtorHistory&bpartnerId=" + element.getBpartnerId() %>">
<html:link href="CreditorDebtorAction.do?action=getDebtorHistory&bpartnerId=<%= element.getBpartnerId() %>">
<bean:write name="element" property="partnerName"/>
</html:link>
</td>

View File

@ -79,7 +79,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>
</td>

View File

@ -204,7 +204,7 @@
</tr>
<tr>
<td>
<html:link href="<%="ViewBPartnerTrxDetailsAction.do?action=getBpartnerTrxDetails&forward=/ViewPOSCustomer.do&isCustomer=true"+"&bpartnerId=" + bpartnerId %>">
<html:link href="ViewBPartnerTrxDetailsAction.do?action=getBpartnerTrxDetails&forward=/ViewPOSCustomer.do&isCustomer=true&bpartnerId=<%= bpartnerId %>">
<pos:message key="view.info"/>
</html:link>
</td>
@ -218,7 +218,7 @@
</table>
<div align="right">
<html:button property="button" styleClass="blank smallbutton" onclick="<%= "get('POSCustomerAction.do?action=initEditPOSCustomer&bpartnerId=" + bpartnerId + "')" %>">Edit</html:button>
<html:button property="button" styleClass="blank smallbutton" onclick="get('POSCustomerAction.do?action=initEditPOSCustomer&bpartnerId=<%= bpartnerId %>">Edit</html:button>
<html:button property="button" styleClass="blank smallbutton" onclick="get('InitCreatePOSCustomer.do?action=initCreatePOSCustomer')">Add New</html:button>
<html:button property="button" styleClass="blank smallbutton" onclick="get('ViewAllCustomers.do')">Back</html:button>
</div>

View File

@ -119,7 +119,7 @@
</logic:equal>
</td>
<td class="<%=styleClass%>">
<a href="<%= "POSCustomerAction.do?action=remove&bpartnerId=" + element.getBpartnerId()%>"><pos:message key="cart.remove"/></a>
<a href="POSCustomerAction.do?action=remove&bpartnerId=<%= element.getBpartnerId() %>"><pos:message key="cart.remove"/></a>
</td>
</tr>
</logic:iterate>

View File

@ -114,7 +114,7 @@
</td>
</td>
<td align="right" class=<%=styleClass%>>
<html:link action="<%= "ViewPOSProductCartAction.do?action=remove&productId=" + element.getProductId() %>">Remove</html:link>
<html:link action="ViewPOSProductCartAction.do?action=remove&productId=<%= element.getProductId() %>">Remove</html:link>
</td>
</tr>
</logic:iterate>

View File

@ -111,7 +111,7 @@
<fmt:formatNumber value='${salesPriceStandard}' type="currency" currencySymbol=" "/>
</td>
<td class=<%=styleClass%> align="center">
<html:link action="<%="/ViewAllPOSProductsForUpdateAction.do?action=remove&productId=" + element.getProductId() %>">
<html:link action="/ViewAllPOSProductsForUpdateAction.do?action=remove&productId=<%= element.getProductId() %>">
<pos:message key="Remove"/>
</html:link>
</td>

View File

@ -93,7 +93,7 @@
<tr>
<td class=<%=styleClass%> width="400px">
<html:link action="<%= "POSProductSalesAnalysisAction.do?action=viewProductSalesDetails&productId=" + element.getProductId() %>">
<html:link action="POSProductSalesAnalysisAction.do?action=viewProductSalesDetails&productId=<%= element.getProductId() %>">
<bean:write name="element" property="productName"/>
</html:link>
</td>

View File

@ -62,7 +62,7 @@
%>
<tr>
<td class=<%=styleClass%>>
<html:link action="<%= "POSProductSalesAnalysisAction.do?action=viewProductSalesDetails&productId=" + element.getProductId() %>">
<html:link action="POSProductSalesAnalysisAction.do?action=viewProductSalesDetails&productId=<%= element.getProductId() %>">
<bean:write name="element" property="productName"/>
</html:link>
</td>