fixed bug [ 1772928 ] Not well format. Repor Cashflow forecast
--- a/src/org/openbravo/erpCommon/ad_reports/ReportCashflowForecast.html Tue Jun 03 18:27:14 2008 +0000
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportCashflowForecast.html Tue Jun 03 18:48:09 2008 +0000
@@ -296,43 +296,48 @@
<TD class="ContentCell"></TD>
</TR>
</TABLE>
- <div align="center">
- <TABLE border="1" cellspacing="0" cellpadding="0" width="60%"><!--RESUMEN DE TODAS LAS CUENTAS AUNQUE ELIGAN UNA EN CONCRETO/-->
- <TR class="TableHeaderLevel1">
- <td width="12%"> </Td>
- <td width="12%">On the bank</Td>
- <td colspan="2" width="12%">Forecast</Td>
- <td width="12%">Final</Td>
+
+ <br>
+
+ <table class="Main_Client_TableEdition">
+ <tr>
+ <td colspan="6">
+
+ <TABLE cellspacing="0" cellpadding="0" width="100%" class="DataGrid_Header_Table DataGrid_Body_Table" style="table-layout: auto;" ><!--RESUMEN DE TODAS LAS CUENTAS AUNQUE ELIGAN UNA EN CONCRETO/-->
+ <TR class="DataGrid_Body_Row">
+ <TH class="DataGrid_Header_Cell" > </TH>
+ <TH class="DataGrid_Header_Cell" width="12%">On the bank</TH>
+ <TH class="DataGrid_Header_Cell" colspan="2" width="12%">Forecast</TH>
+ <TH class="DataGrid_Header_Cell" width="12%">Final</TH>
</TR>
- <TR class="TableHeaderLevel2">
- <TD width="12%">Account No.</TD>
- <TD width="12%"> <SPAN id="fieldDate">xx12/01/2000</SPAN></TD>
- <TD width="12%">Income</TD>
- <TD width="12%">Payment</TD>
- <TD width="12%"> <SPAN id="fieldFinalDate">XX12/01/2005</SPAN></TD>
+ <TR class="DataGrid_Body_Row">
+ <TH class="DataGrid_Header_Cell" width="12%">Account No.</TH>
+ <TH class="DataGrid_Header_Cell" width="12%"> <SPAN id="fieldDate">xx12/01/2000</SPAN></TH>
+ <TH class="DataGrid_Header_Cell" width="12%">Income</TH>
+ <TH class="DataGrid_Header_Cell" width="12%">Payment</TH>
+ <TH class="DataGrid_Header_Cell" width="12%"> <SPAN id="fieldFinalDate">XX12/01/2005</SPAN></TH>
</TR>
<div id="sectionAccountSummary">
- <tr class="Border TableDetailRowEven">
- <TD id="fieldAcctSumary">xx11111111111111111</TD>
- <TD id="fieldBalanceSumary">xx100000</TD>
- <TD id="fieldIncomeSummary">xx3456</TD>
- <TD id="fieldPaymentSummary">xx70000</TD>
- <TD id="fieldFinalSummary">xx130945</SPAN></TD>
- </tr>
+ <TR class="DataGrid_Body_Row DataGrid_Body_Row_yy" id="funcEvenOddRow1xx">
+ <TD class="DataGrid_Body_Cell" id="fieldAcctSumary">xx11111111111111111</TD>
+ <TD class="DataGrid_Body_Cell" id="fieldBalanceSumary">xx100000</TD>
+ <TD class="DataGrid_Body_Cell" id="fieldIncomeSummary">xx3456</TD>
+ <TD class="DataGrid_Body_Cell" id="fieldPaymentSummary">xx70000</TD>
+ <TD class="DataGrid_Body_Cell" id="fieldFinalSummary">xx130945</TD>
+ </TR>
</div>
</table>
- </div>
+
<br>
-
<div id="sectionAccount"><!-- ROTURA POR Nº DE CUENTAS. SI NO ELIGEN UNA EN CONCRETO PUES VERAS EL DETALLE DE CADA UNA DE ELLAS/-->
- <TABLE width="100%" border="1">
- <TR class="TableHeaderLevel1">
- <TD width="50%">Account No <span id="fieldAccount">xx1111111111111111</span></TD>
- <TD width="25%">On the bank (<span id="fieldSysdate">xx12/12/2006</span>) <span id="fieldAmountInitial" >xx12345</span></TD>
- <TD width="25%" >Final<span> </span><span id="fieldAmountfinal" >xx4567</span></TD>
+ <TABLE cellspacing="0" cellpadding="0" width="100%" class="DataGrid_Header_Table DataGrid_Body_Table" style="table-layout: auto;border-bottom: 0px none;">
+ <TR>
+ <TH class="DataGrid_Header_Cell" width="50%">Account No <span id="fieldAccount">xx1111111111111111</span></TH>
+ <TH class="DataGrid_Header_Cell" width="25%">On the bank (<span id="fieldSysdate">xx12/12/2006</span>) <span id="fieldAmountInitial" >xx12345</span></TH>
+ <TH class="DataGrid_Header_Cell" width="25%" >Final<span> </span><span id="fieldAmountfinal" >xx4567</span></TH>
</TR>
- </table>
+</TABLE>
<div id="subrpt">
<div id="reportAccountDate"/>
@@ -340,15 +345,18 @@
</div>
- <table width="30%"><!--UN TOTAL AL FINAL DE LOS INGRESOS MENOS LOS GASTOS/-->
- <TR class="TableHeaderLevel2">
- <TD colspan="2" > <SPAN >Total amount incoming-payments</SPAN></TD>
- <TD colspan="2" > <SPAN id="fieldSumAmount">xx23455.56</SPAN></TD>
+ <TABLE cellspacing="0" cellpadding="0" width="100%" class="DataGrid_Header_Table DataGrid_Body_Table" style="table-layout: auto;border-top: 0px none;">
+ <TR class="DataGrid_Body_Row">
+ <TH class="DataGrid_Header_Cell" colspan="2" > <SPAN >Total amount incoming-payments</SPAN></TH>
+ <TH class="DataGrid_Header_Cell" colspan="2" > <SPAN id="fieldSumAmount">xx23455.56</SPAN></TH>
</TR>
</TABLE>
- <BR>
+
</DIV><!--sectionAccount/-->
-
+
+ </td>
+ </tr>
+ </table>
<!-- USER CONTROLS -->
</TD>
</TR>
--- a/src/org/openbravo/erpCommon/ad_reports/ReportCashflowForecast.xml Tue Jun 03 18:27:14 2008 +0000
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportCashflowForecast.xml Tue Jun 03 18:48:09 2008 +0000
@@ -35,6 +35,7 @@
<PARAMETER id="breakDate" name="breakDate" boolean="checked" withId="parameterBreakDate" default="1"/>
<PARAMETER id="param0" name="Param0" default="0"/>
+ <PARAMETER id="param2" name="param2" default="2"/>
<PARAMETER id="paramCSS" name="theme" attribute="href" replace="Default"/>
<PARAMETER id="tdleftTabs" name="leftTabs" default=""/>
<PARAMETER id="paramParentTabContainer" name="parentTabContainer" default=" "/>
@@ -62,6 +63,9 @@
<FUNCTION id="fieldBalanceSumary" name="LT" arg1="fieldBalanceSumary" arg2="param0" attribute="class" replace="xx"/>
<FUNCTION id="fieldFinalSummary" name="LT" arg1="fieldFinalSummary" arg2="param0" attribute="class" replace="xx"/>
+ <FIELD id="fieldRownum1">rownum</FIELD>
+ <FUNCTION id="funcEvenOddRow1xx" name="MODULE" arg1="fieldRownum1" arg2="param2" format="integerEdition" attribute="class" replace="yy"/>
+
<SECTION id="sectionAccountSummary"/>
</structure>
--- a/src/org/openbravo/erpCommon/ad_reports/ReportCashflowForecastAcct.srpt Tue Jun 03 18:27:14 2008 +0000
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportCashflowForecastAcct.srpt Tue Jun 03 18:48:09 2008 +0000
@@ -19,28 +19,28 @@
-->
- <div align="right">
- <table width="99%" >
- <TR class="TableHeaderLevel2">
- <TD width="10%">Date planned</TD>
- <TD width="10%">Date Invoiced</TD>
- <TD width="10%">Invoice No.</TD>
- <TD width="30%">B.Partner</TD>
- <TD width="30%">Debt Payment</TD>
- <TD width="10%">Amount</TD>
+ <div >
+ <table cellspacing="0" cellpadding="0" width="100%" class="DataGrid_Header_Table DataGrid_Body_Table" style="table-layout: auto;border-top: 0px none;border-bottom: 0px none;">
+ <TR class="DataGrid_Body_Row">
+ <TH class="DataGrid_Header_Cell" width="10%">Date planned</TH>
+ <TH class="DataGrid_Header_Cell" width="10%">Date Invoiced</TH>
+ <TH class="DataGrid_Header_Cell" width="10%">Invoice No.</TH>
+ <TH class="DataGrid_Header_Cell" width="30%">B.Partner</TH>
+ <TH class="DataGrid_Header_Cell" width="30%">Debt Payment</TH>
+ <TH class="DataGrid_Header_Cell" width="10%">Amount</TH>
</TR>
<DIV id="sectionTypePayment"> <!--ROTURA SI SON INGRESO O BIEN SI SON PAGOS/-->
- <tr>
- <td colspan="6" id="fieldClassType"><span id="fieldTypePayment">xxINGRESOS</span></td>
- </tr>
- <DIV id="sectionDetail">
- <TR class="Border TableDetailRowEven">
- <TD id="fieldDatePlanned">xx23/10/1900</TD>
- <TD id="fieldDateInvoiced" >xx23/10/1900</TD>
- <TD id="fieldInvoiceNo" >xx5555</TD>
- <TD ><SPAN id="fieldBP">xxCONSTRUCCIONES GANCEDO-GONZALEZ, S.A </SPAN></TD>
- <TD id="fieldDescription" >xxFACTURA</TD>
- <TD class="Border TableDetailRowEven">
+ <tr class="DataGrid_Body_Row">
+ <TH class="DataGrid_Header_Cell" colspan="6" id="fieldClassType"><span id="fieldTypePayment">xxINGRESOS</span></TH>
+ </tr>
+ <DIV id="sectionDetail">
+ <TR class="DataGrid_Body_Row DataGrid_Body_Row_yy" id="funcEvenOddRow1xx">
+ <TD class="DataGrid_Body_Cell" id="fieldDatePlanned">xx23/10/1900</TD>
+ <TD class="DataGrid_Body_Cell" id="fieldDateInvoiced" >xx23/10/1900</TD>
+ <TD class="DataGrid_Body_Cell" id="fieldInvoiceNo" >xx5555</TD>
+ <TD class="DataGrid_Body_Cell" ><SPAN id="fieldBP">xxCONSTRUCCIONES GANCEDO-GONZALEZ, S.A </SPAN></TD>
+ <TD class="DataGrid_Body_Cell" id="fieldDescription" >xxFACTURA</TD>
+ <TD class="DataGrid_Body_Cell" >
<A href="#" onClick="submitCommandFormParameter('DIRECT', document.frmMain.inpcDebtPaymentId, xx, false, document.frmMain, '../yy', null, false, true);return false;" onmouseover="window.status='DebtPayment';return true;" onmouseout="window.status='';return true;" class="Link" id="fieldCDebtPaymentId">
<SPAN id="fieldAmountLine" class="NumeroNegativoxx">xx3456</SPAN>
</A>
--- a/src/org/openbravo/erpCommon/ad_reports/ReportCashflowForecastAcct.xml Tue Jun 03 18:27:14 2008 +0000
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportCashflowForecastAcct.xml Tue Jun 03 18:48:09 2008 +0000
@@ -21,7 +21,12 @@
<template file="ReportCashflowForecastAcct.srpt"/>
<PARAMETER id="param0" name="Param0" default="0"/>
+ <PARAMETER id="param2" name="param2" default="2"/>
+
<structure name="structureAccount">
+ <FIELD id="fieldRownum1">rownum</FIELD>
+ <FUNCTION id="funcEvenOddRow1xx" name="MODULE" arg1="fieldRownum1" arg2="param2" format="integerEdition" attribute="class" replace="yy"/>
+
<FIELD id="fieldTypePayment">isreceiptmessage</FIELD>
<FIELD id="fieldClassType" attribute="class">classType</FIELD>
--- a/src/org/openbravo/erpCommon/ad_reports/ReportCashflowForecastDateAcct.srpt Tue Jun 03 18:27:14 2008 +0000
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportCashflowForecastDateAcct.srpt Tue Jun 03 18:48:09 2008 +0000
@@ -20,38 +20,38 @@
<DIV id="sectionTotal">
<INPUT type="hidden" id="fieldSumAmount" value=""/>
<DIV id="sectionDatePlanned">
- <div align="right">
- <table width="99%" >
- <TR class="TableHeaderLevel2">
- <TD>
+ <div>
+ <table cellspacing="0" cellpadding="0" width="100%" class="DataGrid_Header_Table DataGrid_Body_Table" style="table-layout: auto;border-top: 0px none;border-bottom: 0px none;" >
+ <TR class="DataGrid_Body_Row">
+ <TH class="DataGrid_Header_Cell">
<span >Date planned: </span><span id="fieldDatePlanned">xx23/10/1900</span>
<span >Tot inc-paym: </span><span id="fieldAmtDatePlanned">xx12345</span>
<span >Balance:</span><span id="fieldBalanceDatePlanned">xx12345</span>
<input type="hidden" id="fieldInitialBalanceHidden" value=""/>
<!--<input type="hidden" id="fieldAccumAmtHidden" value=""/>-->
- </TD>
+ </TH>
</TR>
</table>
- <table width="98%" >
- <TR >
- <TD width="10%">Date Invoiced</TD>
- <TD width="10%">Invoice No.</TD>
- <TD width="35%">B.Partner</TD>
- <TD width="35%">Debt Payment</TD>
- <TD width="10%">Amount</TD>
+ <table cellspacing="0" cellpadding="0" width="100%" class="DataGrid_Header_Table DataGrid_Body_Table" style="table-layout: auto;border-top: 0px none;border-bottom: 0px none;">
+ <TR class="DataGrid_Body_Row">
+ <TH class="DataGrid_Header_Cell" width="10%">Date Invoiced</TH>
+ <TH class="DataGrid_Header_Cell" width="10%">Invoice No.</TH>
+ <TH class="DataGrid_Header_Cell" width="35%">B.Partner</TH>
+ <TH class="DataGrid_Header_Cell" width="35%">Debt Payment</TH>
+ <TH class="DataGrid_Header_Cell" width="10%">Amount</TH>
</TR>
<DIV id="sectionTypePayment"> <!--ROTURA SI SON INGRESO O BIEN SI SON PAGOS/-->
- <tr>
- <td colspan="5" id="fieldClassType"><span id="fieldTypePayment">xxINGRESOS</span></td>
- </tr>
+ <TR class="DataGrid_Body_Row">
+ <TH class="DataGrid_Header_Cell" colspan="5" id="fieldClassType"><span id="fieldTypePayment">xxINGRESOS</span></TH>
+ </TR>
<DIV id="sectionDetail">
- <TR class="Border TableDetailRowEven">
- <TD id="fieldDateInvoiced">xx23/10/1900</TD>
- <TD id="fieldInvoiceNo" >xx5555</TD>
- <TD ><SPAN id="fieldBP">xxCONSTRUCCIONES GANCEDO-GONZALEZ, S.A </SPAN></TD>
- <TD id="fieldDescription" >xxFACTURA</TD>
- <TD>
+ <TR class="DataGrid_Body_Row DataGrid_Body_Row_yy" id="funcEvenOddRow1xx">
+ <TD class="DataGrid_Body_Cell" id="fieldDateInvoiced">xx23/10/1900</TD>
+ <TD class="DataGrid_Body_Cell" id="fieldInvoiceNo" >xx5555</TD>
+ <TD class="DataGrid_Body_Cell" ><SPAN id="fieldBP">xxCONSTRUCCIONES GANCEDO-GONZALEZ, S.A </SPAN></TD>
+ <TD class="DataGrid_Body_Cell" id="fieldDescription" >xxFACTURA</TD>
+ <TD class="DataGrid_Body_Cell" >
<A href="#" onClick="submitCommandFormParameter('DIRECT', document.frmMain.inpcDebtPaymentId, xx, false, document.frmMain, '../yy', null, false, true);return false;" onmouseover="window.status='DebtPayment';return true;" onmouseout="window.status='';return true;" class="Link" id="fieldCDebtPaymentId">
<SPAN id="fieldAmountLine" >xx3456</SPAN>
</A>
--- a/src/org/openbravo/erpCommon/ad_reports/ReportCashflowForecastDateAcct.xml Tue Jun 03 18:27:14 2008 +0000
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportCashflowForecastDateAcct.xml Tue Jun 03 18:48:09 2008 +0000
@@ -21,8 +21,12 @@
<template file="ReportCashflowForecastDateAcct.srpt"/>
<PARAMETER id="param0" name="Param0" default="0"/>
+ <PARAMETER id="param2" name="param2" default="2"/>
<structure name="structureAccount">
+ <FIELD id="fieldRownum1">rownum</FIELD>
+ <FUNCTION id="funcEvenOddRow1xx" name="MODULE" arg1="fieldRownum1" arg2="param2" format="integerEdition" attribute="class" replace="yy"/>
+
<FIELD id="fieldTypePayment">isreceiptmessage</FIELD>
<FIELD id="fieldClassType" attribute="class">classType</FIELD>
--- a/src/org/openbravo/erpCommon/ad_reports/ReportCashflowForecast_data.xsql Tue Jun 03 18:27:14 2008 +0000
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportCashflowForecast_data.xsql Tue Jun 03 18:48:09 2008 +0000
@@ -113,6 +113,7 @@
) AAA
ORDER BY 1
]]></Sql>
+ <Field name="rownum" value="count"/>
<Parameter name="dateMax" optional="true" after="AND 1=1"><![CDATA[ AND DP.DATEPLANNED <= TO_DATE(?) ]]></Parameter>
<Parameter name="dateMax" optional="true" after="AND 2=2"><![CDATA[ AND DP.DATEPLANNED <= TO_DATE(?) ]]></Parameter>
<Parameter name="bankaccount" optional="true" after="AND 3=3"><![CDATA[ AND BA.C_BANKACCOUNT_ID = TO_NUMBER(?) ]]></Parameter>
@@ -181,6 +182,7 @@
AND 1=1
ORDER BY 1,2 DESC
]]></Sql>
+ <Field name="rownum" value="count"/>
<Parameter name="dateFormat"/>
<Parameter name="language"/>
<Parameter name="bankaccount"/>