Author: ashish
Date: Sun Sep 4 06:38:03 2016
New Revision: 1759146
URL: http://svn.apache.org/viewvc?rev=1759146&view=rev
Log:
Applied patch from jira issue - OFBIZ-8075 - Clean up commented out code in
Groovy for Product. Thanks Aman for the contribution.
Modified:
ofbiz/trunk/applications/product/groovyScripts/catalog/lookup/LookupVariantProduct.groovy
ofbiz/trunk/applications/product/groovyScripts/facility/shipment/EditShipmentPlan.groovy
ofbiz/trunk/applications/product/groovyScripts/facility/shipment/PackOrder.groovy
Modified:
ofbiz/trunk/applications/product/groovyScripts/catalog/lookup/LookupVariantProduct.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/groovyScripts/catalog/lookup/LookupVariantProduct.groovy?rev=1759146&r1=1759145&r2=1759146&view=diff
==============================================================================
---
ofbiz/trunk/applications/product/groovyScripts/catalog/lookup/LookupVariantProduct.groovy
(original)
+++
ofbiz/trunk/applications/product/groovyScripts/catalog/lookup/LookupVariantProduct.groovy
Sun Sep 4 06:38:03 2016
@@ -47,10 +47,8 @@ if (featureTypes) {
}
variants = [];
-//if (selectedFeatureTypeValues) {
result = runService('getAllExistingVariants', [productId : productId,
productFeatureAppls : selectedFeatureTypeValues]);
variants = result.variantProductIds;
-//}
// Quick Add Variant
productFeatureIdsPar = request.getParameter("productFeatureIds");
Modified:
ofbiz/trunk/applications/product/groovyScripts/facility/shipment/EditShipmentPlan.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/groovyScripts/facility/shipment/EditShipmentPlan.groovy?rev=1759146&r1=1759145&r2=1759146&view=diff
==============================================================================
---
ofbiz/trunk/applications/product/groovyScripts/facility/shipment/EditShipmentPlan.groovy
(original)
+++
ofbiz/trunk/applications/product/groovyScripts/facility/shipment/EditShipmentPlan.groovy
Sun Sep 4 06:38:03 2016
@@ -63,7 +63,6 @@ if (shipment) {
if (shipmentPlans) {
shipmentPlans.each { shipmentPlan ->
oneRow = new HashMap(shipmentPlan);
- //
oneRow.putAll(shipmentPlan.getRelatedOne("OrderItemShipGrpInvRes", false));
orderItem = shipmentPlan.getRelatedOne("OrderItem", false);
oneRow.productId = orderItem.productId;
orderedQuantity = orderItem.getDouble("quantity");
Modified:
ofbiz/trunk/applications/product/groovyScripts/facility/shipment/PackOrder.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/groovyScripts/facility/shipment/PackOrder.groovy?rev=1759146&r1=1759145&r2=1759146&view=diff
==============================================================================
---
ofbiz/trunk/applications/product/groovyScripts/facility/shipment/PackOrder.groovy
(original)
+++
ofbiz/trunk/applications/product/groovyScripts/facility/shipment/PackOrder.groovy
Sun Sep 4 06:38:03 2016
@@ -100,7 +100,6 @@ if (picklistBinId) {
orderId = bin.primaryOrderId;
shipGroupSeqId = bin.primaryShipGroupSeqId;
packSession.addItemInfo(bin.getRelated("PicklistItem", [itemStatusId :
'PICKITEM_PENDING'], null, false));
- //context.put("picklistItemInfos", bin.getRelated("PicklistItem",
UtilMisc.toMap("itemStatusId", "PICKITEM_PENDING"), null, false));
}
} else {
picklistBinId = null;
@@ -158,7 +157,6 @@ if (orderId) {
if (!picklistBinId) {
packSession.addItemInfo(shippableItems);
- //context.put("itemInfos", shippableItemInfo);
}
} else {
request.setAttribute("_ERROR_MESSAGE_",
UtilProperties.getMessage("OrderErrorUiLabels",
"OrderErrorOrderHasBeenAlreadyVerified", [orderId : orderId], locale));
