Author: pranayp
Date: Sat Sep 17 10:36:33 2016
New Revision: 1761182

URL: http://svn.apache.org/viewvc?rev=1761182&view=rev
Log:
Improved: Product: Remove inline js for toggleAll, checkToggle and selectAll 
calling from ftls
(OFBIZ-7896)

Remove inline js for toggleAll, checkToggle and selectAll calling from ftls in 
Product component, instead added class="selectAll" on parent checkbox element 
for select all functionality.

Thanks: Amardeep Singh Jhajj for the contribution.


Modified:
    ofbiz/trunk/applications/product/template/facility/PickMoveStock.ftl
    ofbiz/trunk/applications/product/template/feature/BulkAddFeature.ftl
    
ofbiz/trunk/applications/product/template/feature/EditFeatureCategoryFeatures.ftl
    ofbiz/trunk/applications/product/template/find/KeywordSearch.ftl
    ofbiz/trunk/applications/product/template/inventory/ReceiveInventory.ftl
    
ofbiz/trunk/applications/product/template/product/ApplyFeaturesFromCategory.ftl
    ofbiz/trunk/applications/product/template/product/EditProductFeatures.ftl
    ofbiz/trunk/applications/product/template/returns/ReceiveReturn.ftl
    ofbiz/trunk/applications/product/template/shipment/AddItemsFromOrder.ftl
    
ofbiz/trunk/applications/product/template/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl

Modified: ofbiz/trunk/applications/product/template/facility/PickMoveStock.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/template/facility/PickMoveStock.ftl?rev=1761182&r1=1761181&r2=1761182&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/template/facility/PickMoveStock.ftl 
(original)
+++ ofbiz/trunk/applications/product/template/facility/PickMoveStock.ftl Sat 
Sep 17 10:36:33 2016
@@ -59,7 +59,7 @@ under the License.
                     <td>${uiLabelMap.CommonConfirm}</td>
                     <td align="right">
                         <label>${uiLabelMap.ProductSelectAll}&nbsp;
-                        <input type="checkbox" name="selectAll" value="Y" 
onclick="javascript:toggleAll(this, 'selectAllForm');highlightAllRows(this, 
'moveInfoId_tableRow_', 'selectAllForm');" /></label>
+                        <input type="checkbox" name="selectAll" value="Y" 
class="selectAll" onclick="highlightAllRows(this, 'moveInfoId_tableRow_', 
'selectAllForm');" /></label>
                     </td>
                 </tr>
                 <#if moveByOisgirInfoList?has_content || 
moveByPflInfoList?has_content>
@@ -91,7 +91,7 @@ under the License.
                                 <input type="text" 
name="quantityMoved_o_${rowCount}" size="6" 
value="${totalQuantity?string.number}" />
                             </td>
                             <td align="right">
-                                <input type="checkbox" 
name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this, 
'selectAllForm');highlightRow(this,'moveInfoId_tableRow_${rowCount}');" />
+                                <input type="checkbox" 
name="_rowSubmit_o_${rowCount}" value="Y" 
onclick="highlightRow(this,'moveInfoId_tableRow_${rowCount}');" />
                             </td>
                         </tr>
                         <#assign rowCount = rowCount + 1>
@@ -125,7 +125,7 @@ under the License.
                                 <input type="text" 
name="quantityMoved_o_${rowCount}" size="6" 
value="${totalQuantity?string.number}" />
                             </td>
                             <td align="right">
-                                <input type="checkbox" 
name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this, 
'selectAllForm');highlightRow(this,'moveInfoId_tableRow_${rowCount}');" />
+                                <input type="checkbox" 
name="_rowSubmit_o_${rowCount}" value="Y" 
onclick="highlightRow(this,'moveInfoId_tableRow_${rowCount}');" />
                             </td>
                         </tr>
                         <#assign rowCount = rowCount + 1>
@@ -184,4 +184,4 @@ under the License.
             </table>
         </form>
     </div>
-</div>
\ No newline at end of file
+</div>

Modified: ofbiz/trunk/applications/product/template/feature/BulkAddFeature.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/template/feature/BulkAddFeature.ftl?rev=1761182&r1=1761181&r2=1761182&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/template/feature/BulkAddFeature.ftl 
(original)
+++ ofbiz/trunk/applications/product/template/feature/BulkAddFeature.ftl Sat 
Sep 17 10:36:33 2016
@@ -21,8 +21,8 @@ under the License.
         <h3>${uiLabelMap.ProductAddProductFeatureInBulk} 
