svn commit: r1747746 - in /ofbiz/trunk: applications/accounting/groovyScripts/ applications/accounting/webapp/accounting/WEB-INF/actions/ applications/accounting/widget/ applications/accounting/widget/ap/ applications/accounting/widget/ar/ applications...

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

svn commit: r1747746 - in /ofbiz/trunk: applications/accounting/groovyScripts/ applications/accounting/webapp/accounting/WEB-INF/actions/ applications/accounting/widget/ applications/accounting/widget/ap/ applications/accounting/widget/ar/ applications...

Deepak Dixit-5
Author: deepak
Date: Fri Jun 10 16:54:38 2016
New Revision: 1747746

URL: http://svn.apache.org/viewvc?rev=1747746&view=rev
Log:
(OFBIZ-7219) Relocate .groovy files in the accounting component

Added:
    ofbiz/trunk/applications/accounting/groovyScripts/
      - copied from r1747740, ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/
Removed:
    ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/
Modified:
    ofbiz/trunk/applications/accounting/widget/AccountingPrintScreens.xml
    ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml
    ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml
    ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml
    ofbiz/trunk/applications/accounting/widget/GlScreens.xml
    ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml
    ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml
    ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml
    ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml
    ofbiz/trunk/applications/accounting/widget/PeriodScreens.xml
    ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml
    ofbiz/trunk/applications/accounting/widget/TransactionScreens.xml
    ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml
    ofbiz/trunk/applications/accounting/widget/ap/InvoiceScreens.xml
    ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml
    ofbiz/trunk/applications/accounting/widget/ar/InvoiceScreens.xml
    ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
    ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/BalanceSheet.rptdesign
    ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/IncomeStatement.rptdesign
    ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/InvoiceAcctgTransEntry.rptdesign
    ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/TrialBalance.rptdesign

Modified: ofbiz/trunk/applications/accounting/widget/AccountingPrintScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AccountingPrintScreens.xml?rev=1747746&r1=1747745&r2=1747746&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/AccountingPrintScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/AccountingPrintScreens.xml Fri Jun 10 16:54:38 2016
@@ -32,7 +32,7 @@ under the License.
                 <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
                 <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
                 <set field="titleProperty" value="AccountingInvoice"/>
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/invoice/EditInvoice.groovy"/>
+                <script location="component://accounting/groovyScripts/invoice/EditInvoice.groovy"/>
                 <script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetMyCompany.groovy"/>
             </actions>
             <widgets>
@@ -108,7 +108,7 @@ under the License.
                 <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
                 <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
                 <set field="invoiceIds" from-field="parameters.invoiceIds" type="List"/>
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/invoice/PrintInvoices.groovy"/>
+                <script location="component://accounting/groovyScripts/invoice/PrintInvoices.groovy"/>
             </actions>
             <widgets>
                <platform-specific>

Modified: ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml?rev=1747746&r1=1747745&r2=1747746&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml Fri Jun 10 16:54:38 2016
@@ -97,7 +97,7 @@ under the License.
                             <fail-widgets>
                                 <section>
                                     <actions>
-                                        <script location="component://accounting/webapp/accounting/WEB-INF/actions/payment/BillingAccounts.groovy"/>
+                                        <script location="component://accounting/groovyScripts/payment/BillingAccounts.groovy"/>
                                         <set field="roleTypeId" value="BILL_TO_CUSTOMER"/>
                                     </actions>
                                     <widgets>
@@ -238,7 +238,7 @@ under the License.
 
                 <set field="billingAccountId" from-field="parameters.billingAccountId"/>
                 <entity-one entity-name="BillingAccount" value-field="billingAccount"/>
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/order/BillingAccountOrders.groovy"/>
+                <script location="component://accounting/groovyScripts/order/BillingAccountOrders.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonBillingAccountDecorator" location="${parameters.billingAccountDecoratorLocation}">

Modified: ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml?rev=1747746&r1=1747745&r2=1747746&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml Fri Jun 10 16:54:38 2016
@@ -231,7 +231,7 @@ under the License.
                 <set field="partyIdFrom" from-field="parameters.partyIdFrom"/>
                 <set field="organizationPartyId" from-field="parameters.organizationPartyId"/>
                 <entity-one entity-name="FinAccount" value-field="finAccount"/>
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/payment/DepositWithdrawPayments.groovy"/>
+                <script location="component://accounting/groovyScripts/payment/DepositWithdrawPayments.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonFinAccountDecorator" location="${parameters.finAccountDecoratorLocation}">

Modified: ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml?rev=1747746&r1=1747745&r2=1747746&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml Fri Jun 10 16:54:38 2016
@@ -617,7 +617,7 @@ under the License.
                 <set field="tabButtonItem" value="FixedAssetGeoLocation"/>
                 <set field="fixedAssetId" from-field="parameters.fixedAssetId"/>
                 <entity-one value-field="fixedAsset" entity-name="FixedAsset"/>
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/fixedasset/FixedAssetGeoLocation.groovy"/>
+                <script location="component://accounting/groovyScripts/fixedasset/FixedAssetGeoLocation.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonFixedAssetDecorator" location="${parameters.fixedAssetDecoratorLocation}">

Modified: ofbiz/trunk/applications/accounting/widget/GlScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlScreens.xml?rev=1747746&r1=1747745&r2=1747746&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlScreens.xml Fri Jun 10 16:54:38 2016
@@ -389,7 +389,7 @@ under the License.
                     </condition-list>
                     <order-by field-name="effectiveDate"/>
                 </entity-condition>
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/admin/FilterOutReceipts.groovy"/>
+                <script location="component://accounting/groovyScripts/admin/FilterOutReceipts.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonAdminChecksDecorator" location="${parameters.mainDecoratorLocation}">
@@ -430,7 +430,7 @@ under the License.
                     </condition-list>
                     <order-by field-name="effectiveDate"/>
                 </entity-condition>
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/admin/FilterOutReceipts.groovy"/>
+                <script location="component://accounting/groovyScripts/admin/FilterOutReceipts.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonAdminChecksDecorator" location="${parameters.mainDecoratorLocation}">

Modified: ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml?rev=1747746&r1=1747745&r2=1747746&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml Fri Jun 10 16:54:38 2016
@@ -477,7 +477,7 @@ under the License.
     <form name="ListSalInvoiceItemTypeGlAssignments" type="list" list-name="invoiceItemTypes"
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <actions>
-            <script location="component://accounting/webapp/accounting/WEB-INF/actions/admin/ListInvoiceItemTypesGlAccount.groovy"/>
+            <script location="component://accounting/groovyScripts/admin/ListInvoiceItemTypesGlAccount.groovy"/>
         </actions>
         <field name="organizationPartyId"><hidden value="${organizationPartyId}"/></field>
         <field name="invoiceItemTypeId"><hidden/></field>
