svn commit: r804866 - in /ofbiz/trunk/applications/accounting: data/ script/org/ofbiz/accounting/payment/ webapp/accounting/finaccounttrans/ widget/

[ashish-18]

Author: ashish
Date: Mon Aug 17 05:29:05 2009
New Revision: 804866

URL: http://svn.apache.org/viewvc?rev=804866&view=rev
Log:
Misc. things are covered in this work:

1) Cancel and PDF button should not be displayed for expired payment group.
2) Fixed an error occurred at Payment Group Overview page, when it has not associated with any member.
3) Update Demo data for GLReconciliatation - assign correct glAccountId (previous - 111000, new - 111100).
4) At Reconciliation tab show  - reconciled balance  at same page, and update algorithm to calculate sum of transaction under reconciliation process.

Thanks Sumit & Parimal for your contribution.


Modified:
    ofbiz/trunk/applications/accounting/data/DemoGlSetupData.xml
    ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml
    ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl
    ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml
    ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml
    ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml

Modified: ofbiz/trunk/applications/accounting/data/DemoGlSetupData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/DemoGlSetupData.xml?rev=804866&r1=804865&r2=804866&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/DemoGlSetupData.xml (original)
+++ ofbiz/trunk/applications/accounting/data/DemoGlSetupData.xml Mon Aug 17 05:29:05 2009
@@ -400,8 +400,8 @@
     <UomConversionDated uomId="USD" uomIdTo="EUR" fromDate="2001-01-01 00:00:00.0" conversionFactor="0.7"/><!-- to convert demo invoice -->
 
     <!-- Gl Reconciliation -->
-    <GlReconciliation glReconciliationId="9000" glReconciliationName="demoGlReconciliation" glAccountId="111000" organizationPartyId="Company" reconciledBalance="75000.00" reconciledDate="2009-08-08 20:03:14.000"/>
-    <GlReconciliation glReconciliationId="9001" glReconciliationName="testGlReconciliation" glAccountId="111000" organizationPartyId="Company" reconciledDate="2009-08-12 20:03:14.000"/>
+    <GlReconciliation glReconciliationId="9000" glReconciliationName="demoGlReconciliation" glAccountId="111100" organizationPartyId="Company" reconciledBalance="75000.00" reconciledDate="2009-08-08 20:03:14.000"/>
+    <GlReconciliation glReconciliationId="9001" glReconciliationName="testGlReconciliation" glAccountId="111100" organizationPartyId="Company" reconciledDate="2009-08-12 20:03:14.000"/>
 
     <GlAccountCategoryMember glAccountId="112000" glAccountCategoryId="9301" fromDate="2009-07-08 11:54:03.8" amountPercentage="50"/>
     <GlAccountCategoryMember glAccountId="112000" glAccountCategoryId="9302" fromDate="2009-07-08 11:54:03.8" amountPercentage="20"/>

Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml?rev=804866&r1=804865&r2=804866&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml Mon Aug 17 05:29:05 2009
@@ -648,12 +648,14 @@
         <entity-and entity-name="PaymentGroupMember" list="paymentGroupMembers">
             <field-map field-name="paymentGroupId"/>
         </entity-and>
-        <first-from-list list="paymentGroupMembers" entry="paymentGroupMember" />
-        <get-related-one relation-name="Payment" value-field="paymentGroupMember" to-value-field="payment"/>
-        <get-related-one relation-name="FinAccountTrans" value-field="payment" to-value-field="finAccountTrans"/>
-        <if-not-empty field="finAccountTrans">
-            <if-not-empty field="finAccountTrans.glReconciliationId">
-                <set field="glReconciliationId" from-field="finAccountTrans.glReconciliationId"/>
+        <if-not-empty field="paymentGroupMembers">
+            <first-from-list list="paymentGroupMembers" entry="paymentGroupMember"/>
+            <get-related-one relation-name="Payment" value-field="paymentGroupMember" to-value-field="payment"/>
+            <get-related-one relation-name="FinAccountTrans" value-field="payment" to-value-field="finAccountTrans"/>
+            <if-not-empty field="finAccountTrans">
+                <if-not-empty field="finAccountTrans.glReconciliationId">
+                    <set field="glReconciliationId" from-field="finAccountTrans.glReconciliationId"/>
+                </if-not-empty>
             </if-not-empty>
         </if-not-empty>
         <field-to-result field="glReconciliationId"/>

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl?rev=804866&r1=804865&r2=804866&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl Mon Aug 17 05:29:05 2009
@@ -37,6 +37,12 @@
             <td><span class="label">${uiLabelMap.FormFieldTitle_glReconciliationName}</span></td>
             <td>${currentGlReconciliation.glReconciliationName?if_exists}</td>
           </tr>
