details: /erp/devel/pi/rev/b3ea04de2722
changeset: 9075:b3ea04de2722
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Fri Dec 10 14:21:13 2010 +0100
summary: Fixes issue 0014896: accounting reports should have page number
Improves the style of parameter textbox and label
diffstat:
src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 6
+-
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.html | 15
+-
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.jrxml | 320
+++++++--
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.xml | 2
+-
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.html | 13
+-
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.jrxml | 190
++++-
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.xml | 2
+-
src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.html | 13
+-
src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.xml | 2
+-
src/org/openbravo/erpCommon/ad_reports/ReportTrialBalancePDF.jrxml | 348
+++++++--
10 files changed, 685 insertions(+), 226 deletions(-)
diffs (truncated from 2020 to 300 lines):
diff -r 3322e18ae878 -r b3ea04de2722
src-db/database/sourcedata/AD_TEXTINTERFACES.xml
--- a/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Thu Dec 09 18:34:01
2010 +0100
+++ b/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Fri Dec 10 14:21:13
2010 +0100
@@ -21642,7 +21642,7 @@
<!--95CA79458E3CC420E040007F01015644-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
<!--95CA79458E3CC420E040007F01015644--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--95CA79458E3CC420E040007F01015644--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--95CA79458E3CC420E040007F01015644--> <TEXT><![CDATA[Initial Page
Number]]></TEXT>
+<!--95CA79458E3CC420E040007F01015644--> <TEXT><![CDATA[Initial page
number]]></TEXT>
<!--95CA79458E3CC420E040007F01015644-->
<FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.html]]></FILENAME>
<!--95CA79458E3CC420E040007F01015644--> <ISUSED><![CDATA[Y]]></ISUSED>
<!--95CA79458E3CC420E040007F01015644-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
@@ -21653,7 +21653,7 @@
<!--95CA79458E3EC420E040007F01015644-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
<!--95CA79458E3EC420E040007F01015644--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--95CA79458E3EC420E040007F01015644--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--95CA79458E3EC420E040007F01015644--> <TEXT><![CDATA[Initial Page
Number]]></TEXT>
+<!--95CA79458E3EC420E040007F01015644--> <TEXT><![CDATA[Initial page
number]]></TEXT>
<!--95CA79458E3EC420E040007F01015644-->
<FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.html]]></FILENAME>
<!--95CA79458E3EC420E040007F01015644--> <ISUSED><![CDATA[Y]]></ISUSED>
<!--95CA79458E3EC420E040007F01015644-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
@@ -21664,7 +21664,7 @@
<!--95CA79458E40C420E040007F01015644-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
<!--95CA79458E40C420E040007F01015644--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--95CA79458E40C420E040007F01015644--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--95CA79458E40C420E040007F01015644--> <TEXT><![CDATA[Initial Page
Number]]></TEXT>
+<!--95CA79458E40C420E040007F01015644--> <TEXT><![CDATA[Initial page
number]]></TEXT>
<!--95CA79458E40C420E040007F01015644-->
<FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.html]]></FILENAME>
<!--95CA79458E40C420E040007F01015644--> <ISUSED><![CDATA[Y]]></ISUSED>
<!--95CA79458E40C420E040007F01015644-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
diff -r 3322e18ae878 -r b3ea04de2722
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.html
--- a/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.html Thu Dec
09 18:34:01 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.html Fri Dec
10 14:21:13 2010 +0100
@@ -707,16 +707,13 @@
<td class="ContentCell"></td>
</tr>
<tr>
- <td class="TitleCell"><span class="LabelText">Initial Page
Number</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 class="TextBox_btn_OneCell_width" type="text"
name="inpPageNo" id="paramPageNo" maxlength="10" value="1"
outputformat="euroEdition"></input>
- </td>
- </tr>
- </table>
+ <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>
+ <td class="ContentCell"></td>
+ <td class="ContentCell"></td>
+ <td class="ContentCell"></td>
+ <td class="ContentCell"></td>
</tr>
<tr>
<td class="TitleCell"><span class="LabelText">Group
By</span></td>
diff -r 3322e18ae878 -r b3ea04de2722
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.jrxml
--- a/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.jrxml Thu Dec
09 18:34:01 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.jrxml Fri Dec
10 14:21:13 2010 +0100
@@ -28,15 +28,18 @@
isDefault="false"
vAlign="Middle"
fontName="Bitstream Vera Sans"
- fontSize="11"
- />
+ fontSize="11"
+ >
+ </style>
<style
name="Report_Title"
isDefault="false"
leftPadding="5"
fontName="Bitstream Vera Sans"
fontSize="18"
- />
+ >
+ <box leftPadding="5"></box>
+ </style>
<style
name="Report_Subtitle"
isDefault="false"
@@ -44,7 +47,9 @@
leftPadding="5"
fontName="Bitstream Vera Sans"
fontSize="14"
- />
+ >
+ <box leftPadding="5"></box>
+ </style>
<style
name="Total_Field"
isDefault="false"
@@ -56,7 +61,9 @@
fontName="Bitstream Vera Sans"
fontSize="11"
isBold="true"
- />
+ >
+ <box leftPadding="5"></box>
+ </style>
<style
name="Detail_Header"
isDefault="false"
@@ -72,7 +79,11 @@
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"
@@ -84,13 +95,16 @@
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"
@@ -105,7 +119,8 @@
isDefault="false"
mode="Opaque"
backcolor="#CCCCCC"
- />
+ >
+ </style>
</conditionalStyle>
</style>
<style
@@ -114,40 +129,46 @@
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"
@@ -156,7 +177,8 @@
fontName="Bitstream Vera Sans"
fontSize="11"
isBold="true"
- />
+ >
+ </style>
<style
name="Detail_Data_Field"
isDefault="false"
@@ -164,14 +186,16 @@
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="ATTACH" isForPrompting="false"
class="java.lang.String"/>
<parameter name="BASE_WEB" isForPrompting="false"
class="java.lang.String"/>
@@ -291,7 +315,11 @@
width="150"
height="18"
key="staticText"/>
- <box topBorder="None"
topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000"
leftPadding="5" rightBorder="None" rightBorderColor="#000000"
bottomBorder="None" bottomBorderColor="#000000"/>
+ <box leftPadding="5">
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="0.0"
lineColor="#000000"/>
+ <rightPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
+</box>
<textElement verticalAlignment="Middle">
<font pdfFontName="Helvetica"
size="14"/>
</textElement>
@@ -316,7 +344,11 @@
width="385"
height="18"
key="textField"/>
- <box topBorder="None"
topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000"
leftPadding="5" rightBorder="None" rightBorderColor="#000000" rightPadding="2"
bottomBorder="None" bottomBorderColor="#000000"/>
+ <box leftPadding="5" rightPadding="2">
<topPen lineWidth="0.0" lineStyle="Solid"
lineColor="#000000"/>
+ <leftPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="0.0"
lineColor="#000000"/>
+ <rightPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
+</box>
<textElement verticalAlignment="Middle">
<font fontName="Times-Roman"
size="14"/>
</textElement>
@@ -362,7 +394,11 @@
width="517"
height="12"
key="frame-4"/>
- <box topBorder="None"
topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000"
rightBorder="None" rightBorderColor="#000000" bottomBorder="None"
bottomBorderColor="#000000"/>
+ <box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="0.0"
lineColor="#000000"/>
+ <rightPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
+</box>
<textField isStretchWithOverflow="false"
pattern="" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"
hyperlinkTarget="Self" >
<reportElement
style="Total_Gray"
@@ -371,7 +407,11 @@
width="65"
height="12"
key="staticText-8"/>
- <box topBorder="None"
topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000"
leftPadding="2" rightBorder="None" rightBorderColor="#000000"
bottomBorder="None" bottomBorderColor="#000000"/>
+ <box leftPadding="2">
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="0.0"
lineColor="#000000"/>
+ <rightPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
+</box>
<textElement verticalAlignment="Middle">
<font
pdfFontName="Helvetica-Bold" size="8" isBold="true"/>
</textElement>
@@ -385,7 +425,11 @@
width="65"
height="12"
key="textField-34"/>
- <box topBorder="None"
topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000"
rightBorder="None" rightBorderColor="#000000" bottomBorder="None"
bottomBorderColor="#000000"/>
+ <box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="0.0"
lineColor="#000000"/>
+ <rightPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
+</box>
<textElement textAlignment="Right"
verticalAlignment="Middle">
<font
pdfFontName="Helvetica-Bold" size="8" isBold="true"/>
</textElement>
@@ -399,7 +443,11 @@
width="65"
height="12"
key="textField-35"/>
- <box topBorder="None"
topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000"
rightBorder="None" rightBorderColor="#000000" bottomBorder="None"
bottomBorderColor="#000000"/>
+ <box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="0.0"
lineColor="#000000"/>
------------------------------------------------------------------------------
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