@@ -531,7 +531,7 @@ under the License.
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <actions>
             <set field="invItemTypePrefix" value="PINV"/>
-            <script location="component://accounting/webapp/accounting/WEB-INF/actions/admin/ListInvoiceItemTypesGlAccount.groovy"/>
+            <script location="component://accounting/groovyScripts/admin/ListInvoiceItemTypesGlAccount.groovy"/>
         </actions>
         <field name="organizationPartyId"><hidden value="${organizationPartyId}"/></field>
         <field name="invoiceItemTypeId"><hidden/></field>

Modified: ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml?rev=1747746&r1=1747745&r2=1747746&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml Fri Jun 10 16:54:38 2016
@@ -487,7 +487,7 @@ under the License.
                     <order-by field-name="taxAuthGeoId"/>
                     <order-by field-name="taxAuthPartyId"/>
                 </entity-condition>
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/chartofaccounts/TaxAuthorityGlAccounts.groovy"/>
+                <script location="component://accounting/groovyScripts/chartofaccounts/TaxAuthorityGlAccounts.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonGlSetupDecorator" location="${parameters.commonGlSetupDecoratorLocation}">

Modified: ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml?rev=1747746&r1=1747745&r2=1747746&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml Fri Jun 10 16:54:38 2016
@@ -187,7 +187,7 @@ under the License.
                     <field-map from-field="parameters.invoiceId" field-name="invoiceId"/>
                     <order-by field-name="invoiceItemSeqId"/>
                 </entity-and>
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/invoice/CreateApplicationList.groovy"/>
+                <script location="component://accounting/groovyScripts/invoice/CreateApplicationList.groovy"/>
                 <set field="invoiceAmount" value="${groovy:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceTotal(invoice)}" type="BigDecimal"/>
                 <set field="notAppliedAmount" value="${groovy:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceNotApplied(invoice)}" type="BigDecimal"/>
                 <set field="appliedAmount" value="${groovy:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceApplied(invoice)}" type="BigDecimal"/>
@@ -359,8 +359,8 @@ under the License.
 
                 <set field="invoiceId" from-field="parameters.invoiceId"/>
                 <entity-one entity-name="Invoice" value-field="invoice"/>
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/invoice/CreateApplicationList.groovy"/>
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/invoice/ListNotAppliedPayments.groovy"/>
+                <script location="component://accounting/groovyScripts/invoice/CreateApplicationList.groovy"/>
+                <script location="component://accounting/groovyScripts/invoice/ListNotAppliedPayments.groovy"/>
                 <set field="invoiceAmount" value="${groovy:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceTotal(invoice)}" type="BigDecimal"/>
                 <set field="notAppliedAmount" value="${groovy:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceNotApplied(invoice)}" type="BigDecimal"/>
                 <set field="appliedAmount" value="${groovy:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceApplied(invoice)}" type="BigDecimal"/>
@@ -457,7 +457,7 @@ under the License.
                     <condition-expr field-name="parentTypeId" value="PAYROL"/>
                 </entity-condition>
                 <entity-condition entity-name="InvoiceItemType" list="PayrolList"/>
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/invoice/GetAccountOrganizationAndClass.groovy"/>
+                <script location="component://accounting/groovyScripts/invoice/GetAccountOrganizationAndClass.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonInvoiceDecorator" location="${parameters.invoiceDecoratorLocation}">

Modified: ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml?rev=1747746&r1=1747745&r2=1747746&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml Fri Jun 10 16:54:38 2016
@@ -175,8 +175,8 @@ under the License.
                 <set field="notAppliedAmountStr" type="String" value="${groovy:
                     import java.text.NumberFormat;
                     return(NumberFormat.getCurrencyInstance(context.get(&quot;locale&quot;)).format(org.ofbiz.accounting.payment.PaymentWorker.getPaymentNotApplied(payment)));}"/>
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/payment/ListNotAppliedInvoices.groovy"/>
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/payment/ListNotAppliedPayments.groovy"/>
+                <script location="component://accounting/groovyScripts/payment/ListNotAppliedInvoices.groovy"/>
+                <script location="component://accounting/groovyScripts/payment/ListNotAppliedPayments.groovy"/>
                 <entity-one entity-name="PartyNameView" value-field="partyNameViewTo">
                     <field-map field-name="partyId" from-field="payment.partyIdTo"/>
                 </entity-one>
@@ -437,7 +437,7 @@ under the License.
                 <set field="titleProperty" value="AccountingManualTransaction"/>
                 <set field="headerItem" value="transaction"/>
                 <set field="tabButtonItem" value="manualtransactiontab"/>
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/payment/ManualTx.groovy"/>
+                <script location="component://accounting/groovyScripts/payment/ManualTx.groovy"/>
                 <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
             </actions>
             <widgets>
@@ -480,7 +480,7 @@ under the License.
                 <set field="paymentId" from-field="parameters.paymentId"/>
                 <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
                 <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/payment/PrintChecks.groovy"/>
+                <script location="component://accounting/groovyScripts/payment/PrintChecks.groovy"/>
                 <entity-condition entity-name="InvoiceItemType" list="PayrolGroup">
                     <condition-expr field-name="parentTypeId" value="PAYROL"/>
                 </entity-condition>
@@ -501,7 +501,7 @@ under the License.
                 <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/>
                 <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/>
                 <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/>
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/payment/FindInvoicesByDueDate.groovy"/>
+                <script location="component://accounting/groovyScripts/payment/FindInvoicesByDueDate.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
@@ -532,7 +532,7 @@ under the License.
                 <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/>
                 <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/>
                 <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/>
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/payment/FindInvoicesByDueDate.groovy"/>
+                <script location="component://accounting/groovyScripts/payment/FindInvoicesByDueDate.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">

Modified: ofbiz/trunk/applications/accounting/widget/PeriodScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PeriodScreens.xml?rev=1747746&r1=1747745&r2=1747746&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/PeriodScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/PeriodScreens.xml Fri Jun 10 16:54:38 2016
@@ -26,7 +26,7 @@ under the License.
                 <set field="headerItem" value="main"/>
                 <set field="titleProperty" value="AccountingEditCustomTimePeriods"/>
                 <set field="tabButtonItem" value="EditCustomTimePeriod"/>
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/period/EditCustomTimePeriod.groovy"/>
+                <script location="component://accounting/groovyScripts/period/EditCustomTimePeriod.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="GlobalGLSettingsDecorator" location="${parameters.mainDecoratorLocation}">

