svn commit: r1533487 - in /ofbiz/branches/release12.04: ./ applications/product/webapp/facility/inventory/receiveInventory.ftl

Author: jleroux
Date: Fri Oct 18 15:09:03 2013
New Revision: 1533487

URL: http://svn.apache.org/r1533487
Log:
"Applied fix from trunk for revision: 1510042"
------------------------------------------------------------------------
r1510042 | jleroux | 2013-08-03 19:24:45 +0200 (sam. 03 août 2013) | 9 lignes

A patch from Pierre Smits for "Receive inventory generates an error when product has mandatory lotid" https://issues.apache.org/jira/browse/OFBIZ-5275

When a product has lotid set to mandatory the receipt of inventory in facility generates following error:

The Following Errors Occurred:
The lotId is mandatory for the product M-AMBER-40.

However, it is not possible to set the lotid on the receipt form.

------------------------------------------------------------------------


Modified:
    ofbiz/branches/release12.04/   (props changed)
    ofbiz/branches/release12.04/applications/product/webapp/facility/inventory/receiveInventory.ftl

Propchange: ofbiz/branches/release12.04/
------------------------------------------------------------------------------
  Merged /ofbiz/trunk:r1510042

Modified: ofbiz/branches/release12.04/applications/product/webapp/facility/inventory/receiveInventory.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/product/webapp/facility/inventory/receiveInventory.ftl?rev=1533487&r1=1533486&r2=1533487&view=diff
==============================================================================
--- ofbiz/branches/release12.04/applications/product/webapp/facility/inventory/receiveInventory.ftl (original)
+++ ofbiz/branches/release12.04/applications/product/webapp/facility/inventory/receiveInventory.ftl Fri Oct 18 15:09:03 2013
@@ -185,6 +185,16 @@ under the License.
                   <#-- <a href="#" onclick="setNow("datetimeReceived")" class="buttontext">[Now]</a> -->
                 </td>
               </tr>
+              
+              
+              <tr>
+                <td width="14%">&nbsp;</td>
+                <td width="6%" align="right" nowrap="nowrap" class="label">${uiLabelMap.lotId}</td>
+                <td width="6%">&nbsp;</td>
+                <td width="74%">
+                  <input type="text" name="lotId" size="10"/>
+                </td>
+              </tr>
 
               <#-- facility location(s) -->
               <#assign facilityLocations = (product.getRelatedByAnd("ProductFacilityLocation", Static["org.ofbiz.base.util.UtilMisc"].toMap("facilityId", facilityId)))?if_exists/>