You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by as...@apache.org on 2010/11/26 08:38:33 UTC
svn commit: r1039256 - in /ofbiz/trunk/applications:
manufacturing/webapp/manufacturing/bom/ product/webapp/catalog/category/
product/webapp/catalog/product/
Author: ashish
Date: Fri Nov 26 07:38:33 2010
New Revision: 1039256
URL: http://svn.apache.org/viewvc?rev=1039256&view=rev
Log:
Bug Fix.
If someone working in different time zone(For ex: PST) then updating, deleting records from db gives error on the console.
Thanks Amit for the contribution.
Modified:
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl
ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryFeatureCats.ftl
ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProducts.ftl
ofbiz/trunk/applications/product/webapp/catalog/product/EditProductAssoc.ftl
ofbiz/trunk/applications/product/webapp/catalog/product/EditProductParties.ftl
ofbiz/trunk/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl
Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl?rev=1039256&r1=1039255&r2=1039256&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl Fri Nov 26 07:38:33 2010
@@ -271,10 +271,10 @@ function lookupBom() {
<td> ${(assocFromProduct.estimateCalcMethod)?if_exists}</td>
<td> ${(assocFromProduct.routingWorkEffortId)?if_exists}</td>
<td>
- <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDelete}</a>
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDelete}</a>
</td>
<td>
- <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonEdit}</a>
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonEdit}</a>
</td>
</tr>
<#-- toggle the row color -->
Modified: ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryFeatureCats.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryFeatureCats.ftl?rev=1039256&r1=1039255&r2=1039256&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryFeatureCats.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryFeatureCats.ftl Fri Nov 26 07:38:33 2010
@@ -62,7 +62,7 @@ under the License.
<form method="post" action="<@o...@ofbizUrl>" name="removeProductFeatureCatGrpApplForm_${productFeatureCatGrpAppl_index}">
<input type="hidden" name="productFeatureGroupId" value="${(productFeatureCatGrpAppl.productFeatureGroupId)?if_exists}" />
<input type="hidden" name="productCategoryId" value="${(productFeatureCatGrpAppl.productCategoryId)?if_exists}" />
- <input type="hidden" name="fromDate" value="${productFeatureCatGrpAppl.getString("fromDate")}" />
+ <input type="hidden" name="fromDate" value="${(productFeatureCatGrpAppl.fromDate)?if_exists}" />
</form>
</td>
</tr>
@@ -142,7 +142,7 @@ under the License.
<form method="post" action="<@o...@ofbizUrl>" name="removeProductFeatureCategoryApplForm_${productFeatureCategoryAppl_index}">
<input type="hidden" name="productFeatureCategoryId" value="${(productFeatureCategoryAppl.productFeatureCategoryId)?if_exists}" />
<input type="hidden" name="productCategoryId" value="${(productFeatureCategoryAppl.productCategoryId)?if_exists}" />
- <input type="hidden" name="fromDate" value="${productFeatureCategoryAppl.getString("fromDate")}" />
+ <input type="hidden" name="fromDate" value="${(productFeatureCategoryAppl.fromDate)?if_exists}" />
</form>
</td>
</tr>
Modified: ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProducts.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProducts.ftl?rev=1039256&r1=1039255&r2=1039256&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProducts.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProducts.ftl Fri Nov 26 07:38:33 2010
@@ -118,7 +118,7 @@ under the License.
<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="fromDate" value="${(productCategoryMember.fromDate)?if_exists}"/>
<input type="hidden" name="activeOnly" value="${activeOnly.toString()}"/>
</form>
<#assign rowCount = rowCount + 1>
Modified: ofbiz/trunk/applications/product/webapp/catalog/product/EditProductAssoc.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/EditProductAssoc.ftl?rev=1039256&r1=1039255&r2=1039256&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/product/EditProductAssoc.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/product/EditProductAssoc.ftl Fri Nov 26 07:38:33 2010
@@ -210,11 +210,11 @@ under the License.
<td> ${(assocFromProduct.quantity)?if_exists}</td>
<td><#if curProductAssocType?exists> ${(curProductAssocType.get("description",locale))?if_exists}<#else>${(assocFromProduct.productAssocTypeId)?if_exists}</#if></td>
<td>
- <a href="<@o...@ofbizUrl>" class="buttontext">
+ <a href="<@o...@ofbizUrl>" class="buttontext">
${uiLabelMap.CommonDelete}</a>
</td>
<td>
- <a href="<@o...@ofbizUrl>" class="buttontext">
+ <a href="<@o...@ofbizUrl>" class="buttontext">
${uiLabelMap.CommonEdit}</a>
</td>
</tr>
@@ -253,7 +253,7 @@ under the License.
<td>${(assocToProduct.getTimestamp("thruDate"))?if_exists} </td>
<td><#if curProductAssocType?exists> ${(curProductAssocType.get("description",locale))?if_exists}<#else> ${(assocToProduct.productAssocTypeId)?if_exists}</#if></td>
<td>
- <a href="<@o...@ofbizUrl>" class="buttontext">
+ <a href="<@o...@ofbizUrl>" class="buttontext">
${uiLabelMap.CommonDelete}</a>
</td>
</tr>
Modified: ofbiz/trunk/applications/product/webapp/catalog/product/EditProductParties.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/EditProductParties.ftl?rev=1039256&r1=1039255&r2=1039256&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/product/EditProductParties.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/product/EditProductParties.ftl Fri Nov 26 07:38:33 2010
@@ -61,7 +61,7 @@ under the License.
<input type="hidden" name="partyId" value="${(productRole.partyId)?if_exists}" />
<input type="hidden" name="productId" value="${(productRole.productId)?if_exists}" />
<input type="hidden" name="roleTypeId" value="${(productRole.roleTypeId)?if_exists}" />
- <input type="hidden" name="fromDate" value="${productRole.getString("fromDate")}" />
+ <input type="hidden" name="fromDate" value="${(productRole.fromDate)?if_exists}" />
<input type="submit" value="${uiLabelMap.CommonDelete}" />
</form>
</td>
Modified: ofbiz/trunk/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl?rev=1039256&r1=1039255&r2=1039256&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl Fri Nov 26 07:38:33 2010
@@ -329,7 +329,7 @@ function doPublish() {
<#list standardFeatureAppls as standardFeatureAppl>
<#assign featureId = standardFeatureAppl.productFeatureId/>
<tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
- <td colspan="2"><a href='<@o...@ofbizUrl>' class="buttontext">x</a>
+ <td colspan="2"><a href='<@o...@ofbizUrl>' class="buttontext">x</a>
${productFeatureTypeLookup.get(featureId).description}: ${standardFeatureLookup.get(featureId).description}
</td>
</tr>
@@ -409,7 +409,7 @@ function doPublish() {
<form name="quickAdminRemoveProductFromCategory_${prodCatMemb_index}" action="<@o...@ofbizUrl>" method="post">
<input type="hidden" name="productId" value="${prodCatMemb.productId?if_exists}" />
<input type="hidden" name="productCategoryId" value="${prodCatMemb.productCategoryId}" />
- <input type="hidden" name="fromDate" value="${prodCatMemb.getString("fromDate")}" />
+ <input type="hidden" name="fromDate" value="${(prodCatMemb.fromDate)?if_exists}" />
<a href="javascript:document.quickAdminRemoveProductFromCategory_${prodCatMemb_index}.submit();" class="buttontext">x</a>
${prodCat.description?if_exists} ${prodCat.productCategoryId}
</form>