Fixes issue 16911. Changed format and alignment to GLJ and GLR
authorAinhoa Pagola <ainhoa.pagola@openbravo.com>
Tue, 10 May 2011 15:12:54 +0200
changeset 12096 57222efb33d1
parent 12095 1d1c5fb4c601
child 12097 797e4542bfcb
Fixes issue 16911. Changed format and alignment to GLJ and GLR
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.html
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.jrxml
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerExcel.jrxml
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.html
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.jrxml
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.xml
--- a/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.html	Wed May 11 13:34:39 2011 +0200
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.html	Tue May 10 15:12:54 2011 +0200
@@ -814,9 +814,9 @@
 
                     <tr class="DataGrid_Body_Row">
                       <th width="10%" class="DataGrid_Header_Cell">DATE</th>
-                      <th width="10%" class="DataGrid_Header_Cell">DEBIT</th>
-                      <th width="10%" class="DataGrid_Header_Cell">CREDIT</th>
-                      <th width="15%" class="DataGrid_Header_Cell">BALANCE</th>
+                      <th width="10%" class="DataGrid_Header_Cell_Amount">DEBIT</th>
+                      <th width="10%" class="DataGrid_Header_Cell_Amount">CREDIT</th>
+                      <th width="15%" class="DataGrid_Header_Cell_Amount">BALANCE</th>
                       <th width="75%" class="DataGrid_Header_Cell">DESCRIPTION</th>
                     </tr>
 
@@ -887,9 +887,9 @@
                       </tr>
                       <tr class="DataGrid_Body_Row">
                         <th width="10%" class="DataGrid_Header_Cell">DATE</th>
-                        <th width="10%" class="DataGrid_Header_Cell">DEBIT</th>
-                        <th width="10%" class="DataGrid_Header_Cell">CREDIT</th>
-                        <th width="15%" class="DataGrid_Header_Cell">BALANCE</th>
+                        <th width="10%" class="DataGrid_Header_Cell_Amount">DEBIT</th>
+                        <th width="10%" class="DataGrid_Header_Cell_Amount">CREDIT</th>
+                        <th width="15%" class="DataGrid_Header_Cell_Amount">BALANCE</th>
                         <th width="75%" class="DataGrid_Header_Cell">DESCRIPTION</th>
                       </tr>
 
--- a/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.jrxml	Wed May 11 13:34:39 2011 +0200
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.jrxml	Tue May 10 15:12:54 2011 +0200
@@ -327,7 +327,7 @@
 						<bottomPen lineWidth="0.0" lineColor="#000000"/>
 						<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
-					<textElement>
+					<textElement textAlignment="Right">
 						<font size="10"/>
 					</textElement>
 					<text><![CDATA[Debit]]></text>
@@ -340,7 +340,7 @@
 						<bottomPen lineWidth="0.0" lineColor="#000000"/>
 						<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
-					<textElement>
+					<textElement textAlignment="Right">
 						<font size="10"/>
 					</textElement>
 					<text><![CDATA[Credit]]></text>
@@ -353,7 +353,7 @@
 						<bottomPen lineWidth="0.0" lineColor="#000000"/>
 						<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
-					<textElement>
+					<textElement textAlignment="Right">
 						<font size="10"/>
 					</textElement>
 					<text><![CDATA[Balance]]></text>
--- a/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerExcel.jrxml	Wed May 11 13:34:39 2011 +0200
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerExcel.jrxml	Tue May 10 15:12:54 2011 +0200
@@ -134,7 +134,7 @@
 					<bottomPen lineWidth="0.0" lineColor="#000000"/>
 					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#333333"/>
 				</box>
-				<textElement>
+				<textElement textAlignment="Right">
 					<font size="8"/>
 				</textElement>
 				<text><![CDATA[Debit]]></text>
@@ -147,7 +147,7 @@
 					<bottomPen lineWidth="0.0" lineColor="#000000"/>
 					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#333333"/>
 				</box>
