svn commit: r805753 - in /ofbiz/trunk/applications/accounting: config/AccountingUiLabels.xml webapp/accounting/payment/PaymentForms.xml widget/PaymentScreens.xml

[apatel-2]

Author: apatel
Date: Wed Aug 19 11:34:53 2009
New Revision: 805753

URL: http://svn.apache.org/viewvc?rev=805753&view=rev
Log:
Adding FinancialAccount details panel to Payment overview page.

Modified:
    ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
    ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml
    ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml

Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=805753&r1=805752&r2=805753&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Wed Aug 19 11:34:53 2009
@@ -3212,6 +3212,10 @@
         <value xml:lang="th">การอนุญาต</value>
         <value xml:lang="zh">授权</value>
     </property>
+    <property key="AccountingFinAccountTransaction">
+        <value xml:lang="en">Financial Account Transaction</value>
+        <value xml:lang="hi_IN">वित्तीय खाता लेन-देन</value>
+    </property>
     <property key="AccountingFinAccountTransations">
         <value xml:lang="de">Transaktionen</value>
         <value xml:lang="en">Transactions</value>

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml?rev=805753&r1=805752&r2=805753&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml Wed Aug 19 11:34:53 2009
@@ -433,8 +433,7 @@
         <field name="effectiveDate" position="1"><display type="date"/></field>
         <field name="comments" position="2"><display/></field>
         <!--field name="paymentGatewayResponseId" title="Paym Gatw Resp." position="2"><display/></field-->
-        <field name="finAccountTransId" position="1"><display/></field>
-        <field name="overrideGlAccountId" position="2"><display/></field>
+        <field name="overrideGlAccountId" position="1"><display/></field>
     </form>
 
     <form name="paymentApplications" type="list" list-name="paymentApplications"
@@ -569,4 +568,17 @@
         <field name="paidAmount"><display/></field>
         <field name="outstandingAmount"><display/></field>
     </form>
+    <form name="FinAccountTransAssociatedWithPayment" type="single" default-map-name="finAccountTrans" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+        <field name="finAccountTransId" position="1"><display/></field>
+        <field name="finAccountTransTypeId" title="${uiLabelMap.FormFieldTitle_finAccountTransType}" position="2"><display-entity entity-name="FinAccountTransType" description="${description}"/></field>
+        <field name="amount" position="3"><display type="currency" currency="${payment.currencyUomId}"/></field>
+        <field name="glReconciliationId" position="1">
+            <hyperlink target="ViewGlReconciliationWithTransaction" description="${finAccountTrans.glReconciliationId}">
+                <parameter param-name="glReconciliationId" from-field="finAccountTrans.glReconciliationId"/>
+                <parameter param-name="finAccountId" from-field="finAccountTrans.finAccountId"/>
+            </hyperlink>
+        </field>
+        <field name="transactionDate" position="2"><display/></field>
+        <field name="statusId"  position="3" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" description="${description}" key-field-name="statusId"/></field>
+    </form>
 </forms>

Modified: ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml?rev=805753&r1=805752&r2=805753&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml Wed Aug 19 11:34:53 2009
@@ -325,6 +325,8 @@
                 <set field="labelTitleProperty" value="PageTitlePaymentOverview"/>
                 <set field="paymentId" from-field="parameters.paymentId"/>
                 <entity-one entity-name="Payment" value-field="payment"/>
+                <set field="finAccountTransId" from-field="payment.finAccountTransId"/>
+                <entity-one entity-name="FinAccountTrans" value-field="finAccountTrans"/>
                 <set field="appliedAmount" value="${bsh:org.ofbiz.accounting.payment.PaymentWorker.getPaymentApplied(payment).toString()}"/>
                 <set field="notAppliedAmount" value="${bsh:org.ofbiz.accounting.payment.PaymentWorker.getPaymentNotApplied(payment).toString()}"/>
                 <entity-condition entity-name="AcctgTransAndEntries" list="AcctgTransAndEntries">
@@ -371,6 +373,16 @@
                                     <screenlet title="${uiLabelMap.AccountingPaymentsApplied} ${appliedAmount?currency(${payment.currencyUomId})} ${uiLabelMap.AccountingOpenPayments} ${notAppliedAmount?currency(${payment.currencyUomId})}">
                                         <include-form name="paymentApplications" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/>
                                     </screenlet>
+                                        <section>
+                                            <condition>
+                                                <not><if-empty field="finAccountTransId"/></not>
+                                            </condition>
+                                            <widgets>
+                                                <screenlet title="${uiLabelMap.AccountingFinAccountTransaction}">
+                                                    <include-form name="FinAccountTransAssociatedWithPayment" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/>
+                                                </screenlet>
+                                            </widgets>
+                                        </section>
                                 </container>
                                 <container style="clear"/>
                                 <screenlet title="${uiLabelMap.AccountingTransactions}" navigation-form-name="AcctgTransAndEntries">
@@ -563,4 +575,4 @@
             </widgets>
         </section>
     </screen>
-</screens>
\ No newline at end of file
+</screens>