${uiLabelMap.CommonFor} ${featureCategory.description}</h3>
     </div>
     <div class="screenlet-body">
+      <form method='post' 
action='<@ofbizUrl>BulkAddProductFeatures</@ofbizUrl>' name="selectAllForm">
         <table cellspacing="0" class="basic-table">
-          <form method='post' 
action='<@ofbizUrl>BulkAddProductFeatures</@ofbizUrl>' name="selectAllForm">
           <input type="hidden" name="_useRowSubmit" value="Y" />
           <input type="hidden" name="_checkGlobalScope" value="N" />
           <input type="hidden" name="productFeatureCategoryId" 
value="${productFeatureCategoryId}" />
@@ -31,7 +31,7 @@ under the License.
             <td><b>${uiLabelMap.ProductFeatureType}</b></td>
             <td><b>${uiLabelMap.ProductIdSeqNum}</b></td>
             <td><b>${uiLabelMap.ProductIdCode}</b></td>
-            <td align="right"><b><label>${uiLabelMap.CommonAll}<input 
type="checkbox" name="selectAll" value="Y" checked="checked" 
onclick="javascript:toggleAll(this, 'selectAllForm');highlightAllRows(this, 
'productFeatureTypeId_tableRow_', 'selectAllForm');" /></label></b></td>
+            <td align="right"><b><label>${uiLabelMap.CommonAll}<input 
type="checkbox" name="selectAll" value="Y" checked="checked" class="selectAll" 
onclick="highlightAllRows(this, 'productFeatureTypeId_tableRow_', 
'selectAllForm');" /></label></b></td>
           </tr>
         <#assign rowClass = "2">
         <#list 0..featureNum-1 as feature>
@@ -46,7 +46,7 @@ under the License.
               </td>
               <td><input type="text" size='5' 
name="defaultSequenceNum_o_${feature_index}"" /></td>
               <td><input type="text" size='5' name="idCode_o_${feature_index}" 
/></td>
-              <td align="right"><input type="checkbox" 
name="_rowSubmit_o_${feature_index}" value="Y" checked="checked" 
onclick="javascript:checkToggle(this, 
'selectAllForm');highlightRow(this,'productFeatureTypeId_tableRow_${feature_index}');"
 /></td>
+              <td align="right"><input type="checkbox" 
name="_rowSubmit_o_${feature_index}" value="Y" 
onclick="highlightRow(this,'productFeatureTypeId_tableRow_${feature_index}');" 
/></td>
           </tr>
           <#-- toggle the row color -->
           <#if rowClass == "2">
@@ -57,8 +57,8 @@ under the License.
         </#list>
         <input type="hidden" name="_rowCount" value="${featureNum}" />
         <tr><td colspan="11" align="center"><input type="submit" 
value='${uiLabelMap.CommonCreate}'/></td></tr>
-        </form>
         </table>
+      </form>
     </div>
 </div>
 

Modified: 
ofbiz/trunk/applications/product/template/feature/EditFeatureCategoryFeatures.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/template/feature/EditFeatureCategoryFeatures.ftl?rev=1761182&r1=1761181&r2=1761182&view=diff
==============================================================================
--- 
ofbiz/trunk/applications/product/template/feature/EditFeatureCategoryFeatures.ftl
 (original)
+++ 
ofbiz/trunk/applications/product/template/feature/EditFeatureCategoryFeatures.ftl
 Sat Sep 17 10:36:33 2016
@@ -81,7 +81,7 @@ under the License.
                 <td><b>${uiLabelMap.ProductIdSeqNum}</b></td>
                 <td><b>${uiLabelMap.ProductIdCode}</b></td>
                 <td><b>${uiLabelMap.ProductAbbrev}</b></td>
-                <td align="right"><b><label>${uiLabelMap.CommonAll}<input 
type="checkbox" name="selectAll" value="${uiLabelMap.CommonY}" 
onclick="javascript:toggleAll(this, 'selectAllForm');highlightAllRows(this, 
'productFeatureId_tableRow_', 'selectAllForm');" /></label></b></td>
+                <td align="right"><b><label>${uiLabelMap.CommonAll}<input 
type="checkbox" name="selectAll" value="${uiLabelMap.CommonY}" 
class="selectAll" onclick="highlightAllRows(this, 'productFeatureId_tableRow_', 
'selectAllForm');" /></label></b></td>
              </tr>
         <#if (listSize > 0)>
             <#assign rowCount = 0>
