Author: erwan
Date: Tue May 18 12:35:41 2010
New Revision: 945622
URL: http://svn.apache.org/viewvc?rev=945622&view=rev
Log:
Applied fix from trunk for revision: 945619
XHTML validation errors round 2++ (product) - OFBIZ-3750
(https://issues.apache.org/jira/browse/OFBIZ-3750)
Modified:
ofbiz/branches/release10.04/ (props changed)
ofbiz/branches/release10.04/applications/product/webapp/catalog/category/EditCategoryProducts.ftl
ofbiz/branches/release10.04/applications/product/webapp/catalog/category/EditCategoryRollup.ftl
ofbiz/branches/release10.04/applications/product/webapp/catalog/store/EditProductStoreSurveys.ftl
ofbiz/branches/release10.04/applications/product/webapp/facility/facility/EditFacility.ftl
ofbiz/branches/release10.04/applications/product/webapp/facility/facility/PicklistOptions.ftl
ofbiz/branches/release10.04/applications/product/webapp/facility/returns/receiveReturn.ftl
ofbiz/branches/release10.04/applications/product/webapp/facility/shipment/ViewShipmentInfo.ftl
ofbiz/branches/release10.04/applications/product/webapp/facility/shipment/ViewShipmentPackageInfo.ftl
Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 18 12:35:41 2010
@@ -1,3 +1,3 @@
/ofbiz/branches/addbirt:831210-885099,885686-886087
/ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610
+/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619
Modified:
ofbiz/branches/release10.04/applications/product/webapp/catalog/category/EditCategoryProducts.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/product/webapp/catalog/category/EditCategoryProducts.ftl?rev=945622&r1=945621&r2=945622&view=diff
==============================================================================
---
ofbiz/branches/release10.04/applications/product/webapp/catalog/category/EditCategoryProducts.ftl
(original)
+++
ofbiz/branches/release10.04/applications/product/webapp/catalog/category/EditCategoryProducts.ftl
Tue May 18 12:35:41 2010
@@ -41,20 +41,28 @@ under the License.
</#if>
</div>
<div class="screenlet-body">
- <table cellspacing="0" class="basic-table">
- <tr class="header-row">
- <td>${uiLabelMap.ProductProductNameId}</td>
- <td>${uiLabelMap.CommonFromDateTime}</td>
- <td
align="center">${uiLabelMap.ProductThruDateTimeSequenceQuantity}
${uiLabelMap.CommonComments}</td>
- <td> </td>
- </tr>
- <#if (listSize > 0)>
- <tr><td>
- <form method="post"
action="<@ofbizUrl>updateCategoryProductMember</@ofbizUrl>"
name="updateCategoryProductForm">
+ <#if (listSize == 0)>
+ <table cellspacing="0" class="basic-table">
+ <tr class="header-row">
+ <td>${uiLabelMap.ProductProductNameId}</td>
+ <td>${uiLabelMap.CommonFromDateTime}</td>
+ <td
align="center">${uiLabelMap.ProductThruDateTimeSequenceQuantity}
${uiLabelMap.CommonComments}</td>
+ <td> </td>
+ </tr>
+ </table>
+ <#else>
+ <form method="post"
action="<@ofbizUrl>updateCategoryProductMember</@ofbizUrl>"
name="updateCategoryProductForm">
<input type="hidden" name="VIEW_SIZE" value="${viewSize}"/>
<input type="hidden" name="VIEW_INDEX" value="${viewIndex}"/>
<input type="hidden" name="activeOnly"
value="${activeOnly.toString()}" />
<input type="hidden" name="productCategoryId"
value="${productCategoryId?if_exists}" />
+ <table cellspacing="0" class="basic-table">
+ <tr class="header-row">
+ <td>${uiLabelMap.ProductProductNameId}</td>
+ <td>${uiLabelMap.CommonFromDateTime}</td>
+ <td
align="center">${uiLabelMap.ProductThruDateTimeSequenceQuantity}
${uiLabelMap.CommonComments}</td>
+ <td> </td>
+ </tr>
<#assign rowClass = "2">
<#assign rowCount = 0>
<#list productCategoryMembers as productCategoryMember>
@@ -101,21 +109,21 @@ under the License.
</tr>
<#assign rowCount = rowCount + 1>
</#list>
- </form>
- <#assign rowCount = 0>
- <#list productCategoryMembers as productCategoryMember>
- <form name="deleteProductFromCategory_o_${rowCount}" method="post"
action="<@ofbizUrl>removeCategoryProductMember</@ofbizUrl>">
+ </table>
+ </form>
+ <#assign rowCount = 0>
+ <#list productCategoryMembers as productCategoryMember>
+ <form name="deleteProductFromCategory_o_${rowCount}" method="post"
action="<@ofbizUrl>removeCategoryProductMember</@ofbizUrl>">
<input type="hidden" name="VIEW_SIZE" value="${viewSize}"/>
<input type="hidden" name="VIEW_INDEX" value="${viewIndex}"/>
<input type="hidden" name="productId"
value="${(productCategoryMember.productId)?if_exists}" />
<input type="hidden" name="productCategoryId"
value="${(productCategoryMember.productCategoryId)?if_exists}"/>
<input type="hidden" name="fromDate"
value="${productCategoryMember.getString("fromDate")?if_exists}"/>
<input type="hidden" name="activeOnly"
value="${activeOnly.toString()}"/>
- </form>
- <#assign rowCount = rowCount + 1>
- </#list>
- </#if>
- </table>
+ </form>
+ <#assign rowCount = rowCount + 1>
+ </#list>
+ </#if>
</div>
<div class="screenlet-title-bar">
<#if (listSize > 0)>
Modified:
ofbiz/branches/release10.04/applications/product/webapp/catalog/category/EditCategoryRollup.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/product/webapp/catalog/category/EditCategoryRollup.ftl?rev=945622&r1=945621&r2=945622&view=diff
==============================================================================
---
ofbiz/branches/release10.04/applications/product/webapp/catalog/category/EditCategoryRollup.ftl
(original)
+++
ofbiz/branches/release10.04/applications/product/webapp/catalog/category/EditCategoryRollup.ftl
Tue May 18 12:35:41 2010
@@ -23,16 +23,28 @@ under the License.
<h3>${uiLabelMap.ProductCategoryRollupParentCategories}</h3>
</div>
<div class="screenlet-body">
- <table cellspacing="0" class="basic-table">
+ <#if currentProductCategoryRollups.size() == 0>
+ <table cellspacing="0" class="basic-table">
+ <tr class="header-row">
+ <td><b>${uiLabelMap.ProductParentCategoryId}</b></td>
+ <td><b>${uiLabelMap.CommonFromDate}</b></td>
+ <td
align="center"><b>${uiLabelMap.ProductThruDateTimeSequence}</b></td>
+ <td><b> </b></td>
+ </tr>
+ <tr valign="middle">
+ <td
colspan="4">${uiLabelMap.ProductNoParentCategoriesFound}.</td>
+ </tr>
+ </table>
+ <#else>
+ <form method="post"
action="<@ofbizUrl>updateProductCategoryToCategory</@ofbizUrl>"
name="updateProductCategoryForm">
+ <input type="hidden" name="showProductCategoryId"
value="${productCategoryId}" />
+ <table cellspacing="0" class="basic-table">
<tr class="header-row">
<td><b>${uiLabelMap.ProductParentCategoryId}</b></td>
<td><b>${uiLabelMap.CommonFromDate}</b></td>
<td
align="center"><b>${uiLabelMap.ProductThruDateTimeSequence}</b></td>
<td><b> </b></td>
</tr>
- <#if currentProductCategoryRollups.size() != 0>
- <form method="post"
action="<@ofbizUrl>updateProductCategoryToCategory</@ofbizUrl>"
name="updateProductCategoryForm">
- <input type="hidden" name="showProductCategoryId"
value="${productCategoryId}" />
<#assign rowClass = "2">
<#list currentProductCategoryRollups as
productCategoryRollup>
<#assign suffix = "_o_" + productCategoryRollup_index>
@@ -70,7 +82,8 @@ under the License.
<input type="hidden"
value="${currentProductCategoryRollups.size()}" name="_rowCount" />
</td>
</tr>
- </form>
+ </table>
+ </form>
<#list currentProductCategoryRollups as productCategoryRollup>
<form
name="removeProductCategoryFromCategory_${productCategoryRollup_index}"
method="post" action="<@ofbizUrl>removeProductCategoryFromCategory</@ofbizUrl>">
<input type="hidden" name="showProductCategoryId"
value="${productCategoryId}"/>
@@ -79,13 +92,7 @@ under the License.
<input type="hidden" name="fromDate"
value="${productCategoryRollup.fromDate}"/>
</form>
</#list>
- </#if>
- <#if currentProductCategoryRollups.size() == 0>
- <tr valign="middle">
- <td
colspan="4">${uiLabelMap.ProductNoParentCategoriesFound}.</td>
- </tr>
- </#if>
- </table>
+ </#if>
</div>
</div>
<div class="screenlet">
@@ -112,16 +119,28 @@ under the License.
<h3>${uiLabelMap.ProductCategoryRollupChildCategories}</h3>
</div>
<div class="screenlet-body">
- <table cellspacing="0" class="basic-table">
- <tr class="header-row">
- <td><b>${uiLabelMap.ProductChildCategoryId}</b></td>
- <td><b>${uiLabelMap.CommonFromDate}</b></td>
- <td
align="center"><b>${uiLabelMap.ProductThruDateTimeSequence}</b></td>
- <td><b> </b></td>
- </tr>
- <#if parentProductCategoryRollups.size() != 0>
- <form method="post"
action="<@ofbizUrl>updateProductCategoryToCategory</@ofbizUrl>"
name="updateProductCategoryToCategoryChild">
- <input type="hidden" name="showProductCategoryId"
value="${productCategoryId}" />
+ <#if parentProductCategoryRollups.size() == 0>
+ <table cellspacing="0" class="basic-table">
+ <tr class="header-row">
+ <td><b>${uiLabelMap.ProductChildCategoryId}</b></td>
+ <td><b>${uiLabelMap.CommonFromDate}</b></td>
+ <td
align="center"><b>${uiLabelMap.ProductThruDateTimeSequence}</b></td>
+ <td><b> </b></td>
+ </tr>
+ <tr valign="middle">
+ <td
colspan="4">${uiLabelMap.ProductNoChildCategoriesFound}.</td>
+ </tr>
+ </table>
+ <#else>
+ <form method="post"
action="<@ofbizUrl>updateProductCategoryToCategory</@ofbizUrl>"
name="updateProductCategoryToCategoryChild">
+ <input type="hidden" name="showProductCategoryId"
value="${productCategoryId}" />
+ <table cellspacing="0" class="basic-table">
+ <tr class="header-row">
+ <td><b>${uiLabelMap.ProductChildCategoryId}</b></td>
+ <td><b>${uiLabelMap.CommonFromDate}</b></td>
+ <td
align="center"><b>${uiLabelMap.ProductThruDateTimeSequence}</b></td>
+ <td><b> </b></td>
+ </tr>
<#assign lineChild = 0>
<#assign rowClass = "2">
<#list parentProductCategoryRollups as
productCategoryRollup>
@@ -133,7 +152,7 @@ under the License.
<#assign hasExpired = false>
<#if productCategoryRollup.thruDate?exists &&
nowTimestamp.after(productCategoryRollup.getTimestamp("thruDate"))><#assign
hasExpired = true></#if>
<tr valign="middle"<#if rowClass == "1">
class="alternate-row"</#if>>
- <td><#if curCategory?has_content><a
href="<@ofbizUrl>EditCategory?productCategoryId=${curCategory.productCategoryId}</@ofbizUrl>"
class="buttontext">${curCategory.description?if_exists}
[${curCategory.productCategoryId}]</a></#if>
+ <td><#if curCategory?has_content><a
href="<@ofbizUrl>EditCategory?productCategoryId=${curCategory.productCategoryId}</@ofbizUrl>"
class="buttontext">${curCategory.description?if_exists}
[${curCategory.productCategoryId}]</a></#if></td>
<td <#if hasntStarted>style="color:
red"</#if>>${productCategoryRollup.fromDate}</td>
<td align="center">
<input type="hidden"
name="productCategoryId${suffix}"
value="${productCategoryRollup.productCategoryId}" />
@@ -160,22 +179,17 @@ under the License.
<input type="hidden" value="${lineChild}"
name="_rowCount" />
</td>
</tr>
- </form>
- <#list parentProductCategoryRollups as productCategoryRollup>
- <form
name="removeProductCategoryFromCategory_1_${productCategoryRollup_index}"
method="post" action="<@ofbizUrl>removeProductCategoryFromCategory</@ofbizUrl>">
- <input type="hidden" name="showProductCategoryId"
value="${productCategoryId}"/>
- <input type="hidden" name="productCategoryId"
value="${productCategoryRollup.productCategoryId}"/>
- <input type="hidden" name="parentProductCategoryId"
value="${productCategoryRollup.parentProductCategoryId}"/>
- <input type="hidden" name="fromDate"
value="${productCategoryRollup.fromDate}"/>
- </form>
- </#list>
- </#if>
- <#if parentProductCategoryRollups.size() == 0>
- <tr valign="middle">
- <td
colspan="4">${uiLabelMap.ProductNoChildCategoriesFound}.</td>
- </tr>
- </#if>
- </table>
+ </table>
+ </form>
+ <#list parentProductCategoryRollups as productCategoryRollup>
+ <form
name="removeProductCategoryFromCategory_1_${productCategoryRollup_index}"
method="post" action="<@ofbizUrl>removeProductCategoryFromCategory</@ofbizUrl>">
+ <input type="hidden" name="showProductCategoryId"
value="${productCategoryId}"/>
+ <input type="hidden" name="productCategoryId"
value="${productCategoryRollup.productCategoryId}"/>
+ <input type="hidden" name="parentProductCategoryId"
value="${productCategoryRollup.parentProductCategoryId}"/>
+ <input type="hidden" name="fromDate"
value="${productCategoryRollup.fromDate}"/>
+ </form>
+ </#list>
+ </#if>
</div>
</div>
<div class="screenlet">
Modified:
ofbiz/branches/release10.04/applications/product/webapp/catalog/store/EditProductStoreSurveys.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/product/webapp/catalog/store/EditProductStoreSurveys.ftl?rev=945622&r1=945621&r2=945622&view=diff
==============================================================================
---
ofbiz/branches/release10.04/applications/product/webapp/catalog/store/EditProductStoreSurveys.ftl
(original)
+++
ofbiz/branches/release10.04/applications/product/webapp/catalog/store/EditProductStoreSurveys.ftl
Tue May 18 12:35:41 2010
@@ -39,7 +39,7 @@ under the License.
<tr valign="middle"<#if alt_row>class="alternate-row"</#if>>
<td>${surveyType.get("description",locale)}</td>
<td>${storeSurvey.groupName?if_exists}</td>
- <td><a
href="/content/control/EditSurvey?surveyId=${storeSurvey.surveyId}"
class="buttontext">${survey.description?default("[" + survey.surveyId +
"]")}</a>
+ <td><a
href="/content/control/EditSurvey?surveyId=${storeSurvey.surveyId}"
class="buttontext">${survey.description?default("[" + survey.surveyId +
"]")}</a></td>
<td>${storeSurvey.productId?default("${uiLabelMap.CommonNA}")}</td>
<td>${storeSurvey.productCategoryId?default("${uiLabelMap.CommonNA}")}</td>
<td>${storeSurvey.fromDate?if_exists?string}</td>
@@ -50,7 +50,8 @@ under the License.
<input type="hidden" name="productStoreSurveyId"
value="${storeSurvey.productStoreSurveyId}" />
<a
href="javascript:document.deleteProductStoreSurveyAppl_${storeSurvey_index}.submit()"
class="buttontext">${uiLabelMap.CommonDelete}</a>
</form>
- </td>
+ </td>
+ </tr>
<#-- toggle the row color -->
<#assign alt_row = !alt_row>
</#list>
Modified:
ofbiz/branches/release10.04/applications/product/webapp/facility/facility/EditFacility.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/product/webapp/facility/facility/EditFacility.ftl?rev=945622&r1=945621&r2=945622&view=diff
==============================================================================
---
ofbiz/branches/release10.04/applications/product/webapp/facility/facility/EditFacility.ftl
(original)
+++
ofbiz/branches/release10.04/applications/product/webapp/facility/facility/EditFacility.ftl
Tue May 18 12:35:41 2010
@@ -106,7 +106,7 @@ under the License.
<#list areaUomList as uom>
<option value='${uom.uomId}'
<#if (facility.facilitySizeUomId?has_content) && (uom.uomId ==
facility.facilitySizeUomId)>
- SELECTED
+ selected="selected"
</#if>
>${uom.get("description",locale)?default(uom.uomId)}</option>
</#list>
Modified:
ofbiz/branches/release10.04/applications/product/webapp/facility/facility/PicklistOptions.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/product/webapp/facility/facility/PicklistOptions.ftl?rev=945622&r1=945621&r2=945622&view=diff
==============================================================================
---
ofbiz/branches/release10.04/applications/product/webapp/facility/facility/PicklistOptions.ftl
(original)
+++
ofbiz/branches/release10.04/applications/product/webapp/facility/facility/PicklistOptions.ftl
Tue May 18 12:35:41 2010
@@ -108,14 +108,15 @@ under the License.
<#assign orderReadyToPickInfoListSizeTotal =
orderReadyToPickInfoListSizeTotal + orderReadyToPickInfoListSize>
<#assign orderNeedsStockMoveInfoListSizeTotal =
orderNeedsStockMoveInfoListSizeTotal + orderNeedsStockMoveInfoListSize>
<tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
- <form name="viewGroupDetail_${pickMoveInfo_index}"
action="<@ofbizUrl>PicklistOptions</@ofbizUrl>" method="post">
- <input type ="hidden" name="viewDetail" value=
"${groupName?if_exists}"/>
- <input type="hidden" name="groupByShippingMethod"
value="${requestParameters.groupByShippingMethod?if_exists}"/>
- <input type="hidden" name="groupByWarehouseArea"
value="${requestParameters.groupByWarehouseArea?if_exists}"/>
- <input type="hidden" name="groupByNoOfOrderItems"
value="${requestParameters.groupByNoOfOrderItems?if_exists}"/>
- <input type="hidden" name="facilityId"
value="${facilityId?if_exists}"/>
- <#if ((requestParameters.groupByShippingMethod?exists &&
requestParameters.groupByShippingMethod == "Y") ||
(requestParameters.groupByWarehouseArea?exists &&
requestParameters.groupByWarehouseArea == "Y") ||
(requestParameters.groupByNoOfOrderItems?exists &&
requestParameters.groupByNoOfOrderItems == "Y"))>
<td>
+ <form name="viewGroupDetail_${pickMoveInfo_index}"
action="<@ofbizUrl>PicklistOptions</@ofbizUrl>" method="post">
+ <input type ="hidden" name="viewDetail" value=
"${groupName?if_exists}"/>
+ <input type="hidden" name="groupByShippingMethod"
value="${requestParameters.groupByShippingMethod?if_exists}"/>
+ <input type="hidden" name="groupByWarehouseArea"
value="${requestParameters.groupByWarehouseArea?if_exists}"/>
+ <input type="hidden" name="groupByNoOfOrderItems"
value="${requestParameters.groupByNoOfOrderItems?if_exists}"/>
+ <input type="hidden" name="facilityId"
value="${facilityId?if_exists}"/>
+ </form>
+ <#if ((requestParameters.groupByShippingMethod?exists &&
requestParameters.groupByShippingMethod == "Y") ||
(requestParameters.groupByWarehouseArea?exists &&
requestParameters.groupByWarehouseArea == "Y") ||
(requestParameters.groupByNoOfOrderItems?exists &&
requestParameters.groupByNoOfOrderItems == "Y"))>
<#if groupName1?has_content>
<a
href="javascript:document.viewGroupDetail_${pickMoveInfo_index}.submit()"
class="buttontext">${groupName1}</a>
</#if>
@@ -129,13 +130,10 @@ under the License.
<#if groupName3?has_content>
<a
href="javascript:document.viewGroupDetail_${pickMoveInfo_index}.submit()"
class="buttontext">${groupName3}</a></td>
</#if>
- </td>
<#else>
- <td>
<a
href="javascript:document.viewGroupDetail_${pickMoveInfo_index}.submit()"
class="buttontext">${groupName?if_exists}</a>
- </td>
</#if>
- </form>
+ </td>
<td>
<#if !((requestParameters.groupByShippingMethod?exists &&
requestParameters.groupByShippingMethod == "Y") ||
(requestParameters.groupByWarehouseArea?exists &&
requestParameters.groupByWarehouseArea == "Y") ||
(requestParameters.groupByNoOfOrderItems?exists &&
requestParameters.groupByNoOfOrderItems == "Y"))>
<#if orderReadyToPickInfoListSize == 0
>${uiLabelMap.CommonN}<#else>${uiLabelMap.CommonY}</#if>
Modified:
ofbiz/branches/release10.04/applications/product/webapp/facility/returns/receiveReturn.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/product/webapp/facility/returns/receiveReturn.ftl?rev=945622&r1=945621&r2=945622&view=diff
==============================================================================
---
ofbiz/branches/release10.04/applications/product/webapp/facility/returns/receiveReturn.ftl
(original)
+++
ofbiz/branches/release10.04/applications/product/webapp/facility/returns/receiveReturn.ftl
Tue May 18 12:35:41 2010
@@ -166,7 +166,7 @@ under the License.
<#list inventoryItemTypes as
nextInventoryItemType>
<option
value='${nextInventoryItemType.inventoryItemTypeId}'
<#if
(facility.defaultInventoryItemTypeId?has_content) &&
(nextInventoryItemType.inventoryItemTypeId ==
facility.defaultInventoryItemTypeId)>
- SELECTED
+ selected="selected"
</#if>
>${nextInventoryItemType.get("description",locale)?default(nextInventoryItemType.inventoryItemTypeId)}</option>
</#list>
Modified:
ofbiz/branches/release10.04/applications/product/webapp/facility/shipment/ViewShipmentInfo.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/product/webapp/facility/shipment/ViewShipmentInfo.ftl?rev=945622&r1=945621&r2=945622&view=diff
==============================================================================
---
ofbiz/branches/release10.04/applications/product/webapp/facility/shipment/ViewShipmentInfo.ftl
(original)
+++
ofbiz/branches/release10.04/applications/product/webapp/facility/shipment/ViewShipmentInfo.ftl
Tue May 18 12:35:41 2010
@@ -91,8 +91,8 @@ under the License.
<td width="20%" align="right"
class="label">${uiLabelMap.PartyParties}</td>
<td width="80%">
<span>
-
<span>${uiLabelMap.CommonTo}: ${(toPerson.firstName)?if_exists}
${(toPerson.middleName)?if_exists} ${(toPerson.lastName)?if_exists}
${(toPartyGroup.groupName)?if_exists} [${shipment.partyIdTo?if_exists}]
-
<span>${uiLabelMap.CommonFrom}: ${(fromPerson.firstName)?if_exists}
${(fromPerson.middleName)?if_exists} ${(fromPerson.lastName)?if_exists}
${(fromPartyGroup.groupName)?if_exists} [${shipment.partyIdFrom?if_exists}]
+
<span>${uiLabelMap.CommonTo}: ${(toPerson.firstName)?if_exists}
${(toPerson.middleName)?if_exists} ${(toPerson.lastName)?if_exists}
${(toPartyGroup.groupName)?if_exists} [${shipment.partyIdTo?if_exists}]</span>
+
<span>${uiLabelMap.CommonFrom}: ${(fromPerson.firstName)?if_exists}
${(fromPerson.middleName)?if_exists} ${(fromPerson.lastName)?if_exists}
${(fromPartyGroup.groupName)?if_exists}
[${shipment.partyIdFrom?if_exists}]</span>
</span>
</td>
</tr>
Modified:
ofbiz/branches/release10.04/applications/product/webapp/facility/shipment/ViewShipmentPackageInfo.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/product/webapp/facility/shipment/ViewShipmentPackageInfo.ftl?rev=945622&r1=945621&r2=945622&view=diff
==============================================================================
---
ofbiz/branches/release10.04/applications/product/webapp/facility/shipment/ViewShipmentPackageInfo.ftl
(original)
+++
ofbiz/branches/release10.04/applications/product/webapp/facility/shipment/ViewShipmentPackageInfo.ftl
Tue May 18 12:35:41 2010
@@ -42,16 +42,16 @@ under the License.
<tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
<td> </td>
<td><span class="label">${uiLabelMap.ProductItem}</span>
${shipmentPackageContent.shipmentItemSeqId}</td>
- <td><span class="label">${uiLabelMap.ProductQuantity}</span>
${shipmentPackageContent.quantity?if_exists}</div></td>
+ <td><span class="label">${uiLabelMap.ProductQuantity}</span>
${shipmentPackageContent.quantity?if_exists}</td>
<td> </td>
</tr>
</#list>
<#list shipmentPackageRouteSegs as shipmentPackageRouteSeg>
<tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
<td> </td>
- <td><span class="label">${uiLabelMap.ProductRouteSegment}</span>
${shipmentPackageRouteSeg.shipmentRouteSegmentId}</div></td>
- <td><span class="label">${uiLabelMap.ProductTracking}</span>
${shipmentPackageRouteSeg.trackingCode?if_exists}</span></td>
- <td><span class="label">${uiLabelMap.ProductBox}</span>
${shipmentPackageRouteSeg.boxNumber?if_exists}</span></td>
+ <td><span class="label">${uiLabelMap.ProductRouteSegment}</span>
${shipmentPackageRouteSeg.shipmentRouteSegmentId}</td>
+ <td><span class="label">${uiLabelMap.ProductTracking}</span>
${shipmentPackageRouteSeg.trackingCode?if_exists}</td>
+ <td><span class="label">${uiLabelMap.ProductBox}</span>
${shipmentPackageRouteSeg.boxNumber?if_exists}</td>
</tr>
</#list>
<#-- toggle the row color -->
