details: https://code.openbravo.com/erp/devel/pi/rev/9159b893ca71
changeset: 19844:9159b893ca71
user: David Miguelez <david.miguelez <at> openbravo.com>
date: Mon Mar 04 10:36:17 2013 +0100
summary: Fixes Issue 23179. Adds Expected Date filter and field.
diffstat:
modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.html
| 62 ++++++-
modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.java
| 70 +++++--
modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.xml
| 8 +
modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportDao.java
| 71 +++++++-
modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportExcel.jrxml
| 83 ++++++---
modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportPDF.jrxml
| 59 ++++--
6 files changed, 266 insertions(+), 87 deletions(-)
diffs (truncated from 870 to 300 lines):
diff -r b89b81a6f0f9 -r 9159b893ca71
modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.html
---
a/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.html
Mon Mar 04 09:55:23 2013 +0100
+++
b/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.html
Mon Mar 04 10:36:17 2013 +0100
@@ -514,6 +514,52 @@
</tr>
</table>
</td>
+ </tr>
+ <tr>
+ <td class="TitleCell"><span class="LabelText">Expected Date
From</span></td>
+ <td class="TextBox_btn_ContentCell">
+ <table border="0" cellspacing="0" cellpadding="0"
summary="" style="padding-top: 0px;">
+ <tr>
+ <td class="TextBox_ContentCell">
+ <input dojoType="openbravo:DateTextbox"
lowerThan="paramExpectedDateTo" displayFormat="xx" saveFormat="yy"
class="TextBox_btn_OneCell_width" type="text" name="inpExpectedDateFrom"
id="paramExpectedDateFrom" size="10" maxlength="10" value=""
onkeyup="autoCompleteDate(this.textbox, this.displayFormat);return
true;"></input><script>djConfig.searchIds.push("paramExpectedDateFrom");</script>
+ </td>
+ <td class="FieldButton_ContentCell">
+ <a class="FieldButtonLink" href="#"
onfocus="setWindowElementFocus(this); window.status='Calendar'; return true;"
onblur="window.status=''; return true;"
onkeypress="this.className='FieldButtonLink_active'; return true;"
onkeyup="this.className='FieldButtonLink_focus'; return true;"
onclick="showCalendar('frmMain.inpExpectedDateFrom',
document.frmMain.inpExpectedDateFrom.value, false);return false;">
+ <table class="FieldButton"
onmouseout="this.className='FieldButton';window.status='';return true;"
onmouseover="this.className='FieldButton_hover';window.status='Show
calendar';return true;" onmousedown="this.className='FieldButton_active';return
true;" onmouseup="this.className='FieldButton';return true;">
+ <tr>
+ <td class="FieldButton_bg">
+ <img alt="Calendar" class="FieldButton_Icon
FieldButton_Icon_Calendar" title="Calendar"
src="../../../../../web/images/blank.gif" border="0"></img>
+ </td>
+ </tr>
+ </table>
+ </a>
+ </td>
+ </tr>
+ </table>
+ </td>
+ <td class="ContentCell"></td>
+ <td class="ContentCell"></td>
+ <td class="TitleCell"><span class="LabelText">Expected Date
To</span></td>
+ <td class="TextBox_btn_ContentCell">
+ <table border="0" cellspacing="0" cellpadding="0"
summary="" style="padding-top: 0px;">
+ <tr>
+ <td class="TextBox_ContentCell">
+ <input dojoType="openbravo:DateTextbox"
greaterThan="paramExpectedDateFrom" displayFormat="xx" saveFormat="yy"
class="TextBox_btn_OneCell_width" type="text" name="inpExpectedDateTo"
id="paramExpectedDateTo" size="10" maxlength="10" value=""
onkeyup="autoCompleteDate(this.textbox, this.displayFormat);return
true;"></input><script>djConfig.searchIds.push("paramExpectedDateTo");</script>
+ </td>
+ <td class="FieldButton_ContentCell">
+ <a class="FieldButtonLink" href="#"
onfocus="setWindowElementFocus(this); window.status='Calendar'; return true;"
onblur="window.status=''; return true;"
onkeypress="this.className='FieldButtonLink_active'; return true;"
onkeyup="this.className='FieldButtonLink_focus'; return true;"
onclick="showCalendar('frmMain.inpExpectedDateTo',
document.frmMain.inpExpectedDateTo.value, false);return false;" >
+ <table
class="FieldButton"onmouseout="this.className='FieldButton';window.status='';return
true;" onmouseover="this.className='FieldButton_hover';window.status='Show
calendar';return true;" onmousedown="this.className='FieldButton_active';return
true;" onmouseup="this.className='FieldButton';return true;">
+ <tr>
+ <td class="FieldButton_bg">
+ <img alt="Calendar" class="FieldButton_Icon
FieldButton_Icon_Calendar" title="Calendar"
src="../../../../../web/images/blank.gif" border="0"></img>
+ </td>
+ </tr>
+ </table>
+ </a>
+ </td>
+ </tr>
+ </table>
+ </td>
</tr>
<tr>
<td class="TitleCell"><span class="LabelText">Document Date
From</span></td>
@@ -1127,7 +1173,7 @@
<table border="0" cellspacing="0" cellpadding="0"
width="90%" class="DataGrid_Header_Table DataGrid_Body_Table"
style="table-layout: auto;">
<div id="sectionStatus">
<tr class="DataGrid_Body_Row">
- <th colspan="16" class="DataGrid_Header_Cell"
style="text-align:left">Status<span>: </span>
+ <th colspan="17" class="DataGrid_Header_Cell"
style="text-align:left">Status<span>: </span>
<span id="fieldStatus">xxStatusName</span></th>
</tr>
@@ -1141,6 +1187,7 @@
<th width="10%"
class="DataGrid_Header_Cell">Invoice Date</th>
<th width="10%"
class="DataGrid_Header_Cell">Payment</th>
<th width="10%" class="DataGrid_Header_Cell">Due
Date</th>
+ <th width="10%"
class="DataGrid_Header_Cell">Expected Date</th>
<th width="10%"
class="DataGrid_Header_Cell">PlannedDSO</th>
<th width="10%"
class="DataGrid_Header_Cell">CurrentDSO</th>
<th width="10%"
class="DataGrid_Header_Cell">Overdue</th>
@@ -1171,6 +1218,7 @@
</a>
</td>
<td width="10%" id="fieldDueDate"
class="DataGrid_Body_Cell">xx14500.34</td>
+ <td width="10%" id="fieldExpectedDate"
class="DataGrid_Body_Cell">xx14500.34</td>
<td width="10%" id="fieldPlannedDSO"
class="DataGrid_Body_Cell_Amount">xx14500.34</td>
<td width="10%" id="fieldCurrentDSO"
class="DataGrid_Body_Cell_Amount">xx14500.34</td>
<td width="10%" id="fieldOverdue"
class="DataGrid_Body_Cell_Amount">xx14500.34</td>
@@ -1183,13 +1231,13 @@
</div>
<tr class="DataGrid_Body_Row">
<th width="10%" class="DataGrid_Header_Cell"><span
class="Bold">Sub Total (Status)</span></th>
- <th width="100%"
class="DataGrid_Header_Cell_Amount" colspan="12"></th>
+ <th width="100%"
class="DataGrid_Header_Cell_Amount" colspan="13"></th>
<th width="10%"
class="DataGrid_Header_Cell_Amount" style="text-align:right"><span class="Bold"
id="subtotalBaseAmount"></span></th>
<th width="10%" class="DataGrid_Header_Cell"><span
class="Bold" id="fieldBaseCurrency"></span></th>
<th width="100%"
class="DataGrid_Header_Cell_Amount"></th>
</tr>
<tr>
- <th colspan="16" height="25px"/>
+ <th colspan="17" height="25px"/>
</tr>
</div>
</table>
@@ -1207,7 +1255,7 @@
</tr>
<div id="sectionStatus2">
<tr class="DataGrid_Body_Row">
- <th colspan="16"
class="DataGrid_Header_Cell" style="text-align:left">Status<span>: </span>
+ <th colspan="17"
class="DataGrid_Header_Cell" style="text-align:left">Status<span>: </span>
<span
id="fieldStatus2">xxStatusName</span></th>
</tr>
@@ -1220,6 +1268,7 @@
<th width="10%"
class="DataGrid_Header_Cell">Invoice Date</th>
<th width="10%"
class="DataGrid_Header_Cell">Payment</th>
<th width="10%"
class="DataGrid_Header_Cell">Due Date</th>
+ <th width="10%"
class="DataGrid_Header_Cell">Expected Date</th>
<th width="10%"
class="DataGrid_Header_Cell">PlannedDSO</th>
<th width="10%"
class="DataGrid_Header_Cell">CurrentDSO</th>
<th width="10%"
class="DataGrid_Header_Cell">Overdue</th>
@@ -1249,6 +1298,7 @@
</a>
</td>
<td width="10%" id="fieldDueDate2"
class="DataGrid_Body_Cell">xx14500.34</td>
+ <td width="10%" id="fieldExpectedDate2"
class="DataGrid_Body_Cell">xx14500.34</td>
<td width="10%" id="fieldPlannedDSO2"
class="DataGrid_Body_Cell_Amount">xx14500.34</td>
<td width="10%" id="fieldCurrentDSO2"
class="DataGrid_Body_Cell_Amount">xx14500.34</td>
<td width="10%" id="fieldOverdue2"
class="DataGrid_Body_Cell_Amount">xx14500.34</td>
@@ -1261,7 +1311,7 @@
</div>
<tr class="DataGrid_Body_Row">
<th width="10%"
class="DataGrid_Header_Cell"><span class="Bold">Sub Total (Status)</span></th>
- <th width="100%"
class="DataGrid_Header_Cell_Amount" colspan="12"></th>
+ <th width="100%"
class="DataGrid_Header_Cell_Amount" colspan="13"></th>
<th width="10%"
class="DataGrid_Header_Cell_Amount" style="text-align:right"><span class="Bold"
id="subtotalBaseAmountStatus"></span></th>
<th width="10%"
class="DataGrid_Header_Cell"><span class="Bold"
id="fieldBaseCurrency2"></span></th>
<th width="100%"
class="DataGrid_Header_Cell_Amount"></th>
@@ -1269,7 +1319,7 @@
</div>
<tr>
- <th colspan="16" style="height:25px"/>
+ <th colspan="17" style="height:25px"/>
</tr>
</div>
</table>
diff -r b89b81a6f0f9 -r 9159b893ca71
modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.java
---
a/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.java
Mon Mar 04 09:55:23 2013 +0100
+++
b/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.java
Mon Mar 04 10:36:17 2013 +0100
@@ -73,6 +73,10 @@
"");
String strDueDateTo = vars
.getRequestGlobalVariable("inpDueDateTo", "PaymentReport|DueDateTo");
+ String strExpectedDateFrom =
vars.getGlobalVariable("inpExpectedDateFrom",
+ "PaymentReport|ExpectedDateFrom", "");
+ String strExpectedDateTo =
vars.getRequestGlobalVariable("inpExpectedDateTo",
+ "PaymentReport|ExpectedDateTo");
String strAmountFrom = vars.getNumericGlobalVariable("inpAmountFrom",
"PaymentReport|AmountFrom", "");
String strAmountTo = vars.getNumericGlobalVariable("inpAmountTo",
"PaymentReport|AmountTo",
@@ -127,10 +131,10 @@
final String strInclPaymentUsingCredit =
vars.getGlobalVariable("inpInclPaymentUsingCredit",
"PaymentReport|IncludePaymentUsingCredit", "Y");
printPageDataSheet(response, vars, strOrg, strInclSubOrg,
strDueDateFrom, strDueDateTo,
- strAmountFrom, strAmountTo, strDocumentDateFrom, strDocumentDateTo,
strcBPartnerIdIN,
- strcBPGroupIdIN, strcNoBusinessPartner, strcProjectIdIN,
strfinPaymSt,
- strPaymentMethodId, strFinancialAccountId, strcCurrency,
strConvertCurrency,
- strConversionDate, strPaymType, strOverdue, strGroupCrit, strOrdCrit,
+ strExpectedDateFrom, strExpectedDateTo, strAmountFrom, strAmountTo,
strDocumentDateFrom,
+ strDocumentDateTo, strcBPartnerIdIN, strcBPGroupIdIN,
strcNoBusinessPartner,
+ strcProjectIdIN, strfinPaymSt, strPaymentMethodId,
strFinancialAccountId, strcCurrency,
+ strConvertCurrency, strConversionDate, strPaymType, strOverdue,
strGroupCrit, strOrdCrit,
strInclPaymentUsingCredit, strPaymentDateFrom, strPaymentDateTo);
// DIRECT is used when coming from Aging Balance Report
} else if (vars.commandIn("FIND", "DIRECT")) {
@@ -141,6 +145,10 @@
"PaymentReport|DueDateFrom");
String strDueDateTo = vars
.getRequestGlobalVariable("inpDueDateTo", "PaymentReport|DueDateTo");
+ String strExpectedDateFrom =
vars.getRequestGlobalVariable("inpExpectedDateFrom",
+ "PaymentReport|ExpectedDateFrom");
+ String strExpectedDateTo =
vars.getRequestGlobalVariable("inpExpectedDateTo",
+ "PaymentReport|ExpectedDateTo");
if (vars.getNumericParameter("inpAmountFrom").isEmpty()) {
vars.removeSessionValue("PaymentReport|AmountFrom");
}
@@ -202,10 +210,10 @@
"N");
vars.setSessionValue("PaymentReport|IncludePaymentUsingCredit",
strInclPaymentUsingCredit);
printPageDataSheet(response, vars, strOrg, strInclSubOrg,
strDueDateFrom, strDueDateTo,
- strAmountFrom, strAmountTo, strDocumentDateFrom, strDocumentDateTo,
strcBPartnerIdIN,
- strcBPGroupIdIN, strcNoBusinessPartner, strcProjectIdIN,
strfinPaymSt,
- strPaymentMethodId, strFinancialAccountId, strcCurrency,
strConvertCurrency,
- strConversionDate, strPaymType, strOverdue, strGroupCrit, strOrdCrit,
+ strExpectedDateFrom, strExpectedDateTo, strAmountFrom, strAmountTo,
strDocumentDateFrom,
+ strDocumentDateTo, strcBPartnerIdIN, strcBPGroupIdIN,
strcNoBusinessPartner,
+ strcProjectIdIN, strfinPaymSt, strPaymentMethodId,
strFinancialAccountId, strcCurrency,
+ strConvertCurrency, strConversionDate, strPaymType, strOverdue,
strGroupCrit, strOrdCrit,
strInclPaymentUsingCredit, strPaymentDateFrom, strPaymentDateTo);
} else if (vars.commandIn("PDF", "XLS")) {
String strOrg = vars.getRequestGlobalVariable("inpOrg",
"PaymentReport|Organization");
@@ -215,6 +223,10 @@
"PaymentReport|DueDateFrom");
String strDueDateTo = vars
.getRequestGlobalVariable("inpDueDateTo", "PaymentReport|DueDateTo");
+ String strExpectedDateFrom =
vars.getRequestGlobalVariable("inpExpectedDateFrom",
+ "PaymentReport|ExpectedDateFrom");
+ String strExpectedDateTo =
vars.getRequestGlobalVariable("inpExpectedDateTo",
+ "PaymentReport|ExpectedDateTo");
String strAmountFrom =
vars.getNumericRequestGlobalVariable("inpAmountFrom",
"PaymentReport|AmountFrom");
String strAmountTo = vars.getNumericRequestGlobalVariable("inpAmountTo",
@@ -266,11 +278,11 @@
strOutput = "xls";
printPage(request, response, vars, strOrg, strInclSubOrg,
strDueDateFrom, strDueDateTo,
- strAmountFrom, strAmountTo, strDocumentDateFrom, strDocumentDateTo,
strcBPartnerIdIN,
- strcBPGroupIdIN, strcNoBusinessPartner, strcProjectIdIN,
strfinPaymSt,
- strPaymentMethodId, strFinancialAccountId, strcCurrency,
strConvertCurrency,
- strConversionDate, strPaymType, strOverdue, strOutput, strGroupCrit,
strOrdCrit,
- strInclPaymentUsingCredit, strPaymentDateFrom, strPaymentDateTo);
+ strExpectedDateFrom, strExpectedDateTo, strAmountFrom, strAmountTo,
strDocumentDateFrom,
+ strDocumentDateTo, strcBPartnerIdIN, strcBPGroupIdIN,
strcNoBusinessPartner,
+ strcProjectIdIN, strfinPaymSt, strPaymentMethodId,
strFinancialAccountId, strcCurrency,
+ strConvertCurrency, strConversionDate, strPaymType, strOverdue,
strOutput, strGroupCrit,
+ strOrdCrit, strInclPaymentUsingCredit, strPaymentDateFrom,
strPaymentDateTo);
} else if (vars.commandIn("LINK")) {
String strTableId = vars.getRequiredStringParameter("inpAdTableId",
IsIDFilter.instance);
@@ -295,13 +307,14 @@
private void printPageDataSheet(HttpServletResponse response,
VariablesSecureApp vars,
String strOrg, String strInclSubOrg, String strDueDateFrom, String
strDueDateTo,
- String strAmountFrom, String strAmountTo, String strDocumentDateFrom,
- String strDocumentDateTo, String strcBPartnerIdIN, String
strcBPGroupIdIN,
- String strcNoBusinessPartner, String strcProjectIdIN, String
strfinPaymSt,
- String strPaymentMethodId, String strFinancialAccountId, String
strcCurrency,
- String strConvertCurrency, String strConversionDate, String strPaymType,
String strOverdue,
- String strGroupCrit, String strOrdCrit, String strInclPaymentUsingCredit,
- String strPaymentDateFrom, String strPaymentDateTo) throws IOException,
ServletException {
+ String strExpectedDateFrom, String strExpectedDateTo, String
strAmountFrom,
+ String strAmountTo, String strDocumentDateFrom, String strDocumentDateTo,
+ String strcBPartnerIdIN, String strcBPGroupIdIN, String
strcNoBusinessPartner,
+ String strcProjectIdIN, String strfinPaymSt, String strPaymentMethodId,
+ String strFinancialAccountId, String strcCurrency, String
strConvertCurrency,
+ String strConversionDate, String strPaymType, String strOverdue, String
strGroupCrit,
+ String strOrdCrit, String strInclPaymentUsingCredit, String
strPaymentDateFrom,
+ String strPaymentDateTo) throws IOException, ServletException {
if (log4j.isDebugEnabled())
log4j.debug("Output: dataSheet");
XmlDocument xmlDocument = null;
@@ -318,7 +331,8 @@
strcBPGroupIdIN, strcNoBusinessPartner, strcProjectIdIN,
strfinPaymSt,
strPaymentMethodId, strFinancialAccountId, strcCurrency,
strConvertCurrency,
strConversionDate, strPaymType, strOverdue, strGroupCrit,
strOrdCrit,
- strInclPaymentUsingCredit, strPaymentDateFrom, strPaymentDateTo);
+ strInclPaymentUsingCredit, strPaymentDateFrom, strPaymentDateTo,
strExpectedDateFrom,
+ strExpectedDateTo);
} catch (OBException e) {
discardAL.add("sectionGroupCrit");
discardAL.add("sectionStatus");
@@ -474,6 +488,12 @@
xmlDocument.setParameter("dueDateFromdisplaySave",
vars.getSessionValue("#AD_SqlDateFormat"));
xmlDocument.setParameter("dueDateTo", strDueDateTo);
xmlDocument.setParameter("dueDateTodisplaySave",
vars.getSessionValue("#AD_SqlDateFormat"));
+ xmlDocument.setParameter("expectedDateFrom", strExpectedDateFrom);
+ xmlDocument.setParameter("expectedDateFromdisplaySave",
+ vars.getSessionValue("#AD_SqlDateFormat"));
+ xmlDocument.setParameter("expectedDateTo", strExpectedDateTo);
+ xmlDocument
+ .setParameter("expectedDateTodisplaySave",
vars.getSessionValue("#AD_SqlDateFormat"));
xmlDocument.setParameter("amountFrom", strAmountFrom);
xmlDocument.setParameter("amountTo", strAmountTo);
xmlDocument.setParameter("documentDateFrom", strDocumentDateFrom);
@@ -725,7 +745,8 @@
private void printPage(HttpServletRequest request, HttpServletResponse
response,
VariablesSecureApp vars, String strOrg, String strInclSubOrg, String
strDueDateFrom,
- String strDueDateTo, String strAmountFrom, String strAmountTo, String
strDocumentDateFrom,
+ String strDueDateTo, String strExpectedDateFrom, String
strExpectedDateTo,
+ String strAmountFrom, String strAmountTo, String strDocumentDateFrom,
String strDocumentDateTo, String strcBPartnerIdIN, String
strcBPGroupIdIN,
String strcNoBusinessPartner, String strcProjectIdIN, String
strfinPaymSt,
String strPaymentMethodId, String strFinancialAccountId, String
strcCurrency,
@@ -743,7 +764,8 @@
strcBPGroupIdIN, strcNoBusinessPartner, strcProjectIdIN,
strfinPaymSt,
strPaymentMethodId, strFinancialAccountId, strcCurrency,
strConvertCurrency,
strConversionDate, strPaymType, strOverdue, strGroupCrit, strOrdCrit,
- strInclPaymentUsingCredit, strPaymentDateFrom, strPaymentDateTo);
+ strInclPaymentUsingCredit, strPaymentDateFrom, strPaymentDateTo,
strExpectedDateFrom,
+ strExpectedDateTo);
} catch (OBException e) {
advisePopUp(request, response, "WARNING",
Utility.messageBD(this, "ProcessStatus-W", vars.getLanguage()),
@@ -898,6 +920,8 @@
parameters.put("INCL_SUBORG_SHOW", Utility.messageBD(this, "No",
vars.getLanguage()));
parameters.put("DUEDATEFROM_SHOW", strDueDateFrom);
parameters.put("DUEDATETO_SHOW", strDueDateTo);
+ parameters.put("EXPECTEDDATEFROM_SHOW", strExpectedDateFrom);
+ parameters.put("EXPECTEDDATETO_SHOW", strExpectedDateTo);
parameters.put("AMTFROM_SHOW", strAmountFrom);
parameters.put("AMTTO_SHOW", strAmountTo);
parameters.put("DOCDATEFROM_SHOW", strDocumentDateFrom);
diff -r b89b81a6f0f9 -r 9159b893ca71
modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.xml
---
a/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.xml
Mon Mar 04 09:55:23 2013 +0100
+++
b/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.xml
Mon Mar 04 10:36:17 2013 +0100
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_feb
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