Modified: ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml?rev=1747746&r1=1747745&r2=1747746&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml Fri Jun 10 16:54:38 2016
@@ -89,7 +89,7 @@ under the License.
                             <field-map field-name="productCategoryId" from-field="rootProductCategoryId"/>
                         </entity-one>
 
-                        <script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/SalesInvoiceByProductCategorySummary.groovy"/>
+                        <script location="component://accounting/groovyScripts/reports/SalesInvoiceByProductCategorySummary.groovy"/>
                     </actions>
                     <widgets>
                         <decorator-screen name="CommonFinAccountDecorator" location="${parameters.mainDecoratorLocation}">
@@ -114,7 +114,7 @@ under the License.
                     <actions>
                         <set field="titleProperty" value="PageTitleSalesInvoiceByProductGlAccountSummary"/>
 
-                        <script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/SalesInvoiceByProductGlAccountSummary.bsh"/>
+                        <script location="component://accounting/groovyScripts/reports/SalesInvoiceByProductGlAccountSummary.bsh"/>
                     </actions>
                     <widgets>
                         <decorator-screen name="CommonFinAccountDecorator" location="${parameters.mainDecoratorLocation}">
@@ -140,7 +140,7 @@ under the License.
                     <actions>
                         <set field="titleProperty" value="PageTitlePaymentByMethodSummary"/>
 
-                        <script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/PaymentByMethodSummary.bsh"/>
+                        <script location="component://accounting/groovyScripts/reports/PaymentByMethodSummary.bsh"/>
                     </actions>
                     <widgets>
                         <decorator-screen name="CommonFinAccountDecorator" location="${parameters.mainDecoratorLocation}">
@@ -165,7 +165,7 @@ under the License.
                     <actions>
                         <set field="titleProperty" value="PageTitleInventoryIssueSummary"/>
 
-                        <script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/InventoryIssueSummary.bsh"/>
+                        <script location="component://accounting/groovyScripts/reports/InventoryIssueSummary.bsh"/>
                     </actions>
                     <widgets>
                         <decorator-screen name="CommonFinAccountDecorator" location="${parameters.mainDecoratorLocation}">
@@ -190,7 +190,7 @@ under the License.
                     <actions>
                         <set field="titleProperty" value="PageTitleFinancialAccountSummary"/>
 
-                        <script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/FinancialAccountSummary.bsh"/>
+                        <script location="component://accounting/groovyScripts/reports/FinancialAccountSummary.bsh"/>
                     </actions>
                     <widgets>
                         <decorator-screen name="CommonFinAccountDecorator" location="${parameters.mainDecoratorLocation}">
@@ -225,7 +225,7 @@ under the License.
                     <condition-expr field-name="partyId" operator="in" from-field="partyIds"/>
                 </entity-condition>
                 <set field="partyIds[]" value="${groovy:parameters.get('ApplicationDecorator|organizationPartyId')}"/>
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/TrialBalance.groovy"/>
+                <script location="component://accounting/groovyScripts/reports/TrialBalance.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonOrganizationAccountingReportsDecorator" location="${parameters.mainDecoratorLocation}">
@@ -279,7 +279,7 @@ under the License.
                     <condition-expr field-name="partyId" operator="in" from-field="partyIds"/>
                 </entity-condition>
                 <set field="partyIds[]" value="${groovy:parameters.get('ApplicationDecorator|organizationPartyId')}"/>
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/TrialBalance.groovy"/>
+                <script location="component://accounting/groovyScripts/reports/TrialBalance.groovy"/>
             </actions>
             <widgets>
                 <container>
@@ -304,7 +304,7 @@ under the License.
                     <condition-expr field-name="partyId" operator="in" from-field="partyIds"/>
                 </entity-condition>
                 <set field="partyIds[]" value="${groovy:parameters.get('ApplicationDecorator|organizationPartyId')}"/>
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/TrialBalance.groovy"/>
+                <script location="component://accounting/groovyScripts/reports/TrialBalance.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="SimpleDecorator" location="component://common/widget/CommonScreens.xml">
@@ -343,7 +343,7 @@ under the License.
                 <set field="currencyUomId" from-field="partyAcctgPreference.baseCurrencyUomId"/>
                 <set field="thruDate" from-field="parameters.thruDate" type="Timestamp" default-value="${nowTimestamp}"/>
                 <set field="glFiscalTypeId" from-field="parameters.glFiscalTypeId" default-value="ACTUAL"/>
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/BalanceSheet.groovy"/>
+                <script location="component://accounting/groovyScripts/reports/BalanceSheet.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonOrganizationAccountingReportsDecorator" location="${parameters.mainDecoratorLocation}">
@@ -388,7 +388,7 @@ under the License.
                 <set field="currencyUomId" from-field="partyAcctgPreference.baseCurrencyUomId"/>
                 <set field="thruDate" from-field="parameters.thruDate" type="Timestamp" default-value="${nowTimestamp}"/>
                 <set field="glFiscalTypeId" from-field="parameters.glFiscalTypeId" default-value="ACTUAL"/>
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/BalanceSheet.groovy"/>
+                <script location="component://accounting/groovyScripts/reports/BalanceSheet.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="SimpleDecorator" location="component://common/widget/CommonScreens.xml">
@@ -422,7 +422,7 @@ under the License.
                 <set field="currencyUomId" from-field="partyAcctgPreference.baseCurrencyUomId"/>
                 <set field="thruDate" from-field="parameters.thruDate" type="Timestamp" default-value="${nowTimestamp}"/>
                 <set field="glFiscalTypeId" from-field="parameters.glFiscalTypeId" default-value="ACTUAL"/>
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/BalanceSheet.groovy"/>
+                <script location="component://accounting/groovyScripts/reports/BalanceSheet.groovy"/>
             </actions>
             <widgets>
                 <label style="h3" text="${uiLabelMap.AccountingAssets}"/>
@@ -452,7 +452,7 @@ under the License.
                 <set field="period1GlFiscalTypeId" from-field="parameters.period1GlFiscalTypeId" default-value="ACTUAL"/>
                 <set field="thruDate" from-field="period1ThruDate" type="Timestamp"/>
                 <set field="glFiscalTypeId" from-field="period1GlFiscalTypeId"/>
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/BalanceSheet.groovy"/>
+                <script location="component://accounting/groovyScripts/reports/BalanceSheet.groovy"/>
                 <set field="assetAccountBalanceList1" from-field="assetAccountBalanceList"/>
                 <set field="liabilityAccountBalanceList1" from-field="liabilityAccountBalanceList"/>
                 <set field="equityAccountBalanceList1" from-field="equityAccountBalanceList"/>
