Changes in Payment Report jrxmls for the translations to fit.
authorIoritz Cia <ioritz.cia@openbravo.com>
Wed, 28 Mar 2012 13:58:59 +0200
changeset 15974 24903cbf763c
parent 15973 eb3fdc5cecf2
child 15975 b3016d7a95ea
Changes in Payment Report jrxmls for the translations to fit.
modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_TEXTINTERFACES.xml
modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportExcel.jrxml
modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportPDF.jrxml
--- a/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_TEXTINTERFACES.xml	Thu Mar 29 12:30:20 2012 +0200
+++ b/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_TEXTINTERFACES.xml	Wed Mar 28 13:58:59 2012 +0200
@@ -11,6 +11,17 @@
 <!--02AAEE46AC52441E84CC3D86CDABEC7C-->  <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID>
 <!--02AAEE46AC52441E84CC3D86CDABEC7C--></AD_TEXTINTERFACES>
 
+<!--02F7B62B809A4C7994C6661D4150A410--><AD_TEXTINTERFACES>
+<!--02F7B62B809A4C7994C6661D4150A410-->  <AD_TEXTINTERFACES_ID><![CDATA[02F7B62B809A4C7994C6661D4150A410]]></AD_TEXTINTERFACES_ID>
+<!--02F7B62B809A4C7994C6661D4150A410-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--02F7B62B809A4C7994C6661D4150A410-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--02F7B62B809A4C7994C6661D4150A410-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--02F7B62B809A4C7994C6661D4150A410-->  <TEXT><![CDATA[PlannedDSO]]></TEXT>
+<!--02F7B62B809A4C7994C6661D4150A410-->  <FILENAME><![CDATA[/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportPDF.jrxml]]></FILENAME>
+<!--02F7B62B809A4C7994C6661D4150A410-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--02F7B62B809A4C7994C6661D4150A410-->  <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID>
+<!--02F7B62B809A4C7994C6661D4150A410--></AD_TEXTINTERFACES>
+
 <!--044881ABF38E44E1BFE3D28F6992587F--><AD_TEXTINTERFACES>
 <!--044881ABF38E44E1BFE3D28F6992587F-->  <AD_TEXTINTERFACES_ID><![CDATA[044881ABF38E44E1BFE3D28F6992587F]]></AD_TEXTINTERFACES_ID>
 <!--044881ABF38E44E1BFE3D28F6992587F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -264,17 +275,6 @@
 <!--393EFE8078AF4B3299DBACBF533128F8-->  <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID>
 <!--393EFE8078AF4B3299DBACBF533128F8--></AD_TEXTINTERFACES>
 
-<!--3A59F70C2BE548398EEC5134095FA252--><AD_TEXTINTERFACES>
-<!--3A59F70C2BE548398EEC5134095FA252-->  <AD_TEXTINTERFACES_ID><![CDATA[3A59F70C2BE548398EEC5134095FA252]]></AD_TEXTINTERFACES_ID>
-<!--3A59F70C2BE548398EEC5134095FA252-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--3A59F70C2BE548398EEC5134095FA252-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--3A59F70C2BE548398EEC5134095FA252-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--3A59F70C2BE548398EEC5134095FA252-->  <TEXT><![CDATA[Current DSO]]></TEXT>
-<!--3A59F70C2BE548398EEC5134095FA252-->  <FILENAME><![CDATA[/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportPDF.jrxml]]></FILENAME>
-<!--3A59F70C2BE548398EEC5134095FA252-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--3A59F70C2BE548398EEC5134095FA252-->  <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID>
-<!--3A59F70C2BE548398EEC5134095FA252--></AD_TEXTINTERFACES>
-
 <!--43C8186236514013ADE1E5C8DB7A043B--><AD_TEXTINTERFACES>
 <!--43C8186236514013ADE1E5C8DB7A043B-->  <AD_TEXTINTERFACES_ID><![CDATA[43C8186236514013ADE1E5C8DB7A043B]]></AD_TEXTINTERFACES_ID>
 <!--43C8186236514013ADE1E5C8DB7A043B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -528,6 +528,17 @@
 <!--956DE8D037514B20A7303E122AAD2713-->  <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID>
 <!--956DE8D037514B20A7303E122AAD2713--></AD_TEXTINTERFACES>
 
