details: /erp/devel/pi/rev/ab9e699df945
changeset: 11486:ab9e699df945
user: Ainhoa Pagola <ainhoa.pagola <at> openbravo.com>
date: Mon Apr 04 18:38:50 2011 +0200
summary: Fixes issue 16189. New validation created
details: /erp/devel/pi/rev/ae0e1bab5d96
changeset: 11487:ae0e1bab5d96
user: Ainhoa Pagola <ainhoa.pagola <at> openbravo.com>
date: Tue Apr 05 09:43:13 2011 +0200
summary: Fixes issue 16214. Column size changed for credit and debit in GL
Report (excel)
diffstat:
src-db/database/sourcedata/AD_PROCESS_PARA.xml | 4 +-
src-db/database/sourcedata/AD_VAL_RULE.xml | 15
+++++-
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerExcel.jrxml | 24
+++++-----
3 files changed, 27 insertions(+), 16 deletions(-)
diffs (137 lines):
diff -r 8fae5c12a4e2 -r ae0e1bab5d96
src-db/database/sourcedata/AD_PROCESS_PARA.xml
--- a/src-db/database/sourcedata/AD_PROCESS_PARA.xml Tue Apr 05 11:31:16
2011 +0200
+++ b/src-db/database/sourcedata/AD_PROCESS_PARA.xml Tue Apr 05 09:43:13
2011 +0200
@@ -4880,7 +4880,7 @@
<!--1000600000--> <AD_PROCESS_ID><![CDATA[140]]></AD_PROCESS_ID>
<!--1000600000--> <SEQNO><![CDATA[20]]></SEQNO>
<!--1000600000--> <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
-<!--1000600000-->
<AD_VAL_RULE_ID><![CDATA[7BAD557A87B64D5386215D77F79A43D7]]></AD_VAL_RULE_ID>
+<!--1000600000-->
<AD_VAL_RULE_ID><![CDATA[FF8081812F06A183012F07323A2A001C]]></AD_VAL_RULE_ID>
<!--1000600000--> <COLUMNNAME><![CDATA[C_AcctSchema_ID]]></COLUMNNAME>
<!--1000600000--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
<!--1000600000--> <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
@@ -4901,7 +4901,7 @@
<!--1000600001--> <AD_PROCESS_ID><![CDATA[112]]></AD_PROCESS_ID>
<!--1000600001--> <SEQNO><![CDATA[20]]></SEQNO>
<!--1000600001--> <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
-<!--1000600001-->
<AD_VAL_RULE_ID><![CDATA[7BAD557A87B64D5386215D77F79A43D7]]></AD_VAL_RULE_ID>
+<!--1000600001-->
<AD_VAL_RULE_ID><![CDATA[FF8081812F06A183012F07323A2A001C]]></AD_VAL_RULE_ID>
<!--1000600001--> <COLUMNNAME><![CDATA[C_AcctSchema_ID]]></COLUMNNAME>
<!--1000600001--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
<!--1000600001--> <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
diff -r 8fae5c12a4e2 -r ae0e1bab5d96 src-db/database/sourcedata/AD_VAL_RULE.xml
--- a/src-db/database/sourcedata/AD_VAL_RULE.xml Tue Apr 05 11:31:16
2011 +0200
+++ b/src-db/database/sourcedata/AD_VAL_RULE.xml Tue Apr 05 09:43:13
2011 +0200
@@ -1462,9 +1462,9 @@
<!--7BAD557A87B64D5386215D77F79A43D7-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
<!--7BAD557A87B64D5386215D77F79A43D7--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--7BAD557A87B64D5386215D77F79A43D7--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--7BAD557A87B64D5386215D77F79A43D7--> <NAME><![CDATA[C_AcctSchema - Schemas
matching organizations]]></NAME>
+<!--7BAD557A87B64D5386215D77F79A43D7--> <NAME><![CDATA[C_AcctSchema - Schemas
matching parent organizations]]></NAME>
<!--7BAD557A87B64D5386215D77F79A43D7--> <TYPE><![CDATA[S]]></TYPE>
-<!--7BAD557A87B64D5386215D77F79A43D7--> <CODE><![CDATA[EXISTS (SELECT 1 FROM
AD_ORG_ACCTSCHEMA WHERE AD_ORG_ACCTSCHEMA.C_ACCTSCHEMA_ID =
C_ACCTSCHEMA.C_ACCTSCHEMA_ID AND (AD_ISORGINCLUDED(@AD_Org_ID@, AD_ORG_ID,
AD_CLIENT_ID)<>-1 OR AD_ISORGINCLUDED(@AD_Org_ID@, AD_ORG_ID,
AD_CLIENT_ID)<>-1))]]></CODE>
+<!--7BAD557A87B64D5386215D77F79A43D7--> <CODE><![CDATA[EXISTS (SELECT 1 FROM
AD_ORG_ACCTSCHEMA WHERE AD_ORG_ACCTSCHEMA.C_ACCTSCHEMA_ID =
C_ACCTSCHEMA.C_ACCTSCHEMA_ID AND AD_ISORGINCLUDED(@AD_Org_ID@, AD_ORG_ID,
AD_CLIENT_ID)<>-1)]]></CODE>
<!--7BAD557A87B64D5386215D77F79A43D7-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--7BAD557A87B64D5386215D77F79A43D7--></AD_VAL_RULE>
@@ -1739,4 +1739,15 @@
<!--FDC45D1AE2404B8384D14DB6DED90DCF-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--FDC45D1AE2404B8384D14DB6DED90DCF--></AD_VAL_RULE>
+<!--FF8081812F06A183012F07323A2A001C--><AD_VAL_RULE>
+<!--FF8081812F06A183012F07323A2A001C-->
<AD_VAL_RULE_ID><![CDATA[FF8081812F06A183012F07323A2A001C]]></AD_VAL_RULE_ID>
+<!--FF8081812F06A183012F07323A2A001C-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FF8081812F06A183012F07323A2A001C--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FF8081812F06A183012F07323A2A001C--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FF8081812F06A183012F07323A2A001C--> <NAME><![CDATA[C_AcctSchema - Schemas
matching parent & child organizations]]></NAME>
+<!--FF8081812F06A183012F07323A2A001C--> <TYPE><![CDATA[S]]></TYPE>
+<!--FF8081812F06A183012F07323A2A001C--> <CODE><![CDATA[EXISTS (SELECT 1 FROM
AD_ORG_ACCTSCHEMA WHERE AD_ORG_ACCTSCHEMA.C_ACCTSCHEMA_ID =
C_ACCTSCHEMA.C_ACCTSCHEMA_ID AND (AD_ISORGINCLUDED(@AD_Org_ID@, AD_ORG_ID,
AD_CLIENT_ID)<>-1 OR AD_ISORGINCLUDED(AD_Org_ID, @AD_Org_ID@,
AD_CLIENT_ID)<>-1))]]></CODE>
+<!--FF8081812F06A183012F07323A2A001C-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--FF8081812F06A183012F07323A2A001C--></AD_VAL_RULE>
+
</data>
diff -r 8fae5c12a4e2 -r ae0e1bab5d96
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerExcel.jrxml
--- a/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerExcel.jrxml
Tue Apr 05 11:31:16 2011 +0200
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerExcel.jrxml
Tue Apr 05 09:43:13 2011 +0200
@@ -297,7 +297,7 @@
style="Detail_Header"
x="350"
y="45"
- width="50"
+ width="80"
height="15"
key="element-90"/>
<box leftPadding="5" rightPadding="2">
<topPen lineWidth="0.0" lineStyle="Solid"
lineColor="#000000"/>
@@ -313,9 +313,9 @@
<staticText>
<reportElement
style="Detail_Header"
- x="400"
+ x="430"
y="45"
- width="50"
+ width="80"
height="15"
key="element-90"/>
<box leftPadding="5" rightPadding="2">
<topPen lineWidth="0.0" lineStyle="Solid"
lineColor="#000000"/>
@@ -331,9 +331,9 @@
<staticText>
<reportElement
style="Detail_Header"
- x="450"
+ x="510"
y="45"
- width="450"
+ width="390"
height="15"
key="element-90"/>
<box leftPadding="5" rightPadding="2">
<topPen lineWidth="0.0" lineStyle="Solid"
lineColor="#000000"/>
@@ -568,9 +568,9 @@
</textField>
<textField isStretchWithOverflow="false"
pattern="" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"
hyperlinkTarget="Self" >
<reportElement
- x="450"
+ x="510"
y="0"
- width="450"
+ width="390"
height="13"
key="textField-18"
stretchType="RelativeToBandHeight"/>
@@ -586,9 +586,9 @@
</textField>
<textField isStretchWithOverflow="false"
pattern="" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"
hyperlinkTarget="Self" >
<reportElement
- x="400"
+ x="430"
y="0"
- width="50"
+ width="80"
height="13"
key="textField-20"
stretchType="RelativeToBandHeight"/>
@@ -600,13 +600,13 @@
<textElement textAlignment="Right">
<font size="8"/>
</textElement>
- <textFieldExpression
class="java.math.BigDecimal"><![CDATA[$F{AMTACCTCR}]]></textFieldExpression>
+ <textFieldExpression
class="java.lang.String"><![CDATA[($F{AMTACCTCR}!=BigDecimal.ZERO &&
$F{AMTACCTCR}!=null)?$P{NUMBERFORMAT}.format($F{AMTACCTCR}).toString():new
String(" ")]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="false"
pattern="" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"
hyperlinkTarget="Self" >
<reportElement
x="350"
y="0"
- width="50"
+ width="80"
height="13"
key="textField-21"
stretchType="RelativeToBandHeight"/>
@@ -618,7 +618,7 @@
<textElement textAlignment="Right">
<font size="8"/>
</textElement>
- <textFieldExpression
class="java.math.BigDecimal"><![CDATA[$F{AMTACCTDR}]]></textFieldExpression>
+ <textFieldExpression
class="java.lang.String"><![CDATA[($F{AMTACCTDR}!=BigDecimal.ZERO &&
$F{AMTACCTDR}!=null)?$P{NUMBERFORMAT}.format($F{AMTACCTDR}).toString():new
String(" ")]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="false"
pattern="dd/MM/yyyy" isBlankWhenNull="false" evaluationTime="Now"
hyperlinkType="None" hyperlinkTarget="Self" >
<reportElement
------------------------------------------------------------------------------
Xperia(TM) PLAY
It's a major breakthrough. An authentic gaming
smartphone on the nation's most reliable network.
And it wants your games.
http://p.sf.net/sfu/verizon-sfdev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
