Author: apatel
Date: Sat Aug 1 13:49:41 2009
New Revision: 799861
URL: http://svn.apache.org/viewvc?rev=799861&view=rev
Log:
Reorganized fields in list. Showing number of tranaction included in the
totals. Show Party name instead of id.
Modified:
ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml
ofbiz/trunk/applications/accounting/servicedef/services_finaccount.xml
ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/FinAccountTrans.ftl
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=799861&r1=799860&r2=799861&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Sat Aug
1 13:49:41 2009
@@ -5697,6 +5697,9 @@
<value xml:lang="th">หมายà¹à¸¥à¸</value>
<value xml:lang="zh">æ°å</value>
</property>
+ <property key="AccountingNumberOfTransaction">
+ <value xml:lang="en">Number of Transaction</value>
+ </property>
<property key="AccountingOfflinePayment">
<value xml:lang="ar">تسدÙد غÙر Ù
باشر</value>
<value xml:lang="cs">Platba off-line</value>
Modified:
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml?rev=799861&r1=799860&r2=799861&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml
(original)
+++
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml
Sat Aug 1 13:49:41 2009
@@ -523,24 +523,30 @@
</entity-condition>
<set field="grandTotal" type="BigDecimal" value="0"/>
<set field="createdGrandTotal" type="BigDecimal" value="0"/>
+ <set field="totalCreatedTransactions" type="Long" value="0"/>
<set field="approvedGrandTotal" type="BigDecimal" value="0"/>
+ <set field="totalApprovedTransactions" type="Long" value="0"/>
<set field="createdApprovedGrandTotal" type="BigDecimal" value="0"/>
<iterate list="finAccountTransactions" entry="finAccountTransaction">
<if-compare field="finAccountTransaction.finAccountTransTypeId"
operator="equals" value="WITHDRAWAL">
<if-compare field="finAccountTransaction.statusId"
operator="equals" value="FINACT_TRNS_CREATED">
+ <set field="totalCreatedTransactions"
value="${totalCreatedTransactions + 1}" type="Long"/>
<set field="createdGrandTotal" value="${createdGrandTotal
- finAccountTransaction.amount}" type="BigDecimal"/>
<set field="createdApprovedGrandTotal"
value="${createdApprovedGrandTotal - finAccountTransaction.amount}"
type="BigDecimal"/>
</if-compare>
<if-compare field="finAccountTransaction.statusId"
operator="equals" value="FINACT_TRNS_APPROVED">
+ <set field="totalApprovedTransactions"
value="${totalApprovedTransactions + 1}" type="Long"/>
<set field="approvedGrandTotal"
value="${approvedGrandTotal - finAccountTransaction.amount}" type="BigDecimal"/>
<set field="createdApprovedGrandTotal"
value="${createdApprovedGrandTotal - finAccountTransaction.amount}"
type="BigDecimal"/>
</if-compare>
<else>
<if-compare field="finAccountTransaction.statusId"
operator="equals" value="FINACT_TRNS_CREATED">
+ <set field="totalCreatedTransactions"
value="${totalCreatedTransactions + 1}" type="Long"/>
<set field="createdGrandTotal" value="${createdGrandTotal
+ finAccountTransaction.amount}" type="BigDecimal"/>
<set field="createdApprovedGrandTotal"
value="${createdApprovedGrandTotal + finAccountTransaction.amount}"
type="BigDecimal"/>
</if-compare>
<if-compare field="finAccountTransaction.statusId"
operator="equals" value="FINACT_TRNS_APPROVED">
+ <set field="totalApprovedTransactions"
value="${totalApprovedTransactions + 1}" type="Long"/>
<set field="approvedGrandTotal"
value="${approvedGrandTotal + finAccountTransaction.amount}" type="BigDecimal"/>
<set field="createdApprovedGrandTotal"
value="${createdApprovedGrandTotal + finAccountTransaction.amount}"
type="BigDecimal"/>
</if-compare>
@@ -566,11 +572,17 @@
</else>
</if-compare>
</iterate>
+ <call-object-method obj-field="finAccountTransList" method-name="size"
ret-field="searchedNumberOfRecords"/>
+ <set field="totalCreatedApprovedTransactions"
value="${totalCreatedTransactions + totalApprovedTransactions}" type="Long"/>
<field-to-result field="finAccountTransList"/>
+ <field-to-result field="searchedNumberOfRecords"/>
<field-to-result field="grandTotal"/>
<field-to-result field="createdGrandTotal"/>
+ <field-to-result field="totalCreatedTransactions"/>
<field-to-result field="approvedGrandTotal"/>
+ <field-to-result field="totalApprovedTransactions"/>
<field-to-result field="createdApprovedGrandTotal"/>
+ <field-to-result field="totalCreatedApprovedTransactions"/>
</simple-method>
<simple-method method-name="getFinAccountTransRunningTotal"
short-description="Calculate running total of Financial Account Transactions">
Modified: ofbiz/trunk/applications/accounting/servicedef/services_finaccount.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/servicedef/services_finaccount.xml?rev=799861&r1=799860&r2=799861&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/servicedef/services_finaccount.xml
(original)
+++ ofbiz/trunk/applications/accounting/servicedef/services_finaccount.xml Sat
Aug 1 13:49:41 2009
@@ -217,10 +217,14 @@
<attribute name="fromEntryDate" type="Timestamp" mode="IN"
optional="true"/>
<attribute name="thruEntryDate" type="Timestamp" mode="IN"
optional="true"/>
<attribute name="finAccountTransList" type="List" mode="OUT"
optional="true"/>
+ <attribute name="searchedNumberOfRecords" type="Integer" mode="OUT"
optional="true"/>
<attribute name="grandTotal" type="BigDecimal" mode="OUT"
optional="true"/>
<attribute name="createdGrandTotal" type="BigDecimal" mode="OUT"
optional="true"/>
+ <attribute name="totalCreatedTransactions" type="Long" mode="OUT"
optional="true"/>
<attribute name="approvedGrandTotal" type="BigDecimal" mode="OUT"
optional="true"/>
+ <attribute name="totalApprovedTransactions" type="Long" mode="OUT"
optional="true"/>
<attribute name="createdApprovedGrandTotal" type="BigDecimal"
mode="OUT" optional="true"/>
+ <attribute name="totalCreatedApprovedTransactions" type="Long"
mode="OUT" optional="true"/>
</service>
<service name="getFinAccountTransRunningTotal" engine="simple"
location="component://accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml"
invoke="getFinAccountTransRunningTotal">
Modified:
ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/FinAccountTrans.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/FinAccountTrans.ftl?rev=799861&r1=799860&r2=799861&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/FinAccountTrans.ftl
(original)
+++
ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/FinAccountTrans.ftl
Sat Aug 1 13:49:41 2009
@@ -83,19 +83,15 @@
<tr class="header-row-2">
<th>${uiLabelMap.FormFieldTitle_finAccountTransId}</th>
<th>${uiLabelMap.FormFieldTitle_finAccountTransTypeId}</th>
- <th>${uiLabelMap.FormFieldTitle_partyId}</th>
+ <th>${uiLabelMap.PartyParty}</th>
<th>${uiLabelMap.FormFieldTitle_transactionDate}</th>
<th>${uiLabelMap.FormFieldTitle_entryDate}</th>
<th>${uiLabelMap.CommonAmount}</th>
<th>${uiLabelMap.FormFieldTitle_paymentId}</th>
- <th>${uiLabelMap.FormFieldTitle_orderId}</th>
- <th>${uiLabelMap.FormFieldTitle_orderItemSeqId}</th>
- <th>${uiLabelMap.FormFieldTitle_performedByPartyId}</th>
- <th>${uiLabelMap.FormFieldTitle_reasonEnumId}</th>
- <th>${uiLabelMap.CommonComments}</th>
- <th>${uiLabelMap.CommonStatus}</th>
<th>${uiLabelMap.OrderPaymentType}</th>
<th>${uiLabelMap.FormFieldTitle_paymentMethodTypeId}</th>
+ <th>${uiLabelMap.CommonStatus}</th>
+ <th>${uiLabelMap.CommonComments}</th>
<#if grandTotal?exists>
<th>${uiLabelMap.AccountingCancelTransactionStatus}</th>
<#else>
@@ -115,9 +111,6 @@
<#assign payments = delegator.findByAnd("Payment",
{"finAccountTransId" : finAccountTrans.finAccountTransId})>
</#if>
<#assign finAccountTransType =
delegator.findOne("FinAccountTransType", {"finAccountTransTypeId" :
finAccountTrans.finAccountTransTypeId}, true)>
- <#if finAccountTrans.reasonEnumId?has_content>
- <#assign enumeration = delegator.findOne("Enumeration",
{"enumId" : finAccountTrans.reasonEnumId}, true)>
- </#if>
<#if finAccountTrans.statusId?has_content>
<#assign status = delegator.findOne("StatusItem", {"statusId" :
finAccountTrans.statusId}, true)>
</#if>
@@ -127,6 +120,9 @@
<#if payment?has_content &&
payment.paymentMethodTypeId?has_content>
<#assign paymentMethodType =
delegator.findOne("PaymentMethodType", {"paymentMethodTypeId" :
payment.paymentMethodTypeId}, true)>
</#if>
+ <#if finAccountTrans.partyId?has_content>
+ <#assign partyName = (delegator.findOne("PartyNameView",
{"partyId" : finAccountTrans.partyId}, true))!>
+ </#if>
<tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
<td>
<#if payments?has_content>
@@ -138,11 +134,11 @@
<table class="basic-table hover-bar" cellspacing="0"
style"width :">
<tr class="header-row-2">
<th>${uiLabelMap.FormFieldTitle_paymentId}</th>
+ <th>${uiLabelMap.OrderPaymentType}</th>
+
<th>${uiLabelMap.FormFieldTitle_paymentMethodTypeId}</th>
<th>${uiLabelMap.CommonAmount}</th>
<th>${uiLabelMap.PartyPartyFrom}</th>
<th>${uiLabelMap.PartyPartyTo}</th>
- <th>${uiLabelMap.OrderPaymentType}</th>
-
<th>${uiLabelMap.FormFieldTitle_paymentMethodTypeId}</th>
</tr>
<#list payments as payment>
<#if payment?exists &&
payment.paymentTypeId?has_content>
@@ -153,11 +149,11 @@
</#if>
<tr valign="middle"<#if alt_row>
class="alternate-row"</#if>>
<td>${payment.paymentId?if_exists}</td>
+ <td><#if
paymentType?has_content>${paymentType.description?if_exists}</#if></td>
+ <td><#if
paymentMethodType?has_content>${paymentMethodType.description?if_exists}</#if></td>
<td>${payment.amount?if_exists}</td>
<td>${payment.partyIdFrom?if_exists}</td>
<td>${payment.partyIdTo?if_exists}</td>
- <td><#if
paymentType?has_content>${paymentType.description?if_exists}</#if></td>
- <td><#if
paymentMethodType?has_content>${paymentMethodType.description?if_exists}</#if></td>
</tr>
</#list>
</table>
@@ -171,7 +167,7 @@
</#if>
</td>
<td>${finAccountTransType.description?if_exists}</td>
- <td>${finAccountTrans.partyId?if_exists}</td>
+ <td>${(partyName.firstName)!} ${(partyName.lastName)!}
${(partyName.groupName)!}</td>
<td>${finAccountTrans.transactionDate?if_exists}</td>
<td>${finAccountTrans.entryDate?if_exists}</td>
<td>${finAccountTrans.amount?if_exists}</td>
@@ -180,14 +176,10 @@
<a
href="<@ofbizUrl>paymentOverview?paymentId=${finAccountTrans.paymentId}</@ofbizUrl>">${finAccountTrans.paymentId}</a>
</#if>
</td>
- <td>${finAccountTrans.orderId?if_exists}</td>
- <td>${finAccountTrans.orderItemSeqId?if_exists}</td>
- <td>${finAccountTrans.performedByPartyId?if_exists}</td>
- <td><#if
enumeration?has_content>${enumeration.description?if_exists}</#if></td>
- <td>${finAccountTrans.comments?if_exists}</td>
- <td><#if
status?has_content>${status.description?if_exists}</#if></td>
<td><#if
paymentType?has_content>${paymentType.description?if_exists}</#if></td>
<td><#if
paymentMethodType?has_content>${paymentMethodType.description?if_exists}</#if></td>
+ <td><#if
status?has_content>${status.description?if_exists}</#if></td>
+ <td>${finAccountTrans.comments?if_exists}</td>
<#if grandTotal?exists>
<td>
<#if finAccountTrans.statusId?has_content &&
finAccountTrans.statusId == 'FINACT_TRNS_CREATED'>
@@ -241,16 +233,16 @@
<#if grandTotal?exists>
<table border="1" class="basic-table">
<tr>
- <th>${uiLabelMap.FormFieldTitle_grandTotal}</th>
- <th>${uiLabelMap.AccountingCreatedGrandTotal}</th>
- <th>${uiLabelMap.AccountingApprovedGrandTotal}</th>
- <th>${uiLabelMap.AccountingCreatedApprovedGrandTotal}</th>
+ <th>${uiLabelMap.FormFieldTitle_grandTotal} /
${uiLabelMap.AccountingNumberOfTransaction}</th>
+ <th>${uiLabelMap.AccountingCreatedGrandTotal} /
${uiLabelMap.AccountingNumberOfTransaction}</th>
+ <th>${uiLabelMap.AccountingApprovedGrandTotal} /
${uiLabelMap.AccountingNumberOfTransaction}</th>
+ <th>${uiLabelMap.AccountingCreatedApprovedGrandTotal} /
${uiLabelMap.AccountingNumberOfTransaction}</th>
</tr>
<tr>
- <td>${grandTotal}</td>
- <td>${createdGrandTotal}</td>
- <td>${approvedGrandTotal}</td>
- <td>${createdApprovedGrandTotal}</td>
+ <td>${grandTotal} / ${searchedNumberOfRecords}</td>
+ <td>${createdGrandTotal} / ${totalCreatedTransactions}</td>
+ <td>${approvedGrandTotal} / ${totalApprovedTransactions}</td>
+ <td>${createdApprovedGrandTotal} /
${totalCreatedApprovedTransactions}</td>
</tr>
</table>
</#if>
Modified: ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml?rev=799861&r1=799860&r2=799861&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml Sat Aug 1
13:49:41 2009
@@ -404,10 +404,14 @@
<set field="layoutSettings.styleSheets[+0]"
value="/images/prototypejs/popup.css" global="true"/>
<service service-name="getFinAccountTransListAndTotals"
result-map="finAccountTransListAndTotals" auto-field-map="true"/>
<set field="finAccountTransList" type="List"
from-field="finAccountTransListAndTotals.finAccountTransList"/>
+ <set field="searchedNumberOfRecords" type="Integer"
from-field="finAccountTransListAndTotals.searchedNumberOfRecords"/>
<set field="grandTotal" type="BigDecimal"
from-field="finAccountTransListAndTotals.grandTotal"/>
<set field="createdGrandTotal" type="BigDecimal"
from-field="finAccountTransListAndTotals.createdGrandTotal"/>
+ <set field="totalCreatedTransactions" type="Long"
from-field="finAccountTransListAndTotals.totalCreatedTransactions"/>
<set field="approvedGrandTotal" type="BigDecimal"
from-field="finAccountTransListAndTotals.approvedGrandTotal"/>
+ <set field="totalApprovedTransactions" type="Long"
from-field="finAccountTransListAndTotals.totalApprovedTransactions"/>
<set field="createdApprovedGrandTotal" type="BigDecimal"
from-field="finAccountTransListAndTotals.createdApprovedGrandTotal"/>
+ <set field="totalCreatedApprovedTransactions" type="Long"
from-field="finAccountTransListAndTotals.totalCreatedApprovedTransactions"/>
<set field="finAccountId"
from-field="parameters.finAccountId"/>
<entity-one entity-name="FinAccount" value-field="finAccount"/>
<set field="finAccountTransId"
from-field="parameters.finAccountTransId"/>