+<!--977F3730B74146ADBB48FCD85218F034--><AD_TEXTINTERFACES>
+<!--977F3730B74146ADBB48FCD85218F034-->  <AD_TEXTINTERFACES_ID><![CDATA[977F3730B74146ADBB48FCD85218F034]]></AD_TEXTINTERFACES_ID>
+<!--977F3730B74146ADBB48FCD85218F034-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--977F3730B74146ADBB48FCD85218F034-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--977F3730B74146ADBB48FCD85218F034-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--977F3730B74146ADBB48FCD85218F034-->  <TEXT><![CDATA[CurrentDSO]]></TEXT>
+<!--977F3730B74146ADBB48FCD85218F034-->  <FILENAME><![CDATA[/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportExcel.jrxml]]></FILENAME>
+<!--977F3730B74146ADBB48FCD85218F034-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--977F3730B74146ADBB48FCD85218F034-->  <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID>
+<!--977F3730B74146ADBB48FCD85218F034--></AD_TEXTINTERFACES>
+
 <!--9896DFF27CCF4AB2A278019CE671DCAC--><AD_TEXTINTERFACES>
 <!--9896DFF27CCF4AB2A278019CE671DCAC-->  <AD_TEXTINTERFACES_ID><![CDATA[9896DFF27CCF4AB2A278019CE671DCAC]]></AD_TEXTINTERFACES_ID>
 <!--9896DFF27CCF4AB2A278019CE671DCAC-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -616,17 +627,6 @@
 <!--A1CC0391770548668172514B0F7D0DDD-->  <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID>
 <!--A1CC0391770548668172514B0F7D0DDD--></AD_TEXTINTERFACES>
 
-<!--AC02964E5D854803852115613014DF6E--><AD_TEXTINTERFACES>
-<!--AC02964E5D854803852115613014DF6E-->  <AD_TEXTINTERFACES_ID><![CDATA[AC02964E5D854803852115613014DF6E]]></AD_TEXTINTERFACES_ID>
-<!--AC02964E5D854803852115613014DF6E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--AC02964E5D854803852115613014DF6E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--AC02964E5D854803852115613014DF6E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--AC02964E5D854803852115613014DF6E-->  <TEXT><![CDATA[Planned DSO]]></TEXT>
-<!--AC02964E5D854803852115613014DF6E-->  <FILENAME><![CDATA[/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportExcel.jrxml]]></FILENAME>
-<!--AC02964E5D854803852115613014DF6E-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--AC02964E5D854803852115613014DF6E-->  <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID>
-<!--AC02964E5D854803852115613014DF6E--></AD_TEXTINTERFACES>
-
 <!--AC44B03FF40047059E663CEB9CF49A5A--><AD_TEXTINTERFACES>
 <!--AC44B03FF40047059E663CEB9CF49A5A-->  <AD_TEXTINTERFACES_ID><![CDATA[AC44B03FF40047059E663CEB9CF49A5A]]></AD_TEXTINTERFACES_ID>
 <!--AC44B03FF40047059E663CEB9CF49A5A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -748,6 +748,17 @@
 <!--B973837A2C334DC49973CEE4179F43B7-->  <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID>
 <!--B973837A2C334DC49973CEE4179F43B7--></AD_TEXTINTERFACES>
 
