svn commit: r1738754 - in /ofbiz/trunk/applications/accounting: template/ template/agreement/ template/common/ template/finaccounttrans/ template/invoice/ template/ledger/ template/payment/ template/period/ template/reports/ webapp/accounting/ webapp/a...

[Deepak Dixit-5]

Author: deepak
Date: Tue Apr 12 10:17:36 2016
New Revision: 1738754

URL: http://svn.apache.org/viewvc?rev=1738754&view=rev
Log:
(OFBIZ-6813) Apply patch from jira issue.
============================================================
relocate .ftl files in the accounting component
============================================================

Thanks Pierre Smits for your contribution.

Added:
    ofbiz/trunk/applications/accounting/template/
    ofbiz/trunk/applications/accounting/template/agreement/
      - copied from r1738739, ofbiz/trunk/applications/accounting/webapp/accounting/agreement/
    ofbiz/trunk/applications/accounting/template/common/
      - copied from r1738739, ofbiz/trunk/applications/accounting/webapp/accounting/common/
    ofbiz/trunk/applications/accounting/template/finaccounttrans/
      - copied from r1738739, ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/
    ofbiz/trunk/applications/accounting/template/invoice/
      - copied from r1738739, ofbiz/trunk/applications/accounting/webapp/accounting/invoice/
    ofbiz/trunk/applications/accounting/template/ledger/
      - copied from r1738739, ofbiz/trunk/applications/accounting/webapp/accounting/ledger/
    ofbiz/trunk/applications/accounting/template/main.ftl
      - copied unchanged from r1738739, ofbiz/trunk/applications/accounting/webapp/accounting/main.ftl
    ofbiz/trunk/applications/accounting/template/payment/
      - copied from r1738739, ofbiz/trunk/applications/accounting/webapp/accounting/payment/
    ofbiz/trunk/applications/accounting/template/period/
      - copied from r1738739, ofbiz/trunk/applications/accounting/webapp/accounting/period/
    ofbiz/trunk/applications/accounting/template/reports/
      - copied from r1738739, ofbiz/trunk/applications/accounting/webapp/accounting/reports/
Removed:
    ofbiz/trunk/applications/accounting/webapp/accounting/agreement/
    ofbiz/trunk/applications/accounting/webapp/accounting/common/
    ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/
    ofbiz/trunk/applications/accounting/webapp/accounting/invoice/
    ofbiz/trunk/applications/accounting/webapp/accounting/ledger/
    ofbiz/trunk/applications/accounting/webapp/accounting/main.ftl
    ofbiz/trunk/applications/accounting/webapp/accounting/payment/
    ofbiz/trunk/applications/accounting/webapp/accounting/period/
    ofbiz/trunk/applications/accounting/webapp/accounting/reports/
Modified:
    ofbiz/trunk/applications/accounting/widget/AccountingPrintScreens.xml
    ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml
    ofbiz/trunk/applications/accounting/widget/CommonScreens.xml
    ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml
    ofbiz/trunk/applications/accounting/widget/GlScreens.xml
    ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml
    ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml
    ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml
    ofbiz/trunk/applications/accounting/widget/PaymentGroupScreens.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/ap/ApPrintScreens.xml
    ofbiz/trunk/applications/accounting/widget/ap/InvoiceScreens.xml
    ofbiz/trunk/applications/accounting/widget/ar/ArPaymentScreens.xml
    ofbiz/trunk/applications/accounting/widget/ar/InvoiceScreens.xml

Modified: ofbiz/trunk/applications/accounting/widget/AccountingPrintScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AccountingPrintScreens.xml?rev=1738754&r1=1738753&r2=1738754&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/AccountingPrintScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/AccountingPrintScreens.xml Tue Apr 12 10:17:36 2016
@@ -55,15 +55,15 @@ under the License.
                             </decorator-section>
                             <decorator-section name="topRight">
                                <platform-specific>
-                                    <xsl-fo><html-template location="component://accounting/webapp/accounting/invoice/invoiceReportHeaderInfo.fo.ftl"/></xsl-fo>
+                                    <xsl-fo><html-template location="component://accounting/template/invoice/invoiceReportHeaderInfo.fo.ftl"/></xsl-fo>
                                 </platform-specific>
                             </decorator-section>
                             <decorator-section name="body">
                                <platform-specific>
