svn commit: r682598 - /ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/reports/OpenOrderItemsReport.groovy

[ashish-18]

Author: ashish
Date: Mon Aug  4 23:36:41 2008
New Revision: 682598

URL: http://svn.apache.org/viewvc?rev=682598&view=rev
Log:
Applied patch from JIRA Issue OFBIZ-1905.
I think its safe to put the "1" for the cost price in the dividend section when cost price comes 0.0.
So it will return some numeric values instead of returning infinity.

Modified:
    ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/reports/OpenOrderItemsReport.groovy

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=682598&r1=682597&r2=682598&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 Mon Aug  4 23:36:41 2008
@@ -1,158 +1,158 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/*
- * Script to build the open order item report using
- * the OrderItemQuantityReportGroupByItem view.
- */
-
-
-import org.ofbiz.base.util.UtilMisc;
-import org.ofbiz.entity.condition.*;
-import org.ofbiz.entity.util.*;
-import org.ofbiz.entity.*;
-import org.ofbiz.base.util.*;
-
-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, fromOrderDate));
-}
-if (thruOrderDate && UtilValidate.isDate(thruOrderDate)){
-    conditions.add(EntityCondition.makeCondition("orderDate", EntityOperator.LESS_THAN_EQUAL_TO, thruOrderDate));
-}
-
-if (productStoreId) {
-    conditions.add(EntityCondition.makeCondition("productStoreId", EntityOperator.EQUALS, productStoreId));
-    // for generating a title (given product store)
-    context.productStore = delegator.findByPrimaryKeyCache("ProductStore", [productStoreId : productStoreId]);
-} else {
-    // for generating a title (all stores)  TODO: use UtilProperties to internationalize
-    context.productStore = [storeName : "All Stores"];
-}
-if (orderStatusId) {
-    conditions.add(EntityCondition.makeCondition("orderStatusId", EntityOperator.EQUALS, orderStatusId));
-} else {
-    // search all orders that are not completed, cancelled or rejected
-    conditions.add(
-            EntityCondition.makeCondition([
-                    EntityCondition.makeCondition("orderStatusId", EntityOperator.NOT_EQUAL, "ORDER_COMPLETED"),
-                    EntityCondition.makeCondition("orderStatusId", EntityOperator.NOT_EQUAL, "ORDER_CANCELLED"),
-                    EntityCondition.makeCondition("orderStatusId", EntityOperator.NOT_EQUAL, "ORDER_REJECTED")
-                    ], EntityOperator.AND)
-            );
-}
-
-// item conditions
-conditions.add(EntityCondition.makeCondition("orderItemStatusId", EntityOperator.NOT_EQUAL, "ITEM_COMPLETED"));
-conditions.add(EntityCondition.makeCondition("orderItemStatusId", EntityOperator.NOT_EQUAL, "ITEM_CANCELLED"));
-conditions.add(EntityCondition.makeCondition("orderItemStatusId", EntityOperator.NOT_EQUAL, "ITEM_REJECTED"));
-
-// get the results as an entity list iterator
-allConditions = EntityCondition.makeCondition( conditions, EntityOperator.AND );
-fieldsToSelect = ["orderId", "orderDate", "productId", "quantityOrdered", "quantityIssued", "quantityOpen"] as Set;
-fieldsToSelect.add("shipBeforeDate");
-fieldsToSelect.add("shipAfterDate");
-fieldsToSelect.add("itemDescription");
-findOptions = new EntityFindOptions(true, EntityFindOptions.TYPE_SCROLL_INSENSITIVE, EntityFindOptions.CONCUR_READ_ONLY, true);
-listIt = delegator.find("OrderItemQuantityReportGroupByItem", allConditions, null, fieldsToSelect, ["orderDate DESC"], findOptions);
-orderItemList = [];
-totalCostPrice = 0.0;
-totalListPrice = 0.0;
-totalMarkup = 0.0;
-totalDiscount = 0.0;
-totalRetailPrice = 0.0;
-totalquantityOrdered = 0.0;
-totalquantityOpen = 0.0;
-
-listIt.each { listValue ->
-    orderId = listValue.orderId;
-    productId = listValue.productId;
-    orderDate = listValue.orderDate;
-    quantityOrdered = listValue.quantityOrdered;
-    quantityOpen = listValue.quantityOpen;
-    quantityIssued = listValue.quantityIssued;
-    itemDescription = listValue.itemDescription;
-    shipAfterDate = listValue.shipAfterDate;
-    shipBeforeDate = listValue.shipBeforeDate;    
-    fieldsToSelect = ["price","productPriceTypeId"] as Set;
-    productIdCondExpr =  [EntityCondition.makeCondition("productId", EntityOperator.EQUALS, productId)];
-    prodPriceCond = EntityCondition.makeCondition(productIdCondExpr, EntityOperator.AND);
-    productPrices = delegator.findList("ProductPrice", prodPriceCond, fieldsToSelect, null, null, false);    
-    costPrice = 0.0;
-    retailPrice = 0.0;
-    listPrice = 0.0;
-    
-    productPrices.each { productPriceMap ->
-        if (productPriceMap.productPriceTypeId.equals("AVERAGE_COST")) {
-            costPrice = productPriceMap.price;
-        } else if (productPriceMap.productPriceTypeId.equals("DEFAULT_PRICE")) {
-            retailPrice = productPriceMap.price;
-        } else if (productPriceMap.productPriceTypeId.equals("LIST_PRICE")) {
-            listPrice = productPriceMap.price;
-        }
-    }
-
-    totalListPrice += listPrice;
-    totalRetailPrice += retailPrice;
-    totalCostPrice += costPrice;    
-    totalquantityOrdered += quantityOrdered;
-    totalquantityOpen += quantityOpen;    
-    orderItemMap = [orderDate : orderDate,
-                    orderId : orderId,
-                    productId : productId,
-                    itemDescription : itemDescription,
-                    quantityOrdered : quantityOrdered,
-                    quantityIssued : quantityIssued,
-                    quantityOpen : quantityOpen,
-                    shipAfterDate : shipAfterDate,
-                    shipBeforeDate : shipBeforeDate,
-                    costPrice : costPrice,
-                    retailPrice : retailPrice,
-                    listPrice : listPrice,
-                    discount : listPrice - retailPrice,
-                    calculatedMarkup : retailPrice - costPrice,
-                    percentMarkup : ((retailPrice - costPrice)/costPrice)*100];
-    orderItemList.add(orderItemMap);
-}
-
-listIt.close();
-totalAmountList = [];
-if (orderItemList) {
-    totalAmountMap = [totalCostPrice : totalCostPrice,
-                      totalListPrice : totalListPrice,
-                      totalRetailPrice : totalRetailPrice,
-                      totalquantityOrdered : totalquantityOrdered,
-                      quantityOrdered : quantityOrdered,
-                      totalquantityOpen : totalquantityOpen,
-                      totalDiscount : totalListPrice - totalRetailPrice,
-                      totalMarkup : totalRetailPrice - totalCostPrice,
-                      totalPercentMarkup : ((totalRetailPrice - totalCostPrice)/totalCostPrice)*100];
-    totalAmountList.add(totalAmountMap);
-}
-context.orderItemList = orderItemList;
-context.totalAmountList = totalAmountList;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/*
+ * Script to build the open order item report using
+ * the OrderItemQuantityReportGroupByItem view.
+ */
+
+
+import org.ofbiz.base.util.UtilMisc;
+import org.ofbiz.entity.condition.*;
+import org.ofbiz.entity.util.*;
+import org.ofbiz.entity.*;
+import org.ofbiz.base.util.*;
+
+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, fromOrderDate));
+}
+if (thruOrderDate && UtilValidate.isDate(thruOrderDate)){
+    conditions.add(EntityCondition.makeCondition("orderDate", EntityOperator.LESS_THAN_EQUAL_TO, thruOrderDate));
+}
+
+if (productStoreId) {
+    conditions.add(EntityCondition.makeCondition("productStoreId", EntityOperator.EQUALS, productStoreId));
+    // for generating a title (given product store)
+    context.productStore = delegator.findByPrimaryKeyCache("ProductStore", [productStoreId : productStoreId]);
+} else {
+    // for generating a title (all stores)  TODO: use UtilProperties to internationalize
+    context.productStore = [storeName : "All Stores"];
+}
+if (orderStatusId) {
+    conditions.add(EntityCondition.makeCondition("orderStatusId", EntityOperator.EQUALS, orderStatusId));
+} else {
+    // search all orders that are not completed, cancelled or rejected
+    conditions.add(
+            EntityCondition.makeCondition([
+                    EntityCondition.makeCondition("orderStatusId", EntityOperator.NOT_EQUAL, "ORDER_COMPLETED"),
+                    EntityCondition.makeCondition("orderStatusId", EntityOperator.NOT_EQUAL, "ORDER_CANCELLED"),
+                    EntityCondition.makeCondition("orderStatusId", EntityOperator.NOT_EQUAL, "ORDER_REJECTED")
+                    ], EntityOperator.AND)
+            );
+}
+
+// item conditions
+conditions.add(EntityCondition.makeCondition("orderItemStatusId", EntityOperator.NOT_EQUAL, "ITEM_COMPLETED"));
+conditions.add(EntityCondition.makeCondition("orderItemStatusId", EntityOperator.NOT_EQUAL, "ITEM_CANCELLED"));
+conditions.add(EntityCondition.makeCondition("orderItemStatusId", EntityOperator.NOT_EQUAL, "ITEM_REJECTED"));
+
+// get the results as an entity list iterator
+allConditions = EntityCondition.makeCondition( conditions, EntityOperator.AND );
+fieldsToSelect = ["orderId", "orderDate", "productId", "quantityOrdered", "quantityIssued", "quantityOpen"] as Set;
+fieldsToSelect.add("shipBeforeDate");
+fieldsToSelect.add("shipAfterDate");
+fieldsToSelect.add("itemDescription");
+findOptions = new EntityFindOptions(true, EntityFindOptions.TYPE_SCROLL_INSENSITIVE, EntityFindOptions.CONCUR_READ_ONLY, true);
+listIt = delegator.find("OrderItemQuantityReportGroupByItem", allConditions, null, fieldsToSelect, ["orderDate DESC"], findOptions);
+orderItemList = [];
+totalCostPrice = 0.0;
+totalListPrice = 0.0;
+totalMarkup = 0.0;
+totalDiscount = 0.0;
+totalRetailPrice = 0.0;
+totalquantityOrdered = 0.0;
+totalquantityOpen = 0.0;
+
+listIt.each { listValue ->
+    orderId = listValue.orderId;
+    productId = listValue.productId;
+    orderDate = listValue.orderDate;
+    quantityOrdered = listValue.quantityOrdered;
+    quantityOpen = listValue.quantityOpen;
+    quantityIssued = listValue.quantityIssued;
+    itemDescription = listValue.itemDescription;
+    shipAfterDate = listValue.shipAfterDate;
+    shipBeforeDate = listValue.shipBeforeDate;    
+    fieldsToSelect = ["price","productPriceTypeId"] as Set;
+    productIdCondExpr =  [EntityCondition.makeCondition("productId", EntityOperator.EQUALS, productId)];
+    prodPriceCond = EntityCondition.makeCondition(productIdCondExpr, EntityOperator.AND);
+    productPrices = delegator.findList("ProductPrice", prodPriceCond, fieldsToSelect, null, null, false);    
+    costPrice = 0.0;
+    retailPrice = 0.0;
+    listPrice = 0.0;
+    
+    productPrices.each { productPriceMap ->
+        if (productPriceMap.productPriceTypeId.equals("AVERAGE_COST")) {
+            costPrice = productPriceMap.price;
+        } else if (productPriceMap.productPriceTypeId.equals("DEFAULT_PRICE")) {
+            retailPrice = productPriceMap.price;
+        } else if (productPriceMap.productPriceTypeId.equals("LIST_PRICE")) {
+            listPrice = productPriceMap.price;
+        }
+    }
+
+    totalListPrice += listPrice;
+    totalRetailPrice += retailPrice;
+    totalCostPrice += costPrice;    
+    totalquantityOrdered += quantityOrdered;
+    totalquantityOpen += quantityOpen;    
+    orderItemMap = [orderDate : orderDate,
+                    orderId : orderId,
+                    productId : productId,
+                    itemDescription : itemDescription,
+                    quantityOrdered : quantityOrdered,
+                    quantityIssued : quantityIssued,
+                    quantityOpen : quantityOpen,
+                    shipAfterDate : shipAfterDate,
+                    shipBeforeDate : shipBeforeDate,
+                    costPrice : costPrice,
+                    retailPrice : retailPrice,
+                    listPrice : listPrice,
+                    discount : listPrice - retailPrice,
+                    calculatedMarkup : retailPrice - costPrice,
+                    percentMarkup : ((retailPrice - costPrice)/costPrice?:1)*100];
+    orderItemList.add(orderItemMap);
+}
+
+listIt.close();
+totalAmountList = [];
+if (orderItemList) {
+    totalAmountMap = [totalCostPrice : totalCostPrice,
+                      totalListPrice : totalListPrice,
+                      totalRetailPrice : totalRetailPrice,
+                      totalquantityOrdered : totalquantityOrdered,
+                      quantityOrdered : quantityOrdered,
+                      totalquantityOpen : totalquantityOpen,
+                      totalDiscount : totalListPrice - totalRetailPrice,
+                      totalMarkup : totalRetailPrice - totalCostPrice,
+                      totalPercentMarkup : ((totalRetailPrice - totalCostPrice)/totalCostPrice)*100];
+    totalAmountList.add(totalAmountMap);
+}
+context.orderItemList = orderItemList;
+context.totalAmountList = totalAmountList;