svn commit: r609295 - in /ofbiz/trunk/applications/prod
Locked
 
|
Author: mrisaliti
Date: Sun Jan 6 03:45:54 2008 New Revision: 609295 URL: http://svn.apache.org/viewvc?rev=609295&view=rev Log: Inventory Totals/Returns forms (ftl/widgets screen) has now the same look and feel (Part of issue OFBIZ-1556) Modified: ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties ofbiz/trunk/applications/product/webapp/facility/returns/receiveReturn.ftl ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml Modified: ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties?rev=609295&r1=609294&r2=609295&view=diff ============================================================================== --- ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties (original) +++ ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties Sun Jan 6 03:45:54 2008 @@ -492,6 +492,7 @@ ProductContentPathPrefix=Contenuto Prefisso Percorso ProductContent_Id=Contenuto [Codice] ProductCopyProductCategoryMembersToAnotherCategory=Copia Membri Categoria Prodotto ad un'Altra Categoria +ProductCostPrice=Prezzo di Costo ProductCosts=Costi ProductCouldNotFindFacilityWithId=Non Trovata Stabilimento con Codice ProductCouldNotFindProduct=Non Trovato Prodotto con Codice @@ -1229,6 +1230,8 @@ ProductReserved=Riservato ProductResetDate=Azzera Data ProductResultOfImageUpload=Risultato del Caricamento dell'immagine +ProductRetailPrice=Prezzo al Dettaglio +ProductReturnCompletelyReceived=Questo reso \u00e8 stato ricevuto completamente ProductReturnNumber=Numero Reso ProductReturnToEditProduct=Torna alla Modifica Prodotto ProductReturnToEditProductFeatures=Torna alla Modifica Caratteristiche Prodotto Modified: ofbiz/trunk/applications/product/webapp/facility/returns/receiveReturn.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/returns/receiveReturn.ftl?rev=609295&r1=609294&r2=609295&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/returns/receiveReturn.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/returns/receiveReturn.ftl Sun Jan 6 03:45:54 2008 @@ -16,253 +16,245 @@ specific language governing permissions and limitations under the License. --> +<div class="screenlet"> + <div class="screenlet-title-bar"> + <h3>${uiLabelMap.ProductReceiveReturn} ${uiLabelMap.CommonInto} <#if facility?has_content>"${facility.facilityName?default("Not Defined")}"</#if> [${uiLabelMap.CommonId}:${facility.facilityId?if_exists}]</h3> + </div> + <div class="screenlet-body"> + <a href="<@ofbizUrl>EditFacility</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductNewFacility}</a> + <#-- Receiving Results --> + <#if receivedItems?has_content> + <h3>${uiLabelMap.ProductReceiptForReturn}# <a href="/ordermgr/control/returnMain?returnId=${returnHeader.returnId}${externalKeyParam?if_exists}" class="buttontext">${returnHeader.returnId}</a></h3> + <#if "RETURN_RECEIVED" == returnHeader.getString("statusId")> + <h3>${uiLabelMap.ProductReturnCompletelyReceived}</h3> + </#if> + <br/> + <table cellspacing="0" class="basic-table"> + <tr class="header-row"> + <td>${uiLabelMap.ProductReceipt}</td> + <td>${uiLabelMap.CommonDate}</td> + <td>${uiLabelMap.CommonReturn}</td> + <td>${uiLabelMap.ProductLine}</td> + <td>${uiLabelMap.ProductProductId}</td> + <td>${uiLabelMap.ProductPerUnitPrice}</td> + <td>${uiLabelMap.ProductReceived}</td> + </tr> + <#list receivedItems as item> + <tr> + <td>${item.receiptId}</td> + <td>${item.getString("datetimeReceived").toString()}</td> + <td>${item.returnId}</td> + <td>${item.returnItemSeqId}</td> + <td>${item.productId?default("Not Found")}</td> + <td>${item.unitCost?default(0)?string("##0.00")}</td> + <td>${item.quantityAccepted?string.number}</td> + </tr> + </#list> + </table> + <br/> + </#if> -<h1>${uiLabelMap.ProductReceiveReturn} <span class='head2'>${uiLabelMap.CommonInto} <#if facility?has_content>"${facility.facilityName?default("Not Defined")}"</#if> [${uiLabelMap.CommonId}:${facility.facilityId?if_exists}]</span></h1> -<a href="<@ofbizUrl>EditFacility</@ofbizUrl>" class="buttontext">[${uiLabelMap.ProductNewFacility}]</a> - -<div> </div> - -<#-- Receiving Results --> -<#if receivedItems?has_content> - <h3>${uiLabelMap.ProductReceiptForReturn} <a href="/ordermgr/control/returnMain?returnId=${returnHeader.returnId}${externalKeyParam?if_exists}" class="buttontext">#${returnHeader.returnId}</a></h3> - <#if "RETURN_RECEIVED" == returnHeader.getString("statusId")> - <h3>${uiLabelMap.ProductReturnCompletelyReceived}</h3> - </#if> - <br/> - <table width="100%" border='0' cellpadding='2' cellspacing='0'> - <tr> - <td><div class="tableheadtext">${uiLabelMap.ProductReceipt}</div></td> - <td><div class="tableheadtext">${uiLabelMap.CommonDate}</div></td> - <td><div class="tableheadtext">${uiLabelMap.CommonReturn}</div></td> - <td><div class="tableheadtext">${uiLabelMap.ProductLine}</div></td> - <td><div class="tableheadtext">${uiLabelMap.ProductProductId}</div></td> - <td><div class="tableheadtext">${uiLabelMap.ProductPerUnitPrice}</div></td> - <td><div class="tableheadtext">${uiLabelMap.ProductReceived}</div></td> - </tr> - <tr><td colspan="7"><hr class="sepbar"></td></tr> - <#list receivedItems as item> - <tr> - <td><div class="tabletext">${item.receiptId}</div></td> - <td><div class="tabletext">${item.getString("datetimeReceived").toString()}</div></td> - <td><div class="tabletext">${item.returnId}</div></td> - <td><div class="tabletext">${item.returnItemSeqId}</div></td> - <td><div class="tabletext">${item.productId?default("Not Found")}</div></td> - <td><div class="tabletext">${item.unitCost?default(0)?string("##0.00")}</div></td> - <td><div class="tabletext">${item.quantityAccepted?string.number}</div></td> - </tr> - </#list> - <tr><td colspan="7"><hr class="sepbar"></td></tr> - </table> - <br/> -</#if> - -<#-- Multi-Item Return Receiving --> -<#if returnHeader?has_content> - <form method="post" action="<@ofbizUrl>receiveReturnedProduct</@ofbizUrl>" name='selectAllForm' style='margin: 0;'> - <#-- general request fields --> - <input type="hidden" name="facilityId" value="${requestParameters.facilityId?if_exists}"> - <input type="hidden" name="returnId" value="${requestParameters.returnId?if_exists}"> - <input type="hidden" name="_useRowSubmit" value="Y"> - <#assign now = Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().toString()> - <#assign rowCount = 0> - <table width="100%" border='0' cellpadding='2' cellspacing='0'> - <#if !returnItems?exists || returnItems?size == 0> - <tr> - <td colspan="2"><div class="tableheadtext">${uiLabelMap.ProductNoItemsToReceive}.</div></td> - </tr> - <#else> - <tr> - <td> - <h3>${uiLabelMap.ProductReceiveReturn} <a href="/ordermgr/control/returnMain?returnId=${returnHeader.returnId}${externalKeyParam?if_exists}" class="buttontext">#${returnHeader.returnId}</a></h3> - </td> - <td align="right"> - <span class="tableheadtext">${uiLabelMap.ProductSelectAll}</span> - <input type="checkbox" name="selectAll" value="Y" onclick="javascript:toggleAll(this, 'selectAllForm');"> - </td> - </tr> - - <#list returnItems as returnItem> - <#assign defaultQuantity = returnItem.returnQuantity - receivedQuantities[returnItem.returnItemSeqId]?double> - <#assign orderItem = returnItem.getRelatedOne("OrderItem")?if_exists> - <#if (orderItem?has_content && 0 < defaultQuantity)> - <#assign orderItemType = (orderItem.getRelatedOne("OrderItemType"))?if_exists> - <input type="hidden" name="returnId_o_${rowCount}" value="${returnItem.returnId}"> - <input type="hidden" name="returnItemSeqId_o_${rowCount}" value="${returnItem.returnItemSeqId}"> - <input type="hidden" name="facilityId_o_${rowCount}" value="${requestParameters.facilityId?if_exists}"> - <input type="hidden" name="datetimeReceived_o_${rowCount}" value="${now}"> - <input type="hidden" name="quantityRejected_o_${rowCount}" value="0"> - <input type="hidden" name="comments_o_${rowCount}" value="Returned Item RA# ${returnItem.returnId}"> - - <#assign unitCost = Static["org.ofbiz.order.order.OrderReturnServices"].getReturnItemInitialCost(delegator, returnItem.returnId, returnItem.returnItemSeqId)/> - <tr> - <td colspan="2"><hr class="sepbar"></td> - </tr> - <tr> - <td> - <table width="100%" border='0' cellpadding='2' cellspacing='0'> + <#-- Multi-Item Return Receiving --> + <#if returnHeader?has_content> + <form method="post" action="<@ofbizUrl>receiveReturnedProduct</@ofbizUrl>" name='selectAllForm'> + <#-- general request fields --> + <input type="hidden" name="facilityId" value="${requestParameters.facilityId?if_exists}"> + <input type="hidden" name="returnId" value="${requestParameters.returnId?if_exists}"> + <input type="hidden" name="_useRowSubmit" value="Y"> + <#assign now = Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().toString()> + <#assign rowCount = 0> + <table cellspacing="0" class="basic-table"> + <#if !returnItems?exists || returnItems?size == 0> <tr> - <#assign productId = ""> - <#if orderItem.productId?exists> - <#assign product = orderItem.getRelatedOne("Product")> - <#assign productId = product.productId> - <#assign serializedInv = product.getRelatedByAnd("InventoryItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("inventoryItemTypeId", "SERIALIZED_INV_ITEM"))> - <input type="hidden" name="productId_o_${rowCount}" value="${product.productId}"> - <td width="45%"> - <div class="tabletext"> - ${returnItem.returnItemSeqId}: <a href="/catalog/control/EditProduct?productId=${product.productId}${externalKeyParam?if_exists}" target="catalog" class="buttontext">${product.productId} - ${product.internalName?if_exists}</a> : ${product.description?if_exists} - <#if serializedInv?has_content><font color='red'>**${uiLabelMap.ProductSerializedInventoryFound}**</font></#if> - </div> - </td> - <#elseif orderItem?has_content> - <td width="45%"> - <div class="tabletext"> - ${returnItem.returnItemSeqId}: <b>${orderItemType.get("description",locale)}</b> : ${orderItem.itemDescription?if_exists} - <input type="text" class="inputBox" size="12" name="productId_o_${rowCount}"> - <a href="/catalog/control/EditProduct?externalLoginKey=${externalLoginKey}" target="catalog" class="buttontext">${uiLabelMap.ProductCreateProduct}</a> - </div> - </td> - <#else> - <td width="45%"> - <div class="tabletext"> - ${returnItem.returnItemSeqId}: ${returnItem.get("description",locale)?if_exists} - </div> - </td> - </#if> - <td> </td> - - <#-- location(s) --> - <td align="right"> - <div class="tableheadtext">${uiLabelMap.ProductLocation}:</div> - </td> - <td align="right"> - <#assign facilityLocations = (product.getRelatedByAnd("ProductFacilityLocation", Static["org.ofbiz.base.util.UtilMisc"].toMap("facilityId", facilityId)))?if_exists> - <#if facilityLocations?has_content> - <select name="locationSeqId_o_${rowCount}" class="selectbox"> - <#list facilityLocations as productFacilityLocation> - <#assign facility = productFacilityLocation.getRelatedOneCache("Facility")> - <#assign facilityLocation = productFacilityLocation.getRelatedOne("FacilityLocation")?if_exists> - <#assign facilityLocationTypeEnum = (facilityLocation.getRelatedOneCache("TypeEnumeration"))?if_exists> - <option value="${productFacilityLocation.locationSeqId}"><#if facilityLocation?exists>${facilityLocation.areaId?if_exists}:${facilityLocation.aisleId?if_exists}:${facilityLocation.sectionId?if_exists}:${facilityLocation.levelId?if_exists}:${facilityLocation.positionId?if_exists}</#if><#if facilityLocationTypeEnum?exists>(${facilityLocationTypeEnum.get("description",locale)})</#if>[${productFacilityLocation.locationSeqId}]</option> - </#list> - <option value="">${uiLabelMap.ProductNoLocation}</option> - </select> - <#else> - <input type="text" class="inputBox" name="locationSeqId_o_${rowCount}" size="12"/> - <span class="tabletext"> - <a href="javascript:call_fieldlookup2(document.selectAllForm.locationSeqId_o_${rowCount},'LookupFacilityLocation<#if parameters.facilityId?exists>?facilityId=${facilityId}</#if>');"> - <img src="<@ofbizContentUrl>/images/fieldlookup.gif"</@ofbizContentUrl>" width="15" height="14" border="0" alt="Click here For Field Lookup"/> - </a> - </span> - </#if> + <td colspan="2" class="label">${uiLabelMap.ProductNoItemsToReceive}</td> + </tr> + <#else> + <tr> + <td> + <h3>${uiLabelMap.ProductReceiveReturn} <a href="/ordermgr/control/returnMain?returnId=${returnHeader.returnId}${externalKeyParam?if_exists}" class="buttontext">#${returnHeader.returnId}</a></h3> </td> - - <td align="right" nowrap> - <div class="tableheadtext">${uiLabelMap.ProductQtyReceived}:</div> + <td align="right"> + ${uiLabelMap.ProductSelectAll} + <input type="checkbox" name="selectAll" value="Y" onclick="javascript:toggleAll(this, 'selectAllForm');"> </td> - <td align="right"> - <input type="text" class="inputBox" name="quantityAccepted_o_${rowCount}" size="6" value="${returnItem.returnQuantity?string.number}"> - </td> </tr> - <tr> - <td width='10%'> - <select name="inventoryItemTypeId_o_${rowCount}" size="1" class="selectBox"> - <#list inventoryItemTypes as nextInventoryItemType> - <option value='${nextInventoryItemType.inventoryItemTypeId}' - <#if (facility.defaultInventoryItemTypeId?has_content) && (nextInventoryItemType.inventoryItemTypeId == facility.defaultInventoryItemTypeId)> - SELECTED + + <#list returnItems as returnItem> + <#assign defaultQuantity = returnItem.returnQuantity - receivedQuantities[returnItem.returnItemSeqId]?double> + <#assign orderItem = returnItem.getRelatedOne("OrderItem")?if_exists> + <#if (orderItem?has_content && 0 < defaultQuantity)> + <#assign orderItemType = (orderItem.getRelatedOne("OrderItemType"))?if_exists> + <input type="hidden" name="returnId_o_${rowCount}" value="${returnItem.returnId}"> + <input type="hidden" name="returnItemSeqId_o_${rowCount}" value="${returnItem.returnItemSeqId}"> + <input type="hidden" name="facilityId_o_${rowCount}" value="${requestParameters.facilityId?if_exists}"> + <input type="hidden" name="datetimeReceived_o_${rowCount}" value="${now}"> + <input type="hidden" name="quantityRejected_o_${rowCount}" value="0"> + <input type="hidden" name="comments_o_${rowCount}" value="Returned Item RA# ${returnItem.returnId}"> + + <#assign unitCost = Static["org.ofbiz.order.order.OrderReturnServices"].getReturnItemInitialCost(delegator, returnItem.returnId, returnItem.returnItemSeqId)/> + <tr> + <td colspan="2"><hr></td> + </tr> + <tr> + <td> + <table cellspacing="0" class="basic-table"> + <tr> + <#assign productId = ""> + <#if orderItem.productId?exists> + <#assign product = orderItem.getRelatedOne("Product")> + <#assign productId = product.productId> + <#assign serializedInv = product.getRelatedByAnd("InventoryItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("inventoryItemTypeId", "SERIALIZED_INV_ITEM"))> + <input type="hidden" name="productId_o_${rowCount}" value="${product.productId}"> + <td width="45%"> + <div> + ${returnItem.returnItemSeqId}: <a href="/catalog/control/EditProduct?productId=${product.productId}${externalKeyParam?if_exists}" target="catalog" class="buttontext">${product.productId} - ${product.internalName?if_exists}</a> : ${product.description?if_exists} + <#if serializedInv?has_content><font color='red'>**${uiLabelMap.ProductSerializedInventoryFound}**</font></#if> + </div> + </td> + <#elseif orderItem?has_content> + <td width="45%"> + <div> + ${returnItem.returnItemSeqId}: <b>${orderItemType.get("description",locale)}</b> : ${orderItem.itemDescription?if_exists} + <input type="text" size="12" name="productId_o_${rowCount}"> + <a href="/catalog/control/EditProduct?externalLoginKey=${externalLoginKey}" target="catalog" class="buttontext">${uiLabelMap.ProductCreateProduct}</a> + </div> + </td> + <#else> + <td width="45%"> + <div> + ${returnItem.returnItemSeqId}: ${returnItem.get("description",locale)?if_exists} + </div> + </td> </#if> - >${nextInventoryItemType.get("description",locale)?default(nextInventoryItemType.inventoryItemTypeId)}</option> - </#list> - </select> - </td> - <td width="35%"> - <span class="tableheadtext">${uiLabelMap.ProductInitialInventoryItemStatus}:</span> - <select name="statusId_o_${rowCount}" size='1' class="selectBox"> - <option value="INV_RETURNED">${uiLabelMap.ProductReturned}</option> - <option value="INV_AVAILABLE">${uiLabelMap.ProductAvailable}</option> - <option value="INV_DEFECTIVE" <#if returnItem.returnReasonId?default("") == "RTN_DEFECTIVE_ITEM">Selected</#if>>${uiLabelMap.ProductDefective}</option> - </select> - </td> - <#if serializedInv?has_content> - <td align="right"> - <div class="tableheadtext">${uiLabelMap.ProductExistingInventoryItem}:</div> + <td> </td> + + <#-- location(s) --> + <td align="right"> + <div class="label">${uiLabelMap.ProductLocation}</div> + </td> + <td align="right"> + <#assign facilityLocations = (product.getRelatedByAnd("ProductFacilityLocation", Static["org.ofbiz.base.util.UtilMisc"].toMap("facilityId", facilityId)))?if_exists> + <#if facilityLocations?has_content> + <select name="locationSeqId_o_${rowCount}"> + <#list facilityLocations as productFacilityLocation> + <#assign facility = productFacilityLocation.getRelatedOneCache("Facility")> + <#assign facilityLocation = productFacilityLocation.getRelatedOne("FacilityLocation")?if_exists> + <#assign facilityLocationTypeEnum = (facilityLocation.getRelatedOneCache("TypeEnumeration"))?if_exists> + <option value="${productFacilityLocation.locationSeqId}"><#if facilityLocation?exists>${facilityLocation.areaId?if_exists}:${facilityLocation.aisleId?if_exists}:${facilityLocation.sectionId?if_exists}:${facilityLocation.levelId?if_exists}:${facilityLocation.positionId?if_exists}</#if><#if facilityLocationTypeEnum?exists>(${facilityLocationTypeEnum.get("description",locale)})</#if>[${productFacilityLocation.locationSeqId}]</option> + </#list> + <option value="">${uiLabelMap.ProductNoLocation}</option> + </select> + <#else> + <input type="text" name="locationSeqId_o_${rowCount}" size="12"/> + <span> + <a href="javascript:call_fieldlookup2(document.selectAllForm.locationSeqId_o_${rowCount},'LookupFacilityLocation<#if parameters.facilityId?exists>?facilityId=${facilityId}</#if>');"> + <img src="<@ofbizContentUrl>/images/fieldlookup.gif"</@ofbizContentUrl>" width="15" height="14" border="0" alt="Click here For Field Lookup"/> + </a> + </span> + </#if> + </td> + + <td align="right" nowrap class="label">${uiLabelMap.ProductQtyReceived}</td> + <td align="right"> + <input type="text" name="quantityAccepted_o_${rowCount}" size="6" value="${returnItem.returnQuantity?string.number}"> + </td> + </tr> + <tr> + <td width='10%'> + <select name="inventoryItemTypeId_o_${rowCount}" size="1"> + <#list inventoryItemTypes as nextInventoryItemType> + <option value='${nextInventoryItemType.inventoryItemTypeId}' + <#if (facility.defaultInventoryItemTypeId?has_content) && (nextInventoryItemType.inventoryItemTypeId == facility.defaultInventoryItemTypeId)> + SELECTED + </#if> + >${nextInventoryItemType.get("description",locale)?default(nextInventoryItemType.inventoryItemTypeId)}</option> + </#list> + </select> + </td> + <td width="35%"> + <span class="label">${uiLabelMap.ProductInitialInventoryItemStatus}:</span> + <select name="statusId_o_${rowCount}" size='1'> + <option value="INV_RETURNED">${uiLabelMap.ProductReturned}</option> + <option value="INV_AVAILABLE">${uiLabelMap.ProductAvailable}</option> + <option value="INV_DEFECTIVE" <#if returnItem.returnReasonId?default("") == "RTN_DEFECTIVE_ITEM">Selected</#if>>${uiLabelMap.ProductDefective}</option> + </select> + </td> + <#if serializedInv?has_content> + <td align="right" class="label">${uiLabelMap.ProductExistingInventoryItem}</td> + <td align="right"> + <select name="inventoryItemId_o_${rowCount}"> + <#list serializedInv as inventoryItem> + <option>${inventoryItem.inventoryItemId}</option> + </#list> + </select> + </td> + <#else> + <td colspan="2"> </td> + </#if> + <td align="right" nowrap class="label">${uiLabelMap.ProductPerUnitPrice}</td> + <td align="right"> + <input type='text' name='unitCost_o_${rowCount}' size='6' value='${unitCost?default(0)?string("##0.00")}'> + </td> + </tr> + </table> </td> - <td align="right"> - <select name="inventoryItemId_o_${rowCount}" class="selectBox"> - <#list serializedInv as inventoryItem> - <option>${inventoryItem.inventoryItemId}</option> - </#list> - </select> + <td align="right"> + <input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this, 'selectAllForm');"> </td> - <#else> - <td colspan="2"> </td> - </#if> - <td align="right" nowrap> - <div class="tableheadtext">${uiLabelMap.ProductPerUnitPrice}:</div> - </td> - <td align="right"> - <input type='text' name='unitCost_o_${rowCount}' size='6' value='${unitCost?default(0)?string("##0.00")}' class="inputBox"> + </tr> + <#assign rowCount = rowCount + 1> + </#if> + </#list> + <tr> + <td colspan="2"> + <hr> </td> - </tr> - </table> - </td> - <td align="right"> - <input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this, 'selectAllForm');"> - </td> - </tr> - <#assign rowCount = rowCount + 1> - </#if> - </#list> - <tr> - <td colspan="2"> - <hr class="sepbar"> - </td> - </tr> - <#if rowCount == 0> - <tr> - <td colspan="2"> - <div class="tabletext">${uiLabelMap.ProductNoItemsReturn} #${returnHeader.returnId} ${uiLabelMap.ProductToReceive}.</div> - </td> - </tr> - <tr> - <td colspan="2" align="right"> - <a href="<@ofbizUrl>ReceiveReturn?facilityId=${requestParameters.facilityId?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductReturnToReceiving}</a> - </td> - </tr> - <#else> - <tr> - <td colspan="2" align="right"> - <a href="javascript:document.selectAllForm.submit();" class="buttontext">${uiLabelMap.ProductReceiveSelectedProduct}</a> - </td> - </tr> + </tr> + <#if rowCount == 0> + <tr> + <td colspan="2" class="label">${uiLabelMap.ProductNoItemsReturn} #${returnHeader.returnId} ${uiLabelMap.ProductToReceive}.</td> + </tr> + <tr> + <td colspan="2" align="right"> + <a href="<@ofbizUrl>ReceiveReturn?facilityId=${requestParameters.facilityId?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductReturnToReceiving}</a> + </td> + </tr> + <#else> + <tr> + <td colspan="2" align="right"> + <a href="javascript:document.selectAllForm.submit();" class="buttontext">${uiLabelMap.ProductReceiveSelectedProduct}</a> + </td> + </tr> + </#if> + </#if> + </table> + <input type="hidden" name="_rowCount" value="${rowCount}"> + </form> + <script language="JavaScript" type="text/javascript">selectAll('selectAllForm');</script> + + <#-- Initial Screen --> + <#else> + <form name="selectAllForm" method="post" action="<@ofbizUrl>ReceiveReturn</@ofbizUrl>"> + <input type="hidden" name="facilityId" value="${requestParameters.facilityId?if_exists}"> + <input type="hidden" name="initialSelected" value="Y"> + <table cellspacing="0" class="basic-table"> + <tr><td colspan="4"><h3>${uiLabelMap.ProductReceiveReturn}</h3></td></tr> + <tr> + <td width="15%" align='right' class="label">${uiLabelMap.ProductReturnNumber}</td> + <td> </td> + <td width="90%"> + <input type="text" name="returnId" size="20" maxlength="20" value="${requestParameters.returnId?if_exists}"> + </td> + <td> </td> + </tr> + <tr> + <td colspan="2"> </td> + <td colspan="2"> + <a href="javascript:document.selectAllForm.submit();" class="buttontext">${uiLabelMap.ProductReceiveProduct}</a> + </td> + </tr> + </table> + </form> </#if> - </#if> - </table> - <input type="hidden" name="_rowCount" value="${rowCount}"> - </form> - <script language="JavaScript" type="text/javascript">selectAll('selectAllForm');</script> - - <#-- Initial Screen --> -<#else> - <form name="selectAllForm" method="post" action="<@ofbizUrl>ReceiveReturn</@ofbizUrl>" style='margin: 0;'> - <input type="hidden" name="facilityId" value="${requestParameters.facilityId?if_exists}"> - <input type="hidden" name="initialSelected" value="Y"> - <table border='0' cellpadding='2' cellspacing='0'> - <tr><td colspan="4"><h3>${uiLabelMap.ProductReceiveReturn}</h3></td></tr> - <tr> - <td width="15%" align='right'><div class="tabletext">${uiLabelMap.ProductReturnNumber}</div></td> - <td> </td> - <td width="90%"> - <input type="text" class="inputBox" name="returnId" size="20" maxlength="20" value="${requestParameters.returnId?if_exists}"> - </td> - <td><div class='tabletext'> </div></td> - </tr> - <tr> - <td colspan="2"> </td> - <td colspan="2"> - <a href="javascript:document.selectAllForm.submit();" class="buttontext">${uiLabelMap.ProductReceiveProduct}</a> - </td> - </tr> - </table> - </form> -</#if> + </div> +</div> \ No newline at end of file Modified: ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml?rev=609295&r1=609294&r2=609295&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml Sun Jan 6 03:45:54 2008 @@ -599,7 +599,6 @@ </section> </container> </container> - </widgets> </section> </decorator-section> @@ -624,10 +623,20 @@ <widgets> <decorator-screen name="CommonFacilityDecorator" location="${parameters.commonFacilityDecoratorLocation}"> <decorator-section name="body"> - <container> - <label style="head2" text="${uiLabelMap.ProductInventoryItemTotals} ${uiLabelMap.CommonFor} ${facility.facilityName}"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.ProductInventoryItemTotals} ${uiLabelMap.CommonFor} ${facility.facilityName}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ListInventoryItemTotals" location="component://product/webapp/facility/facility/FacilityForms.xml"/> + </widgets> + </section> + </container> </container> - <include-form name="ListInventoryItemTotals" location="component://product/webapp/facility/facility/FacilityForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -648,10 +657,20 @@ <widgets> <decorator-screen name="CommonFacilityDecorator" location="${parameters.commonFacilityDecoratorLocation}"> <decorator-section name="body"> - <container> - <label style="head2" text="${uiLabelMap.ProductInventoryItemGrandTotals} ${uiLabelMap.CommonFor} ${facility.facilityName}"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.ProductInventoryItemGrandTotals} ${uiLabelMap.CommonFor} ${facility.facilityName}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ListInventoryItemGrandTotals" location="component://product/webapp/facility/facility/FacilityForms.xml"/> + </widgets> + </section> + </container> </container> - <include-form name="ListInventoryItemGrandTotals" location="component://product/webapp/facility/facility/FacilityForms.xml"/> </decorator-section> </decorator-screen> </widgets> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |