svn commit: r805735 - in /ofbiz/trunk/applications/accounting: config/AccountingUiLabels.xml widget/FinAccountScreens.xml

[ap...@apache.org]

Author: apatel
Date: Wed Aug 19 10:29:55 2009
New Revision: 805735

URL: http://svn.apache.org/viewvc?rev=805735&view=rev
Log:
Adding title to all financial account screens. And minor code cleanup.

Modified:
    ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
    ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml

Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=805735&r1=805734&r2=805735&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Wed Aug 19 10:29:55 2009
@@ -2199,9 +2199,13 @@
         <value xml:lang="en">Create New Deposit Payment</value>
         <value xml:lang="hi_IN">नई जमा भुगतान बनाएँ</value>
     </property>
+    <property key="AccountingCreateNewDepositPaymentFor">
+        <value xml:lang="en">Create New Deposit Payment For Financial Account : ${finAccount.finAccountName} [${finAccountId}]</value>
+        <value xml:lang="hi_IN">${finAccount.finAccountName} [${finAccountId}] वित्तीय खाते के लिए नई जमा भुगतान बनाएँ</value>
+    </property>
     <property key="AccountingCreateNewDepositSlipForFinancialAccount">
-        <value xml:lang="en">Create New Deposit Slip for Financial Account: ${finAccountId}</value>
-        <value xml:lang="hi_IN">नई जमा पर्ची वित्तीय खाते ${finAccountId} के लिए बनाएँ</value>
+        <value xml:lang="en">Create New Deposit Slip for Financial Account: ${finAccount.finAccountName} [${finAccountId}]</value>
+        <value xml:lang="hi_IN">नई जमा पर्ची वित्तीय खाते ${finAccount.finAccountName} [${finAccountId}] के लिए बनाएँ</value>
     </property>
     <property key="AccountingCreateNewEftAccount">
         <value xml:lang="ar">استحداث  حساب EFT  جديد</value>
@@ -2276,6 +2280,10 @@
         <value xml:lang="en">Create New Withdrawal Payment</value>
         <value xml:lang="hi_IN">नई वापसी भुगतान बनाएँ</value>
     </property>
+    <property key="AccountingCreateNewWithdrawalPaymentFor">
+        <value xml:lang="en">Create New Withdrawal Payment For Financial Account : ${finAccount.finAccountName} [${finAccountId}]</value>
+        <value xml:lang="hi_IN">${finAccount.finAccountName} [${finAccountId}] वित्तीय खाते के लिए नई वापसी भुगतान बनाएँ</value>
+    </property>
     <property key="AccountingCreatePayment">
         <value xml:lang="ar">تسديد جديد</value>
         <value xml:lang="de">Zahlung durchführen</value>
@@ -2664,8 +2672,8 @@
         <value xml:lang="hi_IN">जमा/वापस</value>
     </property>
     <property key="AccountingDepositOrWithdrawPayments">
-        <value xml:lang="en">Deposit Or Withdraw Payments for Financial Account: ${finAccountId}</value>
-        <value xml:lang="hi_IN"> ${finAccountId} वित्तीय खाते के लिए जमा भुगतान या भुगतान वापस करे</value>
+        <value xml:lang="en">Deposit Or Withdraw Payments for Financial Account: ${finAccount.finAccountName} [${finAccountId}]</value>
+        <value xml:lang="hi_IN">${finAccount.finAccountName} [${finAccountId}] वित्तीय खाते के लिए जमा भुगतान या भुगतान वापस करे</value>
     </property>
     <property key="AccountingDescr">
         <value xml:lang="ar">وصف</value>
@@ -2793,9 +2801,9 @@
     </property>
     <property key="AccountingEditFinAccount">
         <value xml:lang="de">Finanzkonto bearbeiten</value>
-        <value xml:lang="en">Create/Update Financial Account</value>
+        <value xml:lang="en">Create/Update Financial Account ${finAccount.finAccountName} [${finAccountId}]</value>
         <value xml:lang="fr">Créer/ mettre à jour un compte financier</value>
-        <value xml:lang="hi_IN">वित्तीय खाता बनाएँ/सम्पादित करे</value>
+        <value xml:lang="hi_IN">${finAccount.finAccountName} [${finAccountId}] वित्तीय खाता बनाएँ/सम्पादित करे</value>
         <value xml:lang="it">Crea/Aggiorna Conto Finanziario</value>
         <value xml:lang="nl">Maak/wijzig financiele rekening</value>
         <value xml:lang="ru">Создать/обновить финансовый счет</value>
