details: /erp/devel/pi/rev/42788f7114d6
changeset: 10875:42788f7114d6
user: Egoitz Castillo <egoitz.castillo <at> openbravo.com>
date: Thu Feb 24 17:46:48 2011 +0100
summary: Fixes issue 0015925: The page number should appear in the balance
sheet report
Fixes issue 0015926: The page number should appear in the P&L report
It has been added a new field in the "Balance sheet and P&L structure"
form to set the page number in the report. The report has been modified to show
the page number.
diffstat:
src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 22
++++++++++
src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReports.html | 6
++-
src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReports.java | 7
++-
src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReports.xml | 1 +
src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReportsPDF.fo | 21
++++++++-
src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReportsPDF.xml | 1 +
src/org/openbravo/erpCommon/ad_reports/ReportCashflowForecast.html | 2 +-
7 files changed, 54 insertions(+), 6 deletions(-)
diffs (162 lines):
diff -r 81c9928424fa -r 42788f7114d6
src-db/database/sourcedata/AD_TEXTINTERFACES.xml
--- a/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Thu Feb 24 17:26:32
2011 +0100
+++ b/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Thu Feb 24 17:46:48
2011 +0100
@@ -19938,6 +19938,17 @@
<!--6E961D44DEFA3D3DE040007F0101642C-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--6E961D44DEFA3D3DE040007F0101642C--></AD_TEXTINTERFACES>
+<!--702033B7A0794C539D2C1D52BC95464D--><AD_TEXTINTERFACES>
+<!--702033B7A0794C539D2C1D52BC95464D-->
<AD_TEXTINTERFACES_ID><![CDATA[702033B7A0794C539D2C1D52BC95464D]]></AD_TEXTINTERFACES_ID>
+<!--702033B7A0794C539D2C1D52BC95464D-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--702033B7A0794C539D2C1D52BC95464D--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--702033B7A0794C539D2C1D52BC95464D--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--702033B7A0794C539D2C1D52BC95464D--> <TEXT><![CDATA[Initial page
number]]></TEXT>
+<!--702033B7A0794C539D2C1D52BC95464D-->
<FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/GeneralAccountingReports.html]]></FILENAME>
+<!--702033B7A0794C539D2C1D52BC95464D--> <ISUSED><![CDATA[Y]]></ISUSED>
+<!--702033B7A0794C539D2C1D52BC95464D-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--702033B7A0794C539D2C1D52BC95464D--></AD_TEXTINTERFACES>
+
<!--706C277695FF4A929E64C20FDA703EEE--><AD_TEXTINTERFACES>
<!--706C277695FF4A929E64C20FDA703EEE-->
<AD_TEXTINTERFACES_ID><![CDATA[706C277695FF4A929E64C20FDA703EEE]]></AD_TEXTINTERFACES_ID>
<!--706C277695FF4A929E64C20FDA703EEE-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -21718,6 +21729,17 @@
<!--99A697728AAA426DBBBC95474D01E93D-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--99A697728AAA426DBBBC95474D01E93D--></AD_TEXTINTERFACES>
+<!--9A026A2660054037B3A0E55A8FFE3FA4--><AD_TEXTINTERFACES>
+<!--9A026A2660054037B3A0E55A8FFE3FA4-->
<AD_TEXTINTERFACES_ID><![CDATA[9A026A2660054037B3A0E55A8FFE3FA4]]></AD_TEXTINTERFACES_ID>
+<!--9A026A2660054037B3A0E55A8FFE3FA4-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9A026A2660054037B3A0E55A8FFE3FA4--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9A026A2660054037B3A0E55A8FFE3FA4--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9A026A2660054037B3A0E55A8FFE3FA4--> <TEXT><![CDATA[Page ]]></TEXT>
+<!--9A026A2660054037B3A0E55A8FFE3FA4-->
<FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/GeneralAccountingReportsPDF.fo]]></FILENAME>
+<!--9A026A2660054037B3A0E55A8FFE3FA4--> <ISUSED><![CDATA[Y]]></ISUSED>
+<!--9A026A2660054037B3A0E55A8FFE3FA4-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--9A026A2660054037B3A0E55A8FFE3FA4--></AD_TEXTINTERFACES>
+
<!--9C3EDA8B819131A5E040A8C021013F8D--><AD_TEXTINTERFACES>
<!--9C3EDA8B819131A5E040A8C021013F8D-->
<AD_TEXTINTERFACES_ID><![CDATA[9C3EDA8B819131A5E040A8C021013F8D]]></AD_TEXTINTERFACES_ID>
<!--9C3EDA8B819131A5E040A8C021013F8D-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 81c9928424fa -r 42788f7114d6
src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReports.html
--- a/src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReports.html
Thu Feb 24 17:26:32 2011 +0100
+++ b/src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReports.html
Thu Feb 24 17:46:48 2011 +0100
@@ -534,7 +534,11 @@
</TABLE>
</TD>
</tr>
-
+ <tr>
+ <td class="TitleCell"><span class="LabelText">Initial
page number</span></td>
+ <td class="TextBox_ContentCell"> <input
dojoType="openbravo:Textbox" class="dojoValidateValid TextBox_OneCell_width"
type="text" name="inpPageNo" id="paramPageNo" size="10" maxlength="10"
value=""></input><script>djConfig.searchIds.push("paramPageNo");</script>
+ </td>
+ </tr>
<tr>
<td colspan="6">
<table class="FieldGroup" cellspacing="0" cellpadding="0"
border="0">
diff -r 81c9928424fa -r 42788f7114d6
src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReports.java
--- a/src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReports.java
Thu Feb 24 17:26:32 2011 +0100
+++ b/src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReports.java
Thu Feb 24 17:46:48 2011 +0100
@@ -99,9 +99,10 @@
String strOrg = vars.getRequestGlobalVariable("inpOrganizacion",
"GeneralAccountingReports|organizacion");
String strLevel = vars.getRequestGlobalVariable("inpLevel",
"GeneralAccountingReports|level");
+ String strPageNo = vars.getStringParameter("inpPageNo", "1");
printPagePDF(request, response, vars, strAgno, strAgnoRef, strDateFrom,
strDateTo,
strDateFromRef, strDateToRef, strAsDateTo, strAsDateToRef,
strElementValue,
- strConImporte, strOrg, strLevel, strConCodigo, strcAcctSchemaId);
+ strConImporte, strOrg, strLevel, strConCodigo, strcAcctSchemaId,
strPageNo);
} else
pageError(response);
}
@@ -110,7 +111,7 @@
VariablesSecureApp vars, String strAgno, String strAgnoRef, String
strDateFrom,
String strDateTo, String strDateFromRef, String strDateToRef, String
strAsDateTo,
String strAsDateToRef, String strElementValue, String strConImporte,
String strOrg,
- String strLevel, String strConCodigo, String strcAcctSchemaId) throws
IOException,
+ String strLevel, String strConCodigo, String strcAcctSchemaId, String
strPageNo) throws IOException,
ServletException {
if (log4j.isDebugEnabled())
log4j.debug("Output: pdf");
@@ -265,6 +266,8 @@
strElementValue)
+ " (Provisional)" : GeneralAccountingReportsData.rptTitle(this,
strElementValue));
+ xmlDocument.setParameter("pageNo", strPageNo);
+
AccountTreeData[][] trees = new AccountTreeData[strGroups.length][];
for (int i = 0; i < strGroups.length; i++)
diff -r 81c9928424fa -r 42788f7114d6
src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReports.xml
--- a/src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReports.xml
Thu Feb 24 17:26:32 2011 +0100
+++ b/src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReports.xml
Thu Feb 24 17:46:48 2011 +0100
@@ -62,6 +62,7 @@
<PARAMETER id="paramArrayAccountingReports" name="accountingReports"/>
<PARAMETER id="paramArrayOrg" name="orgs"/>
<PARAMETER id="paramArrayYears" name="years"/>
+ <PARAMETER id="paramPageNo" name="inpPageNo" attribute="value" default="1"/>
<SUBREPORT id="reportLevel" name="reportLevel"
report="org/openbravo/erpCommon/reference/List">
<ARGUMENT name="parameterListSelected" withId="paramLevel"/>
diff -r 81c9928424fa -r 42788f7114d6
src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReportsPDF.fo
--- a/src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReportsPDF.fo
Thu Feb 24 17:26:32 2011 +0100
+++ b/src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReportsPDF.fo
Thu Feb 24 17:46:48 2011 +0100
@@ -21,10 +21,11 @@
<fo:layout-master-set>
<fo:simple-page-master master-name="first" page-height="29.7cm"
page-width="21cm" margin-top="0.5cm" margin-bottom="0.5cm" margin-left="2cm"
margin-right="1cm">
<fo:region-before extent="2.5cm"/>
- <fo:region-body margin-top="2.5cm"/>
+ <fo:region-after extent="1cm"/>
+ <fo:region-body margin-top="2.5cm" margin-bottom="1cm"/>
</fo:simple-page-master>
</fo:layout-master-set>
- <fo:page-sequence master-reference="first">
+ <fo:page-sequence master-reference="first" initial-page-number="xx"
id="fieldPageNo">
<fo:static-content flow-name="xsl-region-before">
<fo:table>
<fo:table-column column-width="14.5cm"/>
@@ -73,6 +74,22 @@
</fo:table-body>
</fo:table>
</fo:static-content>
+ <fo:static-content flow-name="xsl-region-after">
+ <fo:table>
+ <fo:table-column column-width="13.5cm"/>
+ <fo:table-column column-width="4.5cm"/>
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell>
+ <fo:block></fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block
text-align="right" font-size="8pt"
padding-bottom="4pt">Page <fo:inline><fo:page-number/></fo:inline></fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+ </fo:static-content>
<fo:flow flow-name="xsl-region-body">
<DIVFO id="sectionGroup">
<fo:block font-size="10pt" break-after="page"
id="fieldBreak">
diff -r 81c9928424fa -r 42788f7114d6
src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReportsPDF.xml
--- a/src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReportsPDF.xml
Thu Feb 24 17:26:32 2011 +0100
+++ b/src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReportsPDF.xml
Thu Feb 24 17:46:48 2011 +0100
@@ -21,6 +21,7 @@
<template file="GeneralAccountingReportsPDF.fo"/>
<PARAMETER id="fieldPrincipalTitle" name="principalTitle"
replaceCharacters="fo"/>
+ <PARAMETER id="fieldPageNo" name="pageNo" attribute="initial-page-number"
replaceCharacters="fo" default="1"/>
<PARAMETER id="fieldAgno" name="agno" replaceCharacters="fo"/>
diff -r 81c9928424fa -r 42788f7114d6
src/org/openbravo/erpCommon/ad_reports/ReportCashflowForecast.html
--- a/src/org/openbravo/erpCommon/ad_reports/ReportCashflowForecast.html
Thu Feb 24 17:26:32 2011 +0100
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportCashflowForecast.html
Thu Feb 24 17:46:48 2011 +0100
@@ -256,7 +256,7 @@
<table border="0" cellspacing="0" cellpadding="0"
summary="" style="padding-top: 0px;">
<tr>
<td class="TextBox_ContentCell">
- <input dojoType="openbravo:DateTextbox"
displayFormat="xx" saveFormat="yy" class="TextBox_btn_OneCell_width"
type="text" name="inpDateFrom" id="paramDateFrom" size="10" maxlength="10"
value="" onkeyup="autoCompleteDate(this.textbox, this.displayFormat);return
true;"></input><script>djConfig.searchIds.push("paramDateFrom");</script>
+ <input dojoType="openbravo:DateTextbox"
displayFormat="xx" saveFormat="yy" class="TextBox_btn_OneCell_width required"
type="text" name="inpDateFrom" id="paramDateFrom" size="10" maxlength="10"
value="" onkeyup="autoCompleteDate(this.textbox, this.displayFormat);return
true;"></input><script>djConfig.searchIds.push("paramDateFrom");</script>
</td>
<td class="FieldButton_bg">
<a class="FieldButtonLink" href="#"
onfocus="setWindowElementFocus(this); window.status='xx'; return true;"
onblur="window.status=''; return true;"
onkeypress="this.className='FieldButtonLink_active'; return true;"
onkeyup="this.className='FieldButtonLink_focus'; return true;"
onclick="showCalendar('frmMain.inpDateFrom',
document.frmMain.inpDateFrom.value, false);return false;">
------------------------------------------------------------------------------
Free Software Download: Index, Search & Analyze Logs and other IT data in
Real-Time with Splunk. Collect, index and harness all the fast moving IT data
generated by your applications, servers and devices whether physical, virtual
or in the cloud. Deliver compliance at lower cost and gain new business
insights. http://p.sf.net/sfu/splunk-dev2dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
