You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ja...@apache.org on 2011/03/30 21:48:31 UTC
svn commit: r1087058 - in /ofbiz/trunk/applications:
order/webapp/ordermgr/order/orderinfo.ftl
product/webapp/facility/inventory/receiveInventory.ftl
Author: jaz
Date: Wed Mar 30 19:48:31 2011
New Revision: 1087058
URL: http://svn.apache.org/viewvc?rev=1087058&view=rev
Log:
minor bug fixes; approving PO requires newStatusId (was missing), errors on receive PO when no currency was found
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl
ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl?rev=1087058&r1=1087057&r2=1087058&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl Wed Mar 30 19:48:31 2011
@@ -38,6 +38,7 @@ under the License.
<li><a href="javascript:document.OrderApproveOrder.submit()">${uiLabelMap.OrderApproveOrder}</a>
<form name="OrderApproveOrder" method="post" action="<@o...@ofbizUrl>">
<input type="hidden" name="statusId" value="ORDER_APPROVED"/>
+ <input type="hidden" name="newStatusId" value="ORDER_APPROVED"/>
<input type="hidden" name="setItemStatus" value="Y"/>
<input type="hidden" name="workEffortId" value="${workEffortId?if_exists}"/>
<input type="hidden" name="orderId" value="${orderId?if_exists}"/>
Modified: ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl?rev=1087058&r1=1087057&r2=1087058&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl Wed Mar 30 19:48:31 2011
@@ -459,7 +459,7 @@ under the License.
<td> </td>
<td align="right">${uiLabelMap.ProductFacilityOwner}:</td>
<td align="right"><input type="text" name="ownerPartyId_o_${rowCount}" size="20" maxlength="20" value="${facility.ownerPartyId}"/></td>
- <#if currencyUomId != orderCurrencyUomId>
+ <#if currencyUomId?default('') != orderCurrencyUomId?default('')>
<td>${uiLabelMap.ProductPerUnitPriceOrder}:</td>
<td>
<input type="hidden" name="orderCurrencyUomId_o_${rowCount}" value="${orderCurrencyUomId?if_exists}" />