-                                   <xsl-fo><html-template location="component://accounting/webapp/accounting/invoice/invoiceReportContactMechs.fo.ftl"/></xsl-fo>
+                                   <xsl-fo><html-template location="component://accounting/template/invoice/invoiceReportContactMechs.fo.ftl"/></xsl-fo>
                               </platform-specific>
                                <platform-specific>
-                                   <xsl-fo><html-template location="component://accounting/webapp/accounting/invoice/invoiceReportItems.fo.ftl"/></xsl-fo>
+                                   <xsl-fo><html-template location="component://accounting/template/invoice/invoiceReportItems.fo.ftl"/></xsl-fo>
                                </platform-specific>
                             </decorator-section>
                         </decorator-screen>
@@ -72,7 +72,7 @@ under the License.
                         <decorator-screen name="FoReportDecorator" location="component://common/widget/CommonScreens.xml">
                             <decorator-section name="body">
                                 <platform-specific>
-                                    <xsl-fo><html-template location="component://accounting/webapp/accounting/invoice/NoAccountingView.fo.ftl"/></xsl-fo>
+                                    <xsl-fo><html-template location="component://accounting/template/invoice/NoAccountingView.fo.ftl"/></xsl-fo>
                                 </platform-specific>
                             </decorator-section>
                         </decorator-screen>
@@ -92,7 +92,7 @@ under the License.
             </actions>
             <widgets>
                 <platform-specific>
-                    <xsl-fo><html-template location="component://accounting/webapp/accounting/payment/printCheck.fo.ftl"/></xsl-fo>
+                    <xsl-fo><html-template location="component://accounting/template/payment/printCheck.fo.ftl"/></xsl-fo>
                 </platform-specific>
             </widgets>
             <fail-widgets>
@@ -112,7 +112,7 @@ under the License.
             </actions>
             <widgets>
                <platform-specific>
-                    <xsl-fo><html-template location="component://accounting/webapp/accounting/invoice/PrintInvoices.fo.ftl"/></xsl-fo>
+                    <xsl-fo><html-template location="component://accounting/template/invoice/PrintInvoices.fo.ftl"/></xsl-fo>
                 </platform-specific>
             </widgets>
         </section>

Modified: ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml?rev=1738754&r1=1738753&r2=1738754&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml Tue Apr 12 10:17:36 2016
@@ -143,7 +143,7 @@ under the License.
                             <include-form name="EditAgreement" location="component://accounting/widget/AgreementForms.xml"/>
                         </screenlet>
                         <platform-specific>
-                            <html><html-template location="component://accounting/webapp/accounting/agreement/CopyAgreement.ftl"/></html>
+                            <html><html-template location="component://accounting/template/agreement/CopyAgreement.ftl"/></html>
                         </platform-specific>
                     </decorator-section>
                 </decorator-screen>

Modified: ofbiz/trunk/applications/accounting/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/CommonScreens.xml?rev=1738754&r1=1738753&r2=1738754&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/CommonScreens.xml Tue Apr 12 10:17:36 2016
@@ -292,7 +292,7 @@ under the License.
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <screenlet title="${uiLabelMap.AccountingMainPage}">
-                            <platform-specific><html><html-template location="component://accounting/webapp/accounting/main.ftl"/></html></platform-specific>
+                            <platform-specific><html><html-template location="component://accounting/template/main.ftl"/></html></platform-specific>
                         </screenlet>
                     </decorator-section>
                 </decorator-screen>
@@ -303,7 +303,7 @@ under the License.
     <screen name="creditCardFields">
         <section>
             <widgets>
-                <platform-specific><html><html-template location="component://accounting/webapp/accounting/common/creditcardfields.ftl"/></html></platform-specific>
+                <platform-specific><html><html-template location="component://accounting/template/common/creditcardfields.ftl"/></html></platform-specific>
             </widgets>
         </section>
     </screen>

Modified: ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml?rev=1738754&r1=1738753&r2=1738754&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml Tue Apr 12 10:17:36 2016
@@ -252,7 +252,7 @@ under the License.
                                     </decorator-section>
                                     <decorator-section name="search-results">
                                         <platform-specific>
-                                            <html><html-template location="component://accounting/webapp/accounting/payment/depositWithdrawPayments.ftl"/></html>
+                                            <html><html-template location="component://accounting/template/payment/depositWithdrawPayments.ftl"/></html>
                                         </platform-specific>
                                     </decorator-section>
                                 </decorator-screen>  
