svn commit: r795319 - in /ofbiz/trunk/applications/accounting: webapp/accounting/WEB-INF/actions/reports/ webapp/accounting/reports/ widget/

[apatel-2]

Author: apatel
Date: Sat Jul 18 06:02:08 2009
New Revision: 795319

URL: http://svn.apache.org/viewvc?rev=795319&view=rev
Log:
Now form widget drop downs can handle non strings for key. Removing ftl in favor of form widget.

Removed:
    ofbiz/trunk/applications/accounting/webapp/accounting/reports/MonthlyTrialBalance.ftl
Modified:
    ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/MonthlyTrialBalance.groovy
    ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml
    ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/MonthlyTrialBalance.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/MonthlyTrialBalance.groovy?rev=795319&r1=795318&r2=795319&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/MonthlyTrialBalance.groovy (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/MonthlyTrialBalance.groovy Sat Jul 18 06:02:08 2009
@@ -20,7 +20,10 @@
 import java.sql.Timestamp;
 import org.ofbiz.base.util.UtilDateTime;
 import org.ofbiz.entity.util.EntityUtil;
+import org.ofbiz.service.calendar.ExpressionUiHelper;
 
+context.monthList = ExpressionUiHelper.getMonthValueList(locale);
+context.month = (ExpressionUiHelper.getMonthValueList(locale)).get(UtilDateTime.getMonth(UtilDateTime.nowTimestamp(), timeZone, locale));
 if (organizationPartyId && parameters.selectedMonth) {
     selectedMonth = new Integer(parameters.selectedMonth);
     context.selectedMonth = selectedMonth;

Modified: ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml?rev=795319&r1=795318&r2=795319&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml Sat Jul 18 06:02:08 2009
@@ -439,6 +439,25 @@
         </field>
         <field name="submitButton" widget-style="buttontext" action=""><submit button-type="text-link"/></field>
     </form>
+    <form name="MonthlyTrialBalance" type="single" target="MonthlyTrialBalance" title="Find list of monthly transaction totals"
+          header-row-style="header-row" default-table-style="basic-table">
+
+        <field name="organizationPartyId"><hidden/></field>
+        <field name="selectedMonth">
+            <drop-down>
+                <option key="${month.value}" description="${month.description}"/>
+                <list-options list-name="monthList" key-name="value" description="${description}"/>
+            </drop-down>
+        </field>
+        <field name="posted">
+            <drop-down>
+                <option description="${uiLabelMap.CommonY}" key="Y"/>
+                <option description="${uiLabelMap.CommonN}" key="N"/>
+                <option description="${uiLabelMap.CommonAll}" key="All"/>
+            </drop-down>
+        </field>
+        <field name="submitButton" widget-style="smallSubmit"><submit button-type="button"/></field>
+    </form>
     <form name="MonthlyPostedTransactionList" type="list" list-name="postedTransTotalList" paginate-target="MonthlyTrialBalance"
             odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
 

Modified: ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml?rev=795319&r1=795318&r2=795319&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml Sat Jul 18 06:02:08 2009
@@ -930,11 +930,9 @@
             <widgets>
                 <decorator-screen name="CommonOrganizationAccountingReportsDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <platform-specific>
-                            <html>
-                                <html-template location="component://accounting/webapp/accounting/reports/MonthlyTrialBalance.ftl"/>
-                            </html>
-                        </platform-specific>
+                        <screenlet title="${uiLabelMap.AccountingMonthlyTrialBalance}">
+                            <include-form name="MonthlyTrialBalance" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+                        </screenlet>
                         <section>
                             <condition>
                                 <and>