@@ -469,7 +469,7 @@ under the License.
                 <set field="period2GlFiscalTypeId" from-field="parameters.period2GlFiscalTypeId" default-value="ACTUAL"/>
                 <set field="thruDate" from-field="period2ThruDate" type="Timestamp"/>
                 <set field="glFiscalTypeId" from-field="period2GlFiscalTypeId"/>
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/BalanceSheet.groovy"/>
+                <script location="component://accounting/groovyScripts/reports/BalanceSheet.groovy"/>
                 <set field="assetAccountBalanceList2" from-field="assetAccountBalanceList"/>
                 <set field="liabilityAccountBalanceList2" from-field="liabilityAccountBalanceList"/>
                 <set field="equityAccountBalanceList2" from-field="equityAccountBalanceList"/>
@@ -482,7 +482,7 @@ under the License.
                 <set field="liabilityEquityBalanceTotal2" from-field="liabilityEquityBalanceTotal"/>
                 <set field="balanceTotalList2" from-field="balanceTotalList"/>
 
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/ComparativeBalanceSheet.groovy"/>
+                <script location="component://accounting/groovyScripts/reports/ComparativeBalanceSheet.groovy"/>
 
             </actions>
             <widgets>
@@ -539,7 +539,7 @@ under the License.
                 <set field="period1GlFiscalTypeId" from-field="parameters.period1GlFiscalTypeId" default-value="ACTUAL"/>
                 <set field="thruDate" from-field="period1ThruDate" type="Timestamp"/>
                 <set field="glFiscalTypeId" from-field="period1GlFiscalTypeId"/>
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/BalanceSheet.groovy"/>
+                <script location="component://accounting/groovyScripts/reports/BalanceSheet.groovy"/>
                 <set field="assetAccountBalanceList1" from-field="assetAccountBalanceList"/>
                 <set field="liabilityAccountBalanceList1" from-field="liabilityAccountBalanceList"/>
                 <set field="equityAccountBalanceList1" from-field="equityAccountBalanceList"/>
@@ -556,7 +556,7 @@ under the License.
                 <set field="period2GlFiscalTypeId" from-field="parameters.period2GlFiscalTypeId" default-value="ACTUAL"/>
                 <set field="thruDate" from-field="period2ThruDate" type="Timestamp"/>
                 <set field="glFiscalTypeId" from-field="period2GlFiscalTypeId"/>
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/BalanceSheet.groovy"/>
+                <script location="component://accounting/groovyScripts/reports/BalanceSheet.groovy"/>
                 <set field="assetAccountBalanceList2" from-field="assetAccountBalanceList"/>
                 <set field="liabilityAccountBalanceList2" from-field="liabilityAccountBalanceList"/>
                 <set field="equityAccountBalanceList2" from-field="equityAccountBalanceList"/>
@@ -569,7 +569,7 @@ under the License.
                 <set field="liabilityEquityBalanceTotal2" from-field="liabilityEquityBalanceTotal"/>
                 <set field="balanceTotalList2" from-field="balanceTotalList"/>
 
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/ComparativeBalanceSheet.groovy"/>
+                <script location="component://accounting/groovyScripts/reports/ComparativeBalanceSheet.groovy"/>
 
             </actions>
             <widgets>
@@ -610,7 +610,7 @@ under the License.
                 <set field="period1GlFiscalTypeId" from-field="parameters.period1GlFiscalTypeId" default-value="ACTUAL"/>
                 <set field="thruDate" from-field="period1ThruDate" type="Timestamp"/>
                 <set field="glFiscalTypeId" from-field="period1GlFiscalTypeId"/>
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/BalanceSheet.groovy"/>
+                <script location="component://accounting/groovyScripts/reports/BalanceSheet.groovy"/>
                 <set field="assetAccountBalanceList1" from-field="assetAccountBalanceList"/>
                 <set field="liabilityAccountBalanceList1" from-field="liabilityAccountBalanceList"/>
                 <set field="equityAccountBalanceList1" from-field="equityAccountBalanceList"/>
@@ -627,7 +627,7 @@ under the License.
                 <set field="period2GlFiscalTypeId" from-field="parameters.period2GlFiscalTypeId" default-value="ACTUAL"/>
                 <set field="thruDate" from-field="period2ThruDate" type="Timestamp"/>
                 <set field="glFiscalTypeId" from-field="period2GlFiscalTypeId"/>
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/BalanceSheet.groovy"/>
+                <script location="component://accounting/groovyScripts/reports/BalanceSheet.groovy"/>
                 <set field="assetAccountBalanceList2" from-field="assetAccountBalanceList"/>
                 <set field="liabilityAccountBalanceList2" from-field="liabilityAccountBalanceList"/>
                 <set field="equityAccountBalanceList2" from-field="equityAccountBalanceList"/>
@@ -640,7 +640,7 @@ under the License.
                 <set field="liabilityEquityBalanceTotal2" from-field="liabilityEquityBalanceTotal"/>
                 <set field="balanceTotalList2" from-field="balanceTotalList"/>
 
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/ComparativeBalanceSheet.groovy"/>
+                <script location="component://accounting/groovyScripts/reports/ComparativeBalanceSheet.groovy"/>
 
             </actions>
             <widgets>
