You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by mo...@apache.org on 2009/05/15 19:21:07 UTC
svn commit: r775242 - in /ofbiz/trunk/applications/product:
src/org/ofbiz/shipment/packing/PackingServices.java
webapp/facility/shipment/PackOrder.ftl
Author: mor
Date: Fri May 15 17:21:06 2009
New Revision: 775242
URL: http://svn.apache.org/viewvc?rev=775242&view=rev
Log:
Minor fixes, part of OFBIZ-2407
Modified:
ofbiz/trunk/applications/product/src/org/ofbiz/shipment/packing/PackingServices.java
ofbiz/trunk/applications/product/webapp/facility/shipment/PackOrder.ftl
Modified: ofbiz/trunk/applications/product/src/org/ofbiz/shipment/packing/PackingServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/packing/PackingServices.java?rev=775242&r1=775241&r2=775242&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/shipment/packing/PackingServices.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/shipment/packing/PackingServices.java Fri May 15 17:21:06 2009
@@ -400,7 +400,7 @@
String shipmentCostEstimateForShipGroup = (String) context.get("shipmentCostEstimateForShipGroup");
BigDecimal estimatedShipCost = new BigDecimal(shipmentCostEstimateForShipGroup);
- BigDecimal doEstimates = new BigDecimal(UtilProperties.getPropertyValue("shipment.properties", "shipment.default.cost.actual_over_estimated_percent_allowed", "10"));
+ BigDecimal doEstimates = new BigDecimal(UtilProperties.getPropertyValue("shipment.properties", "shipment.default.cost_actual_over_estimated_percent_allowed", "10"));
Map<String, Object> response = FastMap.newInstance();
BigDecimal diffInShipCostInPerc = ZERO;
Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/PackOrder.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/PackOrder.ftl?rev=775242&r1=775241&r2=775242&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/shipment/PackOrder.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/shipment/PackOrder.ftl Fri May 15 17:21:06 2009
@@ -228,6 +228,7 @@
<input type="hidden" name="shipGroupSeqId" value="${shipGroupSeqId}"/>
<input type="hidden" name="facilityId" value="${facilityId?if_exists}"/>
<input type="hidden" name="hideGrid" value="${hideGrid}"/>
+ <input type="hidden" name="showCompletePackForm" value="Y"/>
<table cellpadding="2" cellspacing="0" class="basic-table">
<tr>
<td>
@@ -258,6 +259,7 @@
<input type="hidden" name="shipGroupSeqId" value="${shipGroupSeqId?if_exists}">
<input type="hidden" name="originFacilityId" value="${facilityId?if_exists}">
<input type="hidden" name="hideGrid" value="${hideGrid}"/>
+ <input type="hidden" name="showCompletePackForm" value="Y"/>
<table class="basic-table" cellspacing='0'>
<tr class="header-row">
<td> </td>
@@ -478,7 +480,7 @@
<#assign currentIndex = Static["java.lang.Integer"].parseInt(currentIndex?default("0"))/>
<input type="hidden" name="currentIndex" value="${(currentIndex + 1)}"/>
<input type="hidden" name="weightPackageSeqId" value="${currentPackageSeqId}"/>
- <#if weightPackageSeqIds.size() == packageSeqIds.size()>
+ <#if weightPackageSeqIds.size() == packageSeqIds.size() && "N" == requestParameters.showCompletePackForm?default("Y")>
<hr>
<div align="right">
<#assign buttonName = "${uiLabelMap.ProductComplete}"/>
@@ -495,6 +497,7 @@
<form name="completePackageForm" method="post" action="<@o...@ofbizUrl>">
<input type="hidden" name="orderId" value="${orderId?if_exists}"/>
<input type="hidden" name="showWeightPackageForm" value="Y"/>
+ <input type="hidden" name="showCompletePackForm" value="N"/>
<input type="hidden" name="shipGroupSeqId" value="${shipGroupSeqId?if_exists}"/>
<input type="hidden" name="facilityId" value="${facilityId?if_exists}"/>
<input type="hidden" name="forceComplete" value="${forceComplete?default('false')}"/>