+          <#if currentGlReconciliation.reconciledBalance?exists>
+            <tr>
+              <td><span class="label">${uiLabelMap.FormFieldTitle_reconciledBalance}</span></td>
+              <td>${currentGlReconciliation.reconciledBalance?if_exists}</td>
+            </tr>
+          </#if>
           <tr>
             <td><span class="label">${uiLabelMap.FormFieldTitle_reconciledDate}</span></td>
             <td>${currentGlReconciliation.reconciledDate?if_exists}</td>
@@ -56,10 +62,12 @@
             <td><span class="label">${uiLabelMap.FormFieldTitle_glReconciliationName}</span></td>
             <td>${previousGlReconciliation.glReconciliationName?if_exists}</td>
           </tr>
-          <tr>
-            <td><span class="label">${uiLabelMap.FormFieldTitle_reconciledBalance}</span></td>
-            <td>${previousGlReconciliation.reconciledBalance?if_exists}</td>
-          </tr>
+          <#if previousGlReconciliation.reconciledBalance?exists>
+            <tr>
+              <td><span class="label">${uiLabelMap.FormFieldTitle_reconciledBalance}</span></td>
+              <td>${previousGlReconciliation.reconciledBalance?if_exists}</td>
+            </tr>
+          </#if>
           <tr>
             <td><span class="label">${uiLabelMap.FormFieldTitle_reconciledDate}</span></td>
             <td>${previousGlReconciliation.reconciledDate?if_exists}</td>
@@ -121,7 +129,7 @@
               <td><#if partyName?has_content>${(partyName.firstName)!} ${(partyName.lastName)!} ${(partyName.groupName)!}<a href="/partymgr/control/viewprofile?partyId=${partyName.partyId}">[${(partyName.partyId)!}]</a></#if></td>
               <td>${finAccountTrans.transactionDate?if_exists}</td>
               <td>${finAccountTrans.entryDateId?if_exists}</td>
-              <td>${finAccountTrans.amount?if_exists}</td>
+              <td><@ofbizCurrency amount=finAccountTrans.amount isoCode=defaultOrganizationPartyCurrencyUomId/></td>
               <td>
                 <#if finAccountTrans.paymentId?has_content>
                   <a href="<@ofbizUrl>paymentOverview?paymentId=${finAccountTrans.paymentId}</@ofbizUrl>">${finAccountTrans.paymentId}</a>
@@ -138,7 +146,7 @@
       </#if>
     </div>
     <div class="right">
-      <span class="label">${uiLabelMap.AccountingTotalCapital} </span>${transactionTotalAmount.grandTotal?if_exists}
+      <span class="label">${uiLabelMap.AccountingTotalCapital} </span><@ofbizCurrency amount=transactionTotalAmount.grandTotal isoCode=defaultOrganizationPartyCurrencyUomId/>
       <#if !currentGlReconciliation.reconciledBalance?has_content>
         <input type="submit" value="${uiLabelMap.AccountingReconcile}"/>
       </#if>

Modified: ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml?rev=804866&r1=804865&r2=804866&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml Mon Aug 17 05:29:05 2009
@@ -248,7 +248,7 @@
                 <parameter param-name="finAccountId"/>
             </hyperlink>
         </field>
-        <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use-when="${paymentGroupTypeId == 'BATCH_PAYMENT'}">
+        <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use-when="${paymentGroupTypeId == 'BATCH_PAYMENT'} @and ${groovy:org.ofbiz.base.util.UtilValidate.isNotEmpty(paymentGroupMembers)}">
             <hyperlink target="deleteDepositSlip" description="${uiLabelMap.CommonCancel}" also-hidden="false">
                 <parameter param-name="paymentGroupId"/>
                 <parameter param-name="finAccountId"/>
@@ -399,6 +399,7 @@
             <entity-one entity-name="PartyNameView" value-field="partyName">
                 <field-map field-name="partyId" from-field="glReconciliation.organizationPartyId"/>
             </entity-one>