@@ -678,8 +678,8 @@ under the License.
                 <set field="fromDate" from-field="parameters.fromDate" type="Timestamp" default-value="${findLastClosedDateOutMap.lastClosedDate}"/>
                 <set field="thruDate" from-field="parameters.thruDate" type="Timestamp" default-value="${nowTimestamp}"/>
                 <set field="glFiscalTypeId" from-field="parameters.glFiscalTypeId" default-value="ACTUAL"/>
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/MonthSelection.groovy"/>
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/TransactionTotals.groovy"/>
+                <script location="component://accounting/groovyScripts/reports/MonthSelection.groovy"/>
+                <script location="component://accounting/groovyScripts/reports/TransactionTotals.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonOrganizationAccountingReportsDecorator" location="${parameters.mainDecoratorLocation}">
@@ -744,7 +744,7 @@ under the License.
                 <set field="fromDate" from-field="parameters.fromDate" type="Timestamp" default-value="${nowTimestamp}"/>
                 <set field="thruDate" from-field="parameters.thruDate" type="Timestamp" default-value="${nowTimestamp}"/>
                 <set field="glFiscalTypeId" from-field="parameters.glFiscalTypeId" default-value="ACTUAL"/>
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/TransactionTotals.groovy"/>
+                <script location="component://accounting/groovyScripts/reports/TransactionTotals.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="SimpleDecorator" location="component://common/widget/CommonScreens.xml">
@@ -783,7 +783,7 @@ under the License.
                 <set field="fromDate" from-field="parameters.fromDate" type="Timestamp" default-value="${nowTimestamp}"/>
                 <set field="thruDate" from-field="parameters.thruDate" type="Timestamp" default-value="${nowTimestamp}"/>
                 <set field="glFiscalTypeId" from-field="parameters.glFiscalTypeId" default-value="ACTUAL"/>
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/TransactionTotals.groovy"/>
+                <script location="component://accounting/groovyScripts/reports/TransactionTotals.groovy"/>
             </actions>
             <widgets>
                 <label text="${uiLabelMap.AccountingPostedTransactionTotals}"/>
@@ -815,8 +815,8 @@ under the License.
                 <set field="fromDate" from-field="parameters.fromDate" type="Timestamp" default-value="${findLastClosedDateOutMap.lastClosedDate}"/>
                 <set field="thruDate" from-field="parameters.thruDate" type="Timestamp" default-value="${nowTimestamp}"/>
                 <set field="glFiscalTypeId" from-field="parameters.glFiscalTypeId" default-value="ACTUAL"/>                
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/MonthSelection.groovy"/>
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/IncomeStatement.groovy"/>
+                <script location="component://accounting/groovyScripts/reports/MonthSelection.groovy"/>
+                <script location="component://accounting/groovyScripts/reports/IncomeStatement.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonOrganizationAccountingReportsDecorator" location="${parameters.mainDecoratorLocation}">
@@ -860,7 +860,7 @@ under the License.
                 <set field="fromDate" from-field="parameters.fromDate" type="Timestamp"/>
                 <set field="thruDate" from-field="parameters.thruDate" type="Timestamp"/>
                 <set field="glFiscalTypeId" from-field="parameters.glFiscalTypeId" default-value="ACTUAL"/>
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/IncomeStatement.groovy"/>
+                <script location="component://accounting/groovyScripts/reports/IncomeStatement.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="SimpleDecorator" location="component://common/widget/CommonScreens.xml">
@@ -891,7 +891,7 @@ under the License.
                 <set field="fromDate" from-field="parameters.fromDate" type="Timestamp"/>
                 <set field="thruDate" from-field="parameters.thruDate" type="Timestamp"/>
                 <set field="glFiscalTypeId" from-field="parameters.glFiscalTypeId" default-value="ACTUAL"/>
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/IncomeStatement.groovy"/>
+                <script location="component://accounting/groovyScripts/reports/IncomeStatement.groovy"/>
             </actions>
             <widgets>
                 <label style="h3" text="${uiLabelMap.AccountingRevenues}"/>
@@ -930,7 +930,7 @@ under the License.
                 <set field="fromDate" from-field="period1FromDate"/>
                 <set field="thruDate" from-field="period1ThruDate"/>
                 <set field="glFiscalTypeId" from-field="period1GlFiscalTypeId"/>
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/IncomeStatement.groovy"/>
+                <script location="component://accounting/groovyScripts/reports/IncomeStatement.groovy"/>
                 <set field="revenueAccountBalanceList1" from-field="revenueAccountBalanceList"/>
                 <set field="revenueAccountBalanceTotal1" from-field="revenueAccountBalanceTotal"/>
                 <set field="expenseAccountBalanceList1" from-field="expenseAccountBalanceList"/>
@@ -950,7 +950,7 @@ under the License.
                 <set field="fromDate" from-field="period2FromDate"/>
                 <set field="thruDate" from-field="period2ThruDate"/>
                 <set field="glFiscalTypeId" from-field="period2GlFiscalTypeId"/>
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/IncomeStatement.groovy"/>
+                <script location="component://accounting/groovyScripts/reports/IncomeStatement.groovy"/>
                 <set field="revenueAccountBalanceList2" from-field="revenueAccountBalanceList"/>
                 <set field="revenueAccountBalanceTotal2" from-field="revenueAccountBalanceTotal"/>
                 <set field="expenseAccountBalanceList2" from-field="expenseAccountBalanceList"/>
@@ -963,7 +963,7 @@ under the License.
                 <set field="incomeFromOperations2" from-field="incomeFromOperations"/>
                 <set field="netIncome2" from-field="netIncome"/>
                 <set field="balanceTotalList2" from-field="balanceTotalList"/>
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/ComparativeIncomeStatement.groovy"/>
+                <script location="component://accounting/groovyScripts/reports/ComparativeIncomeStatement.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonOrganizationAccountingReportsDecorator" location="${parameters.mainDecoratorLocation}">
@@ -1031,7 +1031,7 @@ under the License.
                 <set field="fromDate" from-field="period1FromDate"/>
                 <set field="thruDate" from-field="period1ThruDate"/>
                 <set field="glFiscalTypeId" from-field="period1GlFiscalTypeId"/>
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/IncomeStatement.groovy"/>
+                <script location="component://accounting/groovyScripts/reports/IncomeStatement.groovy"/>
                 <set field="revenueAccountBalanceList1" from-field="revenueAccountBalanceList"/>
                 <set field="revenueAccountBalanceTotal1" from-field="revenueAccountBalanceTotal"/>
                 <set field="expenseAccountBalanceList1" from-field="expenseAccountBalanceList"/>
@@ -1051,7 +1051,7 @@ under the License.
                 <set field="fromDate" from-field="period2FromDate"/>
                 <set field="thruDate" from-field="period2ThruDate"/>
                 <set field="glFiscalTypeId" from-field="period2GlFiscalTypeId"/>
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/IncomeStatement.groovy"/>
+                <script location="component://accounting/groovyScripts/reports/IncomeStatement.groovy"/>
                 <set field="revenueAccountBalanceList2" from-field="revenueAccountBalanceList"/>
                 <set field="revenueAccountBalanceTotal2" from-field="revenueAccountBalanceTotal"/>
                 <set field="expenseAccountBalanceList2" from-field="expenseAccountBalanceList"/>