@@ -2807,8 +2815,8 @@
         <value xml:lang="hi_IN">वित्तीय खाता प्राधिकरण ${finAccount.finAccountName} [${finAccountId}] के लिए सम्पादित करे</value>
     </property>
     <property key="AccountingEditFinAccountReconciliations">
-        <value xml:lang="en">Edit Financial Account Reconciliations</value>
-        <value xml:lang="hi_IN">वित्तीय लेखा मिलाप सम्पादित करे</value>
+        <value xml:lang="en">Edit Financial Account Reconciliations for Financial Account : ${finAccount.finAccountName} [${finAccountId}]</value>
+        <value xml:lang="hi_IN">${finAccount.finAccountName} [${finAccountId}] वित्तीय खाते के लिए वित्तीय लेखा मिलाप सम्पादित करे</value>
     </property>
     <property key="AccountingEditFinAccountRoleFor">
         <value xml:lang="en">Edit Financial Account Role For ${finAccount.finAccountName} [${finAccountId}]</value>
@@ -3258,8 +3266,8 @@
         <value xml:lang="hi_IN">लेखा प्राप्य भुगतान खोजें</value>
     </property>
     <property key="AccountingFindDepositSlip">
-        <value xml:lang="en">Find Deposit Slips for finAccount ${finAccountId}</value>
-        <value xml:lang="hi_IN">वित्तीय खाता ${finAccountId} के लिए जमा पर्चीयां ढूँढें</value>
+        <value xml:lang="en">Find Deposit Slips for Financial Account : ${finAccount.finAccountName} [${finAccountId}]</value>
+        <value xml:lang="hi_IN">वित्तीय खाता ${finAccount.finAccountName} [${finAccountId}] के लिए जमा पर्चीयां ढूँढें</value>
     </property>
     <property key="AccountingFindFixedAssets">
         <value xml:lang="de">Suche Anlagen</value>
@@ -4436,6 +4444,10 @@
         <value xml:lang="th">การกำหนดบัญชีแยกประเภททั่วไป</value>
         <value xml:lang="zh">全局总账设置</value>
     </property>
+    <property key="AccountingGlReconciliationFor">
+        <value xml:lang="en">Gl Reconciliation For : ${finAccount.finAccountName} [${finAccountId}]</value>
+        <value xml:lang="hi_IN">${finAccount.finAccountName} [${finAccountId}] के लिए पुनर्मिलान</value>
+    </property>
     <property key="AccountingGroupInOneTransaction">
         <value xml:lang="en">Group in one Transaction</value>
         <value xml:lang="hi_IN">लेन-देन एक समूह में</value>
@@ -7958,6 +7970,10 @@
         <value xml:lang="en">Reconcile</value>
         <value xml:lang="hi_IN">मिलान</value>
     </property>
+    <property key="AccountingReconcileFinAccountTransFor">
+        <value xml:lang="en">Reconcile Financial Accounting Transaction For : ${finAccount.finAccountName} [${finAccountId}]</value>
+        <value xml:lang="hi_IN">${finAccount.finAccountName} [${finAccountId}] के लिए  वित्तीय लेखा गतिविधि का पुनर्मिलान</value>
+    </property>
     <property key="AccountingReconciliation">
         <value xml:lang="en">Reconciliation</value>
         <value xml:lang="hi_IN">मिलाप</value>
@@ -12806,8 +12822,8 @@
         <value xml:lang="zh">查找金融账户</value>
     </property>
     <property key="PageTitleFindFinAccountTrans">
-        <value xml:lang="en">Find Financial Account Transactions</value>
-        <value xml:lang="hi_IN">वित्तीय खाता गतिविधियाँ खोजें</value>
+        <value xml:lang="en">Find Transactions for Financial Account: ${finAccount.finAccountName} [${finAccountId}]</value>
+        <value xml:lang="hi_IN">${finAccount.finAccountName} [${finAccountId}] वित्तीय खाते के लिए वित्तीय खाता गतिविधियाँ खोजें</value>
     </property>
     <property key="PageTitleFindPaymentGatewayConfig">
         <value xml:lang="en">Find Payment Gateway Config</value>

Modified: ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml?rev=805735&r1=805734&r2=805735&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml Wed Aug 19 10:29:55 2009
@@ -116,26 +116,26 @@
                 <decorator-screen name="CommonFinAccountDecorator" location="${parameters.finAccountDecoratorLocation}">
                     <decorator-section name="body">
                         <section>
+                            <condition>
+                                <not><if-empty field="finAccountId"/></not>
+                            </condition>
                             <widgets>
-                                <container style="screenlet">
-                                    <container style="screenlet-title-bar">
-                                        <container style="h3">
-                                            <label text="${uiLabelMap.AccountingEditFinAccount}"/>
-                                        </container>
-                                    </container>
-                                    <container style="screenlet-body">
-                                        <section>
-                                            <condition><not><if-empty field="finAccountId"/></not></condition>
-                                            <widgets>
-                                                <container style="button-bar">
-                                                    <link target="EditFinAccount" text="${uiLabelMap.AccountingCreateNewFinAccount}" style="buttontext"/>
-                                                </container>
-                                            </widgets>
-                                        </section>
-                                        <include-form name="EditFinAccount" location="component://accounting/widget/FinAccountForms.xml"/>
-                                    </container>
+                                <container style="h1">
+                                    <label text="${uiLabelMap.AccountingEditFinAccount}"/>
                                 </container>
+                                <screenlet id="EditFinAccountPanel" collapsible="true">
+                                    <link target="EditFinAccount" text="${uiLabelMap.AccountingCreateNewFinAccount}" style="buttontext"/>
+                                    <include-form name="EditFinAccount" location="component://accounting/widget/FinAccountForms.xml"/>
+                                </screenlet>
                             </widgets>
+                            <fail-widgets>
+                                <container style="h1">
+                                    <label text="${uiLabelMap.AccountingCreateNewFinAccount}"/>
+                                </container>
+                                <screenlet id="CreateFinAccountPanel" collapsible="true">
+                                    <include-form name="EditFinAccount" location="component://accounting/widget/FinAccountForms.xml"/>
+                                </screenlet>
+                            </fail-widgets>
                         </section>
                     </decorator-section>
                 </decorator-screen>
@@ -157,7 +157,10 @@
             <widgets>
                 <decorator-screen name="CommonFinAccountDecorator" location="${parameters.finAccountDecoratorLocation}">
                     <decorator-section name="body">
-                        <screenlet id="FinAccountRolePanel" title="${uiLabelMap.AccountingEditFinAccountRoleFor}" collapsible="true">
+                        <container style="h1">
+                            <label text="${uiLabelMap.AccountingEditFinAccountRoleFor}"/>
+                        </container>
+                        <screenlet id="FinAccountRolePanel" collapsible="true">
                             <include-form name="AddFinAccountRole" location="component://accounting/widget/FinAccountForms.xml"/>
                         </screenlet>
                         <include-form name="ListFinAccountRoles" location="component://accounting/widget/FinAccountForms.xml"/>
@@ -179,7 +182,10 @@
             <widgets>
                 <decorator-screen name="CommonFinAccountDecorator" location="${parameters.finAccountDecoratorLocation}">
                     <decorator-section name="body">
-                        <screenlet id="FinAccountTransPanel" title="${uiLabelMap.AccountingEditFinAccountTransactionFor}" collapsible="true">
+                        <container style="h1">
+                            <label text="${uiLabelMap.AccountingEditFinAccountTransactionFor}"/>
+                        </container>
+                        <screenlet id="FinAccountTransPanel" collapsible="true">
                             <include-form name="AddFinAccountTrans" location="component://accounting/widget/FinAccountForms.xml"/>
                         </screenlet>
                     </decorator-section>
@@ -222,6 +228,7 @@
                 <set field="thruDate" type="Timestamp" from-field="parameters.thruDate"/>
                 <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"/>
             </actions>
             <widgets>
@@ -298,6 +305,7 @@
                 <set field="titleProperty" value="AccountingFindDepositSlip"/>
                 <set field="tabButtonItem" value="findDepositSlips"/>
                 <set field="finAccountId" from-field="parameters.finAccountId"/>
+                <entity-one entity-name="FinAccount" value-field="finAccount"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonFinAccountDecorator" location="${parameters.finAccountDecoratorLocation}">
@@ -373,12 +381,12 @@
                 <set field="finAccountId" from-field="parameters.finAccountId"/>
                 <set field="headerItem" value="FindFinAccount"/>
                 <set field="paymentMethodTypeId" from-field="parameters.paymentMethodTypeId"/>
-                <set field="finAccountId" from-field="parameters.finAccountId"/>
                 <set field="cardType" from-field="parameters.cardType"/>
                 <set field="fromDate" type="Timestamp" from-field="parameters.fromDate"/>
                 <set field="thruDate" type="Timestamp" from-field="parameters.thruDate"/>
                 <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/ar/WEB-INF/actions/BatchPayments.groovy"/>
             </actions>
             <widgets>
@@ -442,12 +450,16 @@
                                 </link>
                             </widgets>
                         </section>
