Author: apatel
Date: Wed Jul 8 11:50:42 2009
New Revision: 792105
URL: http://svn.apache.org/viewvc?rev=792105&view=rev
Log:
New report "GL Account Trial Balance"
Added:
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/GlAccountTrialBalance.groovy
ofbiz/trunk/applications/accounting/webapp/accounting/reports/GlAccountTrialBalanceReport.fo.ftl
(with props)
ofbiz/trunk/applications/accounting/webapp/accounting/reports/GlAccountTrialBalanceReport.ftl
(with props)
Modified:
ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml
ofbiz/trunk/applications/accounting/servicedef/services_ledger.xml
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
ofbiz/trunk/applications/accounting/widget/Menus.xml
ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml
ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml
Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=792105&r1=792104&r2=792105&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Wed Jul
8 11:50:42 2009
@@ -98,6 +98,9 @@
<value xml:lang="th">à¹à¸¥à¸à¸à¸µà¹à¸à¸±à¸à¸à¸µ</value>
<value xml:lang="zh">è´¦æ·å·ç </value>
</property>
+ <property key="AccountingAccountTransactionId">
+ <value xml:lang="en">Account Transaction Id</value>
+ </property>
<property key="AccountingAccountType">
<value xml:lang="ar">ÙÙØ¹ Ø§ÙØØ³Ø§Ø¨</value>
<value xml:lang="cs">Typ úÄtu</value>
@@ -1061,6 +1064,9 @@
<value
xml:lang="th">ยà¸à¸à¸à¸à¹à¸«à¸¥à¸·à¸à¸£à¸°à¸«à¸§à¹à¸²à¸</value>
<value xml:lang="zh">ä¸å®é¢</value>
</property>
+ <property key="AccountingBalanceOfTheAccount">
+ <value xml:lagn="en">Balance Of The Account</value>
+ </property>
<property key="AccountingBalanceSheet">
<value xml:lang="ar">Ù
Ø°ÙØ±Ø© اÙÙ
ÙØ²Ø§ÙÙØ©</value>
<value xml:lang="de">Bilanz</value>
@@ -1789,6 +1795,9 @@
<property key="AccountingCreditDebitFlag">
<value xml:lang="en">C/D</value>
</property>
+ <property key="AccountingCreditFlag">
+ <value xml:lang="en">C</value>
+ </property>
<property key="AccountingCreateAcctRecons">
<value xml:lang="de">Kontenabstimmung erstellen</value>
<value xml:lang="en">Create Account Reconciliation</value>
@@ -1995,6 +2004,9 @@
<value xml:lang="th">Security Error :
à¸à¸§à¸²à¸¡à¸à¸´à¸à¸à¸¥à¸²à¸!
à¹à¸à¸à¸²à¸£à¸ªà¸£à¹à¸²à¸à¸à¸²à¸£à¸à¸³à¸£à¸°à¹à¸à¸´à¸à¸à¸¸à¸à¸à¹à¸à¸à¸£à¸°à¸à¸¸à¸à¸¥à¸¸à¹à¸¡à¸à¸¹à¹à¸ªà¹à¸à¸«à¸£à¸·à¸à¸à¸¥à¸¸à¹à¸¡à¸à¸¹à¹à¸£à¸±à¸à¸«à¸£à¸·à¸à¸à¹à¸à¸à¸¡à¸µ
PAY_INFO_CREATE หรืภPAY_INFO_ADMIN à¸à¹à¸à¸.</value>
<value
xml:lang="zh">å®å
¨é误ï¼è¦æ°å»ºæ¯ä»ï¼ä½ å¿
é¡»æè
æ¯æ¯ä»æ¹ææ¥æ¶æ¹ï¼æå
·æPAY_INFO_CREATEæPAY_INFO_ADMINæéã</value>
</property>
+ <property key="AccountingCreditAmount">
+ <value xml:lang="en">Credit Amount</value>
+ </property>
<property key="AccountingCreatePermissionError">
<value xml:lang="en">Security Error: to run createGlAccount you must
have the ACCOUNTING_CREATE or ACCOUNTING_ADMIN permission</value>
<value xml:lang="es">Error de seguridad: Para ejecutar createGlAccount
debe tener el permiso ACCOUNTING_CREATE o ACCOUNTING_ADMIN </value>
@@ -2225,6 +2237,9 @@
<value
xml:lang="th">à¸à¸²à¸£à¹à¸¥à¸à¹à¸à¸¥à¸µà¹à¸¢à¸à¸à¹à¸à¸¡à¸¹à¸¥</value>
<value xml:lang="zh">æ°æ®äº¤æ¢</value>
</property>
+ <property key="AccountingDebitAmount">
+ <value xml:lang="en">Debit Amount</value>
+ </property>
<property key="AccountingDateAcquiredIsEmpty">
<value xml:lang="en">Field dateAcquired is empty in FixedAsset
data.</value>
<value xml:lang="fr">Le champ date acquise est vide dans les données
d'immobilisation</value>
@@ -2240,6 +2255,12 @@
<value xml:lang="nl">Filter boekhouddatum</value>
<value xml:lang="th">Date Filter</value>
</property>
+ <property key="AccountingDebitFlag">
+ <value xml:lang="en">D</value>
+ </property>
+ <property key="AccountingDebitOrCreditOfBalance">
+ <value xml:lang="en">Debit Or Credit Of The Balance</value>
+ </property>
<property key="AccountingDebitCreditMustEqual">
<value xml:lang="ar"> Ù
جاÙ
ÙØ¹ Ø§ÙØ¯Ù٠٠اÙÙØ±Ø¶ ÙØ¬Ø¨
Ø£Ù ÙÙÙÙØ§ Ù
تساÙÙØ§Ù</value>
<value xml:lang="de">Soll und Haben müssen beim buchen auf dass
Hauptkonto gleich sein.</value>
@@ -3678,6 +3699,9 @@
<value
xml:lang="th">à¸à¸±à¸à¹à¸à¹à¸à¸«à¸¡à¸§à¸à¸«à¸¡à¸¹à¹à¸à¸±à¸à¸à¸µà¹à¸¢à¸à¸à¸£à¸°à¹à¸ à¸à¸à¸±à¹à¸§à¹à¸</value>
<value xml:lang="zh">æ»è´¦è´¦æ·Javaç±»</value>
</property>
+ <property key="AccountingGlAccountNameAndGlAccountCode">
+ <value xml:lang="en">Gl account code and Gl account name</value>
+ </property>
<property key="AccountingGlAccountDefault">
<value xml:lang="ar">اÙÙÙÙ
Ø§ÙØ¥ÙØªØ±Ø§Ø¶ÙØ© ÙÙØØ³Ø§Ø¨
اÙÙ
ØØ§Ø³Ø¨Ù</value>
<value xml:lang="de">GL Standard Konto</value>
@@ -3703,6 +3727,12 @@
<value
xml:lang="th">รหัสà¸à¸±à¸à¸à¸µà¹à¸¢à¸à¸à¸£à¸°à¹à¸ à¸à¸à¸±à¹à¸§à¹à¸</value>
<value xml:lang="zh">æ»è´¦è´¦æ·ç¼å·</value>
</property>
+ <property key="AccountingGlAccountTrialBalance">
+ <value xml:lang="en">GL Account Trial Balance</value>
+ </property>
+ <property key="AccountingGlAccountTrialBalanceReport">
+ <value xml:lang="en">GL Account Trial Balance Report</value>
+ </property>
<property key="AccountingGlAccountTypeDefaults">
<value xml:lang="en">GL Account Type Defaults</value>
<value xml:lang="fr">Types par défaut de compte du GL</value>
@@ -7070,6 +7100,9 @@
<value
xml:lang="th">à¸à¸£à¸°à¸ªà¸à¸à¸§à¸²à¸¡à¸ªà¸³à¹à¸£à¹à¸</value>
<value xml:lang="zh">æå</value>
</property>
+ <property key="AccountingSubsidiaryLedger">
+ <value xml:lang="en">Subsidiary Ledger</value>
+ </property>
<property key="AccountingSuffixCard">
<value xml:lang="en">Suffix on Card</value>
<value xml:lang="es">Sufijo en tarjeta</value>
@@ -7165,6 +7198,12 @@
<value
xml:lang="th">รหัสà¸à¸£à¸°à¹à¸ à¸à¸à¹à¸§à¸à¸£à¸°à¸¢à¸°à¹à¸§à¸¥à¸²</value>
<value xml:lang="zh">æ¡ä»¶ç±»åæ è¯</value>
</property>
+ <property key="AccountingTotalOfTheCurrentMonth">
+ <value xml:lang="en">Total of the current month</value>
+ </property>
+ <property key="AccountingTotalOfYearToDate">
+ <value xml:lang="en">Total of Year To Date</value>
+ </property>
<property key="AccountingTextData">
<value xml:lang="de">Textangaben</value>
<value xml:lang="en">Text Data</value>
@@ -7177,6 +7216,9 @@
<value
xml:lang="th">à¸à¹à¸à¸¡à¸¹à¸¥à¸à¸±à¸§à¸«à¸à¸±à¸à¸ªà¸·à¸</value>
<value xml:lang="zh">ææ¬æ°æ®</value>
</property>
+ <property key="AccountingTheBalanceOfLastYear">
+ <value xml:lang="en">The balance of last year</value>
+ </property>
<property key="AccountingThruDate">
<value xml:lang="ar">Ø§ÙØ£Ø¬Ù</value>
<value xml:lang="en">Thru Date</value>
@@ -7430,6 +7472,9 @@
<value xml:lang="nl">Type</value>
<value xml:lang="th">à¸à¸£à¸°à¹à¸ à¸</value>
</property>
+ <property key="AccountingTypeOfTheCurrency">
+ <value xml:lang="en">Type of the Currency</value>
+ </property>
<property key="AccountingUnPostedTransactionTotals">
<value xml:lang="en">UnPosted Totals</value>
<value xml:lang="fr">Totaux non comptabilisés</value>
Modified: ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml?rev=792105&r1=792104&r2=792105&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml Wed Jul 8
11:50:42 2009
@@ -1704,6 +1704,7 @@
<alias entity-alias="ATE" name="debitCreditFlag"/>
<alias entity-alias="ATE" name="amount"/>
<alias entity-alias="ATE" name="currencyUomId"/>
+ <alias entity-alias="ATE" name="origCurrencyUomId"/>
<alias entity-alias="ATE" name="organizationPartyId"/>
<alias entity-alias="GLA" name="glAccountTypeId"/>
<alias entity-alias="GLA" name="accountCode"/>
Modified:
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml?rev=792105&r1=792104&r2=792105&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml
(original)
+++
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml
Wed Jul 8 11:50:42 2009
@@ -439,4 +439,38 @@
</else>
</if-compare>
</simple-method>
+
+ <simple-method method-name="getAcctgTransEntriesAndTransTotal"
short-description="Calculate total of credit and debit and difference between
both">
+
+ <entity-condition entity-name="AcctgTransAndEntries"
list="acctgTransAndEntries" distinct="true">
+ <condition-list combine="and">
+ <condition-expr field-name="organizationPartyId"
operator="equals" from-field="parameters.organizationPartyId"/>
+ <condition-expr field-name="glAccountId" operator="equals"
from-field="parameters.glAccountId"/>
+ <condition-expr field-name="isPosted" operator="equals"
from-field="parameters.isPosted" ignore-if-empty="true"/>
+ <condition-expr field-name="transactionDate"
operator="greater-equals" from-field="parameters.customTimePeriodStartDate"/>
+ <condition-expr field-name="transactionDate" operator="less"
from-field="parameters.customTimePeriodEndDate"/>
+ </condition-list>
+ </entity-condition>
+
+ <set field="debitTotal" type="BigDecimal" value="0"/>
+ <set field="creditTotal" type="BigDecimal" value="0"/>
+ <set field="debitCreditDifference" type="BigDecimal" value="0"/>
+
+ <iterate entry="acctgTransEntry" list="acctgTransAndEntries">
+ <if-compare field="acctgTransEntry.debitCreditFlag"
operator="equals" value="D">
+ <set field="debitTotal" value="${debitTotal +
acctgTransEntry.amount}" type="BigDecimal"/>
+ <else>
+ <if-compare field="acctgTransEntry.debitCreditFlag"
operator="equals" value="C">
+ <set field="creditTotal" value="${creditTotal +
acctgTransEntry.amount}" type="BigDecimal"/>
+ </if-compare>
+ </else>
+ </if-compare>
+ </iterate>
+
+ <set field="debitCreditDifference" value="${debitTotal - creditTotal}"
type="BigDecimal"/>
+ <field-to-result field="acctgTransAndEntries"/>
+ <field-to-result field="debitTotal"/>
+ <field-to-result field="creditTotal"/>
+ <field-to-result field="debitCreditDifference"/>
+ </simple-method>
</simple-methods>
Modified: ofbiz/trunk/applications/accounting/servicedef/services_ledger.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/servicedef/services_ledger.xml?rev=792105&r1=792104&r2=792105&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/servicedef/services_ledger.xml
(original)
+++ ofbiz/trunk/applications/accounting/servicedef/services_ledger.xml Wed Jul
8 11:50:42 2009
@@ -574,4 +574,17 @@
<attribute name="customTimePeriodId" mode="IN" type="String"/>
<attribute name="previousTimePeriod" mode="OUT" type="Map"
optional="false"/>
</service>
+ <service name="getAcctgTransEntriesAndTransTotal" engine="simple"
invoke="getAcctgTransEntriesAndTransTotal"
+
location="component://accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml"
auth="true">
+ <description>Given AcctgTransAndEntire and Calculate acctg trans total
for specific time period.</description>
+ <attribute name="customTimePeriodStartDate" mode="IN"
type="Timestamp"/>
+ <attribute name="customTimePeriodEndDate" mode="IN" type="Timestamp"/>
+ <attribute name="organizationPartyId" mode="IN" type="String"/>
+ <attribute name="isPosted" mode="IN" type="String" optional="true"/>
+ <attribute name="glAccountId" mode="IN" type="String"/>
+ <attribute name="acctgTransAndEntries" type="List" mode="OUT"/>
+ <attribute name="debitTotal" type="BigDecimal" mode="OUT"/>
+ <attribute name="creditTotal" type="BigDecimal" mode="OUT"/>
+ <attribute name="debitCreditDifference" type="BigDecimal" mode="OUT"/>
+ </service>
</services>
Added:
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=792105&view=auto
==============================================================================
---
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/GlAccountTrialBalance.groovy
(added)
+++
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/GlAccountTrialBalance.groovy
Wed Jul 8 11:50:42 2009
@@ -0,0 +1,95 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import org.ofbiz.entity.condition.EntityCondition;
+import org.ofbiz.entity.condition.EntityOperator;
+import org.ofbiz.entity.util.EntityUtil;
+import org.ofbiz.base.util.UtilDateTime;
+import org.ofbiz.accounting.util.UtilAccounting;
+import java.math.BigDecimal;
+import java.util.Calendar;
+
+if (organizationPartyId) {
+ context.currentOrganization = delegator.findOne("PartyNameView", [partyId
: organizationPartyId], false);
+ if (parameters.glAccountId) {
+ glAccount = delegator.findOne("GlAccount", [glAccountId :
parameters.glAccountId], false);
+ isDebitAccount = UtilAccounting.isDebitAccount(glAccount);
+ context.isDebitAccount = isDebitAccount;
+ context.glAccount = glAccount;
+ }
+
+ currentTimePeriod = null;
+ BigDecimal balanceOfTheAcctgForYear = BigDecimal.ZERO;
+
+ if (parameters.timePeriod) {
+ currentTimePeriod = delegator.findOne("CustomTimePeriod",
[customTimePeriodId : parameters.timePeriod], false);
+ previousTimePeriod = dispatcher.runSync("getPreviousTimePeriod",
+ [customTimePeriodId : parameters.timePeriod, userLogin :
userLogin]);
+
+ if (previousTimePeriod) {
+ glAccountHistory = delegator.findOne("GlAccountHistory",
+ [customTimePeriodId :
previousTimePeriod.previousTimePeriod.customTimePeriodId, glAccountId :
parameters.glAccountId, organizationPartyId : organizationPartyId], false);
+ if (glAccountHistory) {
+ context.openingBalance = glAccountHistory.endingBalance;
+ balanceOfTheAcctgForYear = glAccountHistory.endingBalance;
+ }
+ }
+ }
+
+ if (currentTimePeriod) {
+ context.currentTimePeriod = currentTimePeriod;
+ customTimePeriodStartDate =
UtilDateTime.getMonthStart(UtilDateTime.toTimestamp(currentTimePeriod.fromDate),
timeZone, locale);
+ customTimePeriodEndDate =
UtilDateTime.getMonthEnd(UtilDateTime.toTimestamp(currentTimePeriod.fromDate),
timeZone, locale);
+
+ Calendar calendarTimePeriodStartDate =
UtilDateTime.toCalendar(customTimePeriodStartDate);
+ glAcctgTrialBalanceList = [];
+ BigDecimal totalOfYearToDateDebit = BigDecimal.ZERO;
+ BigDecimal totalOfYearToDateCredit = BigDecimal.ZERO;
+ isPosted = parameters.isPosted;
+
+ while (customTimePeriodEndDate <= currentTimePeriod.thruDate) {
+
+ if ("ALL".equals(isPosted)) {
+ isPosted = "";
+ }
+ acctgTransEntriesAndTransTotal =
dispatcher.runSync("getAcctgTransEntriesAndTransTotal",
+ [customTimePeriodStartDate : customTimePeriodStartDate,
customTimePeriodEndDate : customTimePeriodEndDate, organizationPartyId :
organizationPartyId, glAccountId : parameters.glAccountId, isPosted : isPosted,
userLogin : userLogin]);
+ totalOfYearToDateDebit = totalOfYearToDateDebit +
acctgTransEntriesAndTransTotal.debitTotal;
+ acctgTransEntriesAndTransTotal.totalOfYearToDateDebit =
totalOfYearToDateDebit;
+ totalOfYearToDateCredit = totalOfYearToDateCredit +
acctgTransEntriesAndTransTotal.creditTotal;
+ acctgTransEntriesAndTransTotal.totalOfYearToDateCredit =
totalOfYearToDateCredit;
+
+ if (isDebitAccount) {
+ balanceOfTheAcctgForYear = balanceOfTheAcctgForYear +
acctgTransEntriesAndTransTotal.debitCreditDifference;
+ acctgTransEntriesAndTransTotal.balanceOfTheAcctgForYear =
balanceOfTheAcctgForYear;
+ } else {
+ balanceOfTheAcctgForYear = balanceOfTheAcctgForYear +
acctgTransEntriesAndTransTotal.debitCreditDifference;
+ acctgTransEntriesAndTransTotal.balanceOfTheAcctgForYear =
balanceOfTheAcctgForYear;
+ }
+
+ glAcctgTrialBalanceList.add(acctgTransEntriesAndTransTotal);
+
+ calendarTimePeriodStartDate.roll(Calendar.MONTH, 1);
+ Timestamp retStampStartDate = new
Timestamp(calendarTimePeriodStartDate.getTimeInMillis());
+ retStampStartDate.setNanos(0);
+ customTimePeriodStartDate = retStampStartDate;
+ customTimePeriodEndDate =
UtilDateTime.getMonthEnd(UtilDateTime.toTimestamp(retStampStartDate), timeZone,
locale);
+ }
+ context.glAcctgTrialBalanceList = glAcctgTrialBalanceList;
+ }
+}
Modified:
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml?rev=792105&r1=792104&r2=792105&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
(original)
+++
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
Wed Jul 8 11:50:42 2009
@@ -2130,6 +2130,16 @@
<security https="true" auth="true"/>
<response name="success" type="view"
value="AcctgTransDetailReportPdf"/>
</request-map>
+
+ <request-map uri="GlAccountTrialBalance">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="GlAccountTrialBalance"/>
+ </request-map>
+ <request-map uri="GlAccountTrialBalanceReportPdf.pdf">
+ <security auth="true" https="true"/>
+ <response name="success" type="view"
value="GlAccountTrialBalanceReportPdf"/>
+ </request-map>
+
<!-- end of request mappings -->
<!-- View Mappings -->
@@ -2395,6 +2405,8 @@
<view-map name="TrialBalanceSearchResultsPdf" type="screenfop"
page="component://accounting/widget/ReportFinancialSummaryScreens.xml#TrialBalanceSearchResultsPdf"
content-type="application/pdf" encoding="none"/>
<view-map name="TrialBalanceSearchResultsCsv" type="screentext"
page="component://accounting/widget/ReportFinancialSummaryScreens.xml#TrialBalanceSearchResultsCsv"
content-type="text/csv" encoding="none"/>
<view-map name="AcctgTransDetailReportPdf" type="screenfop"
page="component://accounting/widget/GlScreens.xml#AcctgTransDetailReportPdf"
content-type="application/pdf" encoding="none"/>
+ <view-map name="GlAccountTrialBalance" type="screen"
page="component://accounting/widget/ReportFinancialSummaryScreens.xml#GlAccountTrialBalance"/>
+ <view-map name="GlAccountTrialBalanceReportPdf" type="screenfop"
page="component://accounting/widget/ReportFinancialSummaryScreens.xml#GlAccountTrialBalanceReportPdf"
content-type="application/pdf" encoding="none"/>
<!-- end of view mappings -->
</site-conf>
Added:
ofbiz/trunk/applications/accounting/webapp/accounting/reports/GlAccountTrialBalanceReport.fo.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/reports/GlAccountTrialBalanceReport.fo.ftl?rev=792105&view=auto
==============================================================================
---
ofbiz/trunk/applications/accounting/webapp/accounting/reports/GlAccountTrialBalanceReport.fo.ftl
(added)
+++
ofbiz/trunk/applications/accounting/webapp/accounting/reports/GlAccountTrialBalanceReport.fo.ftl
Wed Jul 8 11:50:42 2009
@@ -0,0 +1,137 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<#escape x as x?xml>
+ <#if glAcctgTrialBalanceList?has_content>
+ <fo:table border="1pt solid" border-width=".1mm" width="19cm">
+ <fo:table-column column-number="1" column-width="60%"/>
+ <fo:table-column column-number="2" column-width="40%"/>
+ <fo:table-header>
+ <fo:table-cell border="1pt solid" border-width=".1mm">
+ <fo:block text-align="center"
font-style="normal">${uiLabelMap.AccountingSubsidiaryLedger}</fo:block>
+ </fo:table-cell>
+ </fo:table-header>
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell width="19cm" border="1pt solid"
border-width=".1mm">
+ <fo:block text-align="start"
font-weight="normal">${uiLabelMap.FormFieldTitle_companyName} :
${(currentOrganization.groupName)!}</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell width="16cm" border="1pt solid"
border-width=".1mm">
+ <fo:block
text-align="start">${uiLabelMap.AccountingTimePeriod} :
${(currentTimePeriod.fromDate)!} ${uiLabelMap.CommonTo}
${(currentTimePeriod.thruDate)!}</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell border="1pt solid" border-width=".1mm">
+ <fo:block text-align="start"
space-after=".01in">${uiLabelMap.AccountingGlAccountNameAndGlAccountCode} :
${(glAccount.accountCode)!} - ${(glAccount.accountName)!}</fo:block><fo:block
text-align="right"> ${uiLabelMap.CommonPage} - <fo:page-number-citation
ref-id="theEnd"/></fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+ <fo:table border="1pt solid" border-width=".1mm" width="19cm">
+ <fo:table-column/>
+ <fo:table-column/>
+ <fo:table-column/>
+ <fo:table-column/>
+ <fo:table-column/>
+ <fo:table-column/>
+ <fo:table-column/>
+ <fo:table-column/>
+ <fo:table-column/>
+ <fo:table-header>
+ <fo:table-cell border="1pt solid" border-width=".1mm">
+ <fo:block
text-align="center">${uiLabelMap.FormFieldTitle_transactionDate}</fo:block>
+ </fo:table-cell>
+ <fo:table-cell border="1pt solid" border-width=".1mm">
+ <fo:block
text-align="center">${uiLabelMap.AccountingAccountTransactionId}</fo:block>
+ </fo:table-cell>
+ <fo:table-cell border="1pt solid" border-width=".1mm">
+ <fo:block
text-align="center">${uiLabelMap.CommonDescription}</fo:block>
+ </fo:table-cell>
+ <fo:table-cell border="1pt solid" border-width=".1mm">
+ <fo:block
text-align="center">${uiLabelMap.AccountingTypeOfTheCurrency}</fo:block>
+ </fo:table-cell>
+ <fo:table-cell border="1pt solid" border-width=".1mm">
+ <fo:block
text-align="center">${uiLabelMap.AccountingOriginalCurrency}</fo:block>
+ </fo:table-cell>
+ <fo:table-cell border="1pt solid" border-width=".1mm">
+ <fo:block
text-align="center">${uiLabelMap.AccountingDebitAmount}</fo:block>
+ </fo:table-cell>
+ <fo:table-cell border="1pt solid" border-width=".1mm">
+ <fo:block
text-align="center">${uiLabelMap.AccountingCreditAmount}</fo:block>
+ </fo:table-cell>
+ <fo:table-cell border="1pt solid" border-width=".1mm">
+ <fo:block
text-align="center">${uiLabelMap.AccountingDebitOrCreditOfBalance}</fo:block>
+ </fo:table-cell>
+ <fo:table-cell border="1pt solid" border-width=".1mm">
+ <fo:block
text-align="center">${uiLabelMap.AccountingBalanceOfTheAccount}</fo:block>
+ </fo:table-cell>
+ </fo:table-header>
+ <fo:table-body>
+ <fo:table-row border="1pt solid"
border-width=".1mm"><fo:table-cell border="1pt solid" border-width=".1mm"
number-columns-spanned="1"></fo:table-cell><fo:table-cell border="1pt solid"
border-width=".1mm" number-columns-spanned="1"></fo:table-cell><fo:table-cell
border="1pt solid" border-width=".1mm" number-columns-spanned="3"
text-align="center" ><fo:block
text-align="center">${uiLabelMap.AccountingTheBalanceOfLastYear}</fo:block></fo:table-cell><fo:table-cell
border="1pt solid" border-width=".1mm"
number-columns-spanned="1"></fo:table-cell><fo:table-cell border="1pt solid"
border-width=".1mm" number-columns-spanned="1"></fo:table-cell><fo:table-cell
border="1pt solid" border-width=".1mm" number-columns-spanned="1"><fo:block
text-align="center"><#if
(isDebitAccount)??>${uiLabelMap.AccountingDebitFlag}<#else>${uiLabelMap.AccountingCreditFlag}</#if></fo:block></fo:table-cell><fo:table-cell
border="1pt solid" border-width=".1mm" number-columns-spanned="1">
<fo:block
text-align="center">${(openingBalance)!}</fo:block></fo:table-cell></fo:table-row>
+ <#list glAcctgTrialBalanceList as glAcctgTrialBalance>
+ <#assign acctgTransAndEntries =
glAcctgTrialBalance.acctgTransAndEntries/>
+ <#if (acctgTransAndEntries)?has_content>
+ <#list acctgTransAndEntries as acctgTransAndEntry>
+ <fo:table-row border="1pt solid"
border-width=".1mm">
+ <fo:table-cell border="1pt solid"
border-width=".1mm">
+ <fo:block text-align="center">
+ <#if
acctgTransAndEntry.transactionDate?has_content>
+ <#assign dateFormat =
Static["java.text.DateFormat"].LONG/>
+ <#assign transactionDate =
Static["java.text.DateFormat"].getDateInstance(dateFormat,
locale).format((acctgTransAndEntry.transactionDate)!)/>
+ ${(transactionDate)!}
+ </#if>
+ </fo:block>
+ </fo:table-cell>
+ <fo:table-cell border="1pt solid"
border-width=".1mm">
+ <fo:block
text-align="center">${(acctgTransAndEntry.acctgTransId)!}</fo:block>
+ </fo:table-cell>
+ <fo:table-cell border="1pt solid"
border-width=".1mm">
+ <fo:block
text-align="center">${(acctgTransAndEntry.transDescription)!}</fo:block>
+ </fo:table-cell>
+ <fo:table-cell border="1pt solid"
border-width=".1mm">
+ <fo:block
text-align="center">${(acctgTransAndEntry.currencyUomId)!}</fo:block>
+ </fo:table-cell>
+ <fo:table-cell border="1pt solid"
border-width=".1mm">
+ <fo:block
text-align="center">${(acctgTransAndEntry.origCurrencyUomId)!}</fo:block>
+ </fo:table-cell>
+ <fo:table-cell border="1pt solid"
border-width=".1mm">
+ <fo:block text-align="center"><#if
(acctgTransAndEntry.debitCreditFlag)! ==
"D">${(acctgTransAndEntry.amount)!}<#else>0</#if></fo:block>
+ </fo:table-cell>
+ <fo:table-cell border="1pt solid"
border-width=".1mm">
+ <fo:block text-align="center"><#if
(acctgTransAndEntry.debitCreditFlag)! ==
"C">${(acctgTransAndEntry.amount)!}<#else>0</#if></fo:block>
+ </fo:table-cell>
+ <fo:table-cell border="1pt solid"
border-width=".1mm">
+ <fo:block text-align="center"></fo:block>
+ </fo:table-cell>
+ <fo:table-cell border="1pt solid"
border-width=".1mm">
+ <fo:block text-align="center"></fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </#list>
+ <fo:table-row border="1pt solid"
border-width=".1mm"><fo:table-cell border="1pt solid" border-width=".1mm"
number-columns-spanned="1"></fo:table-cell><fo:table-cell border="1pt solid"
border-width=".1mm" number-columns-spanned="1"></fo:table-cell><fo:table-cell
border="1pt solid" border-width=".1mm" number-columns-spanned="3"
text-align="center" ><fo:block
text-align="center">${uiLabelMap.AccountingTotalOfTheCurrentMonth}</fo:block></fo:table-cell><fo:table-cell
border="1pt solid" border-width=".1mm" number-columns-spanned="1"><fo:block
text-align="center">${(glAcctgTrialBalance.debitTotal)!}</fo:block></fo:table-cell><fo:table-cell
border="1pt solid" border-width=".1mm" number-columns-spanned="1"><fo:block
text-align="center">${(glAcctgTrialBalance.creditTotal)!}</fo:block></fo:table-cell><fo:table-cell
border="1pt solid" border-width=".1mm" number-columns-spanned="1"><fo:block
text-align="center"><#if (isDebitAccount)??>${uiLabelMap.Accounting
DebitFlag}<#else>${uiLabelMap.AccountingCreditFlag}</#if></fo:block></fo:table-cell><fo:table-cell
border="1pt solid" border-width=".1mm" number-columns-spanned="1"><fo:block
text-align="center">${(glAcctgTrialBalance.debitCreditDifference)!}</fo:block></fo:table-cell></fo:table-row>
+ <fo:table-row border="1pt solid"
border-width=".1mm"><fo:table-cell border="1pt solid" border-width=".1mm"
number-columns-spanned="1"></fo:table-cell><fo:table-cell border="1pt solid"
border-width=".1mm" number-columns-spanned="1"></fo:table-cell><fo:table-cell
border="1pt solid" border-width=".1mm" number-columns-spanned="3"
text-align="center" ><fo:block
text-align="center">${uiLabelMap.AccountingTotalOfYearToDate}</fo:block></fo:table-cell><fo:table-cell
border="1pt solid" border-width=".1mm" number-columns-spanned="1"><fo:block
text-align="center">${glAcctgTrialBalance.totalOfYearToDateDebit}</fo:block></fo:table-cell><fo:table-cell
border="1pt solid" border-width=".1mm" number-columns-spanned="1"><fo:block
text-align="center">${glAcctgTrialBalance.totalOfYearToDateCredit}</fo:block></fo:table-cell><fo:table-cell
border="1pt solid" border-width=".1mm" number-columns-spanned="1"><fo:block
text-align="center"><#if (isDebitAccount)??>${uiLabelM
ap.AccountingDebitFlag}<#else>${uiLabelMap.AccountingCreditFlag}</#if></fo:block></fo:table-cell><fo:table-cell
border="1pt solid" border-width=".1mm" number-columns-spanned="1"><fo:block
text-align="center">${(glAcctgTrialBalance.balanceOfTheAcctgForYear)!}</fo:block></fo:table-cell></fo:table-row>
+ </#if>
+ </#list>
+ </fo:table-body>
+ </fo:table>
+ <#else>
+ ${uiLabelMap.AccountingNoRecordFound}
+ </#if>
+</#escape>
\ No newline at end of file
Propchange:
ofbiz/trunk/applications/accounting/webapp/accounting/reports/GlAccountTrialBalanceReport.fo.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
ofbiz/trunk/applications/accounting/webapp/accounting/reports/GlAccountTrialBalanceReport.fo.ftl
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange:
ofbiz/trunk/applications/accounting/webapp/accounting/reports/GlAccountTrialBalanceReport.fo.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added:
ofbiz/trunk/applications/accounting/webapp/accounting/reports/GlAccountTrialBalanceReport.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/reports/GlAccountTrialBalanceReport.ftl?rev=792105&view=auto
==============================================================================
---
ofbiz/trunk/applications/accounting/webapp/accounting/reports/GlAccountTrialBalanceReport.ftl
(added)
+++
ofbiz/trunk/applications/accounting/webapp/accounting/reports/GlAccountTrialBalanceReport.ftl
Wed Jul 8 11:50:42 2009
@@ -0,0 +1,73 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<div>
+ <#if glAcctgTrialBalanceList?has_content>
+ <div>
+ <form name="glAccountTrialBalanceReport"
id="glAccountTrialBalanceReport">
+ <div>
+ <a
href="<@ofbizUrl>GlAccountTrialBalanceReportPdf.pdf?organizationPartyId=${organizationPartyId}&timePeriod=${parameters.timePeriod}&isPosted=${parameters.isPosted}&glAccountId=${parameters.glAccountId}</@ofbizUrl>"
class="buttontext">${uiLabelMap.AccountingInvoicePDF}</a>
+ </div>
+ <div style="width: 1210px;">
+ <table border=1>
+ <tr><th></th></tr>
+ <tr><th colspan=9 style="height: 30px;"
ALIGN="center">${uiLabelMap.AccountingSubsidiaryLedger}</th></tr>
+ <tr><th colspan=9 style="height: 30px;"
ALIGN="left">${uiLabelMap.FormFieldTitle_companyName} :
${(currentOrganization.groupName)!}</th></tr>
+ <tr><th colspan=9 style="height: 30px;"
ALIGN="left">${uiLabelMap.AccountingTimePeriod} : <#if
currentTimePeriod?has_content>${(currentTimePeriod.fromDate)!}
${uiLabelMap.CommonTo} ${(currentTimePeriod.thruDate)!}</#if></th></tr>
+ <tr><th colspan=9 style="height: 30px;"
ALIGN="left">${uiLabelMap.AccountingGlAccountNameAndGlAccountCode} :
${(glAccount.accountCode)!} - ${(glAccount.accountName)!}</th></tr>
+ <tr>
+
<th>${uiLabelMap.FormFieldTitle_transactionDate}</th>
+
<th>${uiLabelMap.AccountingAccountTransactionId}</th>
+ <th>${uiLabelMap.CommonDescription}</th>
+ <th>${uiLabelMap.AccountingTypeOfTheCurrency}</th>
+ <th>${uiLabelMap.AccountingOriginalCurrency}</th>
+ <th>${uiLabelMap.AccountingDebitAmount}</th>
+ <th>${uiLabelMap.AccountingCreditAmount}</th>
+
<th>${uiLabelMap.AccountingDebitOrCreditOfBalance}</th>
+
<th>${uiLabelMap.AccountingBalanceOfTheAccount}</th>
+ </tr>
+ <tr><th colspan=1><th colspan=1><th
colspan=3>${uiLabelMap.AccountingTheBalanceOfLastYear}<th
colspan=1></th></th></th></th><th></th><th ALIGN="center"><#if
(isDebitAccount)??>${uiLabelMap.AccountingDebitFlag}<#else>${uiLabelMap.AccountingCreditFlag}</#if></th><th
ALIGN="center">${(openingBalance)!}</th></tr>
+ <#list glAcctgTrialBalanceList as glAcctgTrialBalance>
+
+ <#assign acctgTransAndEntries =
glAcctgTrialBalance.acctgTransAndEntries/>
+ <#if acctgTransAndEntries?has_content>
+ <#list acctgTransAndEntries as
acctgTransAndEntry>
+ <tr>
+ <td
ALIGN="center">${(acctgTransAndEntry.transactionDate)!}</td>
+ <td
ALIGN="center">${(acctgTransAndEntry.acctgTransId)!}</td>
+ <td
ALIGN="center">${(acctgTransAndEntry.transDescription)!}</td>
+ <td
ALIGN="center">${(acctgTransAndEntry.currencyUomId)!}</td>
+ <td
ALIGN="center">${(acctgTransAndEntry.origCurrencyUomId)!}</td>
+ <td ALIGN="center"><#if
(acctgTransAndEntry.debitCreditFlag)! ==
"D">${(acctgTransAndEntry.amount)!}<#else>0</#if></td>
+ <td ALIGN="center"><#if
(acctgTransAndEntry.debitCreditFlag)! ==
"C">${(acctgTransAndEntry.amount)!}<#else>0</#if></td>
+ <td ALIGN="center"></td>
+ <td ALIGN="center"></td>
+ </tr>
+ </#list>
+ <tr><td colspan = 1 ALIGN="center"
ALIGN="center"><td colspan = 1 ALIGN="center"><td colspan=3
ALIGN="center"><b>${uiLabelMap.AccountingTotalOfTheCurrentMonth}</b></td></td></td><td
ALIGN="center" colspan=1><b>${(glAcctgTrialBalance.debitTotal)!}</b></td><td
ALIGN="center" colspan=1><b>${(glAcctgTrialBalance.creditTotal)!}</b></td><td
ALIGN="center" colspan=1><b><#if
(isDebitAccount)??>${uiLabelMap.AccountingDebitFlag}<#else>${uiLabelMap.AccountingCreditFlag}</#if></b></td><td
ALIGN="center"
colspan=1><b>${(glAcctgTrialBalance.debitCreditDifference)!}</b></td></tr>
+ <tr><td colspan = 1 ALIGN="center"><td
ALIGN="center" colspan = 1><td ALIGN="center"
colspan=3><b>${uiLabelMap.AccountingTotalOfYearToDate}</b></td></td></td></td><td
ALIGN="center"
colspan=1><b>${glAcctgTrialBalance.totalOfYearToDateDebit}</b></td><td
ALIGN="center"
colspan=1><b>${glAcctgTrialBalance.totalOfYearToDateCredit}</b></td><td
ALIGN="center" colspan=1><b><#if
(isDebitAccount)??>${uiLabelMap.AccountingDebitFlag}<#else>${uiLabelMap.AccountingCreditFlag}</#if></b></td><td
ALIGN="center"
colspan=1><b>${(glAcctgTrialBalance.balanceOfTheAcctgForYear)!}</b></td></tr>
+ </#if>
+ </#list>
+ </table>
+ </div>
+ </form>
+ </div>
+ <#else>
+ ${uiLabelMap.AccountingNoRecordFound}
+ </#if>
+</div>
\ No newline at end of file
Propchange:
ofbiz/trunk/applications/accounting/webapp/accounting/reports/GlAccountTrialBalanceReport.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
ofbiz/trunk/applications/accounting/webapp/accounting/reports/GlAccountTrialBalanceReport.ftl
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange:
ofbiz/trunk/applications/accounting/webapp/accounting/reports/GlAccountTrialBalanceReport.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: ofbiz/trunk/applications/accounting/widget/Menus.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/Menus.xml?rev=792105&r1=792104&r2=792105&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/Menus.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/Menus.xml Wed Jul 8 11:50:42
2009
@@ -678,6 +678,11 @@
<parameter param-name="organizationPartyId"/>
</link>
</menu-item>
+ <menu-item name="GlAccountTrialBalance"
title="${uiLabelMap.AccountingGlAccountTrialBalance}">
+ <link target="GlAccountTrialBalance">
+ <parameter param-name="organizationPartyId"/>
+ </link>
+ </menu-item>
</menu>
<menu name="PartyAdminTabBar" extends="CommonTabBarMenu"
extends-resource="component://common/widget/CommonMenus.xml"
default-menu-item-name="PartyAcctgPreference">
Modified:
ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml?rev=792105&r1=792104&r2=792105&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml
(original)
+++ ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml
Wed Jul 8 11:50:42 2009
@@ -408,4 +408,35 @@
<field name="debit" use-when="showTotals"><display
description="${parameters.debitTotal}" type="currency"
currency="${currencyUomId}"/></field>
<field name="credit" use-when="showTotals"><display
description="${parameters.creditTotal}" type="currency"
currency="${currencyUomId}"/></field>
</form>
+ <form name="GlAccountTrialBalance" type="single"
target="GlAccountTrialBalance">
+ <actions>
+ <entity-and entity-name="CustomTimePeriod"
list="customTimePeriods">
+ <field-map field-name="organizationPartyId"/>
+ <field-map field-name="periodTypeId" value="FISCAL_YEAR"/>
+ <order-by field-name="fromDate"/>
+ </entity-and>
+ </actions>
+ <field name="organizationPartyId"><hidden/></field>
+ <field name="glAccountId" title="${uiLabelMap.AccountingGlAccountId}">
+ <drop-down>
+ <entity-options entity-name="GlAccountOrganizationAndClass"
description="${glAccountId} ${accountName}">
+ <entity-constraint name="organizationPartyId"
operator="equals" env-name="organizationPartyId"/>
+ <entity-order-by field-name="glAccountId"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="timePeriod">
+ <drop-down>
+ <list-options list-name="customTimePeriods"
key-name="customTimePeriodId" description="${fromDate} - ${thruDate}"/>
+ </drop-down>
+ </field>
+ <field name="isPosted">
+ <drop-down>
+ <option description="${uiLabelMap.CommonYes}" key="Y"/>
+ <option description="${uiLabelMap.CommonNo}" key="N"/>
+ <option description="${uiLabelMap.CommonAll}" key="ALL"/>
+ </drop-down>
+ </field>
+ <field name="submitButton" widget-style="buttontext" action=""><submit
button-type="text-link"/></field>
+ </form>
</forms>
\ No newline at end of file
Modified:
ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml?rev=792105&r1=792104&r2=792105&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml
(original)
+++
ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml
Wed Jul 8 11:50:42 2009
@@ -850,4 +850,67 @@
</widgets>
</section>
</screen>
-</screens>
\ No newline at end of file
+
+ <screen name="GlAccountTrialBalance">
+ <section>
+ <actions>
+ <set field="titleProperty"
value="AccountingGlAccountTrialBalance"/>
+ <set field="labelTitleProperty"
value="AccountingGlAccountTrialBalance"/>
+ <set field="tabButtonItem"
value="OrganizationAccountingReports"/>
+ <set field="tabButtonItem2" value="GlAccountTrialBalance"/>
+ <set field="organizationPartyId"
from-field="parameters.organizationPartyId"/>
+ <script
location="component://accounting/webapp/accounting/WEB-INF/actions/reports/GlAccountTrialBalance.groovy"/>
+ </actions>
+ <widgets>
+ <decorator-screen
name="CommonOrganizationAccountingReportsDecorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <screenlet
title="${uiLabelMap.AccountingGlAccountTrialBalance}">
+ <include-form name="GlAccountTrialBalance"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ </screenlet>
+ <section>
+ <condition>
+ <or>
+ <not><if-empty
field="parameters.glAccountId"/></not>
+ <not><if-empty
field="parameters.timePeriod"/></not>
+ <not><if-empty
field="parameters.isPosted"/></not>
+ </or>
+ </condition>
+ <widgets>
+ <screenlet
title="${uiLabelMap.AccountingGlAccountTrialBalance}">
+ <platform-specific>
+ <html>
+ <html-template
location="component://accounting/webapp/accounting/reports/GlAccountTrialBalanceReport.ftl"/>
+ </html>
+ </platform-specific>
+ </screenlet>
+ </widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
+ <screen name="GlAccountTrialBalanceReportPdf">
+ <section>
+ <actions>
+ <property-map resource="CommonUiLabels" map-name="uiLabelMap"
global="true"/>
+ <property-map resource="AccountingUiLabels"
map-name="uiLabelMap" global="true"/>
+ <property-map resource="ProductUiLabels" map-name="uiLabelMap"
global="true"/>
+ <set field="organizationPartyId"
from-field="parameters.organizationPartyId"/>
+ <script
location="component://accounting/webapp/accounting/WEB-INF/actions/reports/GlAccountTrialBalance.groovy"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="SimpleDecorator"
location="component://common/widget/CommonScreens.xml">
+ <decorator-section name="body">
+ <platform-specific>
+ <xsl-fo>
+ <html-template
location="component://accounting/webapp/accounting/reports/GlAccountTrialBalanceReport.fo.ftl"/>
+ </xsl-fo>
+ </platform-specific>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+</screens>