@@ -1064,7 +1064,7 @@ under the License.
                 <set field="incomeFromOperations2" from-field="incomeFromOperations"/>
                 <set field="netIncome2" from-field="netIncome"/>
                 <set field="balanceTotalList2" from-field="balanceTotalList"/>
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/ComparativeIncomeStatement.groovy"/>
+                <script location="component://accounting/groovyScripts/reports/ComparativeIncomeStatement.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="SimpleDecorator" location="component://common/widget/CommonScreens.xml">
@@ -1112,7 +1112,7 @@ under the License.
                 <set field="fromDate" from-field="period1FromDate"/>
                 <set field="thruDate" from-field="period1ThruDate"/>
                 <set field="glFiscalTypeId" from-field="period1GlFiscalTypeId"/>
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/IncomeStatement.groovy"/>
+                <script location="component://accounting/groovyScripts/reports/IncomeStatement.groovy"/>
                 <set field="revenueAccountBalanceList1" from-field="revenueAccountBalanceList"/>
                 <set field="revenueAccountBalanceTotal1" from-field="revenueAccountBalanceTotal"/>
                 <set field="expenseAccountBalanceList1" from-field="expenseAccountBalanceList"/>
@@ -1132,7 +1132,7 @@ under the License.
                 <set field="fromDate" from-field="period2FromDate"/>
                 <set field="thruDate" from-field="period2ThruDate"/>
                 <set field="glFiscalTypeId" from-field="period2GlFiscalTypeId"/>
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/IncomeStatement.groovy"/>
+                <script location="component://accounting/groovyScripts/reports/IncomeStatement.groovy"/>
                 <set field="revenueAccountBalanceList2" from-field="revenueAccountBalanceList"/>
                 <set field="revenueAccountBalanceTotal2" from-field="revenueAccountBalanceTotal"/>
                 <set field="expenseAccountBalanceList2" from-field="expenseAccountBalanceList"/>
@@ -1145,7 +1145,7 @@ under the License.
                 <set field="incomeFromOperations2" from-field="incomeFromOperations"/>
                 <set field="netIncome2" from-field="netIncome"/>
                 <set field="balanceTotalList2" from-field="balanceTotalList"/>
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/ComparativeIncomeStatement.groovy"/>
+                <script location="component://accounting/groovyScripts/reports/ComparativeIncomeStatement.groovy"/>
             </actions>
             <widgets>
                 <label style="h3" text="${uiLabelMap.AccountingRevenues}"/>
@@ -1167,7 +1167,7 @@ under the License.
                 <set field="labelTitleProperty" value="AccountingGlAccountTrialBalance"/>
                 <set field="tabButtonItem" value="OrganizationAccountingReports"/>
                 <set field="tabButtonItem2" value="GlAccountTrialBalance"/>
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/GlAccountTrialBalance.groovy"/>
+                <script location="component://accounting/groovyScripts/reports/GlAccountTrialBalance.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonOrganizationAccountingReportsDecorator" location="${parameters.mainDecoratorLocation}">
@@ -1205,7 +1205,7 @@ under the License.
                 <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"/>
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/GlAccountTrialBalance.groovy"/>
+                <script location="component://accounting/groovyScripts/reports/GlAccountTrialBalance.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="SimpleDecorator" location="component://common/widget/CommonScreens.xml">
@@ -1242,7 +1242,7 @@ under the License.
                 </service>
                 <set field="fromDate" from-field="parameters.fromDate" type="Timestamp" default-value="${findLastClosedDateOutMap.lastClosedDate}"/>
                 <set field="thruDate" from-field="parameters.thruDate" type="Timestamp" default-value="${nowTimestamp}"/>
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/CostCenters.groovy"/>
+                <script location="component://accounting/groovyScripts/reports/CostCenters.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonOrganizationAccountingReportsDecorator" location="${parameters.mainDecoratorLocation}">
@@ -1291,7 +1291,7 @@ under the License.
                 <set field="partyIds[]" value="${groovy:parameters.get('ApplicationDecorator|organizationPartyId')}"/>
                 <set field="fromDate" from-field="parameters.fromDate" type="Timestamp" default-value="${findLastClosedDateOutMap.lastClosedDate}"/>
                 <set field="thruDate" from-field="parameters.thruDate" type="Timestamp" default-value="${nowTimestamp}"/>
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/CostCenters.groovy"/>
+                <script location="component://accounting/groovyScripts/reports/CostCenters.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="SimpleDecorator" location="component://common/widget/CommonScreens.xml">
@@ -1406,8 +1406,8 @@ under the License.
                 <set field="fromDate" from-field="parameters.fromDate" type="Timestamp" default-value="${findLastClosedDateOutMap.lastClosedDate}"/>
                 <set field="thruDate" from-field="parameters.thruDate" type="Timestamp" default-value="${nowTimestamp}"/>
                 <set field="glFiscalTypeId" from-field="parameters.glFiscalTypeId" default-value="ACTUAL"/>
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/MonthSelection.groovy"/>
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/CashFlowStatement.groovy"/>
+                <script location="component://accounting/groovyScripts/reports/MonthSelection.groovy"/>
+                <script location="component://accounting/groovyScripts/reports/CashFlowStatement.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonOrganizationAccountingReportsDecorator" location="${parameters.mainDecoratorLocation}">
@@ -1450,7 +1450,7 @@ under the License.
                 <set field="fromDate" from-field="parameters.fromDate" type="Timestamp"/>
                 <set field="thruDate" from-field="parameters.thruDate" type="Timestamp"/>
                 <set field="glFiscalTypeId" from-field="parameters.glFiscalTypeId" default-value="ACTUAL"/>
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/CashFlowStatement.groovy"/>
+                <script location="component://accounting/groovyScripts/reports/CashFlowStatement.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="SimpleDecorator" location="component://common/widget/CommonScreens.xml">
@@ -1480,7 +1480,7 @@ under the License.
                 <set field="fromDate" from-field="parameters.fromDate" type="Timestamp"/>
                 <set field="thruDate" from-field="parameters.thruDate" type="Timestamp"/>
                 <set field="glFiscalTypeId" from-field="parameters.glFiscalTypeId" default-value="ACTUAL"/>
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/CashFlowStatement.groovy"/>
+                <script location="component://accounting/groovyScripts/reports/CashFlowStatement.groovy"/>
             </actions>
             <widgets>
                 <label style="h3" text="${uiLabelMap.AccountingOpeningCashBalance}"/>