+            <set field="currencyUomId" from-field="defaultOrganizationPartyCurrencyUomId"/>
         </row-actions>
         <auto-fields-service service-name="updateGlReconciliation" default-field-type="display" map-name="glReconciliation"/>
         <field name="glReconciliationId">
@@ -412,5 +413,6 @@
                 <parameter param-name="partyId" from-field="partyName.partyId"/>
             </hyperlink>
         </field>
+        <field name="reconciledBalance"><display type="currency" currency="${currencyUomId}"></display></field>
     </form>
 </forms>

Modified: ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml?rev=804866&r1=804865&r2=804866&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml Mon Aug 17 05:29:05 2009
@@ -594,9 +594,6 @@
                 <set field="glReconciliationId" from-field="parameters.glReconciliationId"/>
                 <entity-one entity-name="FinAccount" value-field="finAccount"/>
                 <entity-one entity-name="GlReconciliation" value-field="currentGlReconciliation"/>
-                <entity-and entity-name="FinAccountTrans" list="finAccountTransList">
-                    <field-map field-name="glReconciliationId"/>
-                </entity-and>
                 <entity-condition entity-name="GlReconciliation" list="glReconciliationList">
                     <condition-list combine="and">
                         <condition-expr field-name="reconciledDate" operator="less" from-field="currentGlReconciliation.reconciledDate" ignore-if-empty="true"/>
@@ -604,7 +601,8 @@
                     </condition-list>
                     <order-by field-name="reconciledDate DESC"/>
                 </entity-condition>
-                <service service-name="getTransactionTotalByGlReconcileId" result-map="transactionTotalAmount"/>
+                <service service-name="getFinAccountTransListAndTotals" result-map="transactionTotalAmount"/>
+                <set field="finAccountTransList" from-field="transactionTotalAmount.finAccountTransList" type="List"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonFinAccountDecorator" location="${parameters.finAccountDecoratorLocation}">

Modified: ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml?rev=804866&r1=804865&r2=804866&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml Mon Aug 17 05:29:05 2009
@@ -37,6 +37,11 @@
                 <field-map field-name="entityName" value="PaymentGroup"/>
             </service>
         </actions>
+        <row-actions>
+            <entity-and entity-name="PaymentGroupMember" list="paymentGroupMembers" filter-by-date="true">
+                <field-map field-name="paymentGroupId"/>
+            </entity-and>
+        </row-actions>
         <field name="paymentGroupId" widget-style="buttontext">
             <hyperlink description="${paymentGroupId}" target="PaymentGroupOverview">
                 <parameter param-name="paymentGroupId"/>
@@ -44,17 +49,17 @@
         </field>
         <field name="paymentGroupTypeId" title="${uiLabelMap.FormFieldTitle_paymentGroupType}"><display-entity entity-name="PaymentGroupType"/></field>
         <field name="paymentGroupName"><display/></field>
-        <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use-when="${paymentGroupTypeId == 'BATCH_PAYMENT'}">
+        <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use-when="${paymentGroupTypeId == 'BATCH_PAYMENT'} @and ${groovy:org.ofbiz.base.util.UtilValidate.isNotEmpty(paymentGroupMembers)}">
             <hyperlink target="cancelPaymentGroup" description="${uiLabelMap.CommonCancel}" also-hidden="false">
                 <parameter param-name="paymentGroupId"/>
             </hyperlink>
         </field>
-        <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use-when="${paymentGroupTypeId == 'CHECK_RUN'}">
+        <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use-when="${paymentGroupTypeId == 'CHECK_RUN'} @and ${groovy:org.ofbiz.base.util.UtilValidate.isNotEmpty(paymentGroupMembers)}">
             <hyperlink target="cancelCheckRunPayments" description="${uiLabelMap.CommonCancel}" also-hidden="false">
                 <parameter param-name="paymentGroupId"/>
             </hyperlink>
         </field>
-        <field name="depositSlip" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
+        <field name="depositSlip" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use-when="${groovy:org.ofbiz.base.util.UtilValidate.isNotEmpty(paymentGroupMembers)}">
             <hyperlink target="DepositSlip.pdf" description="${uiLabelMap.AccountingInvoicePDF}" also-hidden="false">
                 <parameter param-name="paymentGroupId"/>
             </hyperlink>