Return-Path: Delivered-To: apmail-ofbiz-commits-archive@www.apache.org Received: (qmail 78719 invoked from network); 6 Jan 2008 11:46:18 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 6 Jan 2008 11:46:18 -0000 Received: (qmail 78825 invoked by uid 500); 6 Jan 2008 11:46:07 -0000 Delivered-To: apmail-ofbiz-commits-archive@ofbiz.apache.org Received: (qmail 78794 invoked by uid 500); 6 Jan 2008 11:46:06 -0000 Mailing-List: contact commits-help@ofbiz.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ofbiz.apache.org Delivered-To: mailing list commits@ofbiz.apache.org Received: (qmail 78785 invoked by uid 99); 6 Jan 2008 11:46:06 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 06 Jan 2008 03:46:06 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 06 Jan 2008 11:45:51 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 844231A9850; Sun, 6 Jan 2008 03:45:56 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r609295 - in /ofbiz/trunk/applications/product: config/ProductUiLabels_it.properties webapp/facility/returns/receiveReturn.ftl widget/facility/FacilityScreens.xml Date: Sun, 06 Jan 2008 11:45:55 -0000 To: commits@ofbiz.apache.org From: mrisaliti@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080106114556.844231A9850@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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. --> +
+
+

${uiLabelMap.ProductReceiveReturn} ${uiLabelMap.CommonInto} <#if facility?has_content>"${facility.facilityName?default("Not Defined")}" [${uiLabelMap.CommonId}:${facility.facilityId?if_exists}]

+
+
+ ${uiLabelMap.ProductNewFacility} + <#-- Receiving Results --> + <#if receivedItems?has_content> +

${uiLabelMap.ProductReceiptForReturn}# ${returnHeader.returnId}

+ <#if "RETURN_RECEIVED" == returnHeader.getString("statusId")> +

${uiLabelMap.ProductReturnCompletelyReceived}

+ +
+ + + + + + + + + + + <#list receivedItems as item> + + + + + + + + + + +
${uiLabelMap.ProductReceipt}${uiLabelMap.CommonDate}${uiLabelMap.CommonReturn}${uiLabelMap.ProductLine}${uiLabelMap.ProductProductId}${uiLabelMap.ProductPerUnitPrice}${uiLabelMap.ProductReceived}
${item.receiptId}${item.getString("datetimeReceived").toString()}${item.returnId}${item.returnItemSeqId}${item.productId?default("Not Found")}${item.unitCost?default(0)?string("##0.00")}${item.quantityAccepted?string.number}
+
+ -

${uiLabelMap.ProductReceiveReturn} ${uiLabelMap.CommonInto} <#if facility?has_content>"${facility.facilityName?default("Not Defined")}" [${uiLabelMap.CommonId}:${facility.facilityId?if_exists}]

-[${uiLabelMap.ProductNewFacility}] - -
 
- -<#-- Receiving Results --> -<#if receivedItems?has_content> -

${uiLabelMap.ProductReceiptForReturn} #${returnHeader.returnId}

- <#if "RETURN_RECEIVED" == returnHeader.getString("statusId")> -

${uiLabelMap.ProductReturnCompletelyReceived}

- -
- - - - - - - - - - - - <#list receivedItems as item> - - - - - - - - - - - -
${uiLabelMap.ProductReceipt}
${uiLabelMap.CommonDate}
${uiLabelMap.CommonReturn}
${uiLabelMap.ProductLine}
${uiLabelMap.ProductProductId}
${uiLabelMap.ProductPerUnitPrice}
${uiLabelMap.ProductReceived}
${item.receiptId}
${item.getString("datetimeReceived").toString()}
${item.returnId}
${item.returnItemSeqId}
${item.productId?default("Not Found")}
${item.unitCost?default(0)?string("##0.00")}
${item.quantityAccepted?string.number}
-
- - -<#-- Multi-Item Return Receiving --> -<#if returnHeader?has_content> -
- <#-- general request fields --> - - - - <#assign now = Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().toString()> - <#assign rowCount = 0> - - <#if !returnItems?exists || returnItems?size == 0> - - - - <#else> - - - - - - <#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> - - - - - - - - <#assign unitCost = Static["org.ofbiz.order.order.OrderReturnServices"].getReturnItemInitialCost(delegator, returnItem.returnId, returnItem.returnItemSeqId)/> - - - - - - - - <#assign rowCount = rowCount + 1> - - - - - - <#if rowCount == 0> - - - - - - - <#else> - - - + + <#if rowCount == 0> + + + + + + + <#else> + + + + + +
${uiLabelMap.ProductNoItemsToReceive}.
-

${uiLabelMap.ProductReceiveReturn} #${returnHeader.returnId}

