svn commit: r790896 - in /ofbiz/trunk/applications/accounting: config/AccountingUiLabels.xml webapp/accounting/WEB-INF/controller.xml widget/GlForms.xml widget/GlScreens.xml

[ashish-18]

Author: ashish
Date: Fri Jul  3 13:07:38 2009
New Revision: 790896

URL: http://svn.apache.org/viewvc?rev=790896&view=rev
Log:
Applied patch from jira issue OFBIZ-2692 (Generate PDF for the Acctg Trans and related AcctgTransEntry.)
Thanks Brajesh & Rishi for your contribution.

Modified:
    ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
    ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
    ofbiz/trunk/applications/accounting/widget/GlForms.xml
    ofbiz/trunk/applications/accounting/widget/GlScreens.xml

Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=790896&r1=790895&r2=790896&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Fri Jul  3 13:07:38 2009
@@ -6362,6 +6362,10 @@
         <value xml:lang="it">Organizzazione</value>
         <value xml:lang="th">รหัสองค์กรกลุ่มผู้ใช้</value>
     </property>
+    <property key="AccountingOriginalCurrency">
+        <value xml:lang="en">Original Currency</value>
+        <value xml:lang="it">Valuta originale</value>
+    </property>
     <property key="AccountingChildPeriods">
         <value xml:lang="en">Child Periods</value>
         <value xml:lang="fr">Périodes enfants</value>

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml?rev=790896&r1=790895&r2=790896&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml Fri Jul  3 13:07:38 2009
@@ -2124,6 +2124,12 @@
         <security https="true" auth="true"/>
         <response name="success" type="view" value="TrialBalanceSearchResultsCsv"/>
     </request-map>
+
+    <!--Global GL Settings -->
+    <request-map uri="acctgTransDetailReportPdf.pdf">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="AcctgTransDetailReportPdf"/>
+    </request-map>
     <!-- end of request mappings -->
 
     <!-- View Mappings -->
@@ -2388,6 +2394,7 @@
     <view-map name="BalanceSheetPdf" type="screenfop" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#BalanceSheetPdf" content-type="application/pdf" encoding="none"/>
     <view-map name="TrialBalanceSearchResultsPdf" type="screenfop" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#TrialBalanceSearchResultsPdf" content-type="application/pdf" encoding="none"/>
     <view-map name="TrialBalanceSearchResultsCsv" type="screentext" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#TrialBalanceSearchResultsCsv" content-type="text/csv" encoding="none"/>
+    <view-map name="AcctgTransDetailReportPdf" type="screenfop" page="component://accounting/widget/GlScreens.xml#AcctgTransDetailReportPdf" content-type="application/pdf" encoding="none"/>
 
     <!-- end of view mappings -->
 </site-conf>

Modified: ofbiz/trunk/applications/accounting/widget/GlForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlForms.xml?rev=790896&r1=790895&r2=790896&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlForms.xml Fri Jul  3 13:07:38 2009
@@ -139,6 +139,11 @@
                 <parameter param-name="acctgTransId"/>
             </hyperlink>
         </field>
+        <field name="createTransactionDetailReportPDF" title="${uiLabelMap.CommonEmptyHeader}" use-when="${isPosted=='Y'}" widget-style="buttontext">
+            <hyperlink target="acctgTransDetailReportPdf.pdf" description="${uiLabelMap.AccountingInvoicePDF}">
+                <parameter param-name="acctgTransId"/>
+            </hyperlink>
+        </field>
         <field name="postAcctgTrans" title="${uiLabelMap.CommonEmptyHeader}" use-when="!&quot;N&quot;.equals(isPosted)"><display/></field>
     </form>
 
@@ -1044,4 +1049,60 @@
         <field name="quot15" title="&quot;"><display/></field>
         <field name="separator10" title=","><display description=","/></field>
     </form>
+
+    <form name="AcctgTransDetailReportPdf" type="single" default-map-name="acctgTrans">
+    <actions>
+    
+    </actions>
+        <field name="acctgTransId"><display/></field>
+        <field name="acctgTransTypeId" use-when="${acctgTrans.acctgTransTypeId!=null}">
+            <display-entity entity-name="AcctgTransType" key-field-name="acctgTransTypeId"/>
+        </field>
+        <field name="description" use-when="${acctgTrans.description!=null}"><display/></field>
+        <field name="transactionDate" use-when="${acctgTrans.transactionDate!=null}"><display/></field>
+        <field name="isPosted" use-when="${acctgTrans.isPosted!=null}"><display/></field>
+        <field name="postedDate" use-when="${acctgTrans.postedDate!=null}"><display/></field>
+        <field name="scheduledPostingDate" use-when="${acctgTrans.scheduledPostingDate!=null}"><display/></field>
+        <field name="glJournalId" use-when="${acctgTrans.glJournalId!=null}"><display/></field>
+        <field name="glFiscalTypeId" use-when="${acctgTrans.glFiscalTypeId!=null}">
+            <display-entity entity-name="GlFiscalType" key-field-name="glFiscalTypeId"/>
+        </field>
+        <field name="voucherRef"  use-when="${acctgTrans.voucherRef!=null}"><display/></field>
+        <field name="voucherDate" use-when="${acctgTrans.voucherDate!=null}"><display/></field>
+        <field name="groupStatusId" use-when="${acctgTrans.groupStatusId!=null}"><display/></field>
+        <field name="fixedAssetId" use-when="${acctgTrans.fixedAssetId!=null}"><display/></field>
+        <field name="inventoryItemId" use-when="${acctgTrans.inventoryItemId!=null}"><display/></field>
+        <field name="physicalInventoryId" use-when="${acctgTrans.physicalInventoryId!=null}"><display/></field>
+        <field name="partyId" use-when="${acctgTrans.partyId!=null}"><display/></field>
+        <field name="roleTypeId" use-when="${acctgTrans.roleTypeId!=null}">
+            <display-entity entity-name="RoleType" key-field-name="roleTypeId"/>
+        </field>
+        <field name="invoiceId" use-when="${acctgTrans.invoiceId!=null}"><display/></field>
+        <field name="paymentId" use-when="${acctgTrans.paymentId!=null}"><display/></field>
+        <field name="finAccountTransId" use-when="${acctgTrans.finAccountTransId!=null}"><display/></field>
+        <field name="shipmentId" use-when="${acctgTrans.shipmentId!=null}"><display/></field>
+        <field name="receiptId" use-when="${acctgTrans.receiptId!=null}"><display/></field>
+        <field name="workEffortId" use-when="${acctgTrans.workEffortId!=null}"><display/></field>
+        <field name="theirAcctgTransId" use-when="${acctgTrans.theirAcctgTransId!=null}"><display/></field>
+        <field name="createdByUserLogin" use-when="${acctgTrans.createdByUserLogin!=null}"><display/></field>
+        <field name="lastModifiedByUserLogin" use-when="${acctgTrans.lastModifiedByUserLogin!=null}"><display/></field>
+    </form>
+
+    <form name="AcctgTransEntriesDetailReportPdf" type="list" list-name="acctgTransEntries">
+        <row-actions>
+            <entity-one entity-name="GlAccount" value-field="glAccount">
+                <field-map field-name="glAccountId" from-field="glAccountId"/>
+            </entity-one>
+            <set field="accountName" from-field="glAccount.accountName"/>
+            <set field="accountCode" from-field="glAccount.accountCode"/>
+        </row-actions>
+        <field name="accountCode"><display/></field>
+        <field name="accountName"><display/></field>
+        <field name="debitAmount"><display type="currency" currency="${currencyUomId}" description="${groovy:if(debitCreditFlag.equals('D'))return(amount);if(debitCreditFlag.equals('C'))return(0);}"/></field>
+        <field name="creditAmount"><display type="currency" currency="${currencyUomId}" description="${groovy:if(debitCreditFlag.equals('C'))return(amount);if(debitCreditFlag.equals('D'))return(0);}"/></field>
+        <field name="currencyUomId" title="${uiLabelMap.AccountingOriginalCurrency}"><display description="${currencyUomId}"/></field>
+        <field name="exchangeRate" use-when="${origCurrencyUomId!=null}"><display description="${origAmount/amount} ${origCurrencyUomId}/${currencyUomId}"/></field>
+        <field name="exchangeRate" use-when="${origCurrencyUomId==null @and origAmount==null}"><display description="${amount/amount} ${currencyUomId}/${currencyUomId}"/></field>
+    </form>
+
 </forms>
\ No newline at end of file

Modified: ofbiz/trunk/applications/accounting/widget/GlScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlScreens.xml?rev=790896&r1=790895&r2=790896&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlScreens.xml Fri Jul  3 13:07:38 2009
@@ -410,6 +410,9 @@
                                                     <if-compare field="acctgTrans.isPosted" operator="equals" value="Y"/>
                                                 </condition>
                                                 <widgets>
+                                                    <link text="${uiLabelMap.AccountingInvoicePDF}" style="buttontext" target="acctgTransDetailReportPdf.pdf">
+                                                        <parameter param-name="acctgTransId"/>
+                                                    </link>
                                                     <include-form name="ViewAcctgTrans" location="component://accounting/widget/GlForms.xml"/>
                                                 </widgets>
                                                 <fail-widgets>
@@ -901,6 +904,27 @@
                 </platform-specific>
             </widgets>
         </section>
-        
+    </screen>
+
+    <screen name="AcctgTransDetailReportPdf">
+        <section>
+            <actions>
+                <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
+                <set field="acctgTransId" from-field="parameters.acctgTransId"/>
+                <entity-one entity-name="AcctgTrans" value-field="acctgTrans"/>
+                <entity-and entity-name="AcctgTransEntry" list="acctgTransEntries">
+                    <field-map field-name="acctgTransId"/>
+                    <order-by field-name="acctgTransEntrySeqId"/>
+                </entity-and>
+            </actions>
+            <widgets>
+                <decorator-screen name="SimpleDecorator" location="component://common/widget/CommonScreens.xml">
+                    <decorator-section name="body">
+                        <include-form name="AcctgTransDetailReportPdf" location="component://accounting/widget/GlForms.xml"/>
+                        <include-form name="AcctgTransEntriesDetailReportPdf" location="component://accounting/widget/GlForms.xml"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
     </screen>
 </screens>
\ No newline at end of file