details: /erp/devel/pi/rev/5527d191eb7d
changeset: 7418:5527d191eb7d
user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com>
date: Mon May 24 16:34:32 2010 +0200
summary: Fixed bug 11303: null title and wrong subtitle in General Ledger
Journal PDF file
diffstat:
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.java | 6
+-
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.jrxml | 806
++++-----
2 files changed, 360 insertions(+), 452 deletions(-)
diffs (truncated from 941 to 300 lines):
diff -r 75ebe35a028a -r 5527d191eb7d
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.java
--- a/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.java
Mon May 24 14:12:24 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.java
Mon May 24 16:34:32 2010 +0200
@@ -11,7 +11,7 @@
* under the License.
* The Original Code is Openbravo ERP.
* The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2001-2009 Openbravo SLU
+ * All portions are Copyright (C) 2001-2010 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
@@ -57,6 +57,7 @@
*/
private static final String PREVIOUS_RANGE =
"ReportGeneralLedgerJournal.previousRange";
+ @Override
public void doPost(HttpServletRequest request, HttpServletResponse response)
throws IOException,
ServletException {
VariablesSecureApp vars = new VariablesSecureApp(request);
@@ -492,7 +493,7 @@
String strSubtitle = Utility.messageBD(this, "CompanyName",
vars.getLanguage()) + ": "
+ ReportGeneralLedgerJournalData.selectCompany(this, vars.getClient());
- if (strDateFrom.equals("") && strDateTo.equals(""))
+ if (!"".equals(strDateFrom) || !"".equals(strDateTo))
strSubtitle += " - " + Utility.messageBD(this, "Period",
vars.getLanguage()) + ": "
+ strDateFrom + " - " + strDateTo;
@@ -533,6 +534,7 @@
return strCheck;
}
+ @Override
public String getServletInfo() {
return "Servlet ReportGeneralLedgerJournal. This Servlet was made by Pablo
Sarobe modified by everybody";
} // end of getServletInfo() method
diff -r 75ebe35a028a -r 5527d191eb7d
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.jrxml
--- a/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.jrxml
Mon May 24 14:12:24 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.jrxml
Mon May 24 16:34:32 2010 +0200
@@ -1,197 +1,172 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!-- Created with iReport - A designer for JasperReports -->
-<!DOCTYPE jasperReport PUBLIC "//JasperReports//DTD Report Design//EN"
"http://jasperreports.sourceforge.net/dtds/jasperreport.dtd";>
-<jasperReport
- name="ReportGeneralLedgerJournal"
- columnCount="1"
- printOrder="Vertical"
- orientation="Portrait"
- pageWidth="595"
- pageHeight="842"
- columnWidth="535"
- columnSpacing="0"
- leftMargin="30"
- rightMargin="30"
- topMargin="20"
- bottomMargin="20"
- whenNoDataType="NoPages"
- isTitleNewPage="false"
- isSummaryNewPage="false">
- <property name="ireport.scriptlethandling" value="0" />
- <property name="ireport.encoding" value="UTF-8" />
- <import value="java.util.*" />
- <import value="net.sf.jasperreports.engine.*" />
- <import value="net.sf.jasperreports.engine.data.*" />
-
- <style
- name="default"
- isDefault="false"
- vAlign="Middle"
- fontName="Bitstream Vera Sans"
- fontSize="11"
- >
- </style>
- <style
- name="Report_Title"
- isDefault="false"
- fontName="Bitstream Vera Sans"
- fontSize="18"
- >
- <box leftPadding="5"></box>
- </style>
- <style
- name="Report_Subtitle"
- isDefault="false"
- forecolor="#555555"
- fontName="Bitstream Vera Sans"
- fontSize="14"
- >
- <box leftPadding="5"></box>
- </style>
- <style
- name="Total_Field"
- isDefault="false"
- mode="Opaque"
- forecolor="#000000"
- backcolor="#CCCCCC"
- vAlign="Middle"
- fontName="Bitstream Vera Sans"
- fontSize="11"
- isBold="true"
- >
- <box leftPadding="5"></box>
- </style>
- <style
- name="Detail_Header"
- isDefault="false"
- mode="Opaque"
- forecolor="#FFFFFF"
- backcolor="#5D5D5D"
- vAlign="Middle"
- fontName="Bitstream Vera Sans"
- fontSize="11"
- isBold="true"
- >
- <box leftPadding="5">
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#FFFFFF"/>
- <rightPen lineWidth="1.0"
lineStyle="Solid" lineColor="#FFFFFF"/>
-</box>
- </style>
- <style
- name="GroupHeader_DarkGray"
- isDefault="false"
- mode="Opaque"
- forecolor="#FFFFFF"
- backcolor="#555555"
- vAlign="Middle"
- fontName="Bitstream Vera Sans"
- fontSize="18"
- isBold="true"
- >
- <box leftPadding="5"></box>
- </style>
- <style
- name="GroupHeader_Gray"
- isDefault="false"
- mode="Opaque"
- backcolor="#999999"
- >
- </style>
- <style
- name="Detail_Line"
- isDefault="false"
- fontName="Bitstream Vera Sans"
- fontSize="11"
- >
-
- <conditionalStyle>
- <conditionExpression><![CDATA[new
Boolean($V{REPORT_COUNT}.intValue()%2==1)]]></conditionExpression>
- <style
- name="Detail_Line"
- isDefault="false"
- mode="Opaque"
- backcolor="#CCCCCC"
- >
- </style>
- </conditionalStyle>
- </style>
- <style
- name="Total_Gray"
- isDefault="false"
- mode="Opaque"
- forecolor="#000000"
- backcolor="#CCCCCC"
- >
- </style>
- <style
- name="Report_Data_Label"
- isDefault="false"
- fontName="Bitstream Vera Sans"
- fontSize="11"
- isBold="true"
- >
- </style>
- <style
- name="Report_Data_Field"
- isDefault="false"
- fontName="Bitstream Vera Sans"
- fontSize="11"
- isBold="false"
- >
- </style>
- <style
- name="Report_Footer"
- isDefault="true"
- fontName="Bitstream Vera Sans"
- fontSize="11"
- >
- </style>
- <style
- name="Group_Data_Label"
- isDefault="false"
- fontName="Bitstream Vera Sans"
- fontSize="14"
- isBold="true"
- >
- </style>
- <style
- name="Group_Data_Field"
- isDefault="false"
- fontName="Bitstream Vera Sans"
- fontSize="14"
- >
- </style>
- <style
- name="Detail_Data_Label"
- isDefault="false"
- mode="Opaque"
- backcolor="#CCCCCC"
- fontName="Bitstream Vera Sans"
- fontSize="11"
- isBold="true"
- >
- </style>
- <style
- name="Detail_Data_Field"
- isDefault="false"
- mode="Opaque"
- backcolor="#CCCCCC"
- fontName="Bitstream Vera Sans"
- fontSize="11"
- >
- </style>
- <style
- name="Group_Footer"
- isDefault="false"
- fontName="Bitstream Vera Sans"
- fontSize="11"
- isBold="true"
- >
- </style>
-
- <parameter name="Title" isForPrompting="false"
class="java.lang.String"/>
- <parameter name="Subtitle" isForPrompting="false"
class="java.lang.String"/>
- <parameter name="NUMBERFORMAT" isForPrompting="false"
class="java.text.DecimalFormat"/>
- <parameter name="LOCALE" isForPrompting="false"
class="java.util.Locale"/>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!-- Created with iReport - A designer for JasperReports -->
+<!DOCTYPE jasperReport PUBLIC "//JasperReports//DTD Report Design//EN"
"http://jasperreports.sourceforge.net/dtds/jasperreport.dtd";>
+<jasperReport
+ name="ReportGeneralLedgerJournal"
+ columnCount="1"
+ printOrder="Vertical"
+ orientation="Portrait"
+ pageWidth="595"
+ pageHeight="842"
+ columnWidth="535"
+ columnSpacing="0"
+ leftMargin="30"
+ rightMargin="30"
+ topMargin="20"
+ bottomMargin="20"
+ whenNoDataType="NoPages"
+ isTitleNewPage="false"
+ isSummaryNewPage="false">
+ <property name="ireport.scriptlethandling" value="0" />
+ <property name="ireport.encoding" value="UTF-8" />
+ <import value="java.util.*" />
+ <import value="net.sf.jasperreports.engine.*" />
+ <import value="net.sf.jasperreports.engine.data.*" />
+
+ <style
+ name="default"
+ isDefault="false"
+ vAlign="Middle"
+ fontName="Bitstream Vera Sans"
+ fontSize="11"
+ />
+ <style
+ name="Report_Title"
+ isDefault="false"
+ fontName="Bitstream Vera Sans"
+ fontSize="18"
+ />
+ <style
+ name="Report_Subtitle"
+ isDefault="false"
+ forecolor="#555555"
+ fontName="Bitstream Vera Sans"
+ fontSize="14"
+ />
+ <style
+ name="Total_Field"
+ isDefault="false"
+ mode="Opaque"
+ forecolor="#000000"
+ backcolor="#CCCCCC"
+ vAlign="Middle"
+ fontName="Bitstream Vera Sans"
+ fontSize="11"
+ isBold="true"
+ />
+ <style
+ name="Detail_Header"
+ isDefault="false"
+ mode="Opaque"
+ forecolor="#FFFFFF"
+ backcolor="#5D5D5D"
+ vAlign="Middle"
+ fontName="Bitstream Vera Sans"
+ fontSize="11"
------------------------------------------------------------------------------
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
