svn commit: r1593904 - in /ofbiz/branches/release12.04: ./ applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl

Author: jleroux
Date: Mon May 12 08:04:28 2014
New Revision: 1593904

URL: http://svn.apache.org/r1593904
Log:
"Applied fix from trunk for revision: 1593902"
------------------------------------------------------------------------
r1593902 | jleroux | 2014-05-12 10:03:35 +0200 (lun. 12 mai 2014) | 5 lignes

Reverts r1592530 for OFBIZ-5637 "Cannot receive PO shipment"

A change introduced by SVN commit r1345532 in the inline JavaScript snippet in ReceiveInventoryAgainstPurchaseOrder.ftl causes an error while receiving PO into the facility.

We confused ftl and js
------------------------------------------------------------------------


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

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

Modified: ofbiz/branches/release12.04/applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl?rev=1593904&r1=1593903&r2=1593904&view=diff
==============================================================================
--- ofbiz/branches/release12.04/applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl (original)
+++ ofbiz/branches/release12.04/applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl Mon May 12 08:04:28 2014
@@ -24,7 +24,7 @@ under the License.
         for (var x = 0; x <= rowCount; x++) {
           var quantityAcceptedInput = document.getElementById('quantityAccepted_o_' + x);
           var quantityInput = document.getElementById('quantity_o_' + x);
-          if (quantityAcceptedInput?? && quantityInput??) {
+          if (quantityAcceptedInput != null && quantityInput != null) {
             quantityInput.value = quantityAcceptedInput.value;
           }
         }