svn commit: r946310 - in /ofbiz/branches/release10.04: ./ applications/accounting/webapp/accounting/finaccounttrans/FinAccountTrans.ftl applications/accounting/widget/GlForms.xml

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r946310 - in /ofbiz/branches/release10.04: ./ applications/accounting/webapp/accounting/finaccounttrans/FinAccountTrans.ftl applications/accounting/widget/GlForms.xml

erwan
Author: erwan
Date: Wed May 19 17:54:30 2010
New Revision: 946310

URL: http://svn.apache.org/viewvc?rev=946310&view=rev
Log:
Applied fix from trunk for revision: 946309
 XHTML validation errors round 2++ (accounting) - OFBIZ-3754 (https://issues.apache.org/jira/browse/OFBIZ-3754)

Modified:
    ofbiz/branches/release10.04/   (props changed)
    ofbiz/branches/release10.04/applications/accounting/webapp/accounting/finaccounttrans/FinAccountTrans.ftl
    ofbiz/branches/release10.04/applications/accounting/widget/GlForms.xml

Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 19 17:54:30 2010
@@ -1,3 +1,3 @@
 /ofbiz/branches/addbirt:831210-885099,885686-886087
 /ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080
+/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309

Modified: ofbiz/branches/release10.04/applications/accounting/webapp/accounting/finaccounttrans/FinAccountTrans.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/accounting/webapp/accounting/finaccounttrans/FinAccountTrans.ftl?rev=946310&r1=946309&r2=946310&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/accounting/webapp/accounting/finaccounttrans/FinAccountTrans.ftl (original)
+++ ofbiz/branches/release10.04/applications/accounting/webapp/accounting/finaccounttrans/FinAccountTrans.ftl Wed May 19 17:54:30 2010
@@ -177,7 +177,7 @@ function getFinAccountTransRunningTotalA
           <tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
             <td>
               <#if payments?has_content>
-                <a id="togglePayment_${finAccountTrans.finAccountTransId}" href="javascript:void(0)"><img src="<@ofbizContentUrl>/images/expand.gif</@ofbizContentUrl>"/></a> ${finAccountTrans.finAccountTransId}
+                <a id="togglePayment_${finAccountTrans.finAccountTransId}" href="javascript:void(0)"><img src="<@ofbizContentUrl>/images/expand.gif</@ofbizContentUrl>" alt=""/></a> ${finAccountTrans.finAccountTransId}
                 <div id="displayPayments_${finAccountTrans.finAccountTransId}" class="popup" style="display: none;width: 650px;">
                   <div align="right">
                     <input class="popup_closebox buttontext" type="button" value="X"/>

Modified: ofbiz/branches/release10.04/applications/accounting/widget/GlForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/accounting/widget/GlForms.xml?rev=946310&r1=946309&r2=946310&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/accounting/widget/GlForms.xml (original)
+++ ofbiz/branches/release10.04/applications/accounting/widget/GlForms.xml Wed May 19 17:54:30 2010
@@ -756,6 +756,7 @@ under the License.
         <field name="description"><textarea/></field>
         <field name="createButton" widget-style="smallSubmit"><submit button-type="button"/></field>
         <sort-order>
+            <sort-field name="organizationPartyId"/>        
             <sort-field name="acctgTransTypeId"/>
             <sort-field name="glFiscalTypeId"/>
             <sort-field name="glJournalId"/>
@@ -986,6 +987,8 @@ under the License.
             <sort-field name="voucherDate"/>
             <sort-field name="description"/>
             <sort-field name="createButton"/>
+            <sort-field name="createdByUserLogin"/>
+            <sort-field name="lastModifiedByUserLogin"/>
         </sort-order>
     </form>
     <form name="ViewAcctgTransEntries" type="list" list-name="acctgTransEntries" default-entity-name="AcctgTransEntry"