@@ -117,7 +117,7 @@ under the License.
               <td><input type="text" size='5' 
name="defaultSequenceNum_o_${rowCount}" 
value="${productFeature.defaultSequenceNum!}" /></td>
               <td><input type="text" size='5' name="idCode_o_${rowCount}" 
value="${productFeature.idCode!}" /></td>
               <td><input type="text" size='5' name="abbrev_o_${rowCount}" 
value="${productFeature.abbrev!}" /></td>
-              <td align="right"><input type="checkbox" 
name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this, 
'selectAllForm');highlightRow(this,'productFeatureId_tableRow_${rowCount}');" 
/></td>
+              <td align="right"><input type="checkbox" 
name="_rowSubmit_o_${rowCount}" value="Y" 
onclick="highlightRow(this,'productFeatureId_tableRow_${rowCount}');" /></td>
             </tr>
             <#assign rowCount = rowCount + 1>
             <#-- toggle the row color -->

Modified: ofbiz/trunk/applications/product/template/find/KeywordSearch.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/template/find/KeywordSearch.ftl?rev=1761182&r1=1761181&r2=1761182&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/template/find/KeywordSearch.ftl (original)
+++ ofbiz/trunk/applications/product/template/find/KeywordSearch.ftl Sat Sep 17 
10:36:33 2016
@@ -50,26 +50,11 @@ under the License.
                 }
             }
         }
-
-        function toggleAll(e) {
-            var cform = document.products;
-            var len = cform.elements.length;
-            for (var i = 0; i < len; i++) {
-                var element = cform.elements[i];
-                if (element.name == "selectResult" && element.checked != 
e.checked) {
-                    toggle(element);
-                }
-            }
-        }
-
-        function toggle(e) {
-            e.checked = !e.checked;
-        }
     </script>
 
     <table cellspacing="0" class="basic-table">
         <tr>
-          <td><label><input type="checkbox" name="selectAll" value="0" 
onclick="javascript:toggleAll(this);"/> 
<b>${uiLabelMap.ProductProduct}</b></label></td>
+          <td><label><input type="checkbox" name="selectAll" value="0" 
class="selectAll" form="products"/> 
<b>${uiLabelMap.ProductProduct}</b></label></td>
           <td align="right">
             <b>
             <#if 0 < viewIndex?int>
@@ -108,7 +93,7 @@ under the License.
         <tr><td colspan="2"><hr /></td></tr>
     </table>
 
-    <form method="post" name="products">
+    <form method="post" name="products" id="products">
       <input type="hidden" name="productStoreId" 
value="${parameters.productStoreId!}" />
       <table cellspacing="0" class="basic-table">
         <#assign listIndex = lowIndex>

Modified: 
ofbiz/trunk/applications/product/template/inventory/ReceiveInventory.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/template/inventory/ReceiveInventory.ftl?rev=1761182&r1=1761181&r2=1761182&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/template/inventory/ReceiveInventory.ftl 
(original)
+++ ofbiz/trunk/applications/product/template/inventory/ReceiveInventory.ftl 
Sat Sep 17 10:36:33 2016
@@ -372,7 +372,7 @@ under the License.
                   </td>
                   <td align="right">
                     <label>${uiLabelMap.CommonSelectAll}
-                    <input type="checkbox" name="selectAll" value="Y" 
onclick="javascript:toggleAll(this, 'selectAllForm');"/></label>
+                    <input type="checkbox" name="selectAll" value="Y" 
class="selectAll" checked/></label>
                   </td>
                 </tr>
                 <#list purchaseOrderItems as orderItem>
@@ -532,7 +532,7 @@ under the License.
                       </table>
                     </td>
                     <td align="right">
-                      <input type="checkbox" name="_rowSubmit_o_${rowCount}" 
value="Y" onclick="javascript:checkToggle(this, 'selectAllForm');"/>
+                      <input type="checkbox" name="_rowSubmit_o_${rowCount}" 
value="Y" class="selectAllChild"/>
                     </td>
                   </tr>
                   <#assign rowCount = rowCount + 1>
@@ -563,7 +563,6 @@ under the License.
             </table>
             <input type="hidden" name="_rowCount" value="${rowCount}"/>
           </form>
-          <script language="JavaScript" 
type="text/javascript">selectAll('selectAllForm');</script>
 
         <#-- Initial Screen -->
         <#else>

Modified: 
ofbiz/trunk/applications/product/template/product/ApplyFeaturesFromCategory.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/template/product/ApplyFeaturesFromCategory.ftl?rev=1761182&r1=1761181&r2=1761182&view=diff
==============================================================================
--- 
ofbiz/trunk/applications/product/template/product/ApplyFeaturesFromCategory.ftl 
(original)
+++ 
ofbiz/trunk/applications/product/template/product/ApplyFeaturesFromCategory.ftl 
Sat Sep 17 10:36:33 2016
@@ -51,8 +51,8 @@ under the License.
         </tr>
     </table>
 </#if>
-<table cellspacing="0" class="basic-table">
 <form method="post" action="<@ofbizUrl>ApplyFeaturesToProduct</@ofbizUrl>" 
name="selectAllForm">
+<table cellspacing="0" class="basic-table">
   <input type="hidden" name="_useRowSubmit" value="Y" />
   <input type="hidden" name="_checkGlobalScope" value="Y" />
   <input type="hidden" name="productId" value="${productId}" />
@@ -65,7 +65,7 @@ under the License.
     <td><b>${uiLabelMap.CommonThruDate}</b></td>
     <td><b>${uiLabelMap.ProductAmount}</b></td>
     <td><b>${uiLabelMap.CommonSequence}</b></td>
-    <td><b><label>${uiLabelMap.CommonAll}<input type="checkbox" 
name="selectAll" value="${uiLabelMap.CommonY}" 
onclick="javascript:toggleAll(this, 'selectAllForm');highlightAllRows(this, 
'productFeatureId_tableRow_', 'selectAllForm');" /></labe></b></td>
+    <td><b><label>${uiLabelMap.CommonAll}<input type="checkbox" 
name="selectAll" value="${uiLabelMap.CommonY}" class="selectAll" 
onclick="highlightAllRows(this, 'productFeatureId_tableRow_', 
'selectAllForm');" /></labe></b></td>
   </tr>
 <#assign rowCount = 0>
 <#assign rowClass = "2">
@@ -93,7 +93,7 @@ under the License.
         <td><input type="text" size="6" name="amount_o_${rowCount}" 
value="${productFeature.defaultAmount!}" /></td>
         <td><input type="text" size="5" name="sequenceNum_o_${rowCount}" 
value="${productFeature.defaultSequenceNum!}" /></td>
         <td align="right">
-            <input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" 
onclick="javascript:checkToggle(this, 
'selectAllForm');highlightRow(this,'productFeatureId_tableRow_${rowCount}');" />
+            <input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" 
onclick="highlightRow(this,'productFeatureId_tableRow_${rowCount}');" />
         </td>
     </tr>
     <#assign rowCount = rowCount + 1>
@@ -107,5 +107,5 @@ under the License.
 <tr><td colspan="9" align="center"><input type="submit" 
value="${uiLabelMap.CommonApply}" /></td></tr>
 </#if>
 <input type="hidden" name="_rowCount" value="${rowCount!}"/>
-</form>
 </table>
+</form>

Modified: 
ofbiz/trunk/applications/product/template/product/EditProductFeatures.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/template/product/EditProductFeatures.ftl?rev=1761182&r1=1761181&r2=1761182&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/template/product/EditProductFeatures.ftl 
(original)
+++ ofbiz/trunk/applications/product/template/product/EditProductFeatures.ftl 
Sat Sep 17 10:36:33 2016
@@ -35,7 +35,7 @@ under the License.
           <td><b>${uiLabelMap.ProductCategory}</b></td>
           <td><b>${uiLabelMap.CommonFromDate}</b></td>
           
<td><b>${uiLabelMap.ProductThruDateAmountSequenceApplicationType}</b></td>
-          <td><b><label>${uiLabelMap.CommonAll}<input type="checkbox" 
name="selectAll" value="${uiLabelMap.CommonY}" 
onclick="javascript:toggleAll(this, 'selectAllForm');highlightAllRows(this, 
'productFeatureId_tableRow_', 'selectAllForm');"/></label></b></td>
+          <td><b><label>${uiLabelMap.CommonAll}<input type="checkbox" 
name="selectAll" value="${uiLabelMap.CommonY}" class="selectAll" 
onclick="highlightAllRows(this, 'productFeatureId_tableRow_', 
'selectAllForm');"/></label></b></td>
         </tr>
   <#assign rowClass = "2">
   <#list productFeatureAndAppls as productFeatureAndAppl>
@@ -79,7 +79,7 @@ under the License.
             </select>
           </td>
           <td align="right">
-            <input type="checkbox" 
name="_rowSubmit_o_${productFeatureAndAppl_index}" value="Y" 
onclick="javascript:checkToggle(this, 
'selectAllForm');highlightRow(this,'productFeatureId_tableRow_${productFeatureAndAppl_index}');"
 />
+            <input type="checkbox" 
name="_rowSubmit_o_${productFeatureAndAppl_index}" value="Y" 
onclick="highlightRow(this,'productFeatureId_tableRow_${productFeatureAndAppl_index}');"
 />
           </td>
           <td>
             <a 
href="javascript:document.RemoveFeatureFromProduct_o_${productFeatureAndAppl_index}.submit()"
 class="buttontext">${uiLabelMap.CommonDelete}</a>
@@ -204,4 +204,4 @@ under the License.
     </form>
   </div>
 </div>
-</#if>
\ No newline at end of file
+</#if>

Modified: ofbiz/trunk/applications/product/template/returns/ReceiveReturn.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/template/returns/ReceiveReturn.ftl?rev=1761182&r1=1761181&r2=1761182&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/template/returns/ReceiveReturn.ftl 
(original)
+++ ofbiz/trunk/applications/product/template/returns/ReceiveReturn.ftl Sat Sep 
17 10:36:33 2016
@@ -78,7 +78,7 @@ under the License.
                   </td>
                   <td align="right">
                     <label>${uiLabelMap.ProductSelectAll}&nbsp;
-                    <input type="checkbox" name="selectAll" value="Y" 
onclick="javascript:toggleAll(this, 'selectAllForm');" /></label>
+                    <input type="checkbox" name="selectAll" value="Y" 
class="selectAll" checked/></label>
                   </td>
                 </tr>
 
@@ -211,7 +211,7 @@ under the License.
                       </table>
                     </td>
                     <td align="right">
-                      <input type="checkbox" name="_rowSubmit_o_${rowCount}" 
value="Y" onclick="javascript:checkToggle(this, 'selectAllForm');" />
+                      <input type="checkbox" name="_rowSubmit_o_${rowCount}" 
value="Y"/>
                     </td>
                   </tr>
                   <#assign rowCount = rowCount + 1>
@@ -242,7 +242,6 @@ under the License.
             </table>
             <input type="hidden" name="_rowCount" value="${rowCount}" />
           </form>
-          <script language="JavaScript" 
type="text/javascript">selectAll('selectAllForm');</script>
 
           <#-- Initial Screen -->
         <#else>

Modified: 
ofbiz/trunk/applications/product/template/shipment/AddItemsFromOrder.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/template/shipment/AddItemsFromOrder.ftl?rev=1761182&r1=1761181&r2=1761182&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/template/shipment/AddItemsFromOrder.ftl 
(original)
+++ ofbiz/trunk/applications/product/template/shipment/AddItemsFromOrder.ftl 
Sat Sep 17 10:36:33 2016
@@ -98,7 +98,7 @@ under the License.
                 <td>${uiLabelMap.ProductIssue}</td>
                 <td align="right">
                     <div>${uiLabelMap.CommonSubmit} ?</div>
-                    <div><label>${uiLabelMap.CommonAll}<input type="checkbox" 
name="selectAll" value="${uiLabelMap.CommonY}" 
onclick="javascript:toggleAll(this, 'selectAllForm');highlightAllRows(this, 
'orderItemData_tableRow_', 'selectAllForm');" /></label></div>
+                    <div><label>${uiLabelMap.CommonAll}<input type="checkbox" 
name="selectAll" value="${uiLabelMap.CommonY}" checked class="selectAll" 
onclick="highlightAllRows(this, 'orderItemData_tableRow_', 'selectAllForm');" 
/></label></div>
                 </td>
             </tr>
             <#assign alt_row = false>
@@ -167,7 +167,7 @@ under the License.
                                 <input type="text" size="5" 