+<!--BA44533ED06A4B73BCE144691D928626--><AD_TEXTINTERFACES>
+<!--BA44533ED06A4B73BCE144691D928626-->  <AD_TEXTINTERFACES_ID><![CDATA[BA44533ED06A4B73BCE144691D928626]]></AD_TEXTINTERFACES_ID>
+<!--BA44533ED06A4B73BCE144691D928626-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--BA44533ED06A4B73BCE144691D928626-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--BA44533ED06A4B73BCE144691D928626-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--BA44533ED06A4B73BCE144691D928626-->  <TEXT><![CDATA[PlannedDSO]]></TEXT>
+<!--BA44533ED06A4B73BCE144691D928626-->  <FILENAME><![CDATA[/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportExcel.jrxml]]></FILENAME>
+<!--BA44533ED06A4B73BCE144691D928626-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--BA44533ED06A4B73BCE144691D928626-->  <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID>
+<!--BA44533ED06A4B73BCE144691D928626--></AD_TEXTINTERFACES>
+
 <!--BA58631F88A74CB1859804387A7AE6B2--><AD_TEXTINTERFACES>
 <!--BA58631F88A74CB1859804387A7AE6B2-->  <AD_TEXTINTERFACES_ID><![CDATA[BA58631F88A74CB1859804387A7AE6B2]]></AD_TEXTINTERFACES_ID>
 <!--BA58631F88A74CB1859804387A7AE6B2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -792,16 +803,16 @@
 <!--C31FF83C82AB49C7AC446FD28B431B3C-->  <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID>
 <!--C31FF83C82AB49C7AC446FD28B431B3C--></AD_TEXTINTERFACES>
 
-<!--C3A3DCA2DFE142108B0693934784A6F6--><AD_TEXTINTERFACES>
-<!--C3A3DCA2DFE142108B0693934784A6F6-->  <AD_TEXTINTERFACES_ID><![CDATA[C3A3DCA2DFE142108B0693934784A6F6]]></AD_TEXTINTERFACES_ID>
-<!--C3A3DCA2DFE142108B0693934784A6F6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--C3A3DCA2DFE142108B0693934784A6F6-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--C3A3DCA2DFE142108B0693934784A6F6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--C3A3DCA2DFE142108B0693934784A6F6-->  <TEXT><![CDATA[Current DSO]]></TEXT>
-<!--C3A3DCA2DFE142108B0693934784A6F6-->  <FILENAME><![CDATA[/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportExcel.jrxml]]></FILENAME>
-<!--C3A3DCA2DFE142108B0693934784A6F6-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--C3A3DCA2DFE142108B0693934784A6F6-->  <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID>
-<!--C3A3DCA2DFE142108B0693934784A6F6--></AD_TEXTINTERFACES>
+<!--C764993E67B846B4B72165EB26D04BC9--><AD_TEXTINTERFACES>
+<!--C764993E67B846B4B72165EB26D04BC9-->  <AD_TEXTINTERFACES_ID><![CDATA[C764993E67B846B4B72165EB26D04BC9]]></AD_TEXTINTERFACES_ID>
+<!--C764993E67B846B4B72165EB26D04BC9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--C764993E67B846B4B72165EB26D04BC9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--C764993E67B846B4B72165EB26D04BC9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--C764993E67B846B4B72165EB26D04BC9-->  <TEXT><![CDATA[CurrentDSO]]></TEXT>
+<!--C764993E67B846B4B72165EB26D04BC9-->  <FILENAME><![CDATA[/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportPDF.jrxml]]></FILENAME>
+<!--C764993E67B846B4B72165EB26D04BC9-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--C764993E67B846B4B72165EB26D04BC9-->  <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID>
+<!--C764993E67B846B4B72165EB26D04BC9--></AD_TEXTINTERFACES>
 
 <!--C851638940504AF69C111133B4FC53FF--><AD_TEXTINTERFACES>
 <!--C851638940504AF69C111133B4FC53FF-->  <AD_TEXTINTERFACES_ID><![CDATA[C851638940504AF69C111133B4FC53FF]]></AD_TEXTINTERFACES_ID>
@@ -880,17 +891,6 @@
 <!--D79B532849AC43F09FB38375FB9CBBA2-->  <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID>
 <!--D79B532849AC43F09FB38375FB9CBBA2--></AD_TEXTINTERFACES>
 
