svn commit: r767137 - in /ofbiz/branches/release09.04: ./ applications/product/webapp/catalog/category/EditCategoryParties.ftl applications/product/webapp/catalog/category/EditCategoryProdCatalogs.ftl

Author: jleroux
Date: Tue Apr 21 13:02:22 2009
New Revision: 767137

URL: http://svn.apache.org/viewvc?rev=767137&view=rev
Log:
Applied fix from trunk for revision: 767123

Modified:
    ofbiz/branches/release09.04/   (props changed)
    ofbiz/branches/release09.04/applications/product/webapp/catalog/category/EditCategoryParties.ftl
    ofbiz/branches/release09.04/applications/product/webapp/catalog/category/EditCategoryProdCatalogs.ftl

Propchange: ofbiz/branches/release09.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 21 13:02:22 2009
@@ -1 +1 @@
-/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102
+/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123

Modified: ofbiz/branches/release09.04/applications/product/webapp/catalog/category/EditCategoryParties.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/product/webapp/catalog/category/EditCategoryParties.ftl?rev=767137&r1=767136&r2=767137&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/product/webapp/catalog/category/EditCategoryParties.ftl (original)
+++ ofbiz/branches/release09.04/applications/product/webapp/catalog/category/EditCategoryParties.ftl Tue Apr 21 13:02:22 2009
@@ -51,7 +51,7 @@
                     <input type="hidden" name="roleTypeId" value="${(productCategoryRole.roleTypeId)?if_exists}">
                     <input type="hidden" name="fromDate" value="${(productCategoryRole.getTimestamp("fromDate"))?if_exists}">
                     <input type="text" size="25" name="thruDate" value="${(productCategoryRole. getTimestamp("thruDate"))?if_exists}" <#if hasExpired> style="color: red;"</#if>>
-                    <a href="javascript:call_cal(document.lineForm${line}.thruDate, '${(productCategoryRole.getTimestamp("thruDate"))?default(nowTimestamp?string)}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a>
+                    <a href="javascript:call_cal(document.lineForm_update${line}.thruDate, '${(productCategoryRole.getTimestamp("thruDate"))?default(nowTimestamp?string)}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a>
                     <INPUT type="submit" value="${uiLabelMap.CommonUpdate}" style="font-size: x-small;">
                 </FORM>
             </td>

Modified: ofbiz/branches/release09.04/applications/product/webapp/catalog/category/EditCategoryProdCatalogs.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/product/webapp/catalog/category/EditCategoryProdCatalogs.ftl?rev=767137&r1=767136&r2=767137&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/product/webapp/catalog/category/EditCategoryProdCatalogs.ftl (original)
+++ ofbiz/branches/release09.04/applications/product/webapp/catalog/category/EditCategoryProdCatalogs.ftl Tue Apr 21 13:02:22 2009
@@ -54,7 +54,7 @@
                         <input type="hidden" name="prodCatalogCategoryTypeId" value="${prodCatalogCategory.prodCatalogCategoryTypeId}"/>
                         <input type="hidden" name="fromDate" value="${(prodCatalogCategory.fromDate)?if_exists}"/>
                         <input type="text" size="25" name="thruDate" value="${(prodCatalogCategory.thruDate)?if_exists}" style="<#if (hasExpired) >color: red;</#if>"/>
-                        <a href="javascript:call_cal(document.lineForm${line}.thruDate, '${(prodCatalogCategory.thruDate)?default(nowTimestamp?string)}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a>
+                        <a href="javascript:call_cal(document.lineForm_update${line}.thruDate, '${(prodCatalogCategory.thruDate)?default(nowTimestamp?string)}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a>
                         <input type="text" size="5" name="sequenceNum" value="${(prodCatalogCategory.sequenceNum)?if_exists}"/>
                         <#-- the prodCatalogCategoryTypeId field is now part of the PK, so it can't be changed, must be re-created
                         <select name="prodCatalogCategoryTypeId" size="1">