@@ -457,7 +457,7 @@ under the License.
                             </decorator-section>
                             <decorator-section name="search-results">
                                 <platform-specific>
-                                    <html><html-template location="component://accounting/webapp/accounting/finaccounttrans/FinAccountTrans.ftl"/></html>
+                                    <html><html-template location="component://accounting/template/finaccounttrans/FinAccountTrans.ftl"/></html>
                                 </platform-specific>
                             </decorator-section>
                         </decorator-screen>
@@ -508,7 +508,7 @@ under the License.
                                             <include-form name="FindBankReconciliationFinAcctTrans" location="component://accounting/widget/FinAccountForms.xml"/>
                                         </screenlet>
                                         <platform-specific>
-                                            <html><html-template location="component://accounting/webapp/accounting/finaccounttrans/FinAccountTrans.ftl"/></html>
+                                            <html><html-template location="component://accounting/template/finaccounttrans/FinAccountTrans.ftl"/></html>
                                         </platform-specific>
                                     </widgets>
                                 </section>
@@ -518,7 +518,7 @@ under the License.
                                     <include-form name="FindBankReconciliationFinAcctTrans" location="component://accounting/widget/FinAccountForms.xml"/>
                                 </screenlet>
                                 <platform-specific>
-                                    <html><html-template location="component://accounting/webapp/accounting/finaccounttrans/FinAccountTrans.ftl"/></html>
+                                    <html><html-template location="component://accounting/template/finaccounttrans/FinAccountTrans.ftl"/></html>
                                 </platform-specific>
                             </fail-widgets>
                         </section>
@@ -653,7 +653,7 @@ under the License.
                     <decorator-section name="body">
                         <label style="h1" text="${uiLabelMap.AccountingGlReconciliationFor}"></label>
                         <platform-specific>
-                            <html><html-template location="component://accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl"/></html>
+                            <html><html-template location="component://accounting/template/finaccounttrans/GlReconciledFinAccountTrans.ftl"/></html>
                         </platform-specific>
                     </decorator-section>
                 </decorator-screen>

Modified: ofbiz/trunk/applications/accounting/widget/GlScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlScreens.xml?rev=1738754&r1=1738753&r2=1738754&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlScreens.xml Tue Apr 12 10:17:36 2016
@@ -612,7 +612,7 @@ under the License.
             <widgets>
                 <platform-specific>
                     <xsl-fo>
-                        <html-template location="component://accounting/webapp/accounting/reports/AcctgTransEntriesSearchResult.fo.ftl"/>
+                        <html-template location="component://accounting/template/reports/AcctgTransEntriesSearchResult.fo.ftl"/>
                     </xsl-fo>
                 </platform-specific>
             </widgets>
@@ -656,7 +656,7 @@ under the License.
             <widgets>
                 <platform-specific>
                     <xsl-fo>
-                        <html-template location="component://accounting/webapp/accounting/reports/AcctgTransSearchResult.fo.ftl"/>
+                        <html-template location="component://accounting/template/reports/AcctgTransSearchResult.fo.ftl"/>
                     </xsl-fo>
                 </platform-specific>
             </widgets>

Modified: ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml?rev=1738754&r1=1738753&r2=1738754&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml Tue Apr 12 10:17:36 2016
@@ -560,7 +560,7 @@ under the License.
             <widgets>
                 <platform-specific>
                     <xsl-fo>
-                        <html-template location="component://accounting/webapp/accounting/reports/ChartOfAccount.fo.ftl"/>
+                        <html-template location="component://accounting/template/reports/ChartOfAccount.fo.ftl"/>
                     </xsl-fo>
                 </platform-specific>
             </widgets>

Modified: ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml?rev=1738754&r1=1738753&r2=1738754&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml Tue Apr 12 10:17:36 2016
@@ -367,7 +367,7 @@ under the License.
                                 <screenlet title="${uiLabelMap.FormFieldTitle_costCenters}">
                                     <platform-specific>
                                         <html>
-                                            <html-template location="component://accounting/webapp/accounting/ledger/CostCenters.ftl"/>
+                                            <html-template location="component://accounting/template/ledger/CostCenters.ftl"/>
                                         </html>
                                     </platform-specific>
                                 </screenlet>