-<!--D97008CA65654BE69AFCDEECC9D20210--><AD_TEXTINTERFACES>
-<!--D97008CA65654BE69AFCDEECC9D20210-->  <AD_TEXTINTERFACES_ID><![CDATA[D97008CA65654BE69AFCDEECC9D20210]]></AD_TEXTINTERFACES_ID>
-<!--D97008CA65654BE69AFCDEECC9D20210-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--D97008CA65654BE69AFCDEECC9D20210-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--D97008CA65654BE69AFCDEECC9D20210-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--D97008CA65654BE69AFCDEECC9D20210-->  <TEXT><![CDATA[Planned DSO]]></TEXT>
-<!--D97008CA65654BE69AFCDEECC9D20210-->  <FILENAME><![CDATA[/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportPDF.jrxml]]></FILENAME>
-<!--D97008CA65654BE69AFCDEECC9D20210-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--D97008CA65654BE69AFCDEECC9D20210-->  <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID>
-<!--D97008CA65654BE69AFCDEECC9D20210--></AD_TEXTINTERFACES>
-
 <!--DAFB4AF969704E6A8587DD2F9ED525AD--><AD_TEXTINTERFACES>
 <!--DAFB4AF969704E6A8587DD2F9ED525AD-->  <AD_TEXTINTERFACES_ID><![CDATA[DAFB4AF969704E6A8587DD2F9ED525AD]]></AD_TEXTINTERFACES_ID>
 <!--DAFB4AF969704E6A8587DD2F9ED525AD-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportExcel.jrxml	Thu Mar 29 12:30:20 2012 +0200
+++ b/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportExcel.jrxml	Wed Mar 28 13:58:59 2012 +0200
@@ -134,8 +134,7 @@
 				<textElement verticalAlignment="Middle">
 					<font size="8" isBold="false"/>
 				</textElement>
-				<text><![CDATA[Invoice
-Number]]></text>
+				<text><![CDATA[Invoice Number]]></text>
 			</staticText>
 			<staticText>
 				<reportElement key="staticText-7" style="Detail_Header" x="468" y="25" width="55" height="25"/>
@@ -158,16 +157,14 @@
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="8" isBold="false"/>
 				</textElement>
-				<text><![CDATA[Planned
-DSO]]></text>
+				<text><![CDATA[PlannedDSO]]></text>
 			</staticText>
 			<staticText>
 				<reportElement key="staticText-10" style="Detail_Header" x="1162" y="25" width="33" height="25"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="8" isBold="false"/>
 				</textElement>
-				<text><![CDATA[Current
-DSO]]></text>
+				<text><![CDATA[CurrentDSO]]></text>
 			</staticText>
 			<staticText>
 				<reportElement key="staticText-11" style="Detail_Header" x="1195" y="25" width="36" height="25"/>
@@ -182,8 +179,7 @@
 				<textElement textAlignment="Right">
 					<font size="8" isBold="false"/>
 				</textElement>
-				<text><![CDATA[Base
-Amount]]></text>
+				<text><![CDATA[Base Amount]]></text>
 			</staticText>
 			<staticText>
 				<reportElement key="staticText-14" style="Detail_Header" x="1451" y="25" width="46" height="25"/>
@@ -191,8 +187,7 @@
 				<textElement textAlignment="Center">
 					<font size="8" isBold="false"/>
 				</textElement>
-				<text><![CDATA[Base
-Currency]]></text>
+				<text><![CDATA[Base Currency]]></text>
 			</staticText>
 			<staticText>
 				<reportElement key="staticText-15" style="Detail_Header" x="1231" y="25" width="80" height="25"/>
@@ -200,8 +195,7 @@
 				<textElement textAlignment="Right">
 					<font size="8" isBold="false"/>
 				</textElement>
-				<text><![CDATA[Transactional
-Amount]]></text>
+				<text><![CDATA[Transactional Amount]]></text>
 			</staticText>
 			<staticText>
 				<reportElement key="staticText-16" style="Detail_Header" x="1311" y="25" width="60" height="25"/>
--- a/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportPDF.jrxml	Thu Mar 29 12:30:20 2012 +0200
+++ b/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportPDF.jrxml	Wed Mar 28 13:58:59 2012 +0200
@@ -2,9 +2,9 @@
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="PaymentReportPDF" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="782" leftMargin="30" rightMargin="30" topMargin="20" bottomMargin="20">
 	<property name="ireport.scriptlethandling" value="0"/>
 	<property name="ireport.encoding" value="UTF-8"/>
