svn commit: r795812 - in /ofbiz/trunk/applications/accounting: config/AccountingUiLabels.xml entitydef/entitymodel.xml webapp/accounting/WEB-INF/actions/reports/GlAccountTrialBalance.groovy widget/GlForms.xml widget/ReportFinancialSummaryForms.xml

[apatel-2]

Author: apatel
Date: Mon Jul 20 13:05:58 2009
New Revision: 795812

URL: http://svn.apache.org/viewvc?rev=795812&view=rev
Log:
Fixed a type.
Rearrenged fields accountTransDetail report  
GlAccountTrialBalance now has current financial account selected.

Modified:
    ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
    ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml
    ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/GlAccountTrialBalance.groovy
    ofbiz/trunk/applications/accounting/widget/GlForms.xml
    ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml

Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=795812&r1=795811&r2=795812&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Mon Jul 20 13:05:58 2009
@@ -4841,12 +4841,6 @@
         <value xml:lang="th">ชื่อกลาง (บัตร)</value>
         <value xml:lang="zh">卡上姓名的中间一组字母</value>
     </property>
-    <property key="AccountingMonthlyBalanceCredit">
-        <value xml:lang="en">Monthly Balance Credit</value>
-    </property>
-    <property key="AccountingMonthlyBalanceDebit">
-        <value xml:lang="en">Monthly Balance Debit</value>
-    </property>
     <property key="AccountingMonthlyTrialBalance">
         <value xml:lang="en">Monthly Trial Balance</value>
     </property>
@@ -9274,6 +9268,12 @@
         <value xml:lang="ru">Мин. кол-во</value>
         <value xml:lang="th">จำนวนน้อยสุด</value>
     </property>
+    <property key="FormFieldTitle_monthlyTotalCredit">
+        <value xml:lang="en">Monthly Total Credit</value>
+    </property>
+    <property key="FormFieldTitle_monthlyTotalDebit">
+        <value xml:lang="en">Monthly Total Debit</value>
+    </property>
     <property key="FormFieldTitle_name">
         <value xml:lang="ar">اسم</value>
         <value xml:lang="en">Name</value>

Modified: ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml?rev=795812&r1=795811&r2=795812&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml Mon Jul 20 13:05:58 2009
@@ -1931,7 +1931,7 @@
       <field name="glAccountId" type="id-ne"></field>
       <field name="glAccountGroupTypeId" type="id-ne"></field>
       <field name="glAccountGroupId" type="id-ne"></field>
-      <field name="amontPercentage" type="fixed-point"></field>
+      <field name="amountPercentage" type="fixed-point"></field>
       <prim-key field="glAccountId"/>
       <prim-key field="glAccountGroupTypeId"/>
       <relation type="one" fk-name="GLACT_GPMBR_AC" rel-entity-name="GlAccount">

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/GlAccountTrialBalance.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/GlAccountTrialBalance.groovy?rev=795812&r1=795811&r2=795812&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/GlAccountTrialBalance.groovy (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/GlAccountTrialBalance.groovy Mon Jul 20 13:05:58 2009
@@ -27,6 +27,13 @@
 import com.ibm.icu.util.Calendar;
 
 if (organizationPartyId) {
+    onlyIncludePeriodTypeIdList = [];
+    onlyIncludePeriodTypeIdList.add("FISCAL_YEAR");
+    customTimePeriodResults = dispatcher.runSync("findCustomTimePeriods", [findDate : UtilDateTime.nowTimestamp(), organizationPartyId : organizationPartyId, onlyIncludePeriodTypeIdList : onlyIncludePeriodTypeIdList, userLogin : userLogin]);
+    customTimePeriodList = customTimePeriodResults.customTimePeriodList;
+    if (UtilValidate.isNotEmpty(customTimePeriodList)) {
+        context.cutomTimePeriod = EntityUtil.getFirst(customTimePeriodList);
+    }
     decimals = UtilNumber.getBigDecimalScale("ledger.decimals");
     rounding = UtilNumber.getBigDecimalRoundingMode("ledger.rounding");
     context.currentOrganization = delegator.findOne("PartyNameView", [partyId : organizationPartyId], false);

Modified: ofbiz/trunk/applications/accounting/widget/GlForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlForms.xml?rev=795812&r1=795811&r2=795812&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlForms.xml Mon Jul 20 13:05:58 2009
@@ -1106,11 +1106,11 @@
         </row-actions>
         <field name="accountCode"><display/></field>
         <field name="accountName"><display/></field>
-        <field name="debitAmount"><display type="currency" currency="${currencyUomId}" description="${groovy:if(debitCreditFlag.equals('D'))return(amount);if(debitCreditFlag.equals('C'))return(0);}"/></field>
-        <field name="creditAmount"><display type="currency" currency="${currencyUomId}" description="${groovy:if(debitCreditFlag.equals('C'))return(amount);if(debitCreditFlag.equals('D'))return(0);}"/></field>
         <field name="currencyUomId" title="${uiLabelMap.AccountingOriginalCurrency}"><display description="${currencyUomId}"/></field>
         <field name="exchangeRate" use-when="${origCurrencyUomId!=null}"><display description="${origAmount/amount} ${origCurrencyUomId}/${currencyUomId}"/></field>
         <field name="exchangeRate" use-when="${origCurrencyUomId==null @and origAmount==null}"><display description="${amount/amount} ${currencyUomId}/${currencyUomId}"/></field>
+        <field name="debitAmount"><display type="currency" currency="${currencyUomId}" description="${groovy:if(debitCreditFlag.equals('D'))return(amount);if(debitCreditFlag.equals('C'))return(0);}"/></field>
+        <field name="creditAmount"><display type="currency" currency="${currencyUomId}" description="${groovy:if(debitCreditFlag.equals('C'))return(amount);if(debitCreditFlag.equals('D'))return(0);}"/></field>
     </form>
 
 </forms>
\ No newline at end of file

Modified: ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml?rev=795812&r1=795811&r2=795812&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml Mon Jul 20 13:05:58 2009
@@ -427,6 +427,7 @@
         </field>
         <field name="timePeriod">
             <drop-down>
+                <option key="cutomTimePeriod.cutomTimePeriodId" description="${cutomTimePeriod.fromDate} - ${cutomTimePeriod.thruDate}"/>
                 <list-options list-name="customTimePeriods" key-name="customTimePeriodId" description="${fromDate} - ${thruDate}"/>
             </drop-down>
         </field>