details: https://code.openbravo.com/erp/devel/pi/rev/2ae9efe0d6e6
changeset: 15569:2ae9efe0d6e6
user: David Miguelez <david.miguelez <at> openbravo.com>
date: Wed Feb 22 17:59:47 2012 +0100
summary: 0018731: It would be nice to have Deposit/Withdraw date in Payment
Report.
diffstat:
modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportDao.java
| 35 ++++++++-
modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportExcel.jrxml
| 20 +++++-
2 files changed, 47 insertions(+), 8 deletions(-)
diffs (132 lines):
diff -r f80dd438ba39 -r 2ae9efe0d6e6
modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportDao.java
---
a/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportDao.java
Wed Feb 22 12:39:53 2012 +0100
+++
b/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportDao.java
Wed Feb 22 17:59:47 2012 +0100
@@ -176,7 +176,10 @@
try {
hsqlScript
- .append("select fpsd.id, (select a.sequenceNumber from ADList a
where a.reference.id = '575BCB88A4694C27BC013DE9C73E6FE7' and a.searchKey =
coalesce(pay.status, 'RPAP')) as a from FIN_Payment_ScheduleDetail as fpsd ");
+ .append("select fpsd.id, (select a.sequenceNumber from ADList a
where a.reference.id = '575BCB88A4694C27BC013DE9C73E6FE7' and a.searchKey =
coalesce(pay.status, 'RPAP')) as a,");
+ hsqlScript
+ .append(" (select trans.id from FIN_Finacc_Transaction trans left
outer join trans.finPayment payment where payment.id=pay.id) as trans ");
+ hsqlScript.append(" from FIN_Payment_ScheduleDetail as fpsd ");
hsqlScript.append(" left outer join fpsd.paymentDetails.finPayment pay");
hsqlScript.append(" left outer join pay.businessPartner paybp");
hsqlScript.append(" left outer join paybp.businessPartnerCategory
paybpc");
@@ -534,19 +537,26 @@
}
}
- boolean firstMember = true;
+ HashMap<String, FIN_FinaccTransaction> hashMapTransactions = new
HashMap<String, FIN_FinaccTransaction>();
+ int index = 0;
java.util.List<FIN_PaymentScheduleDetail> obqPSDList = new
ArrayList<FIN_PaymentScheduleDetail>();
for (Object resultObject : query.list()) {
if (resultObject.getClass().isArray()) {
final Object[] values = (Object[]) resultObject;
+ String StringPSDId = "";
for (Object value : values) {
- if (firstMember) {
+ if (index == 0) {
obqPSDList.add(OBDal.getInstance().get(FIN_PaymentScheduleDetail.class,
(String) value));
- firstMember = false;
- } else {
- firstMember = true;
+ StringPSDId = (String) value;
+ } else if (index == 2) {
+ if (value != null) {
+ hashMapTransactions.put(StringPSDId,
+ OBDal.getInstance().get(FIN_FinaccTransaction.class,
value));
+ }
+ index = -1;// firstMember = true;
}
+ index++;
}
}
}
@@ -647,6 +657,14 @@
FieldProviderFactory.setField(data[i], "ISRECEIPT", "N");
isReceipt = false;
}
+ // deposit/withdraw date
+ if
(hashMapTransactions.containsKey(FIN_PaymentScheduleDetail[i].getId().toString()))
{
+ FieldProviderFactory.setField(data[i], "DEPOSIT_WITHDRAW_DATE",
dateFormat
+
.format(hashMapTransactions.get(FIN_PaymentScheduleDetail[i].getId())
+ .getTransactionDate()));
+ } else {
+ FieldProviderFactory.setField(data[i], "DEPOSIT_WITHDRAW_DATE",
"");
+ }
} else {
// bp_group -- bp_category
@@ -687,6 +705,8 @@
FieldProviderFactory.setField(data[i], "ISRECEIPT", "N");
isReceipt = false;
}
+ // deposit/withdraw date
+ FieldProviderFactory.setField(data[i], "DEPOSIT_WITHDRAW_DATE", "");
}
/*
@@ -1150,6 +1170,9 @@
FieldProviderFactory.setField(transactionData, "ISRECEIPT", "N");
// isReceipt = false;
}
+ // deposit/withdraw date
+ FieldProviderFactory.setField(transactionData, "DEPOSIT_WITHDRAW_DATE",
+ dateFormat.format(transaction.getDateAcct()));
// project
FieldProviderFactory.setField(transactionData, "PROJECT", "");
// salesPerson
diff -r f80dd438ba39 -r 2ae9efe0d6e6
modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportExcel.jrxml
---
a/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportExcel.jrxml
Wed Feb 22 12:39:53 2012 +0100
+++
b/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportExcel.jrxml
Wed Feb 22 17:59:47 2012 +0100
@@ -2,8 +2,8 @@
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports
http://jasperreports.sourceforge.net/xsd/jasperreport.xsd";
name="PaymentReportExcel" pageWidth="1800" pageHeight="595"
orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="1740"
leftMargin="30" rightMargin="30" topMargin="20" bottomMargin="20">
<property name="ireport.scriptlethandling" value="0"/>
<property name="ireport.encoding" value="UTF-8"/>
- <property name="ireport.zoom" value="1.0"/>
- <property name="ireport.x" value="0"/>
+ <property name="ireport.zoom" value="1.5"/>
+ <property name="ireport.x" value="1591"/>
<property name="ireport.y" value="0"/>
<import value="net.sf.jasperreports.engine.*"/>
<import value="java.util.*"/>
@@ -83,6 +83,7 @@
<field name="PAYMENT_DESC" class="java.lang.String"/>
<field name="PAYMENT_DATE" class="java.util.Date"/>
<field name="PAYMENT_DOCNO" class="java.lang.String"/>
+ <field name="DEPOSIT_WITHDRAW_DATE" class="java.util.Date"/>
<variable name="SUMSUBTOTALSTATUS" class="java.math.BigDecimal"
calculation="Sum">
<variableExpression><![CDATA[$F{BASE_AMOUNT}]]></variableExpression>
<initialValueExpression><![CDATA[BigDecimal.ZERO]]></initialValueExpression>
@@ -263,6 +264,14 @@
</textElement>
<text><![CDATA[Payment Method]]></text>
</staticText>
+ <staticText>
+ <reportElement key="staticText-14"
style="Detail_Header" x="1497" y="25" width="77" height="25"/>
+ <box leftPadding="2"/>
+ <textElement textAlignment="Center">
+ <font size="8" isBold="false"/>
+ </textElement>
+ <text><![CDATA[Deposit/Withdraw Date]]></text>
+ </staticText>
</band>
</pageHeader>
<columnHeader>
@@ -416,6 +425,13 @@
</textElement>
<textFieldExpression
class="java.lang.String"><![CDATA[$F{PAYMENT_METHOD}]]></textFieldExpression>
</textField>
+ <textField isBlankWhenNull="true">
+ <reportElement key="textField-14"
style="Report_Footer" x="1497" y="0" width="77" height="25"/>
+ <textElement textAlignment="Center">
+ <font size="8"/>
+ </textElement>
+ <textFieldExpression
class="java.util.Date"><![CDATA[$F{DEPOSIT_WITHDRAW_DATE}]]></textFieldExpression>
+ </textField>
</band>
</detail>
<columnFooter>
------------------------------------------------------------------------------
Virtualization & Cloud Management Using Capacity Planning
Cloud computing makes use of virtualization - but cloud computing
also focuses on allowing computing to be delivered as a service.
http://www.accelacomm.com/jaw/sfnl/114/51521223/
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