Modified: ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml?rev=1738754&r1=1738753&r2=1738754&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml Tue Apr 12 10:17:36 2016
@@ -474,7 +474,7 @@ under the License.
                                     <include-form name="EditInvoiceItem" location="component://accounting/widget/InvoiceForms.xml"/>
                                 </widgets>
                                 <fail-widgets>
-                                    <platform-specific><html><html-template location="component://accounting/webapp/accounting/invoice/InvoiceItemsPayrol.ftl"/></html></platform-specific>
+                                    <platform-specific><html><html-template location="component://accounting/template/invoice/InvoiceItemsPayrol.ftl"/></html></platform-specific>
                                 </fail-widgets>
                             </section>
                         </screenlet>
@@ -583,7 +583,7 @@ under the License.
     <screen name="sendPerEmailBody">
         <section>
             <widgets>
-                <platform-specific><html><html-template location="component://accounting/webapp/accounting/invoice/sendPerEmail.ftl"/></html></platform-specific>
+                <platform-specific><html><html-template location="component://accounting/template/invoice/sendPerEmail.ftl"/></html></platform-specific>
             </widgets>
         </section>
     </screen>

Modified: ofbiz/trunk/applications/accounting/widget/PaymentGroupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentGroupScreens.xml?rev=1738754&r1=1738753&r2=1738754&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/PaymentGroupScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/PaymentGroupScreens.xml Tue Apr 12 10:17:36 2016
@@ -148,7 +148,7 @@ under the License.
                 <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/DepositSlip.fo.ftl"/></xsl-fo>
+                            <xsl-fo><html-template location="component://accounting/template/reports/DepositSlip.fo.ftl"/></xsl-fo>
                         </platform-specific>
                     </decorator-section>
                 </decorator-screen>

Modified: ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml?rev=1738754&r1=1738753&r2=1738754&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml Tue Apr 12 10:17:36 2016
@@ -445,7 +445,7 @@ under the License.
                     <decorator-section name="body">
                         <screenlet title="${uiLabelMap.AccountingManualTransaction}">
                             <platform-specific>
-                                <html><html-template location="component://accounting/webapp/accounting/payment/manualTx.ftl"/></html>
+                                <html><html-template location="component://accounting/template/payment/manualTx.ftl"/></html>
                             </platform-specific>
                         </screenlet>
                     </decorator-section>
@@ -457,7 +457,7 @@ under the License.
          <section>
             <widgets>
                 <platform-specific>
-                    <html><html-template location="component://accounting/webapp/accounting/payment/manualCCTx.ftl"/></html>
+                    <html><html-template location="component://accounting/template/payment/manualCCTx.ftl"/></html>
                 </platform-specific>
             </widgets>
         </section>
@@ -467,7 +467,7 @@ under the License.
             <widgets>
                 <platform-specific>
                     <!-- TODO: problem here: the original manualTx file referred to manualGCTx, but no such ftl files seems to exist, so this will blow up -->
-                    <html><html-template location="component://accounting/webapp/accounting/payment/manualGCTx.ftl"/></html>
+                    <html><html-template location="component://accounting/template/payment/manualGCTx.ftl"/></html>
                 </platform-specific>
             </widgets>
         </section>
@@ -487,7 +487,7 @@ under the License.
             </actions>
             <widgets>
                 <platform-specific>
-                    <xsl-fo><html-template location="component://accounting/webapp/accounting/payment/PrintChecks.fo.ftl"/></xsl-fo>
+                    <xsl-fo><html-template location="component://accounting/template/payment/PrintChecks.fo.ftl"/></xsl-fo>
                 </platform-specific>
             </widgets>
         </section>

Modified: ofbiz/trunk/applications/accounting/widget/PeriodScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PeriodScreens.xml?rev=1738754&r1=1738753&r2=1738754&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/PeriodScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/PeriodScreens.xml Tue Apr 12 10:17:36 2016
@@ -31,7 +31,7 @@ under the License.
             <widgets>
                 <decorator-screen name="GlobalGLSettingsDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <platform-specific><html><html-template location="component://accounting/webapp/accounting/period/EditCustomTimePeriod.ftl"/></html></platform-specific>
+                        <platform-specific><html><html-template location="component://accounting/template/period/EditCustomTimePeriod.ftl"/></html></platform-specific>
                     </decorator-section>
                 </decorator-screen>
             </widgets>