-				<textElement>
+				<textElement textAlignment="Right">
 					<font size="8"/>
 				</textElement>
 				<text><![CDATA[Credit]]></text>
--- a/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.html	Wed May 11 13:34:39 2011 +0200
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.html	Tue May 10 15:12:54 2011 +0200
@@ -448,15 +448,15 @@
                       <tr class="DataGrid_Body_Row">
                         <th width="15%" class="DataGrid_Header_Cell">Account No.</th>
                         <th width="57%" class="DataGrid_Header_Cell">NAME</th>
-                        <th width="14%" class="DataGrid_Header_Cell">DEBIT</th>
-                        <th width="6%" class="DataGrid_Header_Cell">CREDIT</th>
+                        <th width="14%" class="DataGrid_Header_Cell_Amount">DEBIT</th>
+                        <th width="6%" class="DataGrid_Header_Cell_Amount">CREDIT</th>
                       </tr>
                       <div id="sectionDetail"> 
                         <tr class="DataGrid_Body_Row DataGrid_Body_Row_yy" id="funcEvenOddRow1xx">
                           <td width="15%"  id="fieldValue" class="DataGrid_Body_Cell">XX12345</td>
                           <td width="57%"  id="fieldName" class="DataGrid_Body_Cell">Accounts receivable - Trade</td>
-                          <td width="14%" id="fieldAmtacctdr" class="DataGrid_Body_Cell">xx14500.34</td>
-                          <td width="14%"  id="fieldAmtacctcr" class="DataGrid_Body_Cell">xx14500.34</td>
+                          <td width="14%" id="fieldAmtacctdr" class="DataGrid_Body_Cell_Amount">xx14500.34</td>
+                          <td width="14%"  id="fieldAmtacctcr" class="DataGrid_Body_Cell_Amount">xx14500.34</td>
                         </tr>
                       </div>
                     </table>
--- a/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.jrxml	Wed May 11 13:34:39 2011 +0200
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.jrxml	Tue May 10 15:12:54 2011 +0200
@@ -294,7 +294,7 @@
 					<bottomPen lineWidth="0.0" lineColor="#000000"/>
 					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 </box>
-					<textElement verticalAlignment="Middle">
+					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font/>
 					</textElement>
 				<text><![CDATA[DEBIT]]></text>
@@ -312,7 +312,7 @@
 					<bottomPen lineWidth="0.0" lineColor="#000000"/>
 					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 </box>
-					<textElement verticalAlignment="Middle">
+					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font/>
 					</textElement>
 				<text><![CDATA[CREDIT]]></text>
@@ -637,7 +637,7 @@
 					<bottomPen lineWidth="0.0" lineColor="#000000"/>
 					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 </box>
-					<textElement textAlignment="Right">
+					<textElement textAlignment="Left">
 						<font/>
 					</textElement>
 				<textFieldExpression   class="java.lang.String"><![CDATA[$F{VALUE}]]></textFieldExpression>
--- a/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.xml	Wed May 11 13:34:39 2011 +0200
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.xml	Tue May 10 15:12:54 2011 +0200
@@ -78,8 +78,8 @@
     <FIELD id="fieldIdentifier" attribute="onclick" replace="yy">dateacct</FIELD>
     <FIELD id="fieldDateacct">dateacct</FIELD>
     <FIELD id="fieldName">name</FIELD>
-    <FIELD id="fieldAmtacctdr" format="euroEdition">amtacctdr</FIELD>
-    <FIELD id="fieldAmtacctcr" format="euroEdition">amtacctcr</FIELD>
+    <FIELD id="fieldAmtacctdr" format="euroInform">amtacctdr</FIELD>
+    <FIELD id="fieldAmtacctcr" format="euroInform">amtacctcr</FIELD>
     <FIELD id="fieldValue">value</FIELD>
     <FIELD id="fieldDescription">description</FIELD>
     <FIELD id="fieldId" attribute="onclick" replace="xx">id</FIELD>