-                        <screenlet id="FinAccountTransPanel" collapsible="true">
-                            <include-form name="FindFinAccountTransactions" location="component://accounting/widget/FinAccountForms.xml"/>
-                        </screenlet>
-                        <platform-specific>
-                            <html><html-template location="component://accounting/webapp/accounting/finaccounttrans/FinAccountTrans.ftl"/></html>
-                        </platform-specific>
+                        <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
+                            <decorator-section name="search-options">
+                                <include-form name="FindFinAccountTransactions" location="component://accounting/widget/FinAccountForms.xml"/>
+                            </decorator-section> 
+                            <decorator-section name="search-results">
+                                <platform-specific>
+                                    <html><html-template location="component://accounting/webapp/accounting/finaccounttrans/FinAccountTrans.ftl"/></html>
+                                </platform-specific>
+                            </decorator-section>
+                        </decorator-screen>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -469,6 +481,9 @@
                         <link target="EditFinAccountTrans" text="${uiLabelMap.CommonCreateNew}" style="buttontext">
                             <parameter param-name="finAccountId" from-field="finAccountId"/>
                         </link>
+                        <container style="h1">
+                            <label text="${uiLabelMap.AccountingReconcileFinAccountTransFor}"/>
+                        </container>
                         <section>
                             <condition>
                                 <not>
@@ -528,11 +543,15 @@
                 <set field="statusId" value="PMNT_RECEIVED"/>
                 <set field="parentTypeId" value="RECEIPT"/>
                 <set field="finAccountTransTypeId" value="DEPOSIT"/>
+                <entity-one entity-name="FinAccount" value-field="finAccount"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonFinAccountDecorator" location="${parameters.finAccountDecoratorLocation}">
                     <decorator-section name="body">
-                        <screenlet title="${uiLabelMap.AccountingCreateNewDepositPayment}">
+                        <container style="h1">
+                            <label text="${uiLabelMap.AccountingCreateNewDepositPaymentFor}"/>
+                        </container>
+                        <screenlet id="EditDepositPaymentPanel" collapsible="true">
                             <include-form name="EditDepositPayment" location="component://accounting/widget/FinAccountForms.xml"/>
                         </screenlet>
                     </decorator-section>
@@ -548,11 +567,15 @@
                 <set field="statusId" value="PMNT_SENT"/>
                 <set field="parentTypeId" value="DISBURSEMENT"/>
                 <set field="finAccountTransTypeId" value="WITHDRAWAL"/>
+                <entity-one entity-name="FinAccount" value-field="finAccount"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonFinAccountDecorator" location="${parameters.finAccountDecoratorLocation}">
                     <decorator-section name="body">
-                        <screenlet title="${uiLabelMap.AccountingCreateNewWithdrawalPayment}">
+                        <container style="h1">
+                            <label text="${uiLabelMap.AccountingCreateNewWithdrawalPaymentFor}"/>
+                        </container>
+                        <screenlet id="EditWithdrawalPaymentPanel" collapsible="true">
                             <include-form name="EditWithdrawalPayment" location="component://accounting/widget/FinAccountForms.xml"/>
                         </screenlet>
                     </decorator-section>
@@ -572,11 +595,15 @@
                     <field-map field-name="glAccountId" from-field="finAccount.postToGlAccountId"/>
                     <order-by field-name="reconciledDate DESC"/>
                 </entity-and>
+                <entity-one entity-name="FinAccount" value-field="finAccount"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonFinAccountDecorator" location="${parameters.finAccountDecoratorLocation}">
                     <decorator-section name="body">
-                        <screenlet id="FinAccountReconciliationPanel" title="${uiLabelMap.AccountingEditFinAccountReconciliations}" collapsible="true">
+                        <container style="h1">
+                            <label text="${uiLabelMap.AccountingEditFinAccountReconciliations}"/>
+                        </container>
+                        <screenlet id="FinAccountReconciliationPanel" collapsible="true">
                             <include-form name="EditFinAccountReconciliation" location="component://accounting/widget/FinAccountForms.xml"/>
                         </screenlet>
                         <include-form name="ListFinAccountReconciliations" location="component://accounting/widget/FinAccountForms.xml"/>
@@ -607,6 +634,9 @@
             <widgets>
                 <decorator-screen name="CommonFinAccountDecorator" location="${parameters.finAccountDecoratorLocation}">
                     <decorator-section name="body">
+                        <container style="h1">
+                            <label text="${uiLabelMap.AccountingGlReconciliationFor}"></label>
+                        </container>
                         <platform-specific>
                             <html><html-template location="component://accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl"/></html>
                         </platform-specific>