Modified: ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml?rev=1738754&r1=1738753&r2=1738754&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml Tue Apr 12 10:17:36 2016
@@ -96,7 +96,7 @@ under the License.
                             <decorator-section name="body">
                                 <screenlet title="${uiLabelMap.PageTitleSalesInvoiceByProductCategorySummary}">
                                     <platform-specific>
-                                        <html><html-template location="component://accounting/webapp/accounting/reports/SalesInvoiceByProductCategorySummary.ftl"/></html>
+                                        <html><html-template location="component://accounting/template/reports/SalesInvoiceByProductCategorySummary.ftl"/></html>
                                     </platform-specific>
                                 </screenlet>
                             </decorator-section>
@@ -121,7 +121,7 @@ under the License.
                             <decorator-section name="body">
                                 <screenlet title="${uiLabelMap.PageTitleSalesInvoiceByProductGlAccountSummary}">
                                     <platform-specific>
-                                        <html><html-template location="component://accounting/webapp/accounting/reports/SalesInvoiceByProductGlAccountSummary.ftl"/></html>
+                                        <html><html-template location="component://accounting/template/reports/SalesInvoiceByProductGlAccountSummary.ftl"/></html>
                                     </platform-specific>
                                 </screenlet>
                             </decorator-section>
@@ -147,7 +147,7 @@ under the License.
                             <decorator-section name="body">
                                 <screenlet title="${uiLabelMap.PageTitlePaymentByMethodSummary}">
                                     <platform-specific>
-                                        <html><html-template location="component://accounting/webapp/accounting/reports/PaymentByMethodSummary.ftl"/></html>
+                                        <html><html-template location="component://accounting/template/reports/PaymentByMethodSummary.ftl"/></html>
                                     </platform-specific>
                                 </screenlet>
                             </decorator-section>
@@ -172,7 +172,7 @@ under the License.
                             <decorator-section name="body">
                                 <screenlet title="${uiLabelMap.PageTitleInventoryIssueSummary}">
                                     <platform-specific>
-                                        <html><html-template location="component://accounting/webapp/accounting/reports/InventoryIssueSummary.ftl"/></html>
+                                        <html><html-template location="component://accounting/template/reports/InventoryIssueSummary.ftl"/></html>
                                     </platform-specific>
                                 </screenlet>
                             </decorator-section>
@@ -197,7 +197,7 @@ under the License.
                             <decorator-section name="body">
                                 <screenlet title="${uiLabelMap.PageTitleFinancialAccountSummary}">
                                     <platform-specific>
-                                        <html><html-template location="component://accounting/webapp/accounting/reports/FinancialAccountSummary.ftl"/></html>
+                                        <html><html-template location="component://accounting/template/reports/FinancialAccountSummary.ftl"/></html>
                                     </platform-specific>
                                 </screenlet>
                             </decorator-section>
@@ -1187,7 +1187,7 @@ under the License.
                                 <screenlet title="${uiLabelMap.AccountingGlAccountTrialBalance}">
                                    <platform-specific>
                                        <html>
-                                           <html-template location="component://accounting/webapp/accounting/reports/GlAccountTrialBalanceReport.ftl"/>
+                                           <html-template location="component://accounting/template/reports/GlAccountTrialBalanceReport.ftl"/>
                                        </html>
                                    </platform-specific>
                                 </screenlet>
@@ -1212,7 +1212,7 @@ under the License.
                     <decorator-section name="body">
                         <platform-specific>
                             <xsl-fo>
-                                <html-template location="component://accounting/webapp/accounting/reports/GlAccountTrialBalanceReport.fo.ftl"/>
+                                <html-template location="component://accounting/template/reports/GlAccountTrialBalanceReport.fo.ftl"/>
                             </xsl-fo>
                         </platform-specific>
                     </decorator-section>
@@ -1267,7 +1267,7 @@ under the License.
                                 <screenlet title="${uiLabelMap.FormFieldTitle_costCenters}">
                                     <platform-specific>
                                         <html>
-                                            <html-template location="component://accounting/webapp/accounting/reports/CostCentersReport.ftl"/>
+                                            <html-template location="component://accounting/template/reports/CostCentersReport.ftl"/>
                                         </html>
                                     </platform-specific>
                                 </screenlet>