-	<property name="ireport.zoom" value="1.5"/>
-	<property name="ireport.x" value="233"/>
-	<property name="ireport.y" value="19"/>
+	<property name="ireport.zoom" value="1.0"/>
+	<property name="ireport.x" value="0"/>
+	<property name="ireport.y" value="48"/>
 	<import value="net.sf.jasperreports.engine.*"/>
 	<import value="java.util.*"/>
 	<import value="net.sf.jasperreports.engine.data.*"/>
@@ -371,8 +371,7 @@
 					<textElement verticalAlignment="Middle">
 						<font size="8" isBold="false"/>
 					</textElement>
-					<text><![CDATA[Invoice
-Number]]></text>
+					<text><![CDATA[Invoice Number]]></text>
 				</staticText>
 				<staticText>
 					<reportElement key="staticText-7" style="Detail_Header" x="229" y="35" width="55" height="25"/>
@@ -395,16 +394,14 @@
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font size="8" isBold="false"/>
 					</textElement>
-					<text><![CDATA[Planned
-DSO]]></text>
+					<text><![CDATA[PlannedDSO]]></text>
 				</staticText>
 				<staticText>
 					<reportElement key="staticText-10" style="Detail_Header" x="446" y="35" width="33" height="25"/>
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font size="8" isBold="false"/>
 					</textElement>
-					<text><![CDATA[Current
-DSO]]></text>
+					<text><![CDATA[CurrentDSO]]></text>
 				</staticText>
 				<staticText>
 					<reportElement key="staticText-11" style="Detail_Header" x="480" y="35" width="36" height="25"/>
@@ -414,34 +411,31 @@
 					<text><![CDATA[Overdue]]></text>
 				</staticText>
 				<staticText>
-					<reportElement key="staticText-13" style="Detail_Header" x="659" y="35" width="80" height="25"/>
+					<reportElement key="staticText-13" style="Detail_Header" x="654" y="35" width="75" height="25"/>
 					<box rightPadding="2"/>
 					<textElement textAlignment="Right">
 						<font size="8" isBold="false"/>
 					</textElement>
-					<text><![CDATA[Base
-Amount]]></text>
+					<text><![CDATA[Base Amount]]></text>
 				</staticText>
 				<staticText>
-					<reportElement key="staticText-14" style="Detail_Header" x="740" y="35" width="41" height="25"/>
+					<reportElement key="staticText-14" style="Detail_Header" x="730" y="35" width="51" height="25"/>
 					<box leftPadding="2"/>
 					<textElement textAlignment="Center">
 						<font size="8" isBold="false"/>
 					</textElement>
-					<text><![CDATA[Base
-Currency]]></text>
+					<text><![CDATA[Base Currency]]></text>
 				</staticText>
 				<staticText>
-					<reportElement key="staticText-15" style="Detail_Header" x="517" y="35" width="80" height="25"/>
+					<reportElement key="staticText-15" style="Detail_Header" x="517" y="35" width="75" height="25"/>
 					<box rightPadding="2"/>
 					<textElement textAlignment="Right">
 						<font size="8" isBold="false"/>
 					</textElement>
-					<text><![CDATA[Transactional
-Amount]]></text>
+					<text><![CDATA[Transactional Amount]]></text>
 				</staticText>
 				<staticText>
-					<reportElement key="staticText-16" style="Detail_Header" x="598" y="35" width="60" height="25"/>
+					<reportElement key="staticText-16" style="Detail_Header" x="593" y="35" width="60" height="25"/>
 					<box leftPadding="2"/>
 					<textElement textAlignment="Center">
 						<font size="8" isBold="false"/>
@@ -489,13 +483,13 @@
 					<reportElement key="line-46" style="Report_Footer" stretchType="RelativeToBandHeight" x="516" y="35" width="1" height="25"/>
 				</line>
 				<line>
-					<reportElement key="line-47" style="Report_Footer" stretchType="RelativeToBandHeight" x="597" y="35" width="1" height="25"/>
+					<reportElement key="line-47" style="Report_Footer" stretchType="RelativeToBandHeight" x="592" y="35" width="1" height="25"/>
 				</line>
 				<line>