@@ -1518,7 +1518,7 @@ under the License.
                 <set field="fromDate" from-field="period1FromDate"/>
                 <set field="thruDate" from-field="period1ThruDate"/>
                 <set field="glFiscalTypeId" from-field="period1GlFiscalTypeId"/>
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/CashFlowStatement.groovy"/>
+                <script location="component://accounting/groovyScripts/reports/CashFlowStatement.groovy"/>
                 <set field="openingCashBalanceList1" from-field="openingCashBalanceList"/>
                 <set field="periodCashBalanceList1" from-field="periodCashBalanceList"/>
                 <set field="closingCashBalanceList1" from-field="closingCashBalanceList"/>
@@ -1530,12 +1530,12 @@ under the License.
                 <set field="fromDate" from-field="period2FromDate"/>
                 <set field="thruDate" from-field="period2ThruDate"/>
                 <set field="glFiscalTypeId" from-field="period2GlFiscalTypeId"/>
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/CashFlowStatement.groovy"/>
+                <script location="component://accounting/groovyScripts/reports/CashFlowStatement.groovy"/>
                 <set field="openingCashBalanceList2" from-field="openingCashBalanceList"/>
                 <set field="periodCashBalanceList2" from-field="periodCashBalanceList"/>
                 <set field="closingCashBalanceList2" from-field="closingCashBalanceList"/>
                 <set field="cashFlowBalanceTotalList2" from-field="cashFlowBalanceTotalList"/>
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/ComparativeCashFlowStatement.groovy"/>
+                <script location="component://accounting/groovyScripts/reports/ComparativeCashFlowStatement.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonOrganizationAccountingReportsDecorator" location="${parameters.mainDecoratorLocation}">
@@ -1603,7 +1603,7 @@ under the License.
                 <set field="fromDate" from-field="period1FromDate"/>
                 <set field="thruDate" from-field="period1ThruDate"/>
                 <set field="glFiscalTypeId" from-field="period1GlFiscalTypeId"/>
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/CashFlowStatement.groovy"/>
+                <script location="component://accounting/groovyScripts/reports/CashFlowStatement.groovy"/>
                 <set field="openingCashBalanceList1" from-field="openingCashBalanceList"/>
                 <set field="periodCashBalanceList1" from-field="periodCashBalanceList"/>
                 <set field="closingCashBalanceList1" from-field="closingCashBalanceList"/>
@@ -1615,12 +1615,12 @@ under the License.
                 <set field="fromDate" from-field="period2FromDate"/>
                 <set field="thruDate" from-field="period2ThruDate"/>
                 <set field="glFiscalTypeId" from-field="period2GlFiscalTypeId"/>
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/CashFlowStatement.groovy"/>
+                <script location="component://accounting/groovyScripts/reports/CashFlowStatement.groovy"/>
                 <set field="openingCashBalanceList2" from-field="openingCashBalanceList"/>
                 <set field="periodCashBalanceList2" from-field="periodCashBalanceList"/>
                 <set field="closingCashBalanceList2" from-field="closingCashBalanceList"/>
                 <set field="cashFlowBalanceTotalList2" from-field="cashFlowBalanceTotalList"/>
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/ComparativeCashFlowStatement.groovy"/>
+                <script location="component://accounting/groovyScripts/reports/ComparativeCashFlowStatement.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="SimpleDecorator" location="component://common/widget/CommonScreens.xml">
@@ -1667,7 +1667,7 @@ under the License.
                 <set field="fromDate" from-field="period1FromDate"/>
                 <set field="thruDate" from-field="period1ThruDate"/>
                 <set field="glFiscalTypeId" from-field="period1GlFiscalTypeId"/>
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/CashFlowStatement.groovy"/>
+                <script location="component://accounting/groovyScripts/reports/CashFlowStatement.groovy"/>
                 <set field="openingCashBalanceList1" from-field="openingCashBalanceList"/>
                 <set field="periodCashBalanceList1" from-field="periodCashBalanceList"/>
                 <set field="closingCashBalanceList1" from-field="closingCashBalanceList"/>
@@ -1679,12 +1679,12 @@ under the License.
                 <set field="fromDate" from-field="period2FromDate"/>
                 <set field="thruDate" from-field="period2ThruDate"/>
                 <set field="glFiscalTypeId" from-field="period2GlFiscalTypeId"/>
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/CashFlowStatement.groovy"/>
+                <script location="component://accounting/groovyScripts/reports/CashFlowStatement.groovy"/>
                 <set field="openingCashBalanceList2" from-field="openingCashBalanceList"/>
                 <set field="periodCashBalanceList2" from-field="periodCashBalanceList"/>
                 <set field="closingCashBalanceList2" from-field="closingCashBalanceList"/>
                 <set field="cashFlowBalanceTotalList2" from-field="cashFlowBalanceTotalList"/>
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/ComparativeCashFlowStatement.groovy"/>
+                <script location="component://accounting/groovyScripts/reports/ComparativeCashFlowStatement.groovy"/>
             </actions>
             <widgets>
                 <label style="h3" text="${uiLabelMap.AccountingOpeningCashBalance}"/>

Modified: ofbiz/trunk/applications/accounting/widget/TransactionScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/TransactionScreens.xml?rev=1747746&r1=1747745&r2=1747746&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/TransactionScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/TransactionScreens.xml Fri Jun 10 16:54:38 2016
@@ -93,7 +93,7 @@ under the License.
 
                 <entity-one entity-name="PaymentGatewayResponse" value-field="paymentGatewayResponse" auto-field-map="true"/>
 
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/transaction/ViewGatewayResponse.groovy"/>
+                <script location="component://accounting/groovyScripts/transaction/ViewGatewayResponse.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="GenericTransactionDecorator">
@@ -128,7 +128,7 @@ under the License.
                 </entity-one>
                 <set field="paymentMethodTypeId" from-field="opp.paymentMethodTypeId"/>
 
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/transaction/AuthorizeTransaction.groovy"/>
+                <script location="component://accounting/groovyScripts/transaction/AuthorizeTransaction.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="GenericTransactionDecorator">
@@ -157,7 +157,7 @@ under the License.
                 </entity-one>
                 <set field="paymentMethodTypeId" from-field="opp.paymentMethodTypeId"/>
 
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/transaction/CaptureTransaction.groovy"/>
+                <script location="component://accounting/groovyScripts/transaction/CaptureTransaction.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="GenericTransactionDecorator">

Modified: ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml?rev=1747746&r1=1747745&r2=1747746&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml Fri Jun 10 16:54:38 2016
@@ -50,7 +50,7 @@ under the License.
                         <section>
                             <actions>
                                 <set field="organizationPartyId" from-field="organizationPartyId" default-value="${defaultOrganizationPartyId}"/>
