details: https://code.openbravo.com/erp/devel/pi/rev/80b7e9915544
changeset: 21437:80b7e9915544
user: Pandeeswari Ramakrishnan <pandeeswari.ramakrishnan <at>
openbravo.com>
date: Wed Nov 13 17:45:24 2013 +0530
summary: Fixes Issue 24295: Amount and total fields are truncated in Standard
Costs Report
diffstat:
src/org/openbravo/erpCommon/ad_reports/ReportStandardCostsJR_srptcosts.jrxml
| 63 +++++---
src/org/openbravo/erpCommon/ad_reports/ReportStandardCostsJR_subreport0.jrxml
| 65 ++++++----
2 files changed, 77 insertions(+), 51 deletions(-)
diffs (truncated from 422 to 300 lines):
diff -r cca2f611232d -r 80b7e9915544
src/org/openbravo/erpCommon/ad_reports/ReportStandardCostsJR_srptcosts.jrxml
---
a/src/org/openbravo/erpCommon/ad_reports/ReportStandardCostsJR_srptcosts.jrxml
Wed Nov 13 14:01:03 2013 +0530
+++
b/src/org/openbravo/erpCommon/ad_reports/ReportStandardCostsJR_srptcosts.jrxml
Wed Nov 13 17:45:24 2013 +0530
@@ -2,6 +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="ReportStandardCostsJR_srptcosts" pageWidth="505" pageHeight="46"
orientation="Landscape" columnWidth="505" leftMargin="0" rightMargin="0"
topMargin="0" bottomMargin="0">
<property name="ireport.scriptlethandling" value="0"/>
<property name="ireport.encoding" value="UTF-8"/>
+ <property name="ireport.zoom" value="1.0"/>
+ <property name="ireport.x" value="0"/>
+ <property name="ireport.y" value="0"/>
<import value="net.sf.jasperreports.engine.*"/>
<import value="java.util.*"/>
<import value="net.sf.jasperreports.engine.data.*"/>
@@ -59,7 +62,7 @@
<parameter name="CURRENCY_ID" class="java.lang.String"
isForPrompting="false"/>
<parameter name="BASE_CURRENCY_ID" class="java.lang.String"
isForPrompting="false"/>
<queryString>
- <![CDATA[SELECT 1 AS LINEORDER,
+ <![CDATA[SELECT 1 AS LINEORDER,
AD_COLUMN_IDENTIFIER(to_char('M_PRODUCT'), to_char(M_PRODUCT_ID),
$P{LANGUAGE}) AS CONCEPT,
quantity*COALESCE(decrease,1)*COALESCE(rejected,1) AS QUANTITY,
C_CURRENCY_CONVERT(COALESCE(COST, 0), $P{BASE_CURRENCY_ID},
$P{CURRENCY_ID}, TO_DATE(COALESCE(CREATED,NOW())), NULL, AD_CLIENT_ID,
AD_ORG_ID) AS UNIT_COST,
@@ -70,7 +73,7 @@
WHERE MA_SEQUENCEPRODUCT.MA_SEQUENCE_ID = $P{SEQUENCE_ID}
AND MA_SEQUENCEPRODUCT.PRODUCTIONTYPE = '-'
UNION ALL
-SELECT 2 AS LINEORDER,
+SELECT 2 AS LINEORDER,
AD_COLUMN_IDENTIFIER(to_char('MA_SEQUENCE'), to_char(MA_SEQUENCE_ID),
$P{LANGUAGE}) AS CONCEPT,
1 AS QUANTITY, COALESCE(OUTSOURCINGCOST,0) AS UNIT_COST,
COALESCE(OUTSOURCINGCOST,0) AS COST,
C_CURRENCY_SYMBOL($P{CURRENCY_ID}, 0, 'Y') AS CONVSYM,
@@ -143,7 +146,7 @@
<columnHeader>
<band height="16" splitType="Stretch">
<staticText>
- <reportElement key="element-90"
style="Detail_Header" x="0" y="0" width="272" height="16"/>
+ <reportElement key="element-90"
style="Detail_Header" x="0" y="0" width="175" height="16"/>
<box leftPadding="5">
<pen lineWidth="0.0"/>
<topPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
@@ -155,7 +158,7 @@
<text><![CDATA[Resources]]></text>
</staticText>
<staticText>
- <reportElement key="element-90"
style="Detail_Header" x="272" y="0" width="75" height="16"/>
+ <reportElement key="element-90"
style="Detail_Header" x="175" y="0" width="65" height="16"/>
<box leftPadding="5">
<pen lineWidth="0.0"/>
<topPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
@@ -167,7 +170,7 @@
<text><![CDATA[Quantity]]></text>
</staticText>
<staticText>
- <reportElement key="element-90"
style="Detail_Header" x="347" y="0" width="75" height="16"/>
+ <reportElement key="element-90"
style="Detail_Header" x="240" y="0" width="130" height="16"/>
<box leftPadding="5">
<pen lineWidth="0.0"/>
<topPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
@@ -181,7 +184,7 @@
<text><![CDATA[Cost]]></text>
</staticText>
<staticText>
- <reportElement key="element-90"
style="Detail_Header" x="422" y="0" width="83" height="16"/>
+ <reportElement key="element-90"
style="Detail_Header" x="370" y="0" width="134" height="16"/>
<box leftPadding="5">
<pen lineWidth="0.0"/>
<topPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
@@ -207,51 +210,59 @@
<rightPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
</box>
<textField isBlankWhenNull="false">
- <reportElement key="textField-1"
style="default" mode="Transparent" x="422" y="0" width="65" height="14"/>
+ <reportElement key="textField-1"
style="default" stretchType="RelativeToBandHeight" mode="Transparent" x="370"
y="0" width="118" height="14"/>
<box leftPadding="5" rightPadding="2">
<topPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0"
lineStyle="Solid" lineColor="#666666"/>
<bottomPen lineWidth="0.0"
lineColor="#000000"/>
<rightPen lineWidth="0.0"
lineStyle="Solid" lineColor="#666666"/>
</box>
- <textElement textAlignment="Right"/>
+ <textElement textAlignment="Right">
+ <font size="9"/>
+ </textElement>
<textFieldExpression
class="java.lang.String"><![CDATA[($F{COST}!=null)?$P{NUMBERFORMAT}.format($F{COST}):new
String(" ")]]></textFieldExpression>
</textField>
- <textField isStretchWithOverflow="true"
isBlankWhenNull="false">
- <reportElement key="textField-2"
style="default" stretchType="RelativeToBandHeight" mode="Transparent" x="347"
y="0" width="58" height="14"/>
+ <textField isBlankWhenNull="false">
+ <reportElement key="textField-2"
style="default" stretchType="RelativeToBandHeight" mode="Transparent" x="240"
y="0" width="114" height="14"/>
<box leftPadding="5" rightPadding="2">
<topPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0"
lineStyle="Solid" lineColor="#666666"/>
<bottomPen lineWidth="0.0"
lineColor="#000000"/>
<rightPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
</box>
- <textElement textAlignment="Right"/>
+ <textElement textAlignment="Right">
+ <font size="9"/>
+ </textElement>
<textFieldExpression
class="java.lang.String"><![CDATA[($F{UNIT_COST}!=null)?$P{NUMBERFORMAT}.format($F{UNIT_COST}):new
String(" ")]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true"
isBlankWhenNull="false">
- <reportElement key="textField-3"
style="default" stretchType="RelativeToBandHeight" x="272" y="0" width="75"
height="14"/>
+ <reportElement key="textField-3"
style="default" stretchType="RelativeToBandHeight" x="175" y="0" width="65"
height="14"/>
<box leftPadding="5" rightPadding="2">
<topPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0"
lineStyle="Solid" lineColor="#666666"/>
<bottomPen lineWidth="0.0"
lineColor="#000000"/>
<rightPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
</box>
- <textElement textAlignment="Right"/>
+ <textElement textAlignment="Right">
+ <font size="9"/>
+ </textElement>
<textFieldExpression
class="java.lang.String"><![CDATA[($F{QUANTITY}!=null)?$P{NUMBERFORMAT}.format($F{QUANTITY}):new
String(" ")]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true"
isBlankWhenNull="false">
- <reportElement key="textField-4"
style="default" stretchType="RelativeToBandHeight" x="0" y="0" width="272"
height="14"/>
+ <reportElement key="textField-4"
style="default" x="0" y="0" width="175" height="14"/>
<box leftPadding="5" rightPadding="2">
<topPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0"
lineStyle="Solid" lineColor="#666666"/>
<bottomPen lineWidth="0.0"
lineColor="#000000"/>
<rightPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
</box>
- <textElement/>
+ <textElement>
+ <font size="9"/>
+ </textElement>
<textFieldExpression
class="java.lang.String"><![CDATA[$F{CONCEPT}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="false">
- <reportElement key="textField-5"
style="Report_Footer" x="406" y="0" width="16" height="14"/>
+ <reportElement key="textField-5"
style="Report_Footer" stretchType="RelativeToBandHeight" x="354" y="0"
width="16" height="14"/>
<box>
<topPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
@@ -259,12 +270,12 @@
<rightPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
</box>
<textElement textAlignment="Center"
verticalAlignment="Middle">
- <font size="10"
isUnderline="false"/>
+ <font size="9"
isUnderline="false"/>
</textElement>
<textFieldExpression
class="java.lang.String"><![CDATA[$F{CONVSYM}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="false">
- <reportElement key="textField-6"
style="Report_Footer" x="488" y="0" width="16" height="14"/>
+ <reportElement key="textField-6"
style="Report_Footer" stretchType="RelativeToBandHeight" x="488" y="0"
width="16" height="14"/>
<box>
<topPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
@@ -272,7 +283,7 @@
<rightPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
</box>
<textElement textAlignment="Center"
verticalAlignment="Middle">
- <font size="10"
isUnderline="false"/>
+ <font size="9"
isUnderline="false"/>
</textElement>
<textFieldExpression
class="java.lang.String"><![CDATA[$F{CONVSYM}]]></textFieldExpression>
</textField>
@@ -282,7 +293,7 @@
<columnFooter>
<band height="16" splitType="Stretch">
<textField isStretchWithOverflow="true" pattern=""
isBlankWhenNull="false">
- <reportElement key="textField"
style="Total_Field" x="422" y="1" width="59" height="15"/>
+ <reportElement key="textField"
style="Total_Field" x="370" y="1" width="118" height="15"/>
<box leftPadding="5">
<pen lineWidth="0.0"/>
<topPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
@@ -291,26 +302,28 @@
<rightPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
</box>
<textElement textAlignment="Right">
- <font pdfFontName="Helvetica-Bold"/>
+ <font size="9"
pdfFontName="Helvetica-Bold"/>
</textElement>
<textFieldExpression
class="java.lang.String"><![CDATA[($V{COST_TOTAL}!=null)?$P{NUMBERFORMAT}.format($V{COST_TOTAL}):new
String(" ")]]></textFieldExpression>
</textField>
<staticText>
- <reportElement key="staticText-1"
style="Report_Footer" x="272" y="1" width="150" height="15"/>
+ <reportElement key="staticText-1"
style="Report_Footer" x="220" y="1" width="150" height="15"/>
<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"/>
+ <textElement textAlignment="Right">
+ <font size="10"/>
+ </textElement>
<text><![CDATA[Sequence Total Cost: ]]></text>
</staticText>
<line>
<reportElement key="line-1"
style="Report_Footer" x="0" y="0" width="505" height="1" forecolor="#666666"/>
</line>
<textField isBlankWhenNull="false">
- <reportElement key="textField-7"
style="Total_Field" mode="Opaque" x="481" y="1" width="24" height="15"/>
+ <reportElement key="textField-7"
style="Total_Field" mode="Opaque" x="488" y="1" width="16" height="15"/>
<box leftPadding="5">
<pen lineWidth="0.0"/>
<topPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
@@ -319,7 +332,7 @@
<rightPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
</box>
<textElement textAlignment="Center"
verticalAlignment="Middle">
- <font isUnderline="false"
pdfFontName="Helvetica-Bold"/>
+ <font size="9" isUnderline="false"
pdfFontName="Helvetica-Bold"/>
</textElement>
<textFieldExpression
class="java.lang.String"><![CDATA[$F{CONVSYM}]]></textFieldExpression>
</textField>
diff -r cca2f611232d -r 80b7e9915544
src/org/openbravo/erpCommon/ad_reports/ReportStandardCostsJR_subreport0.jrxml
---
a/src/org/openbravo/erpCommon/ad_reports/ReportStandardCostsJR_subreport0.jrxml
Wed Nov 13 14:01:03 2013 +0530
+++
b/src/org/openbravo/erpCommon/ad_reports/ReportStandardCostsJR_subreport0.jrxml
Wed Nov 13 17:45:24 2013 +0530
@@ -2,6 +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="ReportStandardCostsJR_subreport0" pageWidth="505" pageHeight="46"
orientation="Landscape" columnWidth="505" leftMargin="0" rightMargin="0"
topMargin="0" bottomMargin="0">
<property name="ireport.scriptlethandling" value="0"/>
<property name="ireport.encoding" value="UTF-8"/>
+ <property name="ireport.zoom" value="1.0"/>
+ <property name="ireport.x" value="0"/>
+ <property name="ireport.y" value="0"/>
<import value="net.sf.jasperreports.engine.*"/>
<import value="java.util.*"/>
<import value="net.sf.jasperreports.engine.data.*"/>
@@ -71,11 +74,11 @@
<![CDATA[SELECT MA_SEQUENCEPRODUCT.MA_SEQUENCE_ID,
A.COMPONENTCOSTSUM, MA_SEQUENCEPRODUCT.COMPONENTCOST,
AD_COLUMN_IDENTIFIER(to_char('M_PRODUCT'), to_char(M_PRODUCT_ID),
$P{LANGUAGE}) AS CONCEPT,
ROUND(quantity/COALESCE(decrease,1)*COALESCE(rejected,1),4) AS QUANTITY,
- C_CURRENCY_CONVERT(COALESCE(COST, 0), $P{BASE_CURRENCY_ID},
$P{CURRENCY_ID}, TO_DATE(COALESCE(MA_SEQUENCEPRODUCT.CREATED,NOW())), NULL,
MA_SEQUENCEPRODUCT.AD_CLIENT_ID, MA_SEQUENCEPRODUCT.AD_ORG_ID) AS UNIT_COST,
+ C_CURRENCY_CONVERT(COALESCE(COST, 0), $P{BASE_CURRENCY_ID},
$P{CURRENCY_ID}, TO_DATE(COALESCE(MA_SEQUENCEPRODUCT.CREATED,NOW())), NULL,
MA_SEQUENCEPRODUCT.AD_CLIENT_ID, MA_SEQUENCEPRODUCT.AD_ORG_ID) AS UNIT_COST,
C_CURRENCY_CONVERT(COALESCE(COST*quantity/COALESCE(decrease,1)*COALESCE(rejected,1),0),
$P{BASE_CURRENCY_ID}, $P{CURRENCY_ID},
TO_DATE(COALESCE(MA_SEQUENCEPRODUCT.CREATED,NOW())), NULL,
MA_SEQUENCEPRODUCT.AD_CLIENT_ID, MA_SEQUENCEPRODUCT.AD_ORG_ID) AS COST,
C_CURRENCY_SYMBOL($P{CURRENCY_ID}, 0, 'Y') AS CONVSYM,
- C_CURRENCY_ISOSYM($P{CURRENCY_ID}) AS CONVISOSYM
-FROM MA_SEQUENCEPRODUCT,
+ C_CURRENCY_ISOSYM($P{CURRENCY_ID}) AS CONVISOSYM
+FROM MA_SEQUENCEPRODUCT,
(SELECT SUM(COALESCE(COMPONENTCOST,1)) AS COMPONENTCOSTSUM, MA_SEQUENCE_ID
FROM MA_SEQUENCEPRODUCT
WHERE MA_SEQUENCEPRODUCT.MA_SEQUENCE_ID = $P{SEQUENCE_ID}
@@ -110,7 +113,7 @@
<columnHeader>
<band height="16" splitType="Stretch">
<staticText>
- <reportElement key="element-90"
style="Detail_Header" x="0" y="0" width="272" height="16"/>
+ <reportElement key="element-90"
style="Detail_Header" x="0" y="0" width="175" height="16"/>
<box leftPadding="5">
<pen lineWidth="0.0"/>
<topPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
@@ -122,7 +125,7 @@
<text><![CDATA[Produced Product]]></text>
</staticText>
<staticText>
- <reportElement key="element-90"
style="Detail_Header" x="272" y="0" width="75" height="16"/>
+ <reportElement key="element-90"
style="Detail_Header" x="175" y="0" width="65" height="16"/>
<box leftPadding="5">
<pen lineWidth="0.0"/>
<topPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
@@ -136,7 +139,7 @@
<text><![CDATA[Quantity]]></text>
</staticText>
<staticText>
- <reportElement key="element-90"
style="Detail_Header" x="347" y="0" width="75" height="16"/>
+ <reportElement key="element-90"
style="Detail_Header" x="240" y="0" width="130" height="16"/>
<box leftPadding="5">
<pen lineWidth="0.0"/>
<topPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
@@ -150,7 +153,7 @@
<text><![CDATA[Cost]]></text>
</staticText>
<staticText>
- <reportElement key="element-90"
style="Detail_Header" x="422" y="0" width="83" height="16"/>
+ <reportElement key="element-90"
style="Detail_Header" x="370" y="0" width="134" height="16"/>
<box leftPadding="5">
<pen lineWidth="0.0"/>
<topPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
@@ -175,52 +178,60 @@
<bottomPen lineWidth="0.0"
lineColor="#000000"/>
<rightPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
</box>
- <textField isBlankWhenNull="false">
- <reportElement key="textField-1"
style="default" stretchType="RelativeToBandHeight" x="0" y="0" width="272"
height="14"/>
+ <textField isStretchWithOverflow="true"
isBlankWhenNull="false">
+ <reportElement key="textField-1"
style="default" stretchType="RelativeToBandHeight" x="0" y="0" width="175"
height="14"/>
<box leftPadding="3" rightPadding="2">
<topPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="0.25"
lineStyle="Solid" lineColor="#999999"/>
<bottomPen lineWidth="0.0"
lineColor="#000000"/>
<rightPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
</box>
- <textElement/>
+ <textElement>
+ <font size="9"/>
+ </textElement>
<textFieldExpression
class="java.lang.String"><![CDATA[$F{CONCEPT}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="false">
- <reportElement key="textField-2"
style="default" stretchType="RelativeToBandHeight" x="272" y="0" width="75"
height="14"/>
+ <reportElement key="textField-2"
style="default" stretchType="RelativeToBandHeight" x="175" y="0" width="65"
height="14"/>
<box leftPadding="3" rightPadding="2">
------------------------------------------------------------------------------
DreamFactory - Open Source REST & JSON Services for HTML5 & Native Apps
OAuth, Users, Roles, SQL, NoSQL, BLOB Storage and External API Access
Free app hosting. Or install the open source package on any LAMP server.
Sign up and see examples for AngularJS, jQuery, Sencha Touch and Native!
http://pubads.g.doubleclick.net/gampad/clk?id=63469471&iu=/4140/ostg.clktrk
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