@@ -1298,7 +1298,7 @@ under the License.
                     <decorator-section name="body">
                         <platform-specific>
                             <xsl-fo>
-                                <html-template location="component://accounting/webapp/accounting/reports/CostCentersReport.fo.ftl"/>
+                                <html-template location="component://accounting/template/reports/CostCentersReport.fo.ftl"/>
                             </xsl-fo>
                         </platform-specific>
                     </decorator-section>

Modified: ofbiz/trunk/applications/accounting/widget/ap/ApPrintScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ap/ApPrintScreens.xml?rev=1738754&r1=1738753&r2=1738754&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ap/ApPrintScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ap/ApPrintScreens.xml Tue Apr 12 10:17:36 2016
@@ -36,7 +36,7 @@ under the License.
                     </decorator-section>
                     <decorator-section name="body">
                         <platform-specific>
-                            <xsl-fo><html-template location="component://accounting/webapp/ap/reports/CommissionReport.fo.ftl"/></xsl-fo>
+                            <xsl-fo><html-template location="component://accounting/template/ap/reports/CommissionReport.fo.ftl"/></xsl-fo>
                         </platform-specific>
                     </decorator-section>
                 </decorator-screen>

Modified: ofbiz/trunk/applications/accounting/widget/ap/InvoiceScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ap/InvoiceScreens.xml?rev=1738754&r1=1738753&r2=1738754&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ap/InvoiceScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ap/InvoiceScreens.xml Tue Apr 12 10:17:36 2016
@@ -126,7 +126,7 @@ under the License.
                                     </decorator-section>
                                     <decorator-section name="search-results">
                                         <platform-specific>
-                                            <html><html-template location="component://accounting/webapp/ap/invoices/PurchaseInvoices.ftl"/></html>
+                                            <html><html-template location="component://accounting/template/ap/invoices/PurchaseInvoices.ftl"/></html>
                                         </platform-specific>
                                     </decorator-section>
                                 </decorator-screen>
@@ -190,7 +190,7 @@ under the License.
                                     </decorator-section>
                                     <decorator-section name="search-results">
                                         <platform-specific>
-                                            <html><html-template location="component://accounting/webapp/ap/invoices/CommissionRun.ftl"/></html>
+                                            <html><html-template location="component://accounting/template/ap/invoices/CommissionRun.ftl"/></html>
                                         </platform-specific>
                                     </decorator-section>
                                 </decorator-screen>
@@ -220,7 +220,7 @@ under the License.
                                     </decorator-section>
                                     <decorator-section name="search-results">
                                         <platform-specific>
-                                            <html><html-template location="component://accounting/webapp/ap/invoices/CommissionReport.ftl"/></html>
+                                            <html><html-template location="component://accounting/template/ap/invoices/CommissionReport.ftl"/></html>
                                         </platform-specific>
                                     </decorator-section>
                                 </decorator-screen>

Modified: ofbiz/trunk/applications/accounting/widget/ar/ArPaymentScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ar/ArPaymentScreens.xml?rev=1738754&r1=1738753&r2=1738754&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ar/ArPaymentScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ar/ArPaymentScreens.xml Tue Apr 12 10:17:36 2016
@@ -80,7 +80,7 @@ under the License.
                                     </decorator-section>
                                     <decorator-section name="search-results">
                                         <platform-specific>
-                                            <html><html-template location="component://accounting/webapp/ar/payment/batchPayments.ftl"/></html>
+                                            <html><html-template location="component://accounting/template/ar/payment/batchPayments.ftl"/></html>
                                         </platform-specific>
                                     </decorator-section>
                                 </decorator-screen>  

Modified: ofbiz/trunk/applications/accounting/widget/ar/InvoiceScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ar/InvoiceScreens.xml?rev=1738754&r1=1738753&r2=1738754&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ar/InvoiceScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ar/InvoiceScreens.xml Tue Apr 12 10:17:36 2016
@@ -86,7 +86,7 @@ under the License.
                                     </decorator-section>
                                     <decorator-section name="search-results">
                                         <platform-specific>
-                                            <html><html-template location="component://accounting/webapp/ar/invoice/ListInvoices.ftl"/></html>
+                                            <html><html-template location="component://accounting/template/ar/invoice/ListInvoices.ftl"/></html>
                                         </platform-specific>
                                     </decorator-section>
                                 </decorator-screen>