- 		- ${uiLabelMap.ProductSelectAll}  - -
- + <#-- Multi-Item Return Receiving --> + <#if returnHeader?has_content> + + <#-- general request fields --> + + + + <#assign now = Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().toString()> + <#assign rowCount = 0> +
+ <#if !returnItems?exists || returnItems?size == 0> - <#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"))> - - - <#elseif orderItem?has_content> - - <#else> - - - - - <#-- location(s) --> - - + + <#else> + + - - - - - + + + + - - <#else> - - - - + <#assign rowCount = rowCount + 1> + + + + - -
-
- ${returnItem.returnItemSeqId}: ${product.productId} - ${product.internalName?if_exists} : ${product.description?if_exists} - <#if serializedInv?has_content>**${uiLabelMap.ProductSerializedInventoryFound}** -
- 		-
- ${returnItem.returnItemSeqId}: ${orderItemType.get("description",locale)} : ${orderItem.itemDescription?if_exists}   - - ${uiLabelMap.ProductCreateProduct} -
- 		-
- ${returnItem.returnItemSeqId}: ${returnItem.get("description",locale)?if_exists} -
- 		  -
${uiLabelMap.ProductLocation}:
- 		- <#assign facilityLocations = (product.getRelatedByAnd("ProductFacilityLocation", Static["org.ofbiz.base.util.UtilMisc"].toMap("facilityId", facilityId)))?if_exists> - <#if facilityLocations?has_content> - - <#else> - - - - " width="15" height="14" border="0" alt="Click here For Field Lookup"/> - - - + ${uiLabelMap.ProductNoItemsToReceive}
+

${uiLabelMap.ProductReceiveReturn} #${returnHeader.returnId}

 -
${uiLabelMap.ProductQtyReceived}:
+ 		+ ${uiLabelMap.ProductSelectAll}  + - -
- + + + + + + + <#assign unitCost = Static["org.ofbiz.order.order.OrderReturnServices"].getReturnItemInitialCost(delegator, returnItem.returnId, returnItem.returnItemSeqId)/> +
+ + + <#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"))> + + + <#elseif orderItem?has_content> + + <#else> + - >${nextInventoryItemType.get("description",locale)?default(nextInventoryItemType.inventoryItemTypeId)} - - - - - <#if serializedInv?has_content> - + + <#-- location(s) --> + + + + + + + + + + <#if serializedInv?has_content> + + + <#else> + + + + + +
+
+ ${returnItem.returnItemSeqId}: ${product.productId} - ${product.internalName?if_exists} : ${product.description?if_exists} + <#if serializedInv?has_content>**${uiLabelMap.ProductSerializedInventoryFound}** +
+ 		+
+ ${returnItem.returnItemSeqId}: ${orderItemType.get("description",locale)} : ${orderItem.itemDescription?if_exists}   + + ${uiLabelMap.ProductCreateProduct} +
+ 		+
+ ${returnItem.returnItemSeqId}: ${returnItem.get("description",locale)?if_exists} +
+ 		- ${uiLabelMap.ProductInitialInventoryItemStatus}:   - - -
${uiLabelMap.ProductExistingInventoryItem}:
+ 		  +
${uiLabelMap.ProductLocation}
+ 		+ <#assign facilityLocations = (product.getRelatedByAnd("ProductFacilityLocation", Static["org.ofbiz.base.util.UtilMisc"].toMap("facilityId", facilityId)))?if_exists> + <#if facilityLocations?has_content> + + <#else> + + + + " width="15" height="14" border="0" alt="Click here For Field Lookup"/> + + + + ${uiLabelMap.ProductQtyReceived} + +
+ + + ${uiLabelMap.ProductInitialInventoryItemStatus}:   + + ${uiLabelMap.ProductExistingInventoryItem} + +  ${uiLabelMap.ProductPerUnitPrice} + +
- + +   -
${uiLabelMap.ProductPerUnitPrice}:
- 		- +
+
- 		- -
-
-
-
${uiLabelMap.ProductNoItemsReturn} #${returnHeader.returnId} ${uiLabelMap.ProductToReceive}.
-
- ${uiLabelMap.ProductReturnToReceiving} -
- ${uiLabelMap.ProductReceiveSelectedProduct} -
${uiLabelMap.ProductNoItemsReturn} #${returnHeader.returnId} ${uiLabelMap.ProductToReceive}.
+ ${uiLabelMap.ProductReturnToReceiving} +
+ ${uiLabelMap.ProductReceiveSelectedProduct} +
+ +
+ + + <#-- Initial Screen --> + <#else> +
+ + + + + + + + + + + + + + +

${uiLabelMap.ProductReceiveReturn}

${uiLabelMap.ProductReturnNumber}  + +  
  + ${uiLabelMap.ProductReceiveProduct} +
+
- - - - - - - <#-- Initial Screen --> -<#else> -
- - - - - - - - - - - - - - -

${uiLabelMap.ProductReceiveReturn}

${uiLabelMap.ProductReturnNumber}
  - -
 
  - ${uiLabelMap.ProductReceiveProduct} -
-
- +
+
\ 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 @@ - @@ -624,10 +623,20 @@ - - @@ -648,10 +657,20 @@ - -