-                                <script location="component://accounting/webapp/accounting/WEB-INF/actions/invoice/InvoiceReport.groovy"/>
+                                <script location="component://accounting/groovyScripts/invoice/InvoiceReport.groovy"/>
                             </actions>
                             <widgets>
                                 <include-portal-page id="ApPortalPage"/>

Modified: ofbiz/trunk/applications/accounting/widget/ap/InvoiceScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ap/InvoiceScreens.xml?rev=1747746&r1=1747745&r2=1747746&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ap/InvoiceScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ap/InvoiceScreens.xml Fri Jun 10 16:54:38 2016
@@ -28,7 +28,7 @@ under the License.
                 <set field="tabButtonItem" value="viewReports"/>
                 <set field="invoiceTypeId" value="PURCHASE_INVOICE"/>
                 <set field="organizationPartyId" from-field="userPreferences.ORGANIZATION_PARTY" default-value="${defaultOrganizationPartyId}"/>
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/invoice/InvoiceReport.groovy"/>
+                <script location="component://accounting/groovyScripts/invoice/InvoiceReport.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonApReportDecorator" location="${parameters.mainDecoratorLocation}">

Modified: ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml?rev=1747746&r1=1747745&r2=1747746&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml Fri Jun 10 16:54:38 2016
@@ -52,7 +52,7 @@ under the License.
                         <section>
                             <actions>
                                 <set field="organizationPartyId" from-field="organizationPartyId" default-value="${defaultOrganizationPartyId}"/>
-                                <script location="component://accounting/webapp/accounting/WEB-INF/actions/invoice/InvoiceReport.groovy"/>
+                                <script location="component://accounting/groovyScripts/invoice/InvoiceReport.groovy"/>
                             </actions>
                             <widgets>
                                 <include-portal-page id="ArPortalPage"/>

Modified: ofbiz/trunk/applications/accounting/widget/ar/InvoiceScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ar/InvoiceScreens.xml?rev=1747746&r1=1747745&r2=1747746&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ar/InvoiceScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ar/InvoiceScreens.xml Fri Jun 10 16:54:38 2016
@@ -28,7 +28,7 @@ under the License.
                 <set field="titleProperty" value="AccountingArPageTitleListReports"/>
                 <set field="invoiceTypeId" value="SALES_INVOICE"/>
                 <set field="organizationPartyId" from-field="userPreferences.ORGANIZATION_PARTY" default-value="${defaultOrganizationPartyId}"/>
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/invoice/InvoiceReport.groovy"/>
+                <script location="component://accounting/groovyScripts/invoice/InvoiceReport.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">

Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml?rev=1747746&r1=1747745&r2=1747746&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml Fri Jun 10 16:54:38 2016
@@ -1058,7 +1058,7 @@ under the License.
                         </section>
                         <section>
                             <actions>
-                                <script location="component://accounting/webapp/accounting/WEB-INF/actions/payment/BillingAccounts.groovy"/>
+                                <script location="component://accounting/groovyScripts/payment/BillingAccounts.groovy"/>
                             </actions>
                             <widgets>
                                 <screenlet title="${uiLabelMap.AccountingBillingAccount}">

Modified: ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/BalanceSheet.rptdesign
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/BalanceSheet.rptdesign?rev=1747746&r1=1747745&r2=1747746&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/BalanceSheet.rptdesign (original)
+++ ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/BalanceSheet.rptdesign Fri Jun 10 16:54:38 2016
@@ -75,7 +75,7 @@ context.put("glFiscalTypeId", glFiscalTy
 context.put("delegator", delegator);
 context.put("dispatcher", dispatcher);
 context.put("userLogin", userLogin);
-GroovyUtil.runScriptAtLocation("component://accounting/webapp/accounting/WEB-INF/actions/reports/BalanceSheet.groovy", context);
+GroovyUtil.runScriptAtLocation("component://accounting/groovyScripts/reports/BalanceSheet.groovy", context);
 
 // prepare data source lists
 assetAccountBalanceList = context.get("assetAccountBalanceList");

Modified: ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/IncomeStatement.rptdesign
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/IncomeStatement.rptdesign?rev=1747746&r1=1747745&r2=1747746&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/IncomeStatement.rptdesign (original)
+++ ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/IncomeStatement.rptdesign Fri Jun 10 16:54:38 2016
@@ -75,7 +75,7 @@ context.put("glFiscalTypeId", glFiscalTy
 context.put("delegator", delegator);
 context.put("dispatcher", dispatcher);
 context.put("userLogin", userLogin);
-GroovyUtil.runScriptAtLocation("component://accounting/webapp/accounting/WEB-INF/actions/reports/IncomeStatement.groovy", context);
+GroovyUtil.runScriptAtLocation("component://accounting/groovyScripts/reports/IncomeStatement.groovy", context);
 
 // prepare data source lists
 revenueAccountBalanceList = context.get("revenueAccountBalanceList");

Modified: ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/InvoiceAcctgTransEntry.rptdesign
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/InvoiceAcctgTransEntry.rptdesign?rev=1747746&r1=1747745&r2=1747746&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/InvoiceAcctgTransEntry.rptdesign (original)
+++ ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/InvoiceAcctgTransEntry.rptdesign Fri Jun 10 16:54:38 2016
@@ -68,7 +68,7 @@ if (!logoImageUrl) {
 // create application list
 var context = new HashMap();
 context.put("invoice", invoice);
-GroovyUtil.runScriptAtLocation("component://accounting/webapp/accounting/WEB-INF/actions/invoice/CreateApplicationList.groovy", context);
+GroovyUtil.runScriptAtLocation("component://accounting/groovyScripts/invoice/CreateApplicationList.groovy", context);
 invoiceApplications = context.get("invoiceApplications");
 
 // create debit/credit total variable

Modified: ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/TrialBalance.rptdesign
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/TrialBalance.rptdesign?rev=1747746&r1=1747745&r2=1747746&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/TrialBalance.rptdesign (original)
+++ ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/TrialBalance.rptdesign Fri Jun 10 16:54:38 2016
@@ -65,7 +65,7 @@ context.put("parties", parties);
 context.put("delegator", delegator);
 context.put("dispatcher", dispatcher);
 context.put("userLogin", userLogin);
-GroovyUtil.runScriptAtLocation("component://accounting/webapp/accounting/WEB-INF/actions/reports/TrialBalance.groovy", context);
+GroovyUtil.runScriptAtLocation("component://accounting/groovyScripts/reports/TrialBalance.groovy", context);
 partyNameList = context.partyNameList;
 
 // get grand totoal posted