svn commit: r1305581 [33/36] - in /ofbiz/branches/20111205EmailH
Locked
svn commit: r1305581 [33/36] - in /ofbiz/branches/20111205EmailH
 
|
Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleRequestServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleRequestServices.java?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleRequestServices.java (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleRequestServices.java Mon Mar 26 20:56:02 2012 @@ -504,7 +504,7 @@ public class GoogleRequestServices { String orderId = (String) context.get("orderId"); GenericValue order = findGoogleOrder(delegator, orderId); if (order != null) { - Debug.log("Returning FAILURE; this IS an Google Checkout order and cannot be modified as requested!", module); + Debug.logWarning("Returning FAILURE; this IS an Google Checkout order and cannot be modified as requested!", module); return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "GoogleCheckoutOrderCannotBeModified", locale)); } return ServiceUtil.returnSuccess(); Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/hhfacility/script/org/ofbiz/hhfacility/FacilityServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/hhfacility/script/org/ofbiz/hhfacility/FacilityServices.xml?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/hhfacility/script/org/ofbiz/hhfacility/FacilityServices.xml (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/hhfacility/script/org/ofbiz/hhfacility/FacilityServices.xml Mon Mar 26 20:56:02 2012 @@ -49,7 +49,7 @@ under the License. <set value="hhFacility Receipt" field="receiveCtx.comments"/> <set from-field="nowTimestamp" field="receiveCtx.datetimeReceived"/> <set value="NON_SERIAL_INV_ITEM" field="receiveCtx.inventoryItemTypeId"/> - <calculate field="receiveCtx.quantityRejected" type="Double"> + <calculate field="receiveCtx.quantityRejected" type="BigDecimal"> <number value="0"/> </calculate> <call-service service-name="receiveInventoryProduct" in-map-name="receiveCtx"/> Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/hhfacility/servicedef/services_hhfacility.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/hhfacility/servicedef/services_hhfacility.xml?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/hhfacility/servicedef/services_hhfacility.xml (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/hhfacility/servicedef/services_hhfacility.xml Mon Mar 26 20:56:02 2012 @@ -33,7 +33,7 @@ under the License. <description>Receive Product Qty to Facility</description> <attribute name="facilityId" type="String" mode="IN" optional="false"/> <attribute name="productId" type="String" mode="IN" optional="false"/> - <attribute name="productQty" type="Double" mode="IN" optional="false"/> + <attribute name="productQty" type="BigDecimal" mode="IN" optional="false"/> <attribute name="productLocation" type="String" mode="IN" optional="true"/> </service> @@ -57,7 +57,7 @@ under the License. <attribute name="facilityId" type="String" mode="IN" optional="false"/> <attribute name="locationSeqId" type="String" mode="IN" optional="false"/> <attribute name="productId" type="String" mode="IN" optional="false"/> - <attribute name="quantity" type="Double" mode="IN" optional="false"/> + <attribute name="quantity" type="BigDecimal" mode="IN" optional="false"/> <attribute name="locationSeqIdNew" type="String" mode="IN" optional="true"/> </service> Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/hhfacility/src/org/ofbiz/hhfacility/FacilityServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/hhfacility/src/org/ofbiz/hhfacility/FacilityServices.java?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/hhfacility/src/org/ofbiz/hhfacility/FacilityServices.java (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/hhfacility/src/org/ofbiz/hhfacility/FacilityServices.java Mon Mar 26 20:56:02 2012 @@ -19,6 +19,7 @@ package org.ofbiz.hhfacility; +import java.math.BigDecimal; import java.util.List; import java.util.Locale; import java.util.Map; @@ -107,7 +108,7 @@ public class FacilityServices { String facilityId = (String) context.get("facilityId"); String productId = (String) context.get("productId"); String locationSeqId = (String) context.get("locationSeqId"); - Double quantity = (Double) context.get("quantity"); + BigDecimal quantity = (BigDecimal) context.get("quantity"); if (UtilValidate.isEmpty(productId) || UtilValidate.isEmpty(facilityId)) { return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ProductIdOrFacilityIdNotFound", locale)); } @@ -127,7 +128,7 @@ public class FacilityServices { Debug.logError(e, "updateProductStocktake failed getting inventory counts", module); return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ProductErrorUpdateProductStockTake", locale)); } - int qoh = ((Double)invAvailability.get("quantityOnHandTotal")).intValue(); + int qoh = ((BigDecimal)invAvailability.get("quantityOnHandTotal")).intValue(); if (quantity.intValue() == qoh) { // No change required. Debug.logInfo("updateProductStocktake No change required quantity("+quantity+") = qoh("+qoh+")", module); Propchange: ofbiz/branches/20111205EmailHandling/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy ------------------------------------------------------------------------------ Merged /ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:r1210494-1305499 Propchange: ofbiz/branches/20111205EmailHandling/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy ------------------------------------------------------------------------------ Merged /ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:r1210494-1305499 Propchange: ofbiz/branches/20111205EmailHandling/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy ------------------------------------------------------------------------------ Merged /ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:r1210494-1305499 Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/controller.xml?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/controller.xml (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/controller.xml Mon Mar 26 20:56:02 2012 @@ -43,8 +43,9 @@ under the License. <!-- Request Mappings --> <request-map uri="main"> <security https="true" auth="true"/> - <response name="success" type="view" value="main"/> + <response name="success" type="view" value="menu"/> </request-map> + <request-map uri="receipt"> <security https="true" auth="true"/> <response name="success" type="view" value="receipt"/> @@ -137,8 +138,9 @@ under the License. <!-- end of request mappings --> <!-- View Mappings --> - <view-map name="main" type="screen" page="component://hhfacility/widget/hhfacility/FacilityScreens.xml#facilities"/> + <view-map name="main" type="screen" page="component://hhfacility/widget/hhfacility/FacilityScreens.xml#menu"/> <view-map name="login" type="screen" page="component://hhfacility/widget/hhfacility/FacilityScreens.xml#login"/> + <view-map name="ajaxLogin" type="screen" page="component://hhfacility/widget/hhfacility/FacilityScreens.xml#login"/> <view-map name="receipt" type="screen" page="component://hhfacility/widget/hhfacility/FacilityScreens.xml#receipt"/> <view-map name="poreceipt" type="screen" page="component://hhfacility/widget/hhfacility/FacilityScreens.xml#poreceipt"/> Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/hhfacility/webapp/hhfacility/facilities.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/hhfacility/webapp/hhfacility/facilities.ftl?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/hhfacility/webapp/hhfacility/facilities.ftl (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/hhfacility/webapp/hhfacility/facilities.ftl Mon Mar 26 20:56:02 2012 @@ -18,11 +18,16 @@ under the License. --> <#if facilities?has_content> -Facilities : -<ul> +<div data-role="content"> + <ul data-role="listview"> <#list facilities as facility> - <li> ${facility.facilityId?if_exists} ${facility.facilityName?if_exists} ${facility.description?if_exists} - + <li> + <#-- Each entry will have a html form. Set action to null so previous link be used --> + <form> + <input type="hidden" name="facilityId" value="${facility.facilityId}"/> + <input type="submit" value="${facility.facilityName?if_exists}"/> + </form> + </li> </#list> -</ul> -</#if> \ No newline at end of file + </ul> +</#if> Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/hhfacility/webapp/hhfacility/includes/footer.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/hhfacility/webapp/hhfacility/includes/footer.ftl?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/hhfacility/webapp/hhfacility/includes/footer.ftl (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/hhfacility/webapp/hhfacility/includes/footer.ftl Mon Mar 26 20:56:02 2012 @@ -17,19 +17,5 @@ specific language governing permissions under the License. --> -</td> -</tr> -<tr class="boxtop"> -<td width=100%> -</td> -</tr> -<tr height=24 class="boxbottom"> -<td width=100%> -<span> -Hand Held Facility -</span> -</td> -</tr> -</table> -</body> + </body> </html> \ No newline at end of file Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/hhfacility/webapp/hhfacility/includes/header.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/hhfacility/webapp/hhfacility/includes/header.ftl?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/hhfacility/webapp/hhfacility/includes/header.ftl (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/hhfacility/webapp/hhfacility/includes/header.ftl Mon Mar 26 20:56:02 2012 @@ -17,53 +17,19 @@ specific language governing permissions under the License. --> -<html> -<head> -<script language="JavaScript" type="text/javascript"> -<!-- - // Setting of field focus to initialise the - // handheld forms - critical when scanner is being used. - focusField = ""; - function fieldFocus() { - if (focusField != "") { - document.forms[0].elements[focusField].focus(); - document.forms[0].elements[focusField].select(); - } - } - // Function to move to next field when enter pressed - // event is passed as firefox needs it to get keycode instead - // of using window.event, return false will stop form submit - function enter(e,nextfield) { - if (e.keyCode == 13) { - nextfield.focus(); - nextfield.select(); - return false; - } else { - return true; - } - } -//--> -</script> -<link rel="stylesheet" href="/images/maincss.css" type="text/css"> -<title>Hand Held Facility</title> -</head> -<body onload=fieldFocus()> -<#assign facility = parameters.facility?if_exists> -<table width=240 height=250 align=top> -<tr height=24> -<td width=100% align=top class='boxbottom'> -<!--<p align="right">${Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().toString()}</p>--> -<span class="boxhead"> -<a href="<@ofbizUrl>/main</@ofbizUrl>">Main</a> -<#if facility?has_content><a href="<@ofbizUrl>/menu?facilityId=${facility.facilityId?if_exists}</@ofbizUrl>">Menu</a></#if> -<a href="<@ofbizUrl>/logout</@ofbizUrl>">Logout</a> -</span> -</td> -</tr> -<tr class="boxtop"> -<td width=100%> -</td> -</tr> -<tr height=196> -<td width=100% align=top class='boxbottom'> +<!DOCTYPE html> +<html> + <head> + <meta charset="utf-8" /> + <title>${applicationTitle?if_exists}</title> + <link rel="stylesheet" href="/images/jquery/jquery.mobile-1.1.0-rc.1/jquery.mobile-1.1.0-rc.1.css" /> + <script src="/images/jquery/jquery-1.7.min.js" type="text/javascript"></script> + <script src="/images/jquery/jquery.mobile-1.1.0-rc.1/jquery.mobile-1.1.0-rc.1.js" type="text/javascript"></script> + <meta name="viewport" content="width=device-width, initial-scale=1"> + </head> + <body> + <div data-role="header"> + <a href="<@ofbizUrl>/menu?facilityId=${parameters.facilityId?if_exists}</@ofbizUrl>">Main</a> + <h1>${title?if_exists}</h1> + </div> Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/hhfacility/webapp/hhfacility/login.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/hhfacility/webapp/hhfacility/login.ftl?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/hhfacility/webapp/hhfacility/login.ftl (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/hhfacility/webapp/hhfacility/login.ftl Mon Mar 26 20:56:02 2012 @@ -18,80 +18,21 @@ under the License. --> <#assign useMultitenant = Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("general.properties", "multitenant")> <#assign username = requestParameters.USERNAME?default((sessionAttributes.autoUserLogin.userLoginId)?default(""))> -<#if username != ""> - <#assign focusName = false> -<#else> - <#assign focusName = true> -</#if> -<table width='250' border='0' cellpadding='0' cellspacing='0' align='center'> - <tr> - <td width='100%' valign='top'> - <table border='0' width='100%' cellspacing='0' cellpadding='0' class='boxoutside'> - <tr> - <td width='100%'> - <table width='100%' border='0' cellspacing='0' cellpadding='0' class='boxtop'> - <tr> - <td valign='middle' align='center'> - <div class="boxhead">Login</div> - </td> - </tr> - </table> - </td> - </tr> - <tr> - <td width='100%'> - <table width='100%' border='0' cellspacing='0' cellpadding='0' class='boxbottom'> - <tr> - <td align="center" valign="middle" width='100%'> - <form method="post" action="<@ofbizUrl>login</@ofbizUrl>" name="loginform" style='margin: 0;'> - <table width='100%' border='0' cellpadding='0' cellspacing='2'> - <tr> - <td align="right"> - <span>Username </span> - </td> - <td> - <input type="text" name="USERNAME" value="${username}" size="20" /> - </td> - </tr> - <tr> - <td align="right"> - <span>Password </span> - </td> - <td> - <input type="password" name="PASSWORD" value="" size="20" /> - </td> - </tr> - <#if ("Y" == useMultitenant)> - <tr> - <td class="label">TenantId</td> - <td><input type="text" name="tenantId" value="${parameters.tenantId?if_exists}" size="20"/></td> - </tr> - </#if> - <tr> - <td colspan="2" align="center"> - <!--<a href="javascript:document.loginform.submit()" class="buttontext">[Login]</a>--> - <input type="submit" value="Login" class="loginButton" /> - </td> - </tr> - </table> - </form> - </td> - </tr> - </table> - </td> - </tr> - </table> - </td> - </tr> -</table> - -<script language="JavaScript" type="text/javascript"> -<!-- - <#if focusName> - document.loginform.USERNAME.focus(); - <#else> - document.loginform.PASSWORD.focus(); +<form method="post" action="<@ofbizUrl>login</@ofbizUrl>" name="loginform" data-ajax="false"> + <div data-role="fieldcontainer"> + <label for="USERNAME">Username</label> + <input type="text" id="USERNAME" name="USERNAME" value="${username}" size="20"/> + </div> + <div data-role="fieldcontainer"> + <label for="PASSWORD">Password</label> + <input type="password" id="PASSWORD" name="PASSWORD" value="" size="20" /> + </div> + <#if ("Y" == useMultitenant)> + <div data-role="fieldcontainer"> + <label for="tenantId">TenantId</label> + <input type="text" id="tenantId" name="tenantId" value="${parameters.tenantId?if_exists}" size="20"/> + </div> </#if> -//--> -</script> + <input type="submit" value="Login" class="loginButton" /> +</form> Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/hhfacility/webapp/hhfacility/menu.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/hhfacility/webapp/hhfacility/menu.ftl?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/hhfacility/webapp/hhfacility/menu.ftl (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/hhfacility/webapp/hhfacility/menu.ftl Mon Mar 26 20:56:02 2012 @@ -17,13 +17,18 @@ specific language governing permissions under the License. --> -<#assign facility = parameters.facility> -<span> -<ol> -<li><a accesskey="1" href="<@ofbizUrl>/receipt?facilityId=${facility.facilityId?if_exists}</@ofbizUrl>">Goods Receipt</a></li> -<li><a accesskey="2" href="<@ofbizUrl>/movement?facilityId=${facility.facilityId?if_exists}</@ofbizUrl>">Inventory Movement</a></li> -<li><a accesskey="3" href="<@ofbizUrl>/picking?facilityId=${facility.facilityId?if_exists}</@ofbizUrl>">Picking</a></li> -<li><a accesskey="4" href="<@ofbizUrl>/packing?facilityId=${facility.facilityId?if_exists}</@ofbizUrl>">Packing</a></li> -<li><a accesskey="5" href="<@ofbizUrl>/stocktake?facilityId=${facility.facilityId?if_exists}</@ofbizUrl>">Stocktake</a></li> -</ol> -</span> \ No newline at end of file +<div data-role="content"> +<ul data-role="listview"> +<li><a accesskey="1" href="<@ofbizUrl>/receipt?facilityId=${parameters.facilityId?if_exists}</@ofbizUrl>">Goods Receipt</a></li> +<li><a accesskey="2" href="<@ofbizUrl>/movement?facilityId=${parameters.facilityId?if_exists}</@ofbizUrl>">Inventory Movement</a></li> +<li><a accesskey="3" href="<@ofbizUrl>/picking?facilityId=${parameters.facilityId?if_exists}</@ofbizUrl>">Picking</a></li> +<li><a accesskey="4" href="<@ofbizUrl>/packing?facilityId=${parameters.facilityId?if_exists}</@ofbizUrl>">Packing</a></li> +<li><a accesskey="5" href="<@ofbizUrl>/stocktake?facilityId=${parameters.facilityId?if_exists}</@ofbizUrl>">Stocktake</a></li> +</ul> +</div> + +<#-- Setting Menu. --> +<div data-role="controlgroup"> + <a data-role="button" data-icon="gear" href="<@ofbizUrl>/menu</@ofbizUrl>">Select Facility</a> + <a data-role="button" data-icon="info" href="<@ofbizUrl>/logout</@ofbizUrl>">Logout</a> +</div> Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/hhfacility/webapp/hhfacility/receipt.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/hhfacility/webapp/hhfacility/receipt.ftl?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/hhfacility/webapp/hhfacility/receipt.ftl (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/hhfacility/webapp/hhfacility/receipt.ftl Mon Mar 26 20:56:02 2012 @@ -17,11 +17,11 @@ specific language governing permissions under the License. --> -<#assign facility = parameters.facility> +<#assign facility = parameters.facilityId> -<span> - <ol> +<div data-role="content"> + <ul data-role="listview"> <li><a accesskey="1" href="<@ofbizUrl>/poreceipt?facilityId=${facility.facilityId?if_exists}</@ofbizUrl>">PO Receipt</a></li> <li><a accesskey="2" href="<@ofbizUrl>/productreceipt?facilityId=${facility.facilityId?if_exists}</@ofbizUrl>">Product Receipt</a></li> - </ol> -</span> \ No newline at end of file + </ul> +</div> \ No newline at end of file Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/hhfacility/webapp/hhfacility/stocktake.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/hhfacility/webapp/hhfacility/stocktake.ftl?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/hhfacility/webapp/hhfacility/stocktake.ftl (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/hhfacility/webapp/hhfacility/stocktake.ftl Mon Mar 26 20:56:02 2012 @@ -17,7 +17,7 @@ specific language governing permissions under the License. --> -<#assign facility = parameters.facility> +<#assign facility = parameters.facilityId> <#if parameters.idValue?if_exists?has_content> <#assign idValue = parameters.idValue?has_content> </#if> Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/hhfacility/widget/hhfacility/FacilityForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/hhfacility/widget/hhfacility/FacilityForms.xml?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/hhfacility/widget/hhfacility/FacilityForms.xml (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/hhfacility/widget/hhfacility/FacilityForms.xml Mon Mar 26 20:56:02 2012 @@ -36,7 +36,7 @@ under the License. <form name="POEnter" type="single" target="polinereceipt" default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext"> <field name="facilityId"><hidden/></field> - <field name="OrderId" required-field="true" title="${uiLabelMap.OrderPONumber}"><text size="10"/></field> + <field name="OrderId" title="${uiLabelMap.OrderPONumber}"><text size="10"/></field> <field name="submitButton" title="${uiLabelMap.CommonNext}" widget-style="standardSubmit"><submit button-type="button"/></field> </form> @@ -44,7 +44,7 @@ under the License. <form name="ProductEnter" type="single" target="productqtyreceipt" default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext"> <field name="facilityId"><hidden/></field> - <field name="productId" required-field="true"><text size="10" default-value=""/></field> + <field name="productId"><text size="10" default-value=""/></field> <field name="submitButton" title="${uiLabelMap.CommonNext}" widget-style="standardSubmit"><submit button-type="button"/></field> </form> @@ -64,7 +64,7 @@ under the License. <form name="FindProductStock" type="single" target="findstocktake" default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext"> <field name="facilityId"><hidden/></field> - <field name="idValue" required-field="true"><text size="10" default-value=""/></field> + <field name="idValue"><text size="10" default-value=""/></field> <field name="submitButton" title="${uiLabelMap.CommonNext}" widget-style="standardSubmit"><submit button-type="button"/></field> </form> Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/hhfacility/widget/hhfacility/FacilityScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/hhfacility/widget/hhfacility/FacilityScreens.xml?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/hhfacility/widget/hhfacility/FacilityScreens.xml (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/hhfacility/widget/hhfacility/FacilityScreens.xml Mon Mar 26 20:56:02 2012 @@ -33,6 +33,11 @@ under the License. <screen name="CommonDecorator"> <section> + <actions> + <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> + <set field="applicationTitle" value="mFacility"/> + </actions> <widgets> <include-screen name="GlobalDecorator"/> </widgets> @@ -48,10 +53,17 @@ under the License. <widgets> <decorator-screen name="CommonDecorator"> <decorator-section name="body"> - <container> - <label style="h2">${parameters.facility.facilityName}</label> - </container> - <decorator-section-include name="body"/> + <section> + <condition> + <not><if-empty field="parameters.facilityId"/></not> + </condition> + <widgets> + <decorator-section-include name="body"/> + </widgets> + <fail-widgets> + <include-screen name="facilities"/> + </fail-widgets> + </section> </decorator-section> </decorator-screen> </widgets> @@ -60,6 +72,9 @@ under the License. <screen name="login"> <section> + <actions> + <set field="title" value="Login Page"/> + </actions> <widgets> <decorator-screen name="CommonDecorator"> <decorator-section name="body"> @@ -74,6 +89,9 @@ under the License. <screen name="menu"> <section> + <actions> + <set field="title" value="Select Activity"/> + </actions> <widgets> <decorator-screen name="FacilityDecorator"> <decorator-section name="body"> @@ -86,12 +104,12 @@ under the License. <screen name="receipt"> <section> + <actions> + <set field="title" value="${uiLabelMap.ProductGoodsReceipt}"/> + </actions> <widgets> <decorator-screen name="FacilityDecorator"> <decorator-section name="body"> - <container> - <label style="h1">${uiLabelMap.ProductGoodsReceipt}</label> - </container> <platform-specific><html><html-template location="component://hhfacility/webapp/hhfacility/receipt.ftl"/></html></platform-specific> </decorator-section> </decorator-screen> @@ -101,12 +119,12 @@ under the License. <screen name="poreceipt"> <section> + <actions> + <set field="title" value="${uiLabelMap.ProductReceiptPurchaseOrder}"/> + </actions> <widgets> <decorator-screen name="FacilityDecorator"> <decorator-section name="body"> - <container> - <label style="h1">${uiLabelMap.ProductReceiptPurchaseOrder}</label> - </container> <include-form name="POEnter" location="component://hhfacility/widget/hhfacility/FacilityForms.xml"/> </decorator-section> </decorator-screen> @@ -131,14 +149,12 @@ under the License. <screen name="productreceipt"> <section> <actions> + <set field="title" value="${uiLabelMap.ProductReceipt}"/> <set field="focusField" value="productId"/> </actions> <widgets> <decorator-screen name="FacilityDecorator"> <decorator-section name="body"> - <container> - <label style="h1">${uiLabelMap.ProductReceipt}</label> - </container> <include-form name="ProductEnter" location="component://hhfacility/widget/hhfacility/FacilityForms.xml"/> <platform-specific><html><html-template location="component://hhfacility/webapp/hhfacility/setFocusOnField.ftl"/></html></platform-specific> </decorator-section> @@ -210,15 +226,13 @@ under the License. <screen name="stocktake"> <section> <actions> + <set field="title" value="${uiLabelMap.PageTitleFindProductStocktake}"/> <set field="idValue" from-field="parameters.idValue"/> <script location="component://hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy"/> </actions> <widgets> <decorator-screen name="FacilityDecorator"> <decorator-section name="body"> - <container> - <label style="h1">${uiLabelMap.PageTitleFindProductStocktake}</label> - </container> <include-form name="FindProductStock" location="component://hhfacility/widget/hhfacility/FacilityForms.xml"/> <platform-specific><html><html-template location="component://hhfacility/webapp/hhfacility/stocktake.ftl"/></html></platform-specific> </decorator-section> @@ -230,6 +244,7 @@ under the License. <screen name="productstocktake"> <section> <actions> + <set field="title" value="${uiLabelMap.PageTitleProductStocktake}"/> <script location="component://hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy"/> <set field="locationSeqId" from-field="productFacilityLocations"/> @@ -237,9 +252,6 @@ under the License. <widgets> <decorator-screen name="FacilityDecorator"> <decorator-section name="body"> - <container> - <label style="h1">${uiLabelMap.PageTitleProductStocktake}</label> - </container> <include-form name="ProductStocktake" location="component://hhfacility/widget/hhfacility/FacilityForms.xml"/> <include-form name="UpdateProductStocktake" location="component://hhfacility/widget/hhfacility/FacilityForms.xml"/> <platform-specific><html><html-template location="component://hhfacility/webapp/hhfacility/productstocktake.ftl"/></html></platform-specific> @@ -252,19 +264,15 @@ under the License. <screen name="facilities"> <section> <actions> + <set field="title" value="Select Facility"/> <entity-condition entity-name="Facility" list="facilities"> <condition-expr field-name="facilityTypeId" value="WAREHOUSE"/> <order-by field-name="facilityId"/> </entity-condition> </actions> <widgets> - <decorator-screen name="CommonDecorator"> - <decorator-section name="body"> - <include-form name="ListFacilities" location="component://hhfacility/widget/hhfacility/FacilityForms.xml"/> - </decorator-section> - </decorator-screen> + <platform-specific><html><html-template location="component://hhfacility/webapp/hhfacility/facilities.ftl"/></html></platform-specific> </widgets> </section> </screen> - </screens> Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/ldap/src/org/ofbiz/ldap/LdapLoginWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/ldap/src/org/ofbiz/ldap/LdapLoginWorker.java?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/ldap/src/org/ofbiz/ldap/LdapLoginWorker.java (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/ldap/src/org/ofbiz/ldap/LdapLoginWorker.java Mon Mar 26 20:56:02 2012 @@ -221,7 +221,7 @@ public class LdapLoginWorker extends Log protected static Element getRootElement(HttpServletRequest request) { if (Debug.infoOn()) { - Debug.log("Applet config file: " + ldapConfig); + Debug.logInfo("Applet config file: " + ldapConfig, module); } File configFile = new File(ldapConfig); FileInputStream configFileIS = null; Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/myportal/data/MyPortalTypeData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/myportal/data/MyPortalTypeData.xml?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/myportal/data/MyPortalTypeData.xml (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/myportal/data/MyPortalTypeData.xml Mon Mar 26 20:56:02 2012 @@ -29,6 +29,9 @@ <PortalPage portalPageId="MYPORTAL_EMPLOYEE2" sequenceNum="200" portalPageName="Other Party Comms" description="The OFBiz My Portal other commmunication page" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPLOYEE"/> <PortalPage portalPageId="MYPORTAL_EMPLOYEE4" sequenceNum="400" portalPageName="My Time Sheet" description="The OFBiz My Portal Timesheet page" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPLOYEE"/> <PortalPage portalPageId="MYPORTAL_EMPLOYEE5" sequenceNum="500" portalPageName="My Tasks" description="The OFBiz My Portal My Task page" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPLOYEE"/> + <PortalPage portalPageId="MYPORTAL_EMPLOYEE6" sequenceNum="600" portalPageName="My Leave" description="The OFBiz My Portal My Leave page" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPLOYEE"/> + <PortalPage portalPageId="MYPORTAL_EMPLOYEE7" sequenceNum="700" portalPageName="My Trainings" description="My Portal trainings page" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPLOYEE"/> + <PortalPage portalPageId="MYPORTAL_EMPLOYEE8" sequenceNum="800" portalPageName="My Payments" description="The OFBiz My Portal My Payments page" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPLOYEE"/> <PortalPage portalPageId="MYPORTAL_EMPL-NOEML" sequenceNum="0" portalPageName="Main" description="The OFBiz System info page" ownerUserLoginId="_NA_" securityGroupId="MYPORTAL_EMPL-NOEML"/> <PortalPage portalPageId="MYPORTAL_EMPL-NOEML0" sequenceNum="50" portalPageName="My Comms" description="The OFBiz My Communications page" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPL-NOEML"/> @@ -42,6 +45,7 @@ <PortalPage portalPageId="MYPORTAL_CUSTOMER2" sequenceNum="200" portalPageName="Invoices" description="The OFBiz My Portal Invoices page" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_CUSTOMER"/> <PortalPage portalPageId="MYPORTAL_CUSTOMER3" sequenceNum="300" portalPageName="Projects" description="The OFBiz My Portal Project page" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_CUSTOMER"/> <PortalPage portalPageId="MYPORTAL_CUSTOMER4" sequenceNum="400" portalPageName="Orders" description="The OFBiz My Portal Order page" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_CUSTOMER"/> + <PortalPage portalPageId="MYPORTAL_CUSTOMER5" sequenceNum="500" portalPageName="My Orders" description="The OFBiz My Portal Order page" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_CUSTOMER"/> <PortalPageColumn portalPageId="MYPORTAL_NONE" columnSeqId="00001"/> <PortalPageColumn portalPageId="MYPORTAL_NONE" columnSeqId="00002" columnWidthPercentage="50"/> @@ -53,6 +57,9 @@ <PortalPageColumn portalPageId="MYPORTAL_EMPLOYEE2" columnSeqId="00001"/> <PortalPageColumn portalPageId="MYPORTAL_EMPLOYEE4" columnSeqId="00001"/> <PortalPageColumn portalPageId="MYPORTAL_EMPLOYEE5" columnSeqId="00001"/> + <PortalPageColumn portalPageId="MYPORTAL_EMPLOYEE6" columnSeqId="00001"/> + <PortalPageColumn portalPageId="MYPORTAL_EMPLOYEE7" columnSeqId="00001"/> + <PortalPageColumn portalPageId="MYPORTAL_EMPLOYEE8" columnSeqId="00001"/> <PortalPageColumn portalPageId="MYPORTAL_EMPL-NOEML" columnSeqId="00001"/> <PortalPageColumn portalPageId="MYPORTAL_EMPL-NOEML0" columnSeqId="00001"/> @@ -68,6 +75,7 @@ <PortalPageColumn portalPageId="MYPORTAL_CUSTOMER2" columnSeqId="00001"/> <PortalPageColumn portalPageId="MYPORTAL_CUSTOMER3" columnSeqId="00001"/> <PortalPageColumn portalPageId="MYPORTAL_CUSTOMER4" columnSeqId="00001"/> + <PortalPageColumn portalPageId="MYPORTAL_CUSTOMER5" columnSeqId="00001"/> <PortalPagePortlet portalPageId="MYPORTAL_NONE" portalPortletId="party" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/> <PortalPagePortlet portalPageId="MYPORTAL_NONE" portalPortletId="contact" portletSeqId="00001" columnSeqId="00001" sequenceNum="1"/> @@ -98,6 +106,10 @@ <PortletAttribute portalPageId="MYPORTAL_EMPLOYEE2" portalPortletId="MyCommunications" portletSeqId="00001" attrName="communicationPartyId" attrValue="Company"/> <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE4" portalPortletId="mytimesheet" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/> <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE5" portalPortletId="mytasks" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/> + <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE6" portalPortletId="myLeave" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/> + <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE7" portalPortletId="MyTrainings" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/> + <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE8" portalPortletId="ListPayments" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/> + <PortletAttribute portalPageId="MYPORTAL_EMPLOYEE8" portalPortletId="ListPayments" portletSeqId="00001" attrName="statusId" attrValue="PMNT_NOT_PAID"/> <PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML" portalPortletId="SystemInfoNotes" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/> <PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML" portalPortletId="SystemInfoStatus" portletSeqId="00001" columnSeqId="00001" sequenceNum="1"/> @@ -147,10 +159,11 @@ <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1" portalPortletId="MYTASKSPARTY" portletSeqId="00001" columnSeqId="00002" sequenceNum="8"/> <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER2" portalPortletId="ListCustomerInvoices" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/> <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER3" portalPortletId="ListCustomerProjects" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/> - <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER4" portalPortletId="ListCustomerOrders" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/> <PortletAttribute portalPageId="MYPORTAL_CUSTOMER4" portalPortletId="ListCustomerOrders" portletSeqId="00001" attrName="statusId" attrValue="ORDER_APPROVED"/> <PortletAttribute portalPageId="MYPORTAL_CUSTOMER4" portalPortletId="ListCustomerOrders" portletSeqId="00001" attrName="roleTypeId" attrValue="PLACING_CUSTOMER"/> + <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER5" portalPortletId="ListCustReturns" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/> + <PortletAttribute portalPageId="MYPORTAL_CUSTOMER5" portalPortletId="ListCustReturns" portletSeqId="00001" attrName="statusId" attrValue="RETURN_REQUESTED"/> <PortletPortletCategory portalPortletId="ListCustomerProjects" portletCategoryId="LIST_CUSTOMER"/> <PortletPortletCategory portalPortletId="ListCustomerInvoices" portletCategoryId="LIST_CUSTOMER"/> Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/myportal/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/myportal/widget/CommonScreens.xml?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/myportal/widget/CommonScreens.xml (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/myportal/widget/CommonScreens.xml Mon Mar 26 20:56:02 2012 @@ -209,6 +209,18 @@ under the License. </widgets> </section> </screen> + + <screen name="EmployeeDecorator"> + <section> + <widgets> + <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <decorator-section-include name="body"/> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> <screen name="reloadCaptchaCode"> <section> Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/myportal/widget/MyPortalForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/myportal/widget/MyPortalForms.xml?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/myportal/widget/MyPortalForms.xml (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/myportal/widget/MyPortalForms.xml Mon Mar 26 20:56:02 2012 @@ -36,7 +36,7 @@ under the License. <field name="PASSWORD" title="${uiLabelMap.CommonPassword}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><password size="15" maxlength="250"/></field> <field name="CONFIRM_PASSWORD" title="${uiLabelMap.CommonPassword}" tooltip="* ${uiLabelMap.CommonConfirm}" widget-style="required"><password size="15" maxlength="250"/></field> <field name="VerifyCaptchaTitle" title="${uiLabelMap.MyPortalVerifyCaptcha}" title-area-style="group-label"><display description=" " also-hidden="false"/></field> - <field name="picOfcaptcha" title="${uiLabelMap.MyPortalPicCaptcha}"><image value="${parameters.captchaFileName}" height="40" width="149"/></field> + <field name="picOfcaptcha" title="${uiLabelMap.MyPortalPicCaptcha}"><image value="${parameters.captchaFileName}" style="cssImgSmall"/></field> <field name="reload" title="${uiLabelMap.CommonEmptyHeader}"><hyperlink target="newRegisterLogin" description="${uiLabelMap.MyPortalReloadImage}"/></field> <field name="captcha" title="${uiLabelMap.MyPortalVerifyCaptcha}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="23" maxlength="30"/></field> <field name="submitButton" title="${uiLabelMap.CommonSave}" title-area-style="group-label"><submit button-type="button"/></field> Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/oagis/src/org/ofbiz/oagis/OagisInventoryServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/oagis/src/org/ofbiz/oagis/OagisInventoryServices.java?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/oagis/src/org/ofbiz/oagis/OagisInventoryServices.java (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/oagis/src/org/ofbiz/oagis/OagisInventoryServices.java Mon Mar 26 20:56:02 2012 @@ -394,7 +394,7 @@ public class OagisInventoryServices { Map<String, Object> omiPkMap = UtilMisc.toMap("logicalId", (Object) logicalId, "component", component, "task", task, "referenceId", referenceId); // always log this to make messages easier to find - Debug.log("Processing oagisReceiveAcknowledgeDeliveryPo for message ID [" + omiPkMap + "]", module); + Debug.logInfo("Processing oagisReceiveAcknowledgeDeliveryPo for message ID [" + omiPkMap + "]", module); // before getting into this check to see if we've tried once and had an error, if so set isErrorRetry even if it wasn't passed in GenericValue previousOagisMessageInfo = null; @@ -694,7 +694,7 @@ public class OagisInventoryServices { Map<String, Object> omiPkMap = UtilMisc.toMap("logicalId", (Object) logicalId, "component", component, "task", task, "referenceId", referenceId); // always log this to make messages easier to find - Debug.log("Processing oagisReceiveAcknowledgeDeliveryRma for message ID [" + omiPkMap + "]", module); + Debug.logInfo("Processing oagisReceiveAcknowledgeDeliveryRma for message ID [" + omiPkMap + "]", module); // before getting into this check to see if we've tried once and had an error, if so set isErrorRetry even if it wasn't passed in GenericValue previousOagisMessageInfo = null; @@ -1205,7 +1205,7 @@ public class OagisInventoryServices { Map<String, Object> omiPkMap = UtilMisc.toMap("logicalId", (Object) logicalId, "component", component, "task", task, "referenceId", referenceId); // always log this to make messages easier to find - Debug.log("Processing oagisReceiveAcknowledgeDeliveryStatus for message ID [" + omiPkMap + "]", module); + Debug.logInfo("Processing oagisReceiveAcknowledgeDeliveryStatus for message ID [" + omiPkMap + "]", module); // before getting into this check to see if we've tried once and had an error, if so set isErrorRetry even if it wasn't passed in GenericValue previousOagisMessageInfo = null; Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java Mon Mar 26 20:56:02 2012 @@ -132,7 +132,7 @@ public class OagisShipmentServices { Map<String, String> omiPkMap = UtilMisc.toMap("logicalId", logicalId, "component", component, "task", task, "referenceId", referenceId); // always log this to make messages easier to find - Debug.log("Processing oagisReceiveShowShipment for shipmentId [" + shipmentId + "] message ID [" + omiPkMap + "]", module); + Debug.logInfo("Processing oagisReceiveShowShipment for shipmentId [" + shipmentId + "] message ID [" + omiPkMap + "]", module); // before getting into this check to see if we've tried once and had an error, if so set isErrorRetry even if it wasn't passed in GenericValue previousOagisMessageInfo = null; Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java Mon Mar 26 20:56:02 2012 @@ -331,12 +331,12 @@ public class PosTransaction implements S List<GenericValue> paymentPrefs = session.getDelegator().findByAnd("OrderPaymentPreference", fields); if (UtilValidate.isNotEmpty(paymentPrefs)) { - //Debug.log("Found some prefs - " + paymentPrefs.size(), module); + //Debug.logInfo("Found some prefs - " + paymentPrefs.size(), module); if (paymentPrefs.size() > 1) { Debug.logError("Multiple OrderPaymentPreferences found for the same payment method!", module); } else { paymentPref = EntityUtil.getFirst(paymentPrefs); - //Debug.log("Got the first pref - " + paymentPref, module); + //Debug.logInfo("Got the first pref - " + paymentPref, module); } } else { Debug.logError("No OrderPaymentPreference found - " + fields, module); @@ -344,7 +344,7 @@ public class PosTransaction implements S } catch (GenericEntityException e) { Debug.logError(e, module); } - //Debug.log("PaymentPref - " + paymentPref, module); + //Debug.logInfo("PaymentPref - " + paymentPref, module); Map<String, Object> payInfo = FastMap.newInstance(); @@ -364,7 +364,7 @@ public class PosTransaction implements S Debug.logError("Payment preference is empty!", module); return payInfo; } - //Debug.log("AuthTrans - " + authTrans, module); + //Debug.logInfo("AuthTrans - " + authTrans, module); if ("PaymentMethodType".equals(infValue.getEntityName())) { payInfo.put("description", infValue.get("description", locale)); @@ -435,7 +435,7 @@ public class PosTransaction implements S Delegator delegator = cart.getDelegator(); GenericValue product = null; product = delegator.findByPrimaryKeyCache("Product", UtilMisc.toMap("productId", productId)); - if (UtilValidate.isNotEmpty(product) && "AGGREGATED".equals(product.getString("productTypeId"))) { + if (UtilValidate.isNotEmpty(product) && ("AGGREGATED".equals(product.getString("productTypeId")) || "AGGREGATED_SERVICE".equals(product.getString("productTypeId")))) { return true; } } catch (GenericEntityException e) { @@ -494,7 +494,7 @@ public class PosTransaction implements S GenericValue product = null; ProductConfigWrapper pcw = null; product = delegator.findByPrimaryKeyCache("Product", UtilMisc.toMap("productId", productId)); - if (UtilValidate.isNotEmpty(product) && "AGGREGATED".equals(product.getString("productTypeId"))) { + if (UtilValidate.isNotEmpty(product) && ("AGGREGATED".equals(product.getString("productTypeId"))||"AGGREGATED_SERVICE".equals(product.getString("productTypeId")))) { // if it's an aggregated item, load the configwrapper and set to defaults pcw = new ProductConfigWrapper(delegator, session.getDispatcher(), productId, null, null, null, null, null, null); pcw.setDefaultConfig(); @@ -714,7 +714,7 @@ public class PosTransaction implements S Iterator<GenericValue> i = values.iterator(); while (i.hasNext() && isExternal) { GenericValue v = i.next(); - //Debug.log("Testing [" + paymentMethodTypeId + "] - " + v, module); + //Debug.logInfo("Testing [" + paymentMethodTypeId + "] - " + v, module); if (!externalCode.equals(v.getString("paymentServiceTypeEnumId"))) { isExternal = false; } @@ -833,7 +833,7 @@ public class PosTransaction implements S if (UtilValidate.isEmpty(this.orderId)) { // if order does not exist output.print(UtilProperties.getMessage(resource, "PosSaving", locale)); Map<String, Object> orderRes = ch.createOrder(session.getUserLogin()); - //Debug.log("Create Order Resp : " + orderRes, module); + //Debug.logInfo("Create Order Resp : " + orderRes, module); if (orderRes != null && ServiceUtil.isError(orderRes)) { throw new GeneralException(ServiceUtil.getErrorMessage(orderRes)); @@ -1116,7 +1116,7 @@ public class PosTransaction implements S svcCtx.put("expYear", expYear); svcCtx.put("cardType", UtilValidate.getCardType(cardNumber)); - //Debug.log("Create CC : " + svcCtx, module); + //Debug.logInfo("Create CC : " + svcCtx, module); Map<String, Object> svcRes = null; try { svcRes = dispatcher.runSync("createCreditCard", svcCtx); @@ -1233,7 +1233,7 @@ public class PosTransaction implements S } if (svcRes == null) { - Debug.log(UtilProperties.getMessage("EcommerceUiLabels", "EcommerceNoShoppingListsCreate", locale), module); + Debug.logInfo(UtilProperties.getMessage("EcommerceUiLabels", "EcommerceNoShoppingListsCreate", locale), module); } else if (ServiceUtil.isError(svcRes)) { Debug.logError(ServiceUtil.getErrorMessage(svcRes) + " - " + svcRes, module); } else{ @@ -1278,7 +1278,7 @@ public class PosTransaction implements S } if (shoppingLists == null) { - Debug.log(UtilProperties.getMessage("EcommerceUiLabels", "EcommerceNoShoppingListsCreate", locale), module); + Debug.logInfo(UtilProperties.getMessage("EcommerceUiLabels", "EcommerceNoShoppingListsCreate", locale), module); } return shoppingLists; } @@ -1350,7 +1350,7 @@ public class PosTransaction implements S } if (svcRes == null) { - Debug.log(UtilProperties.getMessage("EcommerceUiLabels", "EcommerceNoShoppingListsCreate", locale), module); + Debug.logInfo(UtilProperties.getMessage("EcommerceUiLabels", "EcommerceNoShoppingListsCreate", locale), module); } else if (ServiceUtil.isError(svcRes)) { Debug.logError(ServiceUtil.getErrorMessage(svcRes) + " - " + svcRes, module); } else{ Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/component/PosButton.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/component/PosButton.java?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/component/PosButton.java (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/component/PosButton.java Mon Mar 26 20:56:02 2012 @@ -139,7 +139,7 @@ public class PosButton { } catch (Throwable t) { } if (cl == null) { - Debug.log("No context classloader available; using class classloader", module); + Debug.logInfo("No context classloader available; using class classloader", module); try { cl = this.getClass().getClassLoader(); } catch (Throwable t) { Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/component/PosButtonWrapper.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/component/PosButtonWrapper.java?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/component/PosButtonWrapper.java (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/component/PosButtonWrapper.java Mon Mar 26 20:56:02 2012 @@ -154,7 +154,7 @@ public class PosButtonWrapper { xbutton.setRolloverEnabled(false); xbutton.setText(newContent.toString()); - //Debug.log("Button [" + name + "] = " + xbutton.getText(), module); + //Debug.logInfo("Button [" + name + "] = " + xbutton.getText(), module); } public String wrapText(String text, String newLine, int padding) { Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/config/ButtonEventConfig.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/config/ButtonEventConfig.java?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/config/ButtonEventConfig.java (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/config/ButtonEventConfig.java Mon Mar 26 20:56:02 2012 @@ -165,7 +165,7 @@ public class ButtonEventConfig implement public void invoke(PosScreen pos, AWTEvent event) throws ButtonEventNotFound, ButtonEventException { ClassLoader cl = Thread.currentThread().getContextClassLoader(); if (cl == null) { - Debug.log("Unable to obtain the context classloader", module); + Debug.logInfo("Unable to obtain the context classloader", module); cl = this.getClass().getClassLoader(); } Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/device/impl/CashDrawer.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/device/impl/CashDrawer.java?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/device/impl/CashDrawer.java (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/device/impl/CashDrawer.java Mon Mar 26 20:56:02 2012 @@ -95,7 +95,7 @@ public class CashDrawer extends GenericD } public void run() { - Debug.log("Starting Waiter Thread", module); + Debug.logInfo("Starting Waiter Thread", module); this.startTime = System.currentTimeMillis(); while (waiting) { boolean isOpen = true; @@ -119,7 +119,7 @@ public class CashDrawer extends GenericD } } this.startTime = -1; - Debug.log("Waiter finished", module); + Debug.logInfo("Waiter finished", module); } } Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Keyboard.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Keyboard.java?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Keyboard.java (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Keyboard.java Mon Mar 26 20:56:02 2012 @@ -54,10 +54,10 @@ public class Keyboard extends GenericDev keyboard.addDataListener(new DataEventAdaptor() { @Override public void dataOccurred(jpos.events.DataEvent event) { - Debug.log("POSKeyboard DataEvent - " + event.getWhen(), module); + Debug.logInfo("POSKeyboard DataEvent - " + event.getWhen(), module); try { int keyCode = keyboard.getPOSKeyData(); - Debug.log("Received KeyCode From POSKeyboard DataEvent : " + keyCode, module); + Debug.logInfo("Received KeyCode From POSKeyboard DataEvent : " + keyCode, module); // -1 is not valid if (keyCode == -1) { @@ -66,14 +66,14 @@ public class Keyboard extends GenericDev // check for button mapping if (PosScreen.currentScreen.isLocked() && 500 != keyCode) { - Debug.log("PosScreen is locked; not running POSKeyboard Event!", module); + Debug.logInfo("PosScreen is locked; not running POSKeyboard Event!", module); return; } List<String> buttonEvents = ButtonEventConfig.findButtonKeyAssign(keyCode); if (UtilValidate.isNotEmpty(buttonEvents)) { - Debug.log("Key -> Button Mapping(s) Found [" + keyCode + "]", module); + Debug.logInfo("Key -> Button Mapping(s) Found [" + keyCode + "]", module); try { ButtonEventConfig.invokeButtonEvents(buttonEvents, PosScreen.currentScreen); } catch (ButtonEventConfig.ButtonEventNotFound e) { Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Msr.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Msr.java?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Msr.java (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Msr.java Mon Mar 26 20:56:02 2012 @@ -101,7 +101,7 @@ public class Msr extends GenericDevice { @Override public void errorOccurred(jpos.events.ErrorEvent event) { - Debug.log("Error Occurred : " + event.getErrorCodeExtended(), module); + Debug.logInfo("Error Occurred : " + event.getErrorCodeExtended(), module); PosScreen.currentScreen.showDialog("dialog/error/cardreaderror"); try { msr.clearInput(); @@ -171,7 +171,7 @@ public class Msr extends GenericDevice { PosScreen pos = PosScreen.currentScreen.showPage("paypanel", false); pos.getInput().setFunction("TOTAL", ""); pos.refresh(); - Debug.log("Switched to paypanel.xml; triggered TOTAL function", module); + Debug.logInfo("Switched to paypanel.xml; triggered TOTAL function", module); } } } Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Receipt.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Receipt.java?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Receipt.java (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Receipt.java Mon Mar 26 20:56:02 2012 @@ -118,7 +118,7 @@ public class Receipt extends GenericDevi } catch (JposException e) { Debug.logError(e, "Exception while setting jpos.POSPrinter.transactionPrint to transaction mode ", module); } - Debug.log("Print Report Requested", module); + Debug.logInfo("Print Report Requested", module); String[] report = this.readReportTemplate(resource); if (report != null) { @@ -150,7 +150,7 @@ public class Receipt extends GenericDevi } public void printReceipt(PosTransaction trans, boolean printStoreCopy) { - Debug.log("Print Receipt Requested : " + trans.getTransactionId(), module); + Debug.logInfo("Print Receipt Requested : " + trans.getTransactionId(), module); POSPrinter printer = (POSPrinter) control; this.lastTransaction = trans; Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java Mon Mar 26 20:56:02 2012 @@ -216,7 +216,7 @@ public class ManagerEvents { state.set("actualEndingGc", new BigDecimal(closeInfo[3])); state.set("actualEndingOther", new BigDecimal(closeInfo[4])); state.set("endingTxId", trans.getTransactionId()); - Debug.log("Updated State - " + state, module); + Debug.logInfo("Updated State - " + state, module); try { state.store(); state.refresh(); Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/event/PaymentEvents.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/event/PaymentEvents.java?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/event/PaymentEvents.java (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/event/PaymentEvents.java Mon Mar 26 20:56:02 2012 @@ -42,7 +42,7 @@ public class PaymentEvents { // all cash transactions are NO_PAYMENT; no need to check try { BigDecimal amount = processAmount(trans, pos, null); - Debug.log("Processing [Cash] Amount : " + amount, module); + Debug.logInfo("Processing [Cash] Amount : " + amount, module); // add the payment trans.addPayment("CASH", amount, null, null); @@ -140,7 +140,7 @@ public class PaymentEvents { input.setFunction("CREDIT"); pos.getOutput().print(UtilProperties.getMessage(PosTransaction.resource,"PosCredNo",Locale.getDefault())); } else { - Debug.log("Credit Func Info : " + crtInfo[1], module); + Debug.logInfo("Credit Func Info : " + crtInfo[1], module); if (msrInfo == null && (creditExpirationInfo == null)) { //test credit card if (UtilValidate.isNotEmpty(input.value()) && UtilValidate.isCreditCard(input.value())) { @@ -149,7 +149,7 @@ public class PaymentEvents { input.setFunction("CREDITEXP"); pos.getOutput().print(UtilProperties.getMessage(PosTransaction.resource,"PosCredex",Locale.getDefault())); } else { - Debug.log("Invalid card number - " + input.value(), module); + Debug.logInfo("Invalid card number - " + input.value(), module); clearInputPaymentFunctions(pos); input.clearInput(); pos.showDialog("dialog/error/invalidcardnumber"); @@ -163,7 +163,7 @@ public class PaymentEvents { input.setFunction("SECURITYCODE"); pos.getOutput().print(UtilProperties.getMessage(PosTransaction.resource,"PosSecurityCode",Locale.getDefault())); } else { - Debug.log("Invalid expiration date", module); + Debug.logInfo("Invalid expiration date", module); clearInputPaymentFunctions(pos); input.clearInput(); pos.showDialog("dialog/error/invalidexpirationdate"); @@ -217,7 +217,7 @@ public class PaymentEvents { try { String[] totalInfo = input.getFunction("TOTAL"); amount = processAmount(trans, pos, totalInfo[1]); - Debug.log("Processing Credit Card Amount : " + amount, module); + Debug.logInfo("Processing Credit Card Amount : " + amount, module); } catch (GeneralException e) { Debug.logError("Exception caught calling processAmount.", module); Debug.logError(e.getMessage(), module); @@ -247,7 +247,7 @@ public class PaymentEvents { pos.getOutput().print(UtilProperties.getMessage(PosTransaction.resource,"PosCredex",Locale.getDefault())); break; default: - Debug.log("Hit the default switch case [" + allInfo + "] refreshing.", module); + Debug.logInfo("Hit the default switch case [" + allInfo + "] refreshing.", module); input.clearFunction("MSRINFO"); pos.getOutput().print(UtilProperties.getMessage(PosTransaction.resource,"PosCredNo",Locale.getDefault())); break; @@ -261,7 +261,7 @@ public class PaymentEvents { try { BigDecimal amount = processAmount(trans, pos, null); - Debug.log("Processing [" + paymentMethodTypeId + "] Amount : " + amount, module); + Debug.logInfo("Processing [" + paymentMethodTypeId + "] Amount : " + amount, module); // add the payment trans.addPayment(paymentMethodTypeId, amount, null, null); @@ -284,7 +284,7 @@ public class PaymentEvents { try { BigDecimal amount = processAmount(trans, pos, amountStr); - Debug.log("Processing [" + paymentMethodTypeId + "] Amount : " + amount, module); + Debug.logInfo("Processing [" + paymentMethodTypeId + "] Amount : " + amount, module); // add the payment trans.addPayment(paymentMethodTypeId, amount, refNum, null); @@ -397,9 +397,9 @@ public class PaymentEvents { throw new GeneralException(); } amount = amount.movePointLeft(2); // convert to decimal - Debug.log("Set amount / 100 : " + amount, module); + Debug.logInfo("Set amount / 100 : " + amount, module); } else { - Debug.log("Amount is empty; assumption is full amount : " + trans.getTotalDue(), module); + Debug.logInfo("Amount is empty; assumption is full amount : " + trans.getTotalDue(), module); amount = trans.getTotalDue(); if (amount.compareTo(BigDecimal.ZERO) <= 0) { throw new GeneralException(); @@ -407,7 +407,7 @@ public class PaymentEvents { } return amount; } else { - Debug.log("TOTAL function NOT set", module); + Debug.logInfo("TOTAL function NOT set", module); throw new GeneralException(); } } Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/event/SecurityEvents.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/event/SecurityEvents.java?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/event/SecurityEvents.java (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/event/SecurityEvents.java Mon Mar 26 20:56:02 2012 @@ -135,7 +135,7 @@ public class SecurityEvents { } } } else { - Debug.log("Login function called but not prepared as a function!", module); + Debug.logInfo("Login function called but not prepared as a function!", module); } } } Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/event/TestEvents.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/event/TestEvents.java?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/event/TestEvents.java (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/event/TestEvents.java Mon Mar 26 20:56:02 2012 @@ -34,7 +34,7 @@ public class TestEvents { public static synchronized void logSelectedIndex(PosScreen pos) { Journal journal = pos.getJournal(); - Debug.log("Selected IDX - " + journal.getSelectedIdx(), module); + Debug.logInfo("Selected IDX - " + journal.getSelectedIdx(), module); } public static synchronized void testMsr(PosScreen pos) { Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/KeyboardService.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/KeyboardService.java?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/KeyboardService.java (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/KeyboardService.java Mon Mar 26 20:56:02 2012 @@ -148,7 +148,7 @@ public class KeyboardService extends Bas this.fireEvent(event); } } else { - Debug.log("Last Event is null??", module); + Debug.logInfo("Last Event is null??", module); } } Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/NullPosPrinter.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/NullPosPrinter.java?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/NullPosPrinter.java (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/NullPosPrinter.java Mon Mar 26 20:56:02 2012 @@ -482,7 +482,7 @@ public class NullPosPrinter extends Base private void printALine(String s) { printerBuffer = printerBuffer.append(s); if (s.indexOf(NullPosPrinter.PAPER_CUT) > 0) { - Debug.log(printerBuffer.toString(), module); + Debug.logInfo(printerBuffer.toString(), module); printerBuffer = new StringBuffer(); } } @@ -517,7 +517,7 @@ public class NullPosPrinter extends Base } public void transactionPrint(int i, int i1) throws JposException { - Debug.log("transactionPrint:\n\n", module); + Debug.logInfo("transactionPrint:\n\n", module); } public void validateData(int i, String s) throws JposException { Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/screen/ClientProfile.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/screen/ClientProfile.java?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/screen/ClientProfile.java (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/screen/ClientProfile.java Mon Mar 26 20:56:02 2012 @@ -344,7 +344,7 @@ public class ClientProfile extends XPage } catch (Throwable t) { } if (cl == null) { - Debug.log("No context classloader available; using class classloader", module); + Debug.logInfo("No context classloader available; using class classloader", module); try { cl = this.getClass().getClassLoader(); } catch (Throwable t) { Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/screen/LoadSale.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/screen/LoadSale.java?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/screen/LoadSale.java (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/screen/LoadSale.java Mon Mar 26 20:56:02 2012 @@ -228,7 +228,7 @@ public class LoadSale extends XPage { } catch (Throwable t) { } if (cl == null) { - Debug.log("No context classloader available; using class classloader", module); + Debug.logInfo("No context classloader available; using class classloader", module); try { cl = this.getClass().getClassLoader(); } catch (Throwable t) { Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/screen/PosDialog.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/screen/PosDialog.java?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/screen/PosDialog.java (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/screen/PosDialog.java Mon Mar 26 20:56:02 2012 @@ -234,7 +234,7 @@ public class PosDialog { } else if (this.closeBtn != null) { this.closeBtn.setText("<html><center>" + text + "</center></html>"); } else { - Debug.log("PosDialog output edit box is NULL!", module); + Debug.logInfo("PosDialog output edit box is NULL!", module); } } Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/screen/PosScreen.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/screen/PosScreen.java?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/screen/PosScreen.java (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/screen/PosScreen.java Mon Mar 26 20:56:02 2012 @@ -164,40 +164,40 @@ public class PosScreen extends XPage imp } public void logInfo() { - Debug.log("App Frame :", module); - Debug.log("name - " + appFrame.getName(), module); - Debug.log("title - " + appFrame.getTitle(), module); - Debug.log("active - " + appFrame.isActive(), module); - Debug.log("enabled - " + appFrame.isEnabled(), module); - Debug.log("visible - " + appFrame.isVisible(), module); - Debug.log("showing - " + appFrame.isShowing(), module); - Debug.log("opaque - " + appFrame.isOpaque(), module); - Debug.log("focusable - " + appFrame.isFocusable(), module); - Debug.log("focused - " + appFrame.isFocused(), module); - Debug.log("hasFocus - " + appFrame.hasFocus(), module); - - Debug.log("", module); - Debug.log("App Window :", module); - Debug.log("name - " + appWin.getName(), module); - Debug.log("active - " + appWin.isActive(), module); - Debug.log("enabled - " + appWin.isEnabled(), module); - Debug.log("visible - " + appWin.isVisible(), module); - Debug.log("showing - " + appWin.isShowing(), module); - Debug.log("opaque - " + appWin.isOpaque(), module); - Debug.log("focusable - " + appWin.isFocusable(), module); - Debug.log("focused - " + appWin.isFocused(), module); - Debug.log("hasFocus - " + appWin.hasFocus(), module); - - Debug.log("", module); - - Debug.log("POS Screen :", module); - Debug.log("name - " + this.getName(), module); - Debug.log("enabled - " + this.isEnabled(), module); - Debug.log("visible - " + this.isVisible(), module); - Debug.log("showing - " + this.isShowing(), module); - Debug.log("opaque - " + this.isOpaque(), module); - Debug.log("focusable - " + this.isFocusable(), module); - Debug.log("focused - " + this.hasFocus(), module); + Debug.logInfo("App Frame :", module); + Debug.logInfo("name - " + appFrame.getName(), module); + Debug.logInfo("title - " + appFrame.getTitle(), module); + Debug.logInfo("active - " + appFrame.isActive(), module); + Debug.logInfo("enabled - " + appFrame.isEnabled(), module); + Debug.logInfo("visible - " + appFrame.isVisible(), module); + Debug.logInfo("showing - " + appFrame.isShowing(), module); + Debug.logInfo("opaque - " + appFrame.isOpaque(), module); + Debug.logInfo("focusable - " + appFrame.isFocusable(), module); + Debug.logInfo("focused - " + appFrame.isFocused(), module); + Debug.logInfo("hasFocus - " + appFrame.hasFocus(), module); + + Debug.logInfo("", module); + Debug.logInfo("App Window :", module); + Debug.logInfo("name - " + appWin.getName(), module); + Debug.logInfo("active - " + appWin.isActive(), module); + Debug.logInfo("enabled - " + appWin.isEnabled(), module); + Debug.logInfo("visible - " + appWin.isVisible(), module); + Debug.logInfo("showing - " + appWin.isShowing(), module); + Debug.logInfo("opaque - " + appWin.isOpaque(), module); + Debug.logInfo("focusable - " + appWin.isFocusable(), module); + Debug.logInfo("focused - " + appWin.isFocused(), module); + Debug.logInfo("hasFocus - " + appWin.hasFocus(), module); + + Debug.logInfo("", module); + + Debug.logInfo("POS Screen :", module); + Debug.logInfo("name - " + this.getName(), module); + Debug.logInfo("enabled - " + this.isEnabled(), module); + Debug.logInfo("visible - " + this.isVisible(), module); + Debug.logInfo("showing - " + this.isShowing(), module); + Debug.logInfo("opaque - " + this.isOpaque(), module); + Debug.logInfo("focusable - " + this.isFocusable(), module); + Debug.logInfo("focused - " + this.hasFocus(), module); } public void refresh() { @@ -360,7 +360,7 @@ public class PosScreen extends XPage imp // PosDialog Callback method public void receiveDialogCb(PosDialog dialog) { - Debug.log("Dialog closed; refreshing screen", module); + Debug.logInfo("Dialog closed; refreshing screen", module); this.refresh(); } @@ -368,7 +368,7 @@ public class PosScreen extends XPage imp public void run() { while (monitorRunning) { if (!isLocked && (System.currentTimeMillis() - lastActivity) > MAX_INACTIVITY) { - Debug.log("POS terminal auto-lock activated", module); + Debug.logInfo("POS terminal auto-lock activated", module); PosScreen.currentScreen.showPage("pospanel").setLock(true); } try { @@ -382,14 +382,14 @@ public class PosScreen extends XPage imp public void focusGained(FocusEvent event) { if (Debug.verboseOn()) { String from = event != null && event.getOppositeComponent() != null ? event.getOppositeComponent().getName() : "??"; - Debug.log(event.getSource() + " focus gained from " + from, module); + Debug.logInfo(event.getSource() + " focus gained from " + from, module); } } public void focusLost(FocusEvent event) { if (Debug.verboseOn()) { String to = event != null && event.getOppositeComponent() != null ? event.getOppositeComponent().getName() : "??"; - Debug.log(event.getSource() + " focus lost to " + to, module); + Debug.logInfo(event.getSource() + " focus lost to " + to, module); } } Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/screen/SaveSale.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/screen/SaveSale.java?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/screen/SaveSale.java (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/pos/src/org/ofbiz/pos/screen/SaveSale.java Mon Mar 26 20:56:02 2012 @@ -156,7 +156,7 @@ public class SaveSale extends XPage { } catch (Throwable t) { } if (cl == null) { - Debug.log("No context classloader available; using class classloader", module); + Debug.logInfo("No context classloader available; using class classloader", module); try { cl = this.getClass().getClassLoader(); } catch (Throwable t) { Modified: ofbiz/branches/20111205EmailHandling/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml (original) +++ ofbiz/branches/20111205EmailHandling/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml Mon Mar 26 20:56:02 2012 @@ -1027,7 +1027,11 @@ <value xml:lang="nl">Taak ${parameters.workEffortId} werd niet gevonden</value> <value xml:lang="zh">ä»»å¡ï¼${parameters.workEffortId}没ææ¾å°</value> </property> - <property key="ProjectMgrErrorTaskStatusWrong"> + <property key="ProjectMgrErrorTaskStatusWrongToBeComplete"> + <value xml:lang="en">Status of Task : ${parameters.workEffortId} is not correct, status cannot change to complete</value> + <value xml:lang="fr">Le status de la tâche : ${parameters.workEffortId} n'est pas correct, il ne peut pas être passé à Terminé</value> + </property> + <property key="ProjectMgrErrorTaskStatusWrongNoRequestAdded"> <value xml:lang="de">Aufgabe: ${parameters.workEffortId} wird nicht bearbeitet, es kann keine Anfrage hinzugefügt werden</value> <value xml:lang="en">Task: ${parameters.workEffortId} is not in progress, no request can be added</value> <value xml:lang="fr">Tâche : ${parameters.workEffortId} n'est pas en cours, aucune demande ne peut être ajoutée</value> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |