svn commit: r937670 - in /ofbiz/trunk/applications/accounting/webapp/accounting: finaccounttrans/GlReconciledFinAccountTrans.ftl payment/manualCCTx.ftl

[buscob]

Author: buscob
Date: Sat Apr 24 18:50:15 2010
New Revision: 937670

URL: http://svn.apache.org/viewvc?rev=937670&view=rev
Log:
A patch from Blas Rodriguez Somoza
OFBIZ-3720 - XHTML validation errors round 2+ (accounting)
https://issues.apache.org/jira/browse/OFBIZ-3720
GlReconciledFinAccountTrans.ftl
Line 149: input can't be directly table must be inside td.
Line 203: invalid td close

manualCCTx.ftl
Lines 64,54,62: script can't be directly inside table must be inside td.

Modified:
    ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl
    ofbiz/trunk/applications/accounting/webapp/accounting/payment/manualCCTx.ftl

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl?rev=937670&r1=937669&r2=937670&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl Sat Apr 24 18:50:15 2010
@@ -145,9 +145,6 @@ under the License.
           </tr>
           <#assign alt_row = false/>
           <#list finAccountTransList as finAccountTrans>
-            <input name="finAccountTransId_o_${finAccountTrans_index}" type="hidden" value="${finAccountTrans.finAccountTransId}"/>
-            <input name="organizationPartyId_o_${finAccountTrans_index}" type="hidden" value="${defaultOrganizationPartyId}"/>
-            <input id="finAccountTransId_${finAccountTrans_index}" name="_rowSubmit_o_${finAccountTrans_index}" type="hidden" value="Y"/>
             <#assign payment = "">
             <#assign payments = "">
             <#assign status = "">
@@ -171,7 +168,11 @@ under the License.
               <#assign partyName = (delegator.findOne("PartyNameView", {"partyId" : finAccountTrans.partyId}, true))>
             </#if>
             <tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
-              <td>${finAccountTrans.finAccountTransId?if_exists}</td>
+              <td>
+                  <input name="finAccountTransId_o_${finAccountTrans_index}" type="hidden" value="${finAccountTrans.finAccountTransId}"/>
+                  <input name="organizationPartyId_o_${finAccountTrans_index}" type="hidden" value="${defaultOrganizationPartyId}"/>
+                  <input id="finAccountTransId_${finAccountTrans_index}" name="_rowSubmit_o_${finAccountTrans_index}" type="hidden" value="Y"/>
+                  ${finAccountTrans.finAccountTransId?if_exists}</td>
               <td>${finAccountTransType.description?if_exists}</td>
               <td><#if partyName?has_content>${(partyName.firstName)!} ${(partyName.lastName)!} ${(partyName.groupName)!}<a href="/partymgr/control/viewprofile?partyId=${partyName.partyId}">[${(partyName.partyId)!}]</a></#if></td>
               <td>${finAccountTrans.transactionDate?if_exists}</td>
@@ -198,8 +199,6 @@ under the License.
                   <script type="text/javascript">
                     new Popup('displayGlTransactions_${finAccountTrans.finAccountTransId}','toggleGlTransactions_${finAccountTrans.finAccountTransId}', {modal: true, position: 'none', trigger: 'click', cursor_margin:0})
                   </script>
-                </td>  
-              <#else>
                 </td>
               </#if>
             </tr>

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/payment/manualCCTx.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/payment/manualCCTx.ftl?rev=937670&r1=937669&r2=937670&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/payment/manualCCTx.ftl (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/payment/manualCCTx.ftl Sat Apr 24 18:50:15 2010
@@ -42,28 +42,34 @@ under the License.
     </#if>
     <#-- manual credit card information -->
     <#if txType?default("") == "PRDS_PAY_RELEASE">
+      <tr><td>
       ${setRequestAttribute("validTx", "true")}
       <script language="JavaScript" type="text/javascript">
       <!-- //
         document.manualTxForm.action = "<@ofbizUrl>processReleaseTransaction</@ofbizUrl>";
       // -->
       </script>
+      </td></tr>
     </#if>
     <#if txType?default("") == "PRDS_PAY_REFUND">
+      <tr><td>
       ${setRequestAttribute("validTx", "true")}
       <script language="JavaScript" type="text/javascript">
       <!-- //
         document.manualTxForm.action = "<@ofbizUrl>processRefundTransaction</@ofbizUrl>";
       // -->
       </script>
+      </td></tr>
     </#if>
     <#if txType?default("") == "PRDS_PAY_CREDIT" || txType?default("") == "PRDS_PAY_AUTH">
+      <tr><td>
       ${setRequestAttribute("validTx", "true")}
       <script language="JavaScript" type="text/javascript">
       <!-- //
         document.manualTxForm.action = "<@ofbizUrl>processManualCcTx</@ofbizUrl>";
       // -->
       </script>
+      </td></tr>
       <tr><td colspan="3"><hr/></td></tr>
       <tr>
         <td width="26%" align="right" valign="middle"><b>${uiLabelMap.PartyFirstName}</b></td>