svn commit: r926987 [12/26] - in /ofbiz/branches/multitenant201
Locked
svn commit: r926987 [12/26] - in /ofbiz/branches/multitenant201
 
|
Modified: ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/lookup/LookupVariantProduct.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/lookup/LookupVariantProduct.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/lookup/LookupVariantProduct.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/lookup/LookupVariantProduct.ftl Wed Mar 24 09:23:07 2010 @@ -17,9 +17,9 @@ specific language governing permissions under the License. --> <#if (requestAttributes.uiLabelMap)?exists><#assign uiLabelMap = requestAttributes.uiLabelMap></#if> -<br/> +<br /> <div class="label">[${product.productId}] ${product.internalName}</div> -<br/> +<br /> <#if searchFeatures?has_content> <table cellspacing="0" class="basic-table"> <form method="post" action="<@ofbizUrl>LookupVariantProduct</@ofbizUrl>" name="selectAllForm"> @@ -50,7 +50,7 @@ under the License. </tr> </table> </#if> -<br/> +<br /> <#if variantProducts?exists> <table cellspacing="0" class="basic-table"> <tr class="header-row"> Modified: ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/main.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/main.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/main.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/main.ftl Wed Mar 24 09:23:07 2010 @@ -20,7 +20,7 @@ under the License. <#if !sessionAttributes.userLogin?exists> <div class='label'> ${uiLabelMap.ProductGeneralMessage}.</div> </#if> -<br/> +<br /> <#if security.hasEntityPermission("CATALOG", "_VIEW", session)> <div class="label">${uiLabelMap.ProductEditCatalogWithCatalogId}:</div> <form method="post" action="<@ofbizUrl>EditProdCatalog</@ofbizUrl>" style="margin: 0;" name="EditProdCatalogForm"> @@ -28,32 +28,32 @@ under the License. <input type="submit" value=" ${uiLabelMap.ProductEditCatalog}" class="smallSubmit"/> </form> <div class="label">${uiLabelMap.CommonOr}: <a href="<@ofbizUrl>EditProdCatalog</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductCreateNewCatalog}</a></div> - <br/> + <br /> <div class="label">${uiLabelMap.ProductEditCategoryWithCategoryId}:</div> <form method="post" action="<@ofbizUrl>EditCategory</@ofbizUrl>" style="margin: 0;" name="EditCategoryForm"> <@formrenderer.renderLookupField name="productCategoryId" id="productCategoryId" formName="EditCategoryForm" lookupFieldFormName="LookupProductCategory"/> <input type="submit" value="${uiLabelMap.ProductEditCategory}" class="smallSubmit"/> </form> - <br/> + <br /> <div class="label">${uiLabelMap.CommonOr}: <a href="<@ofbizUrl>EditCategory</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductCreateNewCategory}</a></div> - <br/> + <br /> <div class="label">${uiLabelMap.ProductEditProductWithProductId}:</div> <form method="post" action="<@ofbizUrl>EditProduct</@ofbizUrl>" style="margin: 0;" name="EditProductForm"> <@formrenderer.renderLookupField name="productId" id="productId" formName="EditProductForm" lookupFieldFormName="LookupProduct"/> <input type="submit" value=" ${uiLabelMap.ProductEditProduct}" class="smallSubmit"/> </form> - <br/> + <br /> <div class="label">${uiLabelMap.CommonOr}: <a href="<@ofbizUrl>EditProduct</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductCreateNewProduct}</a></div> - <br/> + <br /> <div class="label">${uiLabelMap.CommonOr}: <a href="<@ofbizUrl>CreateVirtualWithVariantsForm</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductQuickCreateVirtualFromVariants}</a></div> - <br/> + <br /> <div class="label">${uiLabelMap.ProductFindProductWithIdValue}:</div> <form method="post" action="<@ofbizUrl>FindProductById</@ofbizUrl>" style="margin: 0;"> <input type="text" size="20" maxlength="20" name="idValue" value=""/> <input type="submit" value=" ${uiLabelMap.ProductFindProduct}" class="smallSubmit"/> </form> - <br/> + <br /> <div><a href="<@ofbizUrl>UpdateAllKeywords</@ofbizUrl>" class="buttontext"> ${uiLabelMap.ProductAutoCreateKeywordsForAllProducts}</a></div> <div><a href="<@ofbizUrl>FastLoadCache</@ofbizUrl>" class="buttontext"> ${uiLabelMap.ProductFastLoadCatalogIntoCache}</a></div> - <br/> + <br /> </#if> Modified: ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/product/CreateVirtualWithVariantsForm.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/product/CreateVirtualWithVariantsForm.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/product/CreateVirtualWithVariantsForm.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/product/CreateVirtualWithVariantsForm.ftl Wed Mar 24 09:23:07 2010 @@ -23,7 +23,7 @@ under the License. </tr> <tr> <td> - <br/> + <br /> <span class="label">${uiLabelMap.ProductVariantProductIds}:</span> <textarea name="variantProductIdsBag" rows="6" cols="20"></textarea> <span class="label">Hazmat:</span> Modified: ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/product/EditProductAssoc.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/product/EditProductAssoc.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/product/EditProductAssoc.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/product/EditProductAssoc.ftl Wed Mar 24 09:23:07 2010 @@ -265,5 +265,5 @@ under the License. </div> </div> </#if> -<br/> -<span class="tooltip">${uiLabelMap.CommonNote} : ${uiLabelMap.ProductHighlightedExplanation}</span> \ No newline at end of file +<br /> +<span class="tooltip">${uiLabelMap.CommonNote} : ${uiLabelMap.ProductHighlightedExplanation}</span> Modified: ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/product/EditProductContent.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/product/EditProductContent.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/product/EditProductContent.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/product/EditProductContent.ftl Wed Mar 24 09:23:07 2010 @@ -36,7 +36,7 @@ under the License. <div>${uiLabelMap.ProductServerDirectory}: <b>${imageServerPath?if_exists}</b></div> <div>${uiLabelMap.ProductTheUrlOfYourUploadedFile}: <b><a href="<@ofbizContentUrl>${imageUrl?if_exists}</@ofbizContentUrl>">${imageUrl?if_exists}</a></b></div> </#if> - <br/> + <br /> </#if> <form action="<@ofbizUrl>updateProductContent</@ofbizUrl>" method="post" style="margin: 0;" name="productForm"> <input type="hidden" name="productId" value="${productId?if_exists}"/> @@ -67,7 +67,7 @@ under the License. <td> </td> <td width="80%" colspan="4" valign="top"> <input type="text" name="detailScreen" value="${(product.detailScreen)?if_exists}" size="60" maxlength="250"/> - <br/><span class="tooltip">${uiLabelMap.ProductIfNotSpecifiedDefaultsIsProductdetail} "productdetail", ${uiLabelMap.ProductDetailScreenMessage}: "component://ecommerce/widget/CatalogScreens.xml#productdetail"</span> + <br /><span class="tooltip">${uiLabelMap.ProductIfNotSpecifiedDefaultsIsProductdetail} "productdetail", ${uiLabelMap.ProductDetailScreenMessage}: "component://ecommerce/widget/CatalogScreens.xml#productdetail"</span> </td> </tr> <tr> Modified: ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/product/EditProductFeatures.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/product/EditProductFeatures.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/product/EditProductFeatures.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/product/EditProductFeatures.ftl Wed Mar 24 09:23:07 2010 @@ -150,7 +150,7 @@ under the License. </#list> </select> <span class='label'>${uiLabelMap.CommonIdCode}: </span><input type="text" size='10' name='idCode' value=''/> - <br/> + <br /> <span class='label'>${uiLabelMap.ProductFeatureApplicationType}: </span> <select name='productFeatureApplTypeId' size="1"> <#list productFeatureApplTypes as productFeatureApplType> @@ -160,7 +160,7 @@ under the License. >${(productFeatureApplType.get("description",locale))?if_exists} </option> </#list> </select> - <br/> + <br /> <span class='label'>${uiLabelMap.CommonFrom} : </span><input type="text" size='25' name='fromDate'/> <a href="javascript:call_cal(document.addFeatureByTypeIdCode.fromDate, '${nowTimestamp?string}');"><img src='/images/cal.gif' width='16' height='16' border='0' alt='Calendar'/></a> <span class='label'>${uiLabelMap.CommonThru} : </span><input type="text" size='25' name='thruDate'/> @@ -193,7 +193,7 @@ under the License. >${(productFeatureApplType.get("description",locale))?if_exists} </option> </#list> </select> - <br/> + <br /> <span class="label">${uiLabelMap.CommonFrom} : </span><input type="text" size="25" name="fromDate"/> <a href="javascript:call_cal(document.addFeatureById.fromDate, '${nowTimestamp?string}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a> <span class="label">${uiLabelMap.CommonThru} : </span><input type="text" size="25" name="thruDate"/> Modified: ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl Wed Mar 24 09:23:07 2010 @@ -31,7 +31,7 @@ under the License. <a href="<@ofbizUrl>EditProductInventoryItems?productId=${productId}&showEmpty=true</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductShowEmptyItems}</a> </#if> </#if> - <br/> + <br /> <#if productId?exists> <table cellspacing="0" class="basic-table"> <tr class="header-row"> Modified: ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/product/EditProductParties.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/product/EditProductParties.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/product/EditProductParties.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/product/EditProductParties.ftl Wed Mar 24 09:23:07 2010 @@ -68,9 +68,9 @@ under the License. </#if> </#list> </table> - <br/> + <br /> <h2>${uiLabelMap.ProductAssociatePartyToProduct}:</h2> - <br/> + <br /> <form method="post" action="<@ofbizUrl>addPartyToProduct</@ofbizUrl>" name="addNewForm"> <input type="hidden" name="productId" value="${productId}"> <input type="text" size="20" maxlength="20" name="partyId" value=""> Modified: ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl Wed Mar 24 09:23:07 2010 @@ -104,7 +104,7 @@ function doPublish() { </tr> </table> </form> - <br/> + <br /> <form action="<@ofbizUrl>updateProductQuickAdminSelFeat</@ofbizUrl>" method="post" style="margin: 0;" name="selectableFeature"> <input type="hidden" name="productId" value="${product.productId?if_exists}"/> <input type="hidden" name="productFeatureTypeId" value="${(productFeatureTypeId)?if_exists}"/> @@ -341,7 +341,7 @@ function doPublish() { </td> </tr> </table> - <br/> + <br /> <form action="<@ofbizUrl>EditProductQuickAdmin</@ofbizUrl>"> <input type="hidden" name="productFeatureTypeId" value="${(productFeatureTypeId)?if_exists}"/> <input type="hidden" name="productId" value="${product.productId?if_exists}"/> Modified: ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/product/QuickAddVariants.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/product/QuickAddVariants.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/product/QuickAddVariants.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/product/QuickAddVariants.ftl Wed Mar 24 09:23:07 2010 @@ -125,7 +125,7 @@ function clickAll(e) { </tr> <tr> <td> - <br/> + <br /> <input type="hidden" name="productId" value="${productId}"/> <span class="label">${uiLabelMap.ProductVariantProductIds}:</span> <textarea name="variantProductIdsBag" rows="6" cols="20"></textarea> Modified: ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/promo/FindProductPromoCode.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/promo/FindProductPromoCode.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/promo/FindProductPromoCode.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/promo/FindProductPromoCode.ftl Wed Mar 24 09:23:07 2010 @@ -36,7 +36,7 @@ under the License. </form> </div> </div> - <br/> + <br /> <div class="screenlet"> <div class="screenlet-title-bar"> <h3>${uiLabelMap.ProductPromotionAddSetOfPromotionCodes}</h3> Modified: ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/reviews/pendingReviews.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/reviews/pendingReviews.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/reviews/pendingReviews.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/reviews/pendingReviews.ftl Wed Mar 24 09:23:07 2010 @@ -86,7 +86,7 @@ under the License. <option value="Y">${uiLabelMap.CommonY}</option> </select> </td> - <td>${review.getRelatedOne("Product").internalName?if_exists}<br/><a class="buttontext" href="<@ofbizUrl>EditProduct?productId=${review.productId}</@ofbizUrl>">${review.productId}</a></td> + <td>${review.getRelatedOne("Product").internalName?if_exists}<br /><a class="buttontext" href="<@ofbizUrl>EditProduct?productId=${review.productId}</@ofbizUrl>">${review.productId}</a></td> <td> <input type="text" size='3' name="productRating_o_${rowCount}" value="${review.productRating?if_exists?string}"> </td> Modified: ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/thesaurus/EditKeywordThesaurus.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/thesaurus/EditKeywordThesaurus.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/thesaurus/EditKeywordThesaurus.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/product/webapp/catalog/thesaurus/EditKeywordThesaurus.ftl Wed Mar 24 09:23:07 2010 @@ -39,7 +39,7 @@ under the License. <a href="<@ofbizUrl>editKeywordThesaurus?firstLetter=${letter}</@ofbizUrl>" class="buttontext"><#if highlight>[</#if>${letter}<#if highlight>]</#if></a> </#list> </div> - <br/> + <br /> <#assign lastkeyword = ""> <table cellspacing="0" class="basic-table"> <#assign rowClass = "2"> Modified: ofbiz/branches/multitenant20100310/applications/product/webapp/facility/WEB-INF/actions/inventory/InventoryItemReport.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/product/webapp/facility/WEB-INF/actions/inventory/InventoryItemReport.groovy?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/product/webapp/facility/WEB-INF/actions/inventory/InventoryItemReport.groovy (original) +++ ofbiz/branches/multitenant20100310/applications/product/webapp/facility/WEB-INF/actions/inventory/InventoryItemReport.groovy Wed Mar 24 09:23:07 2010 @@ -42,11 +42,11 @@ int lastIntMonth = Integer.parseInt(request.getParameter("lastIntMonth")); if (lastIntMonth == 0 ){ - fromOrderDate = null; + fromOrderDate = null; }else{ - fromDateTime = UtilDateTime.getDayStart(UtilDateTime.toTimestamp(UtilDateTime.nowTimestamp()), (lastIntMonth*(-30))); - fromOrderDate = UtilDateTime.toDateString(fromDateTime,"MMMM dd, yyyy") - Debug.logInfo("====fromDate======="+fromOrderDate.toString(),""); + fromDateTime = UtilDateTime.getDayStart(UtilDateTime.toTimestamp(UtilDateTime.nowTimestamp()), (lastIntMonth*(-30))); + fromOrderDate = UtilDateTime.toDateString(fromDateTime,"MMMM dd, yyyy") + Debug.logInfo("====fromDate======="+fromOrderDate.toString(),""); } birtParameters.facilityId = request.getParameter("facilityId"); Modified: ofbiz/branches/multitenant20100310/applications/product/webapp/facility/facility/EditFacilityLocation.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/product/webapp/facility/facility/EditFacilityLocation.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/product/webapp/facility/facility/EditFacilityLocation.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/product/webapp/facility/facility/EditFacilityLocation.ftl Wed Mar 24 09:23:07 2010 @@ -97,7 +97,7 @@ under the License. </table> </form> <#if locationSeqId?exists> - <br/> + <br /> <div class="screenlet"> <div class="screenlet-title-bar"> <h3>${uiLabelMap.ProductLocationProduct}</h3> Modified: ofbiz/branches/multitenant20100310/applications/product/webapp/facility/facility/FacilityScheduleTabBar.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/product/webapp/facility/facility/FacilityScheduleTabBar.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/product/webapp/facility/facility/FacilityScheduleTabBar.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/product/webapp/facility/facility/FacilityScheduleTabBar.ftl Wed Mar 24 09:23:07 2010 @@ -19,12 +19,12 @@ under the License. <#assign selected = scheduleTabButtonItem?default("void")> <#if facilityId?has_content> - <br/> + <br /> <div class="button-bar tab-bar"> <ul> <li<#if selected="ScheduleTabButton"> class="selected"</#if>><a href="<@ofbizUrl>ScheduleShipmentRouteSegment?facilityId=${facilityId}</@ofbizUrl>">${uiLabelMap.ProductSchedule}</a></li> <li<#if selected="LabelsTabButton"> class="selected"</#if>><a href="<@ofbizUrl>Labels?facilityId=${facilityId}</@ofbizUrl>">${uiLabelMap.ProductLabels}</a></li> </ul> - <br/> + <br /> </div> </#if> \ No newline at end of file Modified: ofbiz/branches/multitenant20100310/applications/product/webapp/facility/facility/FindFacilityLocation.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/product/webapp/facility/facility/FindFacilityLocation.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/product/webapp/facility/facility/FindFacilityLocation.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/product/webapp/facility/facility/FindFacilityLocation.ftl Wed Mar 24 09:23:07 2010 @@ -71,9 +71,9 @@ under the License. <#if foundLocations?exists> <#-- TODO: Put this in a screenlet - make it look more like the party find screen --> - <br/> + <br /> <h1>${uiLabelMap.CommonFound}: ${foundLocations.size()} ${uiLabelMap.ProductLocationsFor} <#if facility?exists>${(facility.facilityName)?if_exists}</#if> [ID:${facilityId?if_exists}]</h1> - <br/> + <br /> <table class="basic-table hover-bar" cellspacing="0"> <tr class="header-row-2"> <td>${uiLabelMap.ProductFacility}</td> Modified: ofbiz/branches/multitenant20100310/applications/product/webapp/facility/facility/PicklistManage.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/product/webapp/facility/facility/PicklistManage.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/product/webapp/facility/facility/PicklistManage.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/product/webapp/facility/facility/PicklistManage.ftl Wed Mar 24 09:23:07 2010 @@ -47,7 +47,7 @@ under the License. </form> <span class="label">${uiLabelMap.ProductCreatedModifiedBy}</span> ${picklist.createdByUserLogin}/${picklist.lastModifiedByUserLogin} <a href="<@ofbizUrl>PicklistReport.pdf?picklistId=${picklist.picklistId}</@ofbizUrl>" target="_blank" class="buttontext">${uiLabelMap.ProductPick}/${uiLabelMap.ProductPacking} ${uiLabelMap.CommonReports}</a> - <hr/> + <hr /> </div> <#if picklistInfo.shipmentMethodType?has_content> <div style="margin-left: 15px;"> @@ -88,7 +88,7 @@ under the License. ${uiLabelMap.CommonBy} ${picklistStatusHistoryInfo.picklistStatusHistory.changeUserLoginId} </div> </#list> - <hr/> + <hr /> <#-- PicklistBin --> <#list picklistInfo.picklistBinInfoList?if_exists as picklistBinInfo> <#assign isBinComplete = Static["org.ofbiz.shipment.picklist.PickListServices"].isBinComplete(delegator, picklistBinInfo.picklistBin.picklistBinId)/> @@ -173,11 +173,11 @@ under the License. </#if> </#list> <#if picklistInfo_has_next> - <hr/> + <hr /> </#if> </#list> <#else/> <h3>${uiLabelMap.ProductNoPicksStarted}.</h3> </#if> </div> -</div> \ No newline at end of file +</div> Modified: ofbiz/branches/multitenant20100310/applications/product/webapp/facility/facility/ViewContactMechs.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/product/webapp/facility/facility/ViewContactMechs.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/product/webapp/facility/facility/ViewContactMechs.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/product/webapp/facility/facility/ViewContactMechs.ftl Wed Mar 24 09:23:07 2010 @@ -39,31 +39,31 @@ under the License. <#if facilityContactMechPurpose.thruDate?has_content> (${uiLabelMap.CommonExpire}: ${facilityContactMechPurpose.thruDate.toString()}) </#if> - <br/> + <br /> </#list> <#if "POSTAL_ADDRESS" = contactMech.contactMechTypeId> <#assign postalAddress = contactMechMap.postalAddress> - <#if postalAddress.toName?has_content><b>${uiLabelMap.CommonTo}:</b> ${postalAddress.toName}<br/></#if> - <#if postalAddress.attnName?has_content><b>${uiLabelMap.CommonAttn}:</b> ${postalAddress.attnName}<br/></#if> - ${postalAddress.address1?if_exists}<br/> - <#if postalAddress.address2?has_content>${postalAddress.address2?if_exists}<br/></#if> + <#if postalAddress.toName?has_content><b>${uiLabelMap.CommonTo}:</b> ${postalAddress.toName}<br /></#if> + <#if postalAddress.attnName?has_content><b>${uiLabelMap.CommonAttn}:</b> ${postalAddress.attnName}<br /></#if> + ${postalAddress.address1?if_exists}<br /> + <#if postalAddress.address2?has_content>${postalAddress.address2?if_exists}<br /></#if> ${postalAddress.city?if_exists}, ${postalAddress.stateProvinceGeoId?if_exists} ${postalAddress.postalCode?if_exists} - <#if postalAddress.countryGeoId?has_content><br/>${postalAddress.countryGeoId}</#if> + <#if postalAddress.countryGeoId?has_content><br />${postalAddress.countryGeoId}</#if> <#if (postalAddress?has_content && !postalAddress.countryGeoId?has_content) || postalAddress.countryGeoId = "USA"> <#assign addr1 = postalAddress.address1?if_exists> <#if (addr1.indexOf(" ") > 0)> <#assign addressNum = addr1.substring(0, addr1.indexOf(" "))> <#assign addressOther = addr1.substring(addr1.indexOf(" ")+1)> - <br/><a target='_blank' href='${uiLabelMap.CommonLookupWhitepagesAddressLink}' class='buttontext'>${uiLabelMap.CommonLookupWhitepages}</a> + <br /><a target='_blank' href='${uiLabelMap.CommonLookupWhitepagesAddressLink}' class='buttontext'>${uiLabelMap.CommonLookupWhitepages}</a> </#if> </#if> <#if postalAddress.geoPointId?has_content> <#if contactMechPurposeType?has_content> <#assign popUptitle = contactMechPurposeType.get("description",locale) + uiLabelMap.CommonGeoLocation> </#if> - <br/><a href="javascript:popUp('<@ofbizUrl>geoLocation?geoPointId=${postalAddress.geoPointId}</@ofbizUrl>', '${popUptitle?if_exists}', '450', '550')" class="buttontext">${uiLabelMap.CommonGeoLocation}</a> + <br /><a href="javascript:popUp('<@ofbizUrl>geoLocation?geoPointId=${postalAddress.geoPointId}</@ofbizUrl>', '${popUptitle?if_exists}', '450', '550')" class="buttontext">${uiLabelMap.CommonGeoLocation}</a> </#if> <#elseif "TELECOM_NUMBER" = contactMech.contactMechTypeId> <#assign telecomNumber = contactMechMap.telecomNumber> @@ -71,7 +71,7 @@ under the License. <#if telecomNumber.areaCode?has_content>${telecomNumber.areaCode}-</#if>${telecomNumber.contactNumber?if_exists} <#if facilityContactMech.extension?has_content>${uiLabelMap.CommonExt} ${facilityContactMech.extension}</#if> <#if (telecomNumber?has_content && !telecomNumber.countryCode?has_content) || telecomNumber.countryCode = "011"> - <br/><a target='_blank' href='${uiLabelMap.CommonLookupAnywhoLink}' class='buttontext'>${uiLabelMap.CommonLookupAnywho}</a> + <br /><a target='_blank' href='${uiLabelMap.CommonLookupAnywhoLink}' class='buttontext'>${uiLabelMap.CommonLookupAnywho}</a> <a target='_blank' href='${uiLabelMap.CommonLookupWhitepagesTelNumberLink}' class='buttontext'>${uiLabelMap.CommonLookupWhitepages}</a> </#if> <#elseif "EMAIL_ADDRESS" = contactMech.contactMechTypeId> @@ -85,8 +85,8 @@ under the License. <#else> ${contactMech.infoString?if_exists} </#if> - <br/>(${uiLabelMap.CommonUpdated}: ${facilityContactMech.fromDate.toString()}) - <#if facilityContactMech.thruDate?has_content><br/><b>${uiLabelMap.CommonUpdatedEffectiveThru}: ${facilityContactMech.thruDate.toString()}</b></#if> + <br />(${uiLabelMap.CommonUpdated}: ${facilityContactMech.fromDate.toString()}) + <#if facilityContactMech.thruDate?has_content><br /><b>${uiLabelMap.CommonUpdatedEffectiveThru}: ${facilityContactMech.thruDate.toString()}</b></#if> </td> <td class="button-col"> Modified: ofbiz/branches/multitenant20100310/applications/product/webapp/facility/group/FacilityGroupTabBar.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/product/webapp/facility/group/FacilityGroupTabBar.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/product/webapp/facility/group/FacilityGroupTabBar.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/product/webapp/facility/group/FacilityGroupTabBar.ftl Wed Mar 24 09:23:07 2010 @@ -26,6 +26,6 @@ under the License. <li<#if selected="EditFacilityGroupMembers"> class="selected"</#if>><a href="<@ofbizUrl>EditFacilityGroupMembers?facilityGroupId=${facilityGroupId}</@ofbizUrl>">${uiLabelMap.ProductFacilities}</a></li> <li<#if selected="EditFacilityGroupRoles"> class="selected"</#if>><a href="<@ofbizUrl>EditFacilityGroupRoles?facilityGroupId=${facilityGroupId}</@ofbizUrl>">${uiLabelMap.PartyRoles}</a></li> </ul> - <br/> + <br /> </div> </#if> \ No newline at end of file Modified: ofbiz/branches/multitenant20100310/applications/product/webapp/facility/inventory/TransferInventoryItem.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/product/webapp/facility/inventory/TransferInventoryItem.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/product/webapp/facility/inventory/TransferInventoryItem.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/product/webapp/facility/inventory/TransferInventoryItem.ftl Wed Mar 24 09:23:07 2010 @@ -110,7 +110,7 @@ under the License. </tr> <tr> <td width="14%"> </td> - <td colspan="3"><hr/></td> + <td colspan="3"><hr /></td> </tr> <tr> <td width="14%"> </td> @@ -150,7 +150,7 @@ under the License. </#list> </select> <span class="tooltip">${uiLabelMap.ProductSelectFacility}</span> - <br/> + <br /> <input type="text" name="containerIdTo" value="${(inventoryTransfer.containerIdTo)?if_exists}" size="20" maxlength="20"> <span class="tooltip">${uiLabelMap.ProductOrEnterContainerId}</span> </div> Modified: ofbiz/branches/multitenant20100310/applications/product/webapp/facility/inventory/receiveInventory.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/product/webapp/facility/inventory/receiveInventory.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/product/webapp/facility/inventory/receiveInventory.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/product/webapp/facility/inventory/receiveInventory.ftl Wed Mar 24 09:23:07 2010 @@ -29,7 +29,7 @@ under the License. <#-- Receiving Results --> <#if receivedItems?has_content> <h3>${uiLabelMap.ProductReceiptPurchaseOrder} ${purchaseOrder.orderId}</h3> - <hr/> + <hr /> <table class="basic-table" cellspacing="0"> <tr class="header-row"> <td>${uiLabelMap.ProductShipmentId}</td> @@ -66,9 +66,9 @@ under the License. </tr> </form> </#list> - <tr><td colspan="10"><hr/></td></tr> + <tr><td colspan="10"><hr /></td></tr> </table> - <br/> + <br /> </#if> <#-- Single Product Receiving --> @@ -259,7 +259,7 @@ under the License. <#assign shipmentType = shipment.getRelatedOneCache("ShipmentType")/> <#assign shipmentDate = shipment.estimatedArrivalDate?if_exists/> <tr> - <td><hr/></td> + <td><hr /></td> </tr> <tr> <td> @@ -278,7 +278,7 @@ under the License. </tr> </#list> <tr> - <td><hr/></td> + <td><hr /></td> </tr> <tr> <td> @@ -357,7 +357,7 @@ under the License. </#if> <tr> - <td colspan="2"><hr/></td> + <td colspan="2"><hr /></td> </tr> <tr> <td> @@ -472,7 +472,7 @@ under the License. </#list> <tr> <td colspan="2"> - <hr/> + <hr /> </td> </tr> <#if rowCount == 0> Modified: ofbiz/branches/multitenant20100310/applications/product/webapp/facility/inventory/report/InventoryReport.rptdesign URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/product/webapp/facility/inventory/report/InventoryReport.rptdesign?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/product/webapp/facility/inventory/report/InventoryReport.rptdesign (original) +++ ofbiz/branches/multitenant20100310/applications/product/webapp/facility/inventory/report/InventoryReport.rptdesign Wed Mar 24 09:23:07 2010 @@ -182,22 +182,22 @@ try { inputInvent = FastMap.newInstance(); inputInventFields = FastMap.newInstance(); if(params!=null){ - inputInventFields.put("facilityId", params["facilityId"]); - inputInventFields.put("noConditionFind", "Y"); - //inputFields.put("productInternalName", params["internalName"]); - /* - inputFields.put("quantityOnHandTotal", params["offsetQOHQty"]); - inputFields.put("availableToPromiseTotal", params["offsetATPQty"]); - inputFields.put("productId", params["productId"]); - inputFields.put("productTypeId", params["productTypeId"]); - inputFields.put("searchInProductCategoryId", params["searchInProductCategoryId"]); - inputFields.put("productSupplierId", params["productSupplierId"]); - inputFields.put("productsSoldThruTimestamp", params["productsSoldThruTimestamp"]); - inputFields.put("statusId", params["statusId"]); - inputFields.put("VIEW_SIZE", params["VIEW_SIZE"]); - inputFields.put("monthsInPastLimit", params["monthsInPastLimit"]); - inputFields.put("fromDateSellThrough", params["fromDateSellThrough"]); - inputFields.put("thruDateSellThrough", params["thruDateSellThrough"]);*/ + inputInventFields.put("facilityId", params["facilityId"]); + inputInventFields.put("noConditionFind", "Y"); + //inputFields.put("productInternalName", params["internalName"]); + /* + inputFields.put("quantityOnHandTotal", params["offsetQOHQty"]); + inputFields.put("availableToPromiseTotal", params["offsetATPQty"]); + inputFields.put("productId", params["productId"]); + inputFields.put("productTypeId", params["productTypeId"]); + inputFields.put("searchInProductCategoryId", params["searchInProductCategoryId"]); + inputFields.put("productSupplierId", params["productSupplierId"]); + inputFields.put("productsSoldThruTimestamp", params["productsSoldThruTimestamp"]); + inputFields.put("statusId", params["statusId"]); + inputFields.put("VIEW_SIZE", params["VIEW_SIZE"]); + inputFields.put("monthsInPastLimit", params["monthsInPastLimit"]); + inputFields.put("fromDateSellThrough", params["fromDateSellThrough"]); + inputFields.put("thruDateSellThrough", params["thruDateSellThrough"]);*/ } inputInvent.put("userLogin",userLogin); inputInvent.put("inputFields",inputInventFields); @@ -212,17 +212,17 @@ try { }]]></method> <method name="fetch"><![CDATA[if(inventories == null)return false; if(inventory = inventories.next()){ - row["productId"] = inventory.getString("productProductId"); - row["productName"] = inventory.getString("productInternalName"); - row["quantityOnHand"] = inventory.getString("quantityOnHandTotal"); - row["availableToPromise"] = inventory.getString("availableToPromiseTotal"); - row["retailPrice"] = inventory.getString("unitCost"); - row["datetimeReceived"] = inventory.getString("inventoryDateDateValue"); - Debug.logInfo("-----------inventory---------"+inventory.getString("productProductId"),module); - return true; + row["productId"] = inventory.getString("productProductId"); + row["productName"] = inventory.getString("productInternalName"); + row["quantityOnHand"] = inventory.getString("quantityOnHandTotal"); + row["availableToPromise"] = inventory.getString("availableToPromiseTotal"); + row["retailPrice"] = inventory.getString("unitCost"); + row["datetimeReceived"] = inventory.getString("inventoryDateDateValue"); + Debug.logInfo("-----------inventory---------"+inventory.getString("productProductId"),module); + return true; }else{ - inventories.close(); - return false; + inventories.close(); + return false; }]]></method> </script-data-set> <script-data-set name="Order" id="191"> @@ -283,8 +283,8 @@ try { } inputOrderFields = FastMap.newInstance(); if(params!=null){ - inputOrderFields.put("orderDateDateValue_fld0_op", params["orderDateDateValue_fld0_op"]); - inputOrderFields.put("noConditionFind", "Y"); + inputOrderFields.put("orderDateDateValue_fld0_op", params["orderDateDateValue_fld0_op"]); + inputOrderFields.put("noConditionFind", "Y"); } orders = null; @@ -302,13 +302,13 @@ try { <method name="fetch"><![CDATA[if(orders == null)return false; if(order = orders.next()){ row["productOrderId"] = order.getString("productProductId"); - row["quantity"] = order.getString("quantity"); - row["orderDate"] = order.getString("orderDateDescription"); - Debug.logInfo("++++++++++++order++++++++"+order.getString("quantity"),module); - return true; + row["quantity"] = order.getString("quantity"); + row["orderDate"] = order.getString("orderDateDescription"); + Debug.logInfo("++++++++++++order++++++++"+order.getString("quantity"),module); + return true; }else{ - orders.close(); - return false; + orders.close(); + return false; }]]></method> </script-data-set> </data-sets> Modified: ofbiz/branches/multitenant20100310/applications/product/webapp/facility/lookup/LookupInventoryItems.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/product/webapp/facility/lookup/LookupInventoryItems.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/product/webapp/facility/lookup/LookupInventoryItems.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/product/webapp/facility/lookup/LookupInventoryItems.ftl Wed Mar 24 09:23:07 2010 @@ -26,7 +26,7 @@ under the License. <td>${uiLabelMap.ProductAtp}</td> <td>${uiLabelMap.FormFieldTitle_unitCost}</td> </tr> - <tr><td colspan="6"><hr/></td></tr> + <tr><td colspan="6"><hr /></td></tr> <#if (inventoryItemsForPo?exists && inventoryItemsForPo?has_content)> <tr class="header-row-2"><td colspan="6"><span class="label"> ${uiLabelMap.ProductInventoryItemsFor} ${uiLabelMap.ProductPurchaseOrder} - ${orderId}</span></td></tr> <#list inventoryItemsForPo as inventoryItem> @@ -70,4 +70,4 @@ under the License. <#if !(inventoryItemsForPo?exists && inventoryItemsForPo?has_content) && !(inventoryItemsForSupplier?exists && inventoryItemsForSupplier?has_content) && !(inventoryItemsForProduct?exists && inventoryItemsForProduct?has_content)> <tr><td><span class="label">${uiLabelMap.CommonNo} ${uiLabelMap.ProductInventoryItems} ${uiLabelMap.ProductAvailable}.</span></td></tr> </#if> -</table> \ No newline at end of file +</table> Modified: ofbiz/branches/multitenant20100310/applications/product/webapp/facility/returns/receiveReturn.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/product/webapp/facility/returns/receiveReturn.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/product/webapp/facility/returns/receiveReturn.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/product/webapp/facility/returns/receiveReturn.ftl Wed Mar 24 09:23:07 2010 @@ -28,7 +28,7 @@ under the License. <#if "RETURN_RECEIVED" == returnHeader.getString("statusId")> <h3>${uiLabelMap.ProductReturnCompletelyReceived}</h3> </#if> - <br/> + <br /> <table cellspacing="0" class="basic-table"> <tr class="header-row"> <td>${uiLabelMap.ProductReceipt}</td> @@ -51,7 +51,7 @@ under the License. </tr> </#list> </table> - <br/> + <br /> </#if> <#-- Multi-Item Return Receiving --> Modified: ofbiz/branches/multitenant20100310/applications/product/webapp/facility/shipment/AddItemsFromOrder.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/product/webapp/facility/shipment/AddItemsFromOrder.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/product/webapp/facility/shipment/AddItemsFromOrder.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/product/webapp/facility/shipment/AddItemsFromOrder.ftl Wed Mar 24 09:23:07 2010 @@ -75,7 +75,7 @@ under the License. <h3 style="color: red;">${uiLabelMap.ProductWarningOrderStatus} ${(orderHeaderStatus.get("description",locale))?default(orderHeader.statusId?if_exists)}; ${uiLabelMap.ProductApprovedBeforeShipping}.</h3> </#if> </#if> - <br/> + <br /> <#if orderItemDatas?exists> <#assign rowCount = 0> <#if isSalesOrder> @@ -87,7 +87,7 @@ under the License. <input type="hidden" name="_useRowSubmit" value="Y"> <table cellspacing="0" cellpadding="2" class="basic-table hover-bar"> <tr class="header-row"> - <td>${uiLabelMap.ProductOrderId}<br/>${uiLabelMap.ProductOrderShipGroupId}<br/>${uiLabelMap.ProductOrderItem}</td> + <td>${uiLabelMap.ProductOrderId}<br />${uiLabelMap.ProductOrderShipGroupId}<br />${uiLabelMap.ProductOrderItem}</td> <td>${uiLabelMap.ProductProduct}</td> <#if isSalesOrder> <td>${uiLabelMap.ProductItemsIssuedReserved}</td> Modified: ofbiz/branches/multitenant20100310/applications/product/webapp/facility/shipment/EditShipmentRouteSegments.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/product/webapp/facility/shipment/EditShipmentRouteSegments.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/product/webapp/facility/shipment/EditShipmentRouteSegments.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/product/webapp/facility/shipment/EditShipmentRouteSegments.ftl Wed Mar 24 09:23:07 2010 @@ -85,11 +85,11 @@ under the License. <td valign="top"> <div> ${shipmentRouteSegment.shipmentRouteSegmentId} - <br/> + <br /> <a href="javascript:document.updateShipmentRouteSegmentForm${shipmentRouteSegmentData_index}.submit();" class="buttontext">${uiLabelMap.CommonUpdate}</a> - <br/> + <br /> <a href="javascript:document.duplicateShipmentRouteSegment_${shipmentRouteSegmentData_index}.submit();" class="buttontext">${uiLabelMap.CommonDuplicate}</a> - <br/> + <br /> <a href="javascript:document.deleteShipmentRouteSegment_${shipmentRouteSegmentData_index}.submit();" class="buttontext">${uiLabelMap.CommonDelete}</a> </div> </td> @@ -117,7 +117,7 @@ under the License. <option value="${shipmentMethodTypeOption.shipmentMethodTypeId}">${shipmentMethodTypeOption.get("description",locale)}</option> </#list> </select> - <br/> + <br /> <select name="originFacilityId"> <#if originFacility?has_content> <option value="${originFacility.facilityId}">${originFacility.facilityName} [${originFacility.facilityId}]</option> @@ -140,7 +140,7 @@ under the License. <option value="${facility.facilityId}">${facility.facilityName} [${facility.facilityId}]</option> </#list> </select> - <br/> + <br /> <div> <input type="text" size="15" name="originContactMechId" value="${shipmentRouteSegment.originContactMechId?if_exists}"/> <#if originPostalAddress?has_content><span class="tooltip">${uiLabelMap.CommonTo}: ${originPostalAddress.toName?if_exists}, ${uiLabelMap.CommonAttn}: ${originPostalAddress.attnName?if_exists}, ${originPostalAddress.address1?if_exists}, ${originPostalAddress.address2?if_exists}, ${originPostalAddress.city?if_exists}, ${originPostalAddress.stateProvinceGeoId?if_exists}, ${originPostalAddress.postalCode?if_exists}, ${originPostalAddress.countryGeoId?if_exists}</span></#if> @@ -173,16 +173,16 @@ under the License. <#if "UPS" == shipmentRouteSegment.carrierPartyId?if_exists> <#if !shipmentRouteSegment.carrierServiceStatusId?has_content || "SHRSCS_NOT_STARTED" == shipmentRouteSegment.carrierServiceStatusId?if_exists> <a href="javascript:document.upsShipmentConfirm_${shipmentRouteSegmentData_index}.submit()" class="buttontext">${uiLabelMap.ProductConfirmShipmentUps}</a> - <br/> + <br /> ${uiLabelMap.ProductShipmentUpsResidential}: <input type="checkbox" name="homeDeliveryType" value="Y" ${(shipmentRouteSegment.homeDeliveryType?has_content)?string("checked=\"checked\"","")}> <#elseif "SHRSCS_CONFIRMED" == shipmentRouteSegment.carrierServiceStatusId?if_exists> <a href="javascript:document.upsShipmentAccept_${shipmentRouteSegmentData_index}.submit()" class="buttontext">${uiLabelMap.ProductAcceptUpsShipmentConfirmation}</a> - <br/> + <br /> <a href="javascript:document.upsVoidShipment_${shipmentRouteSegmentData_index}.submit()" class="buttontext">${uiLabelMap.ProductVoidUpsShipmentConfirmation}</a> <#elseif "SHRSCS_ACCEPTED" == shipmentRouteSegment.carrierServiceStatusId?if_exists> <a href="javascript:document.upsTrackShipment_${shipmentRouteSegmentData_index}.submit()" class="buttontext">${uiLabelMap.ProductTrackUpsShipment}</a> - <br/> + <br /> <a href="javascript:document.upsVoidShipment_${shipmentRouteSegmentData_index}.submit()" class="buttontext">${uiLabelMap.ProductVoidUpsShipment}</a> </#if> </#if> @@ -194,7 +194,7 @@ under the License. <#if "FEDEX" == shipmentRouteSegment.carrierPartyId?if_exists> <#if !shipmentRouteSegment.carrierServiceStatusId?has_content || "SHRSCS_NOT_STARTED" == shipmentRouteSegment.carrierServiceStatusId?if_exists> <a href="javascript:document.fedexShipmentConfirm_${shipmentRouteSegmentData_index}.submit()" class="buttontext">${uiLabelMap.ProductConfirmShipmentFedex}</a> - <br/> + <br /> <#if shipmentMethodType?exists && shipmentMethodType.shipmentMethodTypeId=="GROUND_HOME"> <select name="homeDeliveryType"> <option value="">${uiLabelMap.ProductShipmentNone}</option> @@ -212,10 +212,10 @@ under the License. <#if shipmentRouteSegment.homeDeliveryDate?exists> (${shipmentRouteSegment.homeDeliveryDate?string("yyyy-MM-dd")}) </#if> - <br/> + <br /> </#if> </#if> - <br/> + <br /> <select name="carrierServiceStatusId"> <#if carrierServiceStatusItem?has_content> <option value="${carrierServiceStatusItem.statusId}">${carrierServiceStatusItem.description}</option> @@ -227,12 +227,12 @@ under the License. <option value="${carrierServiceStatusValidChangeToDetail.statusIdTo}">${carrierServiceStatusValidChangeToDetail.transitionName} [${carrierServiceStatusValidChangeToDetail.description}]</option> </#list> </select> - <br/> + <br /> <input type="text" size="24" name="trackingIdNumber" value="${shipmentRouteSegment.trackingIdNumber?if_exists}"/> - <br/> + <br /> <input type="text" size="25" name="estimatedStartDate" value="${(shipmentRouteSegment.estimatedStartDate.toString())?if_exists}"/><a href="javascript:call_cal(document.updateShipmentRouteSegmentForm${shipmentRouteSegmentData_index}.estimatedStartDate, '${(shipmentRouteSegment.estimatedStartDate.toString())?default(nowTimestampString)}');"><img src='<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>' width='16' height='16' border='0' alt='Calendar'></a> <input type="text" size="25" name="estimatedArrivalDate" value="${(shipmentRouteSegment.estimatedArrivalDate.toString())?if_exists}"/><a href="javascript:call_cal(document.updateShipmentRouteSegmentForm${shipmentRouteSegmentData_index}.estimatedArrivalDate, '${(shipmentRouteSegment.estimatedArrivalDate.toString())?default(nowTimestampString)}');"><img src='<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>' width='16' height='16' border='0' alt='Calendar'></a> - <br/> + <br /> <input type="text" size="25" name="actualStartDate" value="${(shipmentRouteSegment.actualStartDate.toString())?if_exists}"/><a href="javascript:call_cal(document.updateShipmentRouteSegmentForm${shipmentRouteSegmentData_index}.actualStartDate, '${(shipmentRouteSegment.actualStartDate.toString())?default(nowTimestampString)}');"><img src='<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>' width='16' height='16' border='0' alt='Calendar'></a> <input type="text" size="25" name="actualArrivalDate" value="${(shipmentRouteSegment.actualArrivalDate.toString())?if_exists}"/><a href="javascript:call_cal(document.updateShipmentRouteSegmentForm${shipmentRouteSegmentData_index}.actualArrivalDate, '${(shipmentRouteSegment.actualArrivalDate.toString())?default(nowTimestampString)}');"><img src='<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>' width='16' height='16' border='0' alt='Calendar'></a> </div> @@ -250,7 +250,7 @@ under the License. <option value="${weightUom.uomId}">${weightUom.get("description",locale)} [${weightUom.abbreviation}]</option> </#list> </select> - <br/> + <br /> <select name="currencyUomId"> <#if currencyUom?has_content> <option value="${currencyUom.uomId}">${currencyUom.get("description",locale)} [${currencyUom.uomId}]</option> @@ -262,13 +262,13 @@ under the License. <option value="${altCurrencyUom.uomId}">${altCurrencyUom.get("description",locale)} [${altCurrencyUom.uomId}]</option> </#list> </select> - <br/> + <br /> <input type="text" size="8" name="actualTransportCost" value="${shipmentRouteSegment.actualTransportCost?if_exists}"/> - <br/> + <br /> <input type="text" size="8" name="actualServiceCost" value="${shipmentRouteSegment.actualServiceCost?if_exists}"/> - <br/> + <br /> <input type="text" size="8" name="actualOtherCost" value="${shipmentRouteSegment.actualOtherCost?if_exists}"/> - <br/> + <br /> <input type="text" size="8" name="actualCost" value="${shipmentRouteSegment.actualCost?if_exists}"/> </td> </tr> @@ -383,7 +383,7 @@ under the License. <td valign="top"> <div> <span class="label">${uiLabelMap.ProductNewSegment}</span> - <br/> + <br /> <a href="javascript:document.createShipmentRouteSegmentForm.submit();" class="buttontext">${uiLabelMap.CommonCreate}</a> </div> </td> @@ -400,7 +400,7 @@ under the License. <option value="${shipmentMethodTypeOption.shipmentMethodTypeId}">${shipmentMethodTypeOption.get("description",locale)}</option> </#list> </select> - <br/> + <br /> <select name="originFacilityId"> <option value=""> </option> <#list facilities as facility> @@ -413,10 +413,10 @@ under the License. <option value="${facility.facilityId}">${facility.facilityName} [${facility.facilityId}]</option> </#list> </select> - <br/> + <br /> <input type="text" size="15" name="originContactMechId" value=""/> <input type="text" size="15" name="destContactMechId" value=""/> - <br/> + <br /> <input type="text" size="15" name="originTelecomNumberId" value=""/> <input type="text" size="15" name="destTelecomNumberId" value=""/> </div> @@ -428,12 +428,12 @@ under the License. <option value="${carrierServiceStatusValidChangeToDetail.statusIdTo}">${carrierServiceStatusValidChangeToDetail.transitionName} [${carrierServiceStatusValidChangeToDetail.description}]</option> </#list> </select> - <br/> + <br /> <input type="text" size="24" name="trackingIdNumber" value=""/> - <br/> + <br /> <input type="text" size="25" name="estimatedStartDate" value=""/><a href="javascript:call_cal(document.createShipmentRouteSegmentForm.estimatedStartDate, '${nowTimestampString}');"><img src='<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>' width='16' height='16' border='0' alt='Calendar'></a> <input type="text" size="25" name="estimatedArrivalDate" value=""/><a href="javascript:call_cal(document.createShipmentRouteSegmentForm.estimatedArrivalDate, '${nowTimestampString}');"><img src='<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>' width='16' height='16' border='0' alt='Calendar'></a> - <br/> + <br /> <input type="text" size="25" name="actualStartDate" value=""/><a href="javascript:call_cal(document.createShipmentRouteSegmentForm.actualStartDate, '${nowTimestampString}');"><img src='<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>' width='16' height='16' border='0' alt='Calendar'></a> <input type="text" size="25" name="actualArrivalDate" value=""/><a href="javascript:call_cal(document.createShipmentRouteSegmentForm.actualArrivalDate, '${nowTimestampString}');"><img src='<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>' width='16' height='16' border='0' alt='Calendar'></a> </td> @@ -445,20 +445,20 @@ under the License. <option value="${weightUom.uomId}">${weightUom.get("description",locale)} [${weightUom.abbreviation}]</option> </#list> </select> - <br/> + <br /> <select name="currencyUomId"> <option value=""> </option> <#list currencyUoms as altCurrencyUom> <option value="${altCurrencyUom.uomId}">${altCurrencyUom.get("description",locale)} [${altCurrencyUom.uomId}]</option> </#list> </select> - <br/> + <br /> <input type="text" size="8" name="actualTransportCost"/> - <br/> + <br /> <input type="text" size="8" name="actualServiceCost"/> - <br/> + <br /> <input type="text" size="8" name="actualOtherCost"/> - <br/> + <br /> <input type="text" size="8" name="actualCost"/> </td> </tr> Modified: ofbiz/branches/multitenant20100310/applications/product/webapp/facility/shipment/PackOrder.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/product/webapp/facility/shipment/PackOrder.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/product/webapp/facility/shipment/PackOrder.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/product/webapp/facility/shipment/PackOrder.ftl Wed Mar 24 09:23:07 2010 @@ -66,7 +66,7 @@ under the License. </div> </#if> </#if> - <br/> + <br /> <!-- select order form --> <form name="selectOrderForm" method="post" action="<@ofbizUrl>PackOrder</@ofbizUrl>"> @@ -93,7 +93,7 @@ under the License. </tr> </table> </form> - <br/> + <br /> <!-- select picklist bin form --> <form name="selectPicklistBinForm" method="post" action="<@ofbizUrl>PackOrder</@ofbizUrl>" style="margin: 0;"> @@ -156,28 +156,28 @@ under the License. <tr> <td valign="top"> <span class="label">${uiLabelMap.ProductShipToAddress}</span> - <br/> + <br /> ${uiLabelMap.CommonTo}: ${postalAddress.toName?default("")} - <br/> + <br /> <#if postalAddress.attnName?has_content> ${uiLabelMap.CommonAttn}: ${postalAddress.attnName} - <br/> + <br /> </#if> ${postalAddress.address1} - <br/> + <br /> <#if postalAddress.address2?has_content> ${postalAddress.address2} - <br/> + <br /> </#if> ${postalAddress.city?if_exists}, ${postalAddress.stateProvinceGeoId?if_exists} ${postalAddress.postalCode?if_exists} - <br/> + <br /> ${postalAddress.countryGeoId} - <br/> + <br /> </td> <td> </td> <td valign="top"> <span class="label">${uiLabelMap.ProductCarrierShipmentMethod}</span> - <br/> + <br /> <#if carrier == "USPS"> <#assign color = "red"> <#elseif carrier == "UPS"> @@ -190,18 +190,18 @@ under the License. </#if> ${orderItemShipGroup.shipmentMethodTypeId?default("??")} - <br/> + <br /> <span class="label">${uiLabelMap.ProductEstimatedShipCostForShipGroup}</span> - <br/> + <br /> <#if shipmentCostEstimateForShipGroup?exists> <@ofbizCurrency amount=shipmentCostEstimateForShipGroup isoCode=orderReadHelper.getCurrency()?if_exists/> - <br/> + <br /> </#if> </td> <td> </td> <td valign="top"> <span class="label">${uiLabelMap.OrderInstructions}</span> - <br/> + <br /> ${orderItemShipGroup.shippingInstructions?default("(${uiLabelMap.CommonNone})")} </td> </tr> @@ -210,7 +210,7 @@ under the License. <!-- manual per item form --> <#if showInput != "N"> - <hr/> + <hr /> <form name="singlePackForm" method="post" action="<@ofbizUrl>ProcessPackOrder</@ofbizUrl>"> <input type="hidden" name="packageSeq" value="${packingSession.getCurrentPackageSeq()}"/> <input type="hidden" name="orderId" value="${orderId}"/> @@ -241,7 +241,7 @@ under the License. <!-- auto grid form --> <#assign itemInfos = packingSession.getItemInfos()?if_exists> <#if showInput != "N" && hideGrid != "Y" && itemInfos?has_content> - <br/> + <br /> <form name="multiPackForm" method="post" action="<@ofbizUrl>ProcessBulkPackOrder</@ofbizUrl>"> <input type="hidden" name="facilityId" value="${facilityId?if_exists}"> <input type="hidden" name="orderId" value="${orderId?if_exists}"> @@ -343,7 +343,7 @@ under the License. </tr> </table> </form> - <br/> + <br /> </#if> <!-- complete form --> @@ -362,11 +362,11 @@ under the License. <#if packageSeqIds?has_content> <td> <span class="label">${uiLabelMap.ProductPackedWeight} (${("uiLabelMap.ProductShipmentUomAbbreviation_" + defaultWeightUomId)?eval}):</span> - <br/> + <br /> <#list packageSeqIds as packageSeqId> ${uiLabelMap.ProductPackage} ${packageSeqId} <input type="text" size="7" name="packageWeight_${packageSeqId}" value="${packingSession.getPackageWeight(packageSeqId?int)?if_exists}"> - <br/> + <br /> </#list> <#if orderItemShipGroup?has_content> <input type="hidden" name="shippingContactMechId" value="${orderItemShipGroup.contactMechId?if_exists}"/> @@ -379,16 +379,16 @@ under the License. </#if> <td nowrap="nowrap"> <span class="label">${uiLabelMap.ProductAdditionalShippingCharge}:</span> - <br/> + <br /> <input type="text" name="additionalShippingCharge" value="${packingSession.getAdditionalShippingCharge()?if_exists}" size="20"/> <#if packageSeqIds?has_content> <a href="javascript:document.completePackForm.action='<@ofbizUrl>calcPackSessionAdditionalShippingCharge</@ofbizUrl>';document.completePackForm.submit();" class="buttontext">${uiLabelMap.ProductEstimateShipCost}</a> - <br/> + <br /> </#if> </td> <td> <span class="label">${uiLabelMap.ProductHandlingInstructions}:</span> - <br/> + <br /> <textarea name="handlingInstructions" rows="2" cols="30">${packingSession.getHandlingInstructions()?if_exists}</textarea> </td> <td align="right"> @@ -402,7 +402,7 @@ under the License. </td> </tr> </table> - <br/> + <br /> </form> </#if> </div> @@ -424,10 +424,10 @@ under the License. <#list sortedKeys as key> <#assign packedLines = packageMap.get(key)> <#if packedLines?has_content> - <br/> + <br /> <#assign packedLine = packedLines.get(0)?if_exists> <span class="label" style="font-size:1.2em">${uiLabelMap.ProductPackage} ${packedLine.getPackageSeq()?if_exists}</span> - <br/> + <br /> <table class="basic-table" cellspacing='0'> <tr class="header-row"> <td>${uiLabelMap.ProductItem} #</td> @@ -517,4 +517,4 @@ under the License. </div> <#else> <h3>${uiLabelMap.ProductFacilityViewPermissionError}</h3> -</#if> \ No newline at end of file +</#if> Modified: ofbiz/branches/multitenant20100310/applications/product/webapp/facility/shipment/QuickShipOrder.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/product/webapp/facility/shipment/QuickShipOrder.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/product/webapp/facility/shipment/QuickShipOrder.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/product/webapp/facility/shipment/QuickShipOrder.ftl Wed Mar 24 09:23:07 2010 @@ -117,7 +117,7 @@ function setWeight(weight) { <#-- display the links for label/packing slip --> <#assign allDone = "yes"> <center> - <a href="<@ofbizUrl>viewShipmentPackageRouteSegLabelImage?shipmentId=${requestParameters.shipmentId}&shipmentRouteSegmentId=${requestParameters.shipmentRouteSegmentId}&shipmentPackageSeqId=00001</@ofbizUrl>" target="_blank" class="buttontext">${uiLabelMap.ProductShippingLabel}</a><br/> + <a href="<@ofbizUrl>viewShipmentPackageRouteSegLabelImage?shipmentId=${requestParameters.shipmentId}&shipmentRouteSegmentId=${requestParameters.shipmentRouteSegmentId}&shipmentPackageSeqId=00001</@ofbizUrl>" target="_blank" class="buttontext">${uiLabelMap.ProductShippingLabel}</a><br /> <a href="<@ofbizUrl>ShipmentManifest.pdf?shipmentId=${requestParameters.shipmentId}&shipmentRouteSegmentId=${requestParameters.shipmentRouteSegmentId}</@ofbizUrl>" target="_blank" class="buttontext">${uiLabelMap.ProductPackingSlip}</a> </center> </#if> @@ -166,12 +166,12 @@ function setWeight(weight) { <#else> <div class="alert">${uiLabelMap.ProductErrorNoPackagesFoundForShipment} !</div> </#if> - <hr/> + <hr /> ${pages.get("/shipment/ViewShipmentInfo.ftl")} - <br/>${pages.get("/shipment/ViewShipmentItemInfo.ftl")} - <br/>${pages.get("/shipment/ViewShipmentPackageInfo.ftl")} + <br />${pages.get("/shipment/ViewShipmentItemInfo.ftl")} + <br />${pages.get("/shipment/ViewShipmentPackageInfo.ftl")} <#if allDone?default("no") == "yes"> - <br/>${pages.get("/shipment/ViewShipmentRouteInfo.ftl")} + <br />${pages.get("/shipment/ViewShipmentRouteInfo.ftl")} </#if> </#if> <#else> @@ -201,4 +201,4 @@ function setWeight(weight) { document.selectOrderForm.orderId.focus(); </script> </#if> -</#if> \ No newline at end of file +</#if> Modified: ofbiz/branches/multitenant20100310/applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl Wed Mar 24 09:23:07 2010 @@ -92,7 +92,7 @@ under the License. <#assign itemsAvailableToReceive = totalAvailableToReceive?default(0) > 0/> <#if orderItemDatas?exists> - <br/> + <br /> <#assign rowCount = 0> <#assign totalReadyToReceive = 0/> <form action="<@ofbizUrl>issueOrderItemToShipmentAndReceiveAgainstPO?clearAll=Y</@ofbizUrl>" method="post" name="selectAllForm"> @@ -153,7 +153,7 @@ under the License. <div> <#if fulfilledReservations?has_content> <#list fulfilledReservations?sort_by("orderId") as fulfilledReservation> - ${fulfilledReservation.orderId}<br/> + ${fulfilledReservation.orderId}<br /> </#list> </#if> </div> Modified: ofbiz/branches/multitenant20100310/applications/product/webapp/facility/shipment/ShipmentTabBar.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/product/webapp/facility/shipment/ShipmentTabBar.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/product/webapp/facility/shipment/ShipmentTabBar.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/product/webapp/facility/shipment/ShipmentTabBar.ftl Wed Mar 24 09:23:07 2010 @@ -40,6 +40,6 @@ under the License. <li<#if selected="ViewShipmentReceipts"> class="selected"</#if>><a href="<@ofbizUrl>ViewShipmentReceipts?shipmentId=${shipmentId}</@ofbizUrl>">${uiLabelMap.ProductShipmentReceipts}</a></li> </#if> </ul> - <br/> + <br /> </div> </#if> Modified: ofbiz/branches/multitenant20100310/applications/product/webapp/facility/shipment/VerifyPick.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/product/webapp/facility/shipment/VerifyPick.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/product/webapp/facility/shipment/VerifyPick.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/product/webapp/facility/shipment/VerifyPick.ftl Wed Mar 24 09:23:07 2010 @@ -47,7 +47,7 @@ under the License. </div> </#if> </#if> - <br/> + <br /> <div class="screenlet-body"> <form name="selectOrderForm" method="post" action="<@ofbizUrl>VerifyPick</@ofbizUrl>"> <input type="hidden" name="facilityId" value="${facility.facilityId?if_exists}"/> @@ -74,7 +74,7 @@ under the License. </tr> </table> </form> - <br/> + <br /> <!-- select picklist bin form --> <form name="selectPicklistBinForm" method="post" action="<@ofbizUrl>VerifyPick</@ofbizUrl>" style="margin: 0;"> <input type="hidden" name="facilityId" value="${facility.facilityId?if_exists}"/> @@ -118,28 +118,28 @@ under the License. <tr> <td valign="top"> <span class="label">${uiLabelMap.ProductShipToAddress}</span> - <br/> + <br /> ${uiLabelMap.CommonTo}: ${postalAddress.toName?default("")} - <br/> + <br /> <#if postalAddress.attnName?has_content> ${uiLabelMap.CommonAttn}: ${postalAddress.attnName} - <br/> + <br /> </#if> ${postalAddress.address1} - <br/> + <br /> <#if postalAddress.address2?has_content> ${postalAddress.address2} - <br/> + <br /> </#if> ${postalAddress.city?if_exists}, ${postalAddress.stateProvinceGeoId?if_exists} ${postalAddress.postalCode?if_exists} - <br/> + <br /> ${postalAddress.countryGeoId} - <br/> + <br /> </td> <td> </td> <td valign="top"> <span class="label">${uiLabelMap.ProductCarrierShipmentMethod}</span> - <br/> + <br /> <#if carrier == "USPS"> <#assign color = "red"> <#elseif carrier == "UPS"> @@ -156,13 +156,13 @@ under the License. <td> </td> <td valign="top"> <span class="label">${uiLabelMap.OrderInstructions}</span> - <br/> + <br /> ${orderItemShipGroup.shippingInstructions?default("(${uiLabelMap.CommonNone})")} </td> </tr> </table> </#if> - <hr/> + <hr /> <form name="singlePickForm" method="post" action="<@ofbizUrl>processVerifyPick</@ofbizUrl>"> <input type="hidden" name="orderId" value="${orderId?if_exists}"/> <input type="hidden" name="shipGroupSeqId" value="${shipGroupSeqId?if_exists}"/> @@ -181,7 +181,7 @@ under the License. </tr> </table> </form> - <br/> + <br /> <#assign orderItems = orderItems?if_exists> <form name="multiPickForm" method="post" action="<@ofbizUrl>processBulkVerifyPick</@ofbizUrl>"> <input type="hidden" name="facilityId" value="${facility.facilityId?if_exists}"/> @@ -313,7 +313,7 @@ under the License. </tr> </table> </form> - <br/> + <br /> </div> </div> <#assign orderId = orderId?if_exists > Modified: ofbiz/branches/multitenant20100310/applications/product/webapp/facility/shipment/ViewShipmentRouteInfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/product/webapp/facility/shipment/ViewShipmentRouteInfo.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/product/webapp/facility/shipment/ViewShipmentRouteInfo.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/product/webapp/facility/shipment/ViewShipmentRouteInfo.ftl Wed Mar 24 09:23:07 2010 @@ -65,25 +65,25 @@ under the License. <td> <span>${(carrierPerson.firstName)?if_exists} ${(carrierPerson.middleName)?if_exists} ${(carrierPerson.lastName)?if_exists} ${(carrierPartyGroup.groupName)?if_exists} [${shipmentRouteSegment.carrierPartyId?if_exists}]</span> <span>${shipmentMethodType.description?default(shipmentRouteSegment.shipmentMethodTypeId?if_exists)}</span> - <br/> + <br /> <span class="label">${uiLabelMap.ProductOrigin}</span> <span>${(originFacility.facilityName)?if_exists} [${originFacility.facilityId?if_exists}]</span> - <br/> + <br /> <span class="label">${uiLabelMap.ProductDest}</span> <span>${(destFacility.facilityName)?if_exists} [${destFacility.facilityId?if_exists}]</span> - <br/> + <br /> <span class="label">${uiLabelMap.ProductOrigin}</span> <span><#if originPostalAddress?has_content>${uiLabelMap.CommonTo} : ${originPostalAddress.toName?if_exists}, ${uiLabelMap.CommonAttn} : ${originPostalAddress.attnName?if_exists}, ${originPostalAddress.address1?if_exists}, ${originPostalAddress.address2?if_exists}, ${originPostalAddress.city?if_exists}, ${originPostalAddress.stateProvinceGeoId?if_exists}, ${originPostalAddress.postalCode?if_exists}, ${originPostalAddress.countryGeoId?if_exists}</#if> [${shipmentRouteSegment.originContactMechId?if_exists}]</span> - <br/> + <br /> <span class="label">${uiLabelMap.ProductDest}</span> <span><#if destPostalAddress?has_content>${uiLabelMap.CommonTo} : ${destPostalAddress.toName?if_exists}, ${uiLabelMap.CommonAttn} : ${destPostalAddress.attnName?if_exists}, ${destPostalAddress.address1?if_exists}, ${destPostalAddress.address2?if_exists}, ${destPostalAddress.city?if_exists}, ${destPostalAddress.stateProvinceGeoId?if_exists}, ${destPostalAddress.postalCode?if_exists}, ${destPostalAddress.countryGeoId?if_exists}</#if> [${shipmentRouteSegment.destContactMechId?if_exists}]</span> - <br/> + <br /> <span class="label">${uiLabelMap.ProductOrigin}</span> <span><#if originTelecomNumber?has_content>${originTelecomNumber.countryCode?if_exists} ${originTelecomNumber.areaCode?if_exists} ${originTelecomNumber.contactNumber?if_exists}</#if> [${shipmentRouteSegment.originTelecomNumberId?if_exists}]</span> - <br/> + <br /> <span class="label">${uiLabelMap.ProductDest}</span> <span><#if destTelecomNumber?has_content>${destTelecomNumber.countryCode?if_exists} ${destTelecomNumber.areaCode?if_exists} ${destTelecomNumber.contactNumber?if_exists}</#if> [${shipmentRouteSegment.destTelecomNumberId?if_exists}]</span> - <br/> + <br /> </td> <td> <div>${(carrierServiceStatus.description)?default(" ")}</div> Modified: ofbiz/branches/multitenant20100310/applications/product/webapp/facility/shipment/WeightPackage.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/product/webapp/facility/shipment/WeightPackage.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/product/webapp/facility/shipment/WeightPackage.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/product/webapp/facility/shipment/WeightPackage.ftl Wed Mar 24 09:23:07 2010 @@ -61,7 +61,7 @@ under the License. </form> </#list> </#if> - <br/> + <br /> <#if !(orderId?has_content)> <form name="selectOrderForm" method="post" action="<@ofbizUrl>WeightPackageOnly</@ofbizUrl>"> <input type="hidden" name="facilityId" value="${(facility.facilityId)?if_exists}"> @@ -85,7 +85,7 @@ under the License. </tr> </table> </form> - <br/> + <br /> <!-- select picklist bin form --> <form name="selectPicklistBinForm" method="post" action="<@ofbizUrl>WeightPackageOnly</@ofbizUrl>" style="margin: 0;"> <input type="hidden" name="facilityId" value="${(facility.facilityId)?if_exists}"> @@ -190,21 +190,21 @@ under the License. <tr> <td> <span class="label">${uiLabelMap.ProductPackedWeight} (${("uiLabelMap.ProductShipmentUomAbbreviation_" + defaultWeightUomId)?eval}): - <br/> + <br /> ${uiLabelMap.ProductPackage} <input type="text" size="7" name="packageWeight" value=""/> </span> </td> <td> <span class="label">${uiLabelMap.CommonDimension} (${("uiLabelMap.ProductShipmentUomAbbreviation_" + defaultDimensionUomId)?eval}):</span> - <br/> + <br /> <span class="label">${uiLabelMap.CommonLength}<input type="text" name="packageLength" value="" size="5"/></span> <span class="label">${uiLabelMap.ProductWidth}<input type="text" name="packageWidth" value="" size="5"/></span> <span class="label">${uiLabelMap.PartyHeight}<input type="text" name="packageHeight" value="" size="5"/></span> </td> <td> <span class="label">${uiLabelMap.ProductPackageInputBox}:</span> - <br/> + <br /> <select name="shipmentBoxTypeId"> <#if shipmentBoxTypes?has_content> <option value=""></option> Modified: ofbiz/branches/multitenant20100310/applications/product/widget/catalog/CatalogMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/product/widget/catalog/CatalogMenus.xml?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/product/widget/catalog/CatalogMenus.xml (original) +++ ofbiz/branches/multitenant20100310/applications/product/widget/catalog/CatalogMenus.xml Wed Mar 24 09:23:07 2010 @@ -235,6 +235,11 @@ under the License. <parameter param-name="productPromoId"/> </link> </menu-item> + <menu-item name="EditProductPromoContent" title="${uiLabelMap.CommonContent}"> + <link target="EditProductPromoContent"> + <parameter param-name="productPromoId"/> + </link> + </menu-item> </menu> <menu name="ProductTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |