svn commit: r703816 - in /ofbiz/trunk: applications/accounting/webapp/accounting/WEB-INF/actions/reports/ applications/accounting/widget/ applications/marketing/webapp/marketing/WEB-INF/actions/reports/ applications/marketing/widget/ applications/order...

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r703816 - in /ofbiz/trunk: applications/accounting/webapp/accounting/WEB-INF/actions/reports/ applications/accounting/widget/ applications/marketing/webapp/marketing/WEB-INF/actions/reports/ applications/marketing/widget/ applications/order...

jleroux@apache.org
Author: jleroux
Date: Sun Oct 12 06:36:51 2008
New Revision: 703816

URL: http://svn.apache.org/viewvc?rev=703816&view=rev
Log:
As suggested by Adrian on dev ML, better fix for the Groovy-TimeStamp-Postgres isssue already fixed in r703731

Modified:
    ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/TransactionTotals.groovy
    ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml
    ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/actions/reports/MarketingCampaignReport.groovy
    ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/actions/reports/TrackingCodeReport.groovy
    ofbiz/trunk/applications/marketing/widget/MarketingReportScreens.xml
    ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/reports/OpenOrderItemsReport.groovy
    ofbiz/trunk/applications/order/webapp/ordermgr/reports/OrderReportPrepare.groovy
    ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml
    ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/ApplyFeaturesFromGroup.groovy
    ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/CountFacilityInventoryByProduct.groovy
    ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/ViewFacilityInventoryByProduct.groovy
    ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml
    ofbiz/trunk/applications/product/widget/facility/ReportScreens.xml
    ofbiz/trunk/specialpurpose/assetmaint/widget/FacilityScreens.xml

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/TransactionTotals.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/TransactionTotals.groovy?rev=703816&r1=703815&r2=703816&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/TransactionTotals.groovy (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/TransactionTotals.groovy Sun Oct 12 06:36:51 2008
@@ -30,10 +30,10 @@
 
 exprs = [EntityCondition.makeCondition("organizationPartyId", EntityOperator.EQUALS, organizationPartyId)];
 if (fromDate) {
-    exprs.add(EntityCondition.makeCondition("transactionDate", EntityOperator.GREATER_THAN_EQUAL_TO, ObjectType.simpleTypeConvert(fromDate, "Timestamp", null, null)));
+    exprs.add(EntityCondition.makeCondition("transactionDate", EntityOperator.GREATER_THAN_EQUAL_TO, fromDate));
 }
 if (thruDate) {
-    exprs.add(EntityCondition.makeCondition("transactionDate", EntityOperator.LESS_THAN_EQUAL_TO, ObjectType.simpleTypeConvert(thruDate, "Timestamp", null, null)));
+    exprs.add(EntityCondition.makeCondition("transactionDate", EntityOperator.LESS_THAN_EQUAL_TO, thruDate));
 }
 
 postedExprs = FastList.newInstance();

Modified: ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml?rev=703816&r1=703815&r2=703816&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml Sun Oct 12 06:36:51 2008
@@ -531,8 +531,8 @@
                 <set field="tabButtonItem" value="OrganizationAccountingReports"/>
                 <set field="tabButtonItem2" value="TransactionTotals"/>
                 <set field="organizationPartyId" from-field="parameters.organizationPartyId"/>
-                <set field="fromDate" from-field="parameters.fromDate"/>
-                <set field="thruDate" from-field="parameters.thruDate"/>
+                <set field="fromDate" from-field="parameters.fromDate" type="Timestamp"/>                
+                <set field="thruDate" from-field="parameters.thruDate" type="Timestamp"/>
                 <script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/TransactionTotals.groovy"/>
             </actions>
             <widgets>

Modified: ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/actions/reports/MarketingCampaignReport.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/actions/reports/MarketingCampaignReport.groovy?rev=703816&r1=703815&r2=703816&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/actions/reports/MarketingCampaignReport.groovy (original)
+++ ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/actions/reports/MarketingCampaignReport.groovy Sun Oct 12 06:36:51 2008
@@ -28,20 +28,18 @@
 //query for both number of visits and number of orders
 
 marketingCampaignId = request.getParameter("marketingCampaignId");
-fromDateStr = request.getParameter("fromDate");
-thruDateStr = request.getParameter("thruDate");
 visitConditionList = [] as LinkedList;
 orderConditionList = [] as LinkedList;
 
-if (fromDateStr && !(fromDateStr.equals(""))) {
-    visitConditionList.add(EntityCondition.makeCondition("fromDate", EntityOperator.GREATER_THAN_EQUAL_TO, ObjectType.simpleTypeConvert(fromDateStr, "Timestamp", null, null)));
-    orderConditionList.add(EntityCondition.makeCondition("orderDate", EntityOperator.GREATER_THAN_EQUAL_TO, ObjectType.simpleTypeConvert(fromDateStr, "Timestamp", null, null)));
+if (fromDate) {
+    visitConditionList.add(EntityCondition.makeCondition("fromDate", EntityOperator.GREATER_THAN_EQUAL_TO, fromDate));
+    orderConditionList.add(EntityCondition.makeCondition("orderDate", EntityOperator.GREATER_THAN_EQUAL_TO, fromDate));
 }
-if (thruDateStr && !(thruDateStr.equals(""))) {
-    visitConditionList.add(EntityCondition.makeCondition("fromDate", EntityOperator.LESS_THAN_EQUAL_TO, ObjectType.simpleTypeConvert(thruDateStr, "Timestamp", null, null)));
-    orderConditionList.add(EntityCondition.makeCondition("orderDate", EntityOperator.LESS_THAN_EQUAL_TO, ObjectType.simpleTypeConvert(thruDateStr, "Timestamp", null, null)));
+if (thruDate) {
+    visitConditionList.add(EntityCondition.makeCondition("fromDate", EntityOperator.LESS_THAN_EQUAL_TO, thruDateStr));
+    orderConditionList.add(EntityCondition.makeCondition("orderDate", EntityOperator.LESS_THAN_EQUAL_TO, thruDateStr));
 }
-if (marketingCampaignId && !(marketingCampaignId.equals(""))) {
+if (marketingCampaignId) {
     visitConditionList.add(EntityCondition.makeCondition("marketingCampaignId", EntityOperator.EQUALS, marketingCampaignId));
     orderConditionList.add(EntityCondition.makeCondition("marketingCampaignId", EntityOperator.EQUALS, marketingCampaignId));
 }

Modified: ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/actions/reports/TrackingCodeReport.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/actions/reports/TrackingCodeReport.groovy?rev=703816&r1=703815&r2=703816&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/actions/reports/TrackingCodeReport.groovy (original)
+++ ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/actions/reports/TrackingCodeReport.groovy Sun Oct 12 06:36:51 2008
@@ -25,23 +25,20 @@
 import org.ofbiz.marketing.report.ReportHelper
 
 trackingCodeIdStr = request.getParameter("trackingCodeId");
-fromDateStr = request.getParameter("fromDate");
-thruDateStr = request.getParameter("thruDate");
-
 // query for both number of visits and number of orders
 
 visitConditionList = [] as LinkedList;
 orderConditionList = [] as LinkedList;
 
-if (fromDateStr && !(fromDateStr.equals(""))) {
-    visitConditionList.add(EntityCondition.makeCondition("fromDate", EntityOperator.GREATER_THAN_EQUAL_TO, ObjectType.simpleTypeConvert(fromDateStr, "Timestamp", null, null)));
-    orderConditionList.add(EntityCondition.makeCondition("orderDate", EntityOperator.GREATER_THAN_EQUAL_TO, ObjectType.simpleTypeConvert(fromDateStr, "Timestamp", null, null)));
+if (fromDate) {
+    visitConditionList.add(EntityCondition.makeCondition("fromDate", EntityOperator.GREATER_THAN_EQUAL_TO, fromDate));
+    orderConditionList.add(EntityCondition.makeCondition("orderDate", EntityOperator.GREATER_THAN_EQUAL_TO, fromDate));
 }
-if (thruDateStr && !(thruDateStr.equals(""))) {
-     visitConditionList.add(EntityCondition.makeCondition("fromDate", EntityOperator.LESS_THAN_EQUAL_TO, ObjectType.simpleTypeConvert(thruDateStr, "Timestamp", null, null)));
-     orderConditionList.add(EntityCondition.makeCondition("orderDate", EntityOperator.LESS_THAN_EQUAL_TO, ObjectType.simpleTypeConvert(thruDateStr, "Timestamp", null, null)));
+if (thruDate) {
+     visitConditionList.add(EntityCondition.makeCondition("fromDate", EntityOperator.LESS_THAN_EQUAL_TO, thruDate));
+     orderConditionList.add(EntityCondition.makeCondition("orderDate", EntityOperator.LESS_THAN_EQUAL_TO, thruDate));
 }
-if (trackingCodeIdStr && !(trackingCodeIdStr.equals(""))) {
+if (trackingCodeIdSt) {
      visitConditionList.add(EntityCondition.makeCondition("trackingCodeId", EntityOperator.EQUALS, trackingCodeIdStr));
      orderConditionList.add(EntityCondition.makeCondition("trackingCodeId", EntityOperator.EQUALS, trackingCodeIdStr));
 }

Modified: ofbiz/trunk/applications/marketing/widget/MarketingReportScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/MarketingReportScreens.xml?rev=703816&r1=703815&r2=703816&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/MarketingReportScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/MarketingReportScreens.xml Sun Oct 12 06:36:51 2008
@@ -96,6 +96,8 @@
                 <set field="titleProperty" value="MarketingTrackingCodeReportTitle"/>
                 <property-map resource="MarketingUiLabels" map-name="uiLabelMap" global="true"/>
                 <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
+                <set field="fromDate" from-field="requestParameters.fromDate" type="Timestamp"/>
+                <set field="thruDate" from-field="requestParameters.thruDate" type="Timestamp"/>
                 <script location="component://marketing/webapp/marketing/WEB-INF/actions/reports/TrackingCodeReport.groovy"/>
             </actions>
             <widgets>
@@ -127,6 +129,8 @@
                 <set field="title" value="${uiLabelMap.MarketingTrackingCodeReportTitle}"/>
                 <property-map resource="MarketingUiLabels" map-name="uiLabelMap" global="true"/>
                 <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
+                <set field="fromDate" from-field="requestParameters.fromDate" type="Timestamp"/>
+                <set field="thruDate" from-field="requestParameters.thruDate" type="Timestamp"/>
                 <script location="component://marketing/webapp/marketing/WEB-INF/actions/reports/MarketingCampaignReport.groovy"/>
             </actions>
             <widgets>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/reports/OpenOrderItemsReport.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/reports/OpenOrderItemsReport.groovy?rev=703816&r1=703815&r2=703816&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/reports/OpenOrderItemsReport.groovy (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/reports/OpenOrderItemsReport.groovy Sun Oct 12 06:36:51 2008
@@ -32,18 +32,15 @@
 productStoreId = parameters.productStoreId;
 orderTypeId = parameters.orderTypeId;
 orderStatusId = parameters.orderStatusId;
-fromOrderDate = parameters.fromOrderDate;
-thruOrderDate = parameters.thruOrderDate;
-
 
 // search by orderTypeId is mandatory
 conditions = [EntityCondition.makeCondition("orderTypeId", EntityOperator.EQUALS, orderTypeId)];
 
-if (fromOrderDate && UtilValidate.isDate(fromOrderDate)){
-    conditions.add(EntityCondition.makeCondition("orderDate", EntityOperator.GREATER_THAN_EQUAL_TO, ObjectType.simpleTypeConvert(fromOrderDate, "Timestamp", null, null)));
+if (fromOrderDate){
+    conditions.add(EntityCondition.makeCondition("orderDate", EntityOperator.GREATER_THAN_EQUAL_TO, fromOrderDate));
 }
-if (thruOrderDate && UtilValidate.isDate(thruOrderDate)){
-    conditions.add(EntityCondition.makeCondition("orderDate", EntityOperator.LESS_THAN_EQUAL_TO, ObjectType.simpleTypeConvert(thruOrderDate, "Timestamp", null, null)));
+if (thruOrderDate){
+    conditions.add(EntityCondition.makeCondition("orderDate", EntityOperator.LESS_THAN_EQUAL_TO, thruOrderDate));
 }
 
 if (productStoreId) {

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/reports/OrderReportPrepare.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/reports/OrderReportPrepare.groovy?rev=703816&r1=703815&r2=703816&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/reports/OrderReportPrepare.groovy (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/reports/OrderReportPrepare.groovy Sun Oct 12 06:36:51 2008
@@ -72,10 +72,10 @@
 
 conditionList = [];
 if (fromDate) {
-    conditionList.add(EntityCondition.makeCondition("orderDate", EntityOperator.GREATER_THAN_EQUAL_TO, ObjectType.simpleTypeConvert(fromDate, "Timestamp", null, null)));
+    conditionList.add(EntityCondition.makeCondition("orderDate", EntityOperator.GREATER_THAN_EQUAL_TO, fromDate));
 }
 if (toDate) {
-    conditionList.add(EntityCondition.makeCondition("orderDate", EntityOperator.LESS_THAN_EQUAL_TO, ObjectType.simpleTypeConvert(toDate, "Timestamp", null, null)));
+    conditionList.add(EntityCondition.makeCondition("orderDate", EntityOperator.LESS_THAN_EQUAL_TO, toDate));
 }
 entityCondition = EntityCondition.makeCondition(conditionList, EntityOperator.AND);
 orderByList = ["orderTypeId", "orderStatus"];

Modified: ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml?rev=703816&r1=703815&r2=703816&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml Sun Oct 12 06:36:51 2008
@@ -222,6 +222,8 @@
                 <set field="headerItem" value="reports"/>
                 <set field="viewSize" value="${parameters.VIEW_SIZE}" default-value="20" type="Integer"/>
                 <set field="viewIndex" value="${parameters.VIEW_INDEX}" default-value="0" type="Integer"/>
+                <set field="fromDate" from-field="parameters.fromDate" type="Timestamp"/>
+                <set field="thruDate" from-field="parameters.thruDate" type="Timestamp"/>
                 <script location="component://order/webapp/ordermgr/WEB-INF/actions/reports/OpenOrderItemsReport.groovy"/>
             </actions>
             <widgets>

Modified: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/ApplyFeaturesFromGroup.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/ApplyFeaturesFromGroup.groovy?rev=703816&r1=703815&r2=703816&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/ApplyFeaturesFromGroup.groovy (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/ApplyFeaturesFromGroup.groovy Sun Oct 12 06:36:51 2008
@@ -25,7 +25,7 @@
 import org.ofbiz.entity.*
 
 productFeatureGroupId = parameters.get("productFeatureGroupId");
-if ((productFeatureGroupId) && !(productFeatureGroupId.equals(""))) {
+if (productFeatureGroupId) {
     productFeatureGroup = delegator.findOne("ProductFeatureGroup", [productFeatureGroupId : productFeatureGroupId], false);
     productFeatures = [];
     productFeatureGroupAppls = productFeatureGroup.getRelated("ProductFeatureGroupAppl", ['sequenceNum']);

Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/CountFacilityInventoryByProduct.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/CountFacilityInventoryByProduct.groovy?rev=703816&r1=703815&r2=703816&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/CountFacilityInventoryByProduct.groovy (original)
+++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/CountFacilityInventoryByProduct.groovy Sun Oct 12 06:36:51 2008
@@ -140,8 +140,7 @@
         discontinuationDateCondition = EntityCondition.makeCondition(
                [
                 EntityCondition.makeCondition("salesDiscontinuationDate", EntityOperator.EQUALS, null),
-                EntityCondition.makeCondition("salesDiscontinuationDate", EntityOperator.GREATER_THAN,
-                ObjectType.simpleTypeConvert(productsSoldThruTimestamp, "Timestamp", null, null, false))
+                EntityCondition.makeCondition("salesDiscontinuationDate", EntityOperator.GREATER_THAN,productsSoldThruTimestamp)
                ],
                EntityOperator.OR);
         whereConditionsList.add(discontinuationDateCondition);

Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/ViewFacilityInventoryByProduct.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/ViewFacilityInventoryByProduct.groovy?rev=703816&r1=703815&r2=703816&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/ViewFacilityInventoryByProduct.groovy (original)
+++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/ViewFacilityInventoryByProduct.groovy Sun Oct 12 06:36:51 2008
@@ -104,8 +104,7 @@
         discontinuationDateCondition = EntityCondition.makeCondition(
                [
                 EntityCondition.makeCondition("salesDiscontinuationDate", EntityOperator.EQUALS, null),
-                EntityCondition.makeCondition("salesDiscontinuationDate", EntityOperator.GREATER_THAN,
-                        ObjectType.simpleTypeConvert(productsSoldThruTimestamp, "Timestamp", null, null, false))
+                EntityCondition.makeCondition("salesDiscontinuationDate", EntityOperator.GREATER_THAN,productsSoldThruTimestamp)
                ],
                EntityOperator.OR);
         whereConditionsList.add(discontinuationDateCondition);

Modified: ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml?rev=703816&r1=703815&r2=703816&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml Sun Oct 12 06:36:51 2008
@@ -344,7 +344,7 @@
                 <set field="productSupplierId" from-field="parameters.productSupplierId"/>
                 <set field="offsetQOHQty" from-field="parameters.offsetQOHQty"/>
                 <set field="offsetATPQty" from-field="parameters.offsetATPQty"/>
-                <set field="productsSoldThruTimestamp" from-field="parameters.productsSoldThruTimestamp"/>
+                <set field="productsSoldThruTimestamp" from-field="parameters.productsSoldThruTimestamp" type="Timestamp"/>
                 <set field="internalName" from-field="parameters.internalName"/>
                 <set field="productId" from-field="parameters.productId"/>
                 <set field="statusId" from-field="parameters.statusId"/>
@@ -403,7 +403,7 @@
                 <set field="productSupplierId" from-field="parameters.productSupplierId"/>
                 <set field="offsetQOHQty" from-field="parameters.offsetQOHQty"/>
                 <set field="offsetATPQty" from-field="parameters.offsetATPQty"/>
-                <set field="productsSoldThruTimestamp" from-field="parameters.productsSoldThruTimestamp"/>
+                <set field="productsSoldThruTimestamp" from-field="parameters.productsSoldThruTimestamp" type="Timestamp"/>
                 <set field="internalName" from-field="parameters.internalName"/>
                 <set field="productId" from-field="parameters.productId"/>
                 
@@ -444,7 +444,7 @@
                 <set field="productSupplierId" from-field="parameters.productSupplierId"/>
                 <set field="offsetQOHQty" from-field="parameters.offsetQOHQty"/>
                 <set field="offsetATPQty" from-field="parameters.offsetATPQty"/>
-                <set field="productsSoldThruTimestamp" from-field="parameters.productsSoldThruTimestamp"/>
+                <set field="productsSoldThruTimestamp" from-field="parameters.productsSoldThruTimestamp" type="Timestamp"/>
                 <set field="internalName" from-field="parameters.internalName"/>
                 <set field="productId" from-field="parameters.productId"/>
 

Modified: ofbiz/trunk/applications/product/widget/facility/ReportScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/ReportScreens.xml?rev=703816&r1=703815&r2=703816&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/ReportScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/ReportScreens.xml Sun Oct 12 06:36:51 2008
@@ -40,7 +40,7 @@
                 <set field="productSupplierId" from-field="parameters.productSupplierId"/>
                 <set field="offsetQOHQty" from-field="parameters.offsetQOHQty"/>
                 <set field="offsetATPQty" from-field="parameters.offsetATPQty"/>
-                <set field="productsSoldThruTimestamp" from-field="parameters.productsSoldThruTimestamp"/>
+                <set field="productsSoldThruTimestamp" from-field="parameters.productsSoldThruTimestamp" type="Timestamp"/>
                 <set field="internalName" from-field="parameters.internalName"/>
                 <set field="productId" from-field="parameters.productId"/>
   

Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/FacilityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/FacilityScreens.xml?rev=703816&r1=703815&r2=703816&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/FacilityScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/FacilityScreens.xml Sun Oct 12 06:36:51 2008
@@ -38,7 +38,7 @@
                 <set field="productSupplierId" from-field="parameters.productSupplierId"/>
                 <set field="offsetQOHQty" from-field="parameters.offsetQOHQty"/>
                 <set field="offsetATPQty" from-field="parameters.offsetATPQty"/>
-                <set field="productsSoldThruTimestamp" from-field="parameters.productsSoldThruTimestamp"/>
+                <set field="productsSoldThruTimestamp" from-field="parameters.productsSoldThruTimestamp" type="Timestamp"/>
                 <set field="internalName" from-field="parameters.internalName"/>
                 <set field="productId" from-field="parameters.productId"/>