svn commit: r543427 - in /ofbiz/trunk/applications: order/entitydef/entitymodel_view.xml product/config/ProductUiLabels.properties product/config/ProductUiLabels_it.properties product/webapp/facility/shipment/PackOrder.ftl

[jacopoc]

Author: jacopoc
Date: Fri Jun  1 01:33:09 2007
New Revision: 543427

URL: http://svn.apache.org/viewvc?view=rev&rev=543427
Log:
Applied patch from Marco Risaliti (OFBIZ-1036) to add product descriptions for marketing packages components in the packing screen.

Modified:
    ofbiz/trunk/applications/order/entitydef/entitymodel_view.xml
    ofbiz/trunk/applications/product/config/ProductUiLabels.properties
    ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties
    ofbiz/trunk/applications/product/webapp/facility/shipment/PackOrder.ftl

Modified: ofbiz/trunk/applications/order/entitydef/entitymodel_view.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/entitydef/entitymodel_view.xml?view=diff&rev=543427&r1=543426&r2=543427
==============================================================================
--- ofbiz/trunk/applications/order/entitydef/entitymodel_view.xml (original)
+++ ofbiz/trunk/applications/order/entitydef/entitymodel_view.xml Fri Jun  1 01:33:09 2007
@@ -856,6 +856,8 @@
       <alias entity-alias="OH" name="orderId"/>
       <alias entity-alias="OH" name="orderTypeId"/>
       <alias entity-alias="OH" name="orderDate"/>
+      <alias entity-alias="OH" name="billingAccountId"/>
+      <alias entity-alias="OPP" name="preferenceStatusId" field="statusId"/>
       <view-link entity-alias="OH" rel-entity-alias="OPP">
         <key-map field-name="orderId"/>
       </view-link>
@@ -1415,6 +1417,9 @@
         <key-map field-name="orderItemSeqId"/>
       </view-link>
       <view-link entity-alias="OISGIR" rel-entity-alias="II">
+      <relation type="one-nofk" rel-entity-name="Product">
+        <key-map field-name="productId"/>
+      </relation>
         <key-map field-name="inventoryItemId"/>
       </view-link>
     </view-entity>

Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.properties?view=diff&rev=543427&r1=543426&r2=543427
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.properties (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.properties Fri Jun  1 01:33:09 2007
@@ -1847,5 +1847,5 @@
 FormFieldTitle_carrierServiceCode=Carrier Service Code
 FormFieldTitle_editLink=Edit Link
 FormFieldTitle_monthsInPastLimit=Months In Past Limit
-FormFieldTitle_picklistBinId=Picklist Bin Id
+FormFieldTitle_picklistBinId=Picklist Bin
 

Modified: ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties?view=diff&rev=543427&r1=543426&r2=543427
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties Fri Jun  1 01:33:09 2007
@@ -1839,5 +1839,5 @@
 FormFieldTitle_carrierServiceCode=Codice Servizio Corriere
 FormFieldTitle_editLink=Aggiorna Link
 FormFieldTitle_monthsInPastLimit=Mesi Nel Limite Passato
-FormFieldTitle_picklistBinId=Scomparto Lista di Prelievo
+FormFieldTitle_picklistBinId=Lista di Prelievo
 

Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/PackOrder.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/PackOrder.ftl?view=diff&rev=543427&r1=543426&r2=543427
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/shipment/PackOrder.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/shipment/PackOrder.ftl Fri Jun  1 01:33:09 2007
@@ -80,7 +80,7 @@
       <input type="hidden" name="facilityId" value="${facilityId?if_exists}">
       <table border='0' cellpadding='2' cellspacing='0'>
         <tr>
-          <td width="25%" align='right'><div class="tabletext">Picklist Bin #</div></td>
+          <td width="25%" align='right'><div class="tabletext">${uiLabelMap.FormFieldTitle_picklistBinId} #</div></td>
           <td width="1">&nbsp;</td>
           <td width="25%">
             <input type="text" class="inputBox" name="picklistBinId" size="29" maxlength="60" value="${picklistBinId?if_exists}"/>            
@@ -245,6 +245,8 @@
                 <#assign orderItem = itemInfo.orderItem/>
                 <#assign shippedQuantity = orderReadHelper.getItemShippedQuantityBd(orderItem)?if_exists>
                 <#assign orderItemQuantity = itemInfo.quantity/>
+                <#assign orderProduct = orderItem.getRelatedOne("Product")?if_exists/>
+                <#assign product = Static["org.ofbiz.product.product.ProductWorker"].findProduct(delegator, itemInfo.productId)?if_exists/>
                 <#--
                 <#if orderItem.cancelQuantity?exists>
                   <#assign orderItemQuantity = orderItem.quantity - orderItem.cancelQuantity>
@@ -257,8 +259,22 @@
                 <tr>
                   <td><input type="checkbox" name="sel_${rowKey}" value="Y" <#if (inputQty >0)>checked=""</#if>/></td>
                   <td><div class="tabletext">${orderItem.orderItemSeqId}</td>
-                  <td><div class="tabletext"><#if itemInfo.productId?exists && orderItem.productId?exists && orderItem.productId != itemInfo.productId>${orderItem.productId?default("N/A")}&nbsp;</#if>${itemInfo.productId?default("N/A")}</td>
-                  <td><div class="tabletext">${orderItem.itemDescription?if_exists}</td>
+                  <td>
+                      <div class="tabletext">
+                          ${orderProduct.productId?default("N/A")}
+                          <#if orderProduct.productId != product.productId>
+                              &nbsp;${product.productId?default("N/A")}
+                          </#if>
+                      </div>
+                  </td>
+                  <td>
+                      <div class="tabletext">
+                          <a href="/catalog/control/EditProduct?productId=${orderProduct.productId?if_exists}${externalKeyParam}" class="linktext" target="_blank">${(orderProduct.internalName)?if_exists}</a>
+                          <#if orderProduct.productId != product.productId>
+                              &nbsp;[<a href="/catalog/control/EditProduct?productId=${product.productId?if_exists}${externalKeyParam}" class="linktext" target="_blank">${(product.internalName)?if_exists}</a>]
+                          </#if>
+                      </div>
+                  </td>
                   <td align="right"><div class="tabletext">${orderItemQuantity}</td>
                   <td align="right"><div class="tabletext">${shippedQuantity?default(0)}</td>
                   <td align="right"><div class="tabletext">${packingSession.getPackedQuantity(orderId, orderItem.orderItemSeqId, shipGroupSeqId, itemInfo.productId)}</td>
@@ -383,11 +399,15 @@
             </td>
           </tr>
           <#list packedLines as line>
-            <#assign orderItem = orderReadHelper.getOrderItem(line.getOrderItemSeqId())?if_exists>
+            <#assign product = Static["org.ofbiz.product.product.ProductWorker"].findProduct(delegator, line.getProductId())/>
             <tr>
               <td><div class="tabletext">${line.getOrderItemSeqId()}</td>
               <td><div class="tabletext">${line.getProductId()?default("N/A")}</td>
-              <td><div class="tabletext">${(orderItem.itemDescription)?default("[N/A]")}</td>
+              <td>
+                  <div class="tabletext">
+                      <a href="/catalog/control/EditProduct?productId=${line.getProductId()?if_exists}${externalKeyParam}" class="linktext" target="_blank">${product.internalName?if_exists?default("[N/A]")}</a>
+                  </div>      
+              </td>
               <td><div class="tabletext">${line.getInventoryItemId()}</td>
               <td align="right"><div class="tabletext">${line.getQuantity()}</td>
               <#--td align="right"><div class="tabletext">${line.getWeight()}</td-->