-					<reportElement key="line-48" style="Report_Footer" stretchType="RelativeToBandHeight" x="658" y="35" width="1" height="25"/>
+					<reportElement key="line-48" style="Report_Footer" stretchType="RelativeToBandHeight" x="653" y="35" width="1" height="25"/>
 				</line>
 				<line>
-					<reportElement key="line-49" style="Report_Footer" stretchType="RelativeToBandHeight" x="739" y="35" width="1" height="25"/>
+					<reportElement key="line-49" style="Report_Footer" stretchType="RelativeToBandHeight" x="729" y="35" width="1" height="25"/>
 				</line>
 				<line>
 					<reportElement key="line-50" style="Report_Footer" stretchType="RelativeToBandHeight" x="781" y="35" width="1" height="25"/>
@@ -740,7 +734,7 @@
 				<textFieldExpression class="java.lang.String"><![CDATA[($F{OVERDUE}== null ? " " : $F{OVERDUE}.toString())]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="false">
-				<reportElement key="textField-13" style="Report_Footer" x="659" y="0" width="79" height="25"/>
+				<reportElement key="textField-13" style="Report_Footer" x="654" y="0" width="74" height="25"/>
 				<box rightPadding="2"/>
 				<textElement textAlignment="Right">
 					<font size="8"/>
@@ -748,14 +742,14 @@
 				<textFieldExpression class="java.lang.String"><![CDATA[($F{BASE_AMOUNT}== null ? " " : $F{BASE_AMOUNT}.toString())]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="false">
-				<reportElement key="textField-14" style="Report_Footer" x="740" y="0" width="40" height="25"/>
+				<reportElement key="textField-14" style="Report_Footer" x="730" y="0" width="50" height="25"/>
 				<textElement textAlignment="Center">
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression class="java.lang.String"><![CDATA[$F{BASE_CURRENCY}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="false">
-				<reportElement key="textField-15" style="Report_Footer" x="517" y="0" width="79" height="25"/>
+				<reportElement key="textField-15" style="Report_Footer" x="517" y="0" width="74" height="25"/>
 				<box rightPadding="2"/>
 				<textElement textAlignment="Right">
 					<font size="8"/>
@@ -763,7 +757,7 @@
 				<textFieldExpression class="java.lang.String"><![CDATA[$F{TRANS_AMOUNT}.toString() + " "]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="false">
-				<reportElement key="textField-16" style="Report_Footer" x="598" y="0" width="60" height="25"/>
+				<reportElement key="textField-16" style="Report_Footer" x="593" y="0" width="60" height="25"/>
 				<textElement textAlignment="Center">
 					<font size="8"/>
 				</textElement>
@@ -797,13 +791,13 @@
 				<reportElement key="line-15" style="Report_Footer" stretchType="RelativeToBandHeight" x="516" y="0" width="1" height="25"/>
 			</line>
 			<line>
-				<reportElement key="line-17" style="Report_Footer" stretchType="RelativeToBandHeight" x="597" y="0" width="1" height="25"/>
+				<reportElement key="line-17" style="Report_Footer" stretchType="RelativeToBandHeight" x="592" y="0" width="1" height="25"/>
 			</line>
 			<line>
-				<reportElement key="line-18" style="Report_Footer" stretchType="RelativeToBandHeight" x="658" y="0" width="1" height="25"/>
+				<reportElement key="line-18" style="Report_Footer" stretchType="RelativeToBandHeight" x="653" y="0" width="1" height="25"/>
 			</line>
 			<line>
-				<reportElement key="line-19" style="Report_Footer" stretchType="RelativeToBandHeight" x="739" y="0" width="1" height="25"/>
+				<reportElement key="line-19" style="Report_Footer" stretchType="RelativeToBandHeight" x="729" y="0" width="1" height="25"/>
 			</line>
 			<line>
 				<reportElement key="line-25" style="Report_Footer" stretchType="RelativeToBandHeight" x="781" y="0" width="1" height="25"/>