name="quantity_o_${rowCount}" value="${quantityNotIssued}"/>
                             </td>
                             <td align="right">
-                              <input type="checkbox" 
name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this, 
'selectAllForm');highlightRow(this,'orderItemData_tableRow_${rowCount}');" />
+                              <input type="checkbox" 
name="_rowSubmit_o_${rowCount}" value="Y" 
onclick="highlightRow(this,'orderItemData_tableRow_${rowCount}');" />
                             </td>
                             <#assign rowCount = rowCount + 1>
                         <#else>
@@ -211,7 +211,7 @@ under the License.
                                     <input type="text" size="5" 
name="quantity_o_${rowCount}" 
value="${(orderItemShipGrpInvResData.shipmentPlanQuantity)?default(availableQuantity)}"/>
                                 </td>
                                 <td align="right">
-                                  <input type="checkbox" 
name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this, 
'selectAllForm');highlightRow(this,'orderItemData_tableRow_${rowCount}');" />
+                                  <input type="checkbox" 
name="_rowSubmit_o_${rowCount}" value="Y" 
onclick="highlightRow(this,'orderItemData_tableRow_${rowCount}');" />
                                 </td>
                                 <#assign rowCount = rowCount + 1>
                             <#else>
@@ -228,7 +228,6 @@ under the License.
         <div align="right"><input type="submit" class="smallSubmit" 
value="${uiLabelMap.ProductIssueAll}"/></div>
         <input type="hidden" name="_rowCount" value="${rowCount}" />
         </form>
-        <script language="JavaScript" 
type="text/javascript">selectAll('selectAllForm');</script>
     </#if>
     </div>
 </div>
@@ -241,4 +240,4 @@ under the License.
         <br class="clear"/>
     </div>
 </div>
-</#if>
\ No newline at end of file
+</#if>

Modified: 
ofbiz/trunk/applications/product/template/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/template/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl?rev=1761182&r1=1761181&r2=1761182&view=diff
==============================================================================
--- 
ofbiz/trunk/applications/product/template/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl
 (original)
+++ 
ofbiz/trunk/applications/product/template/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl
 Sat Sep 17 10:36:33 2016
@@ -123,7 +123,7 @@ under the License.
                             <td>${uiLabelMap.CommonReceive}</td>
                             <td>${uiLabelMap.ProductInventoryItemType}</td>
                             <td colspan="2" align="right">
-                                <div><label>${uiLabelMap.CommonAll}<input 
type="checkbox" name="selectAll" value="${uiLabelMap.CommonY}" 
onclick="javascript:toggleAll(this, 'selectAllForm');highlightAllRows(this, 
'orderItemData_tableRow_', 'selectAllForm');" /></label></div>
+                                <div><label>${uiLabelMap.CommonAll}<input 
type="checkbox" name="selectAll" value="${uiLabelMap.CommonY}" checked 
class="selectAll" onclick="highlightAllRows(this, 'orderItemData_tableRow_', 
'selectAllForm');" /></label></div>
                             </td>
                         </#if>
                     </tr>
@@ -203,7 +203,7 @@ under the License.
                                     <a 
href="<@ofbizUrl>ReceiveInventoryAgainstPurchaseOrder?shipmentId=${shipmentId}&amp;purchaseOrderId=${orderId}&amp;productId=${product.productId}</@ofbizUrl>"
 class="buttontext">${uiLabelMap.CommonClear}</a>
                                 </td>
                                 <td align="right">
-                                  <input type="checkbox" 
name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this, 
'selectAllForm');highlightRow(this,'orderItemData_tableRow_${rowCount}');" />
+                                  <input type="checkbox" 
name="_rowSubmit_o_${rowCount}" value="Y" 
onclick="highlightRow(this,'orderItemData_tableRow_${rowCount}');" />
                                 </td>
                                 <#assign rowCount = rowCount + 1>
                             </#if>
@@ -229,7 +229,6 @@ under the License.
                 </table>
                 <input type="hidden" name="_rowCount" value="${rowCount}" />
             </form>
-            <script language="JavaScript" 
type="text/javascript">selectAll('selectAllForm');</script>
         </#if>
         <#if itemsAvailableToReceive && totalReadyToReceive < 
totalAvailableToReceive>
             <h3>${uiLabelMap.ProductReceiveInventoryAddProductToReceive}</h3>


Reply via email to