details: https://code.openbravo.com/erp/devel/pi/rev/9b5623c3aaf6
changeset: 20226:9b5623c3aaf6
user: Javier Etxarri <javier.echarri <at> openbravo.com>
date: Mon Apr 29 14:05:40 2013 +0200
summary: Fixes issue 23269: Sales Dimensional Report should show weight UOM
diffstat:
src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/DuplicatedPriceListVersion.class
| 0
src-util/buildvalidation/src/org/openbravo/buildvalidation/DuplicatedPriceListVersion.java
| 52 ++++
src-util/buildvalidation/src/org/openbravo/buildvalidation/DuplicatedPriceListVersion_data.xsql
| 32 ++
src/org/openbravo/erpCommon/ad_reports/ReportSalesDimensionalAnalyzeJR_data.xsql
| 31 +-
src/org/openbravo/erpCommon/ad_reports/WeightDimensionalComparative.jrxml
| 96 ++++----
src/org/openbravo/erpCommon/ad_reports/WeightDimensionalNoComparative.jrxml
| 110 +++++----
6 files changed, 220 insertions(+), 101 deletions(-)
diffs (truncated from 909 to 300 lines):
diff -r fe9b93ae554e -r 9b5623c3aaf6
src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/DuplicatedPriceListVersion.class
Binary file
src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/DuplicatedPriceListVersion.class
has changed
diff -r fe9b93ae554e -r 9b5623c3aaf6
src-util/buildvalidation/src/org/openbravo/buildvalidation/DuplicatedPriceListVersion.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++
b/src-util/buildvalidation/src/org/openbravo/buildvalidation/DuplicatedPriceListVersion.java
Mon Apr 29 14:05:40 2013 +0200
@@ -0,0 +1,52 @@
+/*
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo Public License
+ * Version 1.1 (the "License"), being the Mozilla Public License
+ * Version 1.1 with a permitted attribution clause; you may not use this
+ * file except in compliance with the License. You may obtain a copy of
+ * the License at http://www.openbravo.com/legal/license.html
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * The Original Code is Openbravo ERP.
+ * The Initial Developer of the Original Code is Openbravo SLU
+ * All portions are Copyright (C) 2010 Openbravo SLU
+ * All Rights Reserved.
+ * Contributor(s): ______________________________________.
+ ************************************************************************
+ */
+package org.openbravo.buildvalidation;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.openbravo.database.ConnectionProvider;
+
+/**
+ * This validation is related to this issue: 23164: It is possible to create a
+ * two price list versions with same name and same valid from date
+ */
+public class DuplicatedPriceListVersion extends BuildValidation {
+
+ @Override
+ public List<String> execute() {
+ ConnectionProvider cp = getConnectionProvider();
+ ArrayList<String> errors = new ArrayList<String>();
+ try {
+ if (DuplicatedPriceListVersionData.existsDuplicatedPriceListVersion(cp))
{
+ errors
+ .add("Due to a database constraint modification, is no longer
allowed " +
+ "to create two price list versions with same name and
same valid from date" +
+ "to one price list. " +
+ "There exists data in your database that do not fit
this new constraint. " +
+ "Please fix it in M_PRICELIST_VERSION table as
M_PRICELIST_ID, NAME AND " +
+ "VALIDFROM columns have not got duplicated values");
+ }
+ } catch (Exception e) {
+ return handleError(e);
+ }
+ return errors;
+ }
+
+}
diff -r fe9b93ae554e -r 9b5623c3aaf6
src-util/buildvalidation/src/org/openbravo/buildvalidation/DuplicatedPriceListVersion_data.xsql
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++
b/src-util/buildvalidation/src/org/openbravo/buildvalidation/DuplicatedPriceListVersion_data.xsql
Mon Apr 29 14:05:40 2013 +0200
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo Public License
+ * Version 1.1 (the "License"), being the Mozilla Public License
+ * Version 1.1 with a permitted attribution clause; you may not use this
+ * file except in compliance with the License. You may obtain a copy of
+ * the License at http://www.openbravo.com/legal/license.html
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * The Original Code is Openbravo ERP.
+ * The Initial Developer of the Original Code is Openbravo SLU
+ * All portions are Copyright (C) 2013 Openbravo SLU
+ * All Rights Reserved.
+ * Contributor(s): ______________________________________.
+ ************************************************************************
+-->
+
+<SqlClass name="DuplicatedPriceListVersionData"
package="org.openbravo.buildvalidation">
+ <SqlMethod name="existsDuplicatedPriceListVersion" type="preparedStatement"
return="boolean">
+ <SqlMethodComment></SqlMethodComment>
+ <Sql><![CDATA[
+ SELECT count(*) AS EXISTING
+ FROM m_pricelist_version
+ GROUP BY m_pricelist_id, name, validfrom
+ HAVING count(*)>1
+ ]]>
+ </Sql>
+ </SqlMethod>
+</SqlClass>
diff -r fe9b93ae554e -r 9b5623c3aaf6
src/org/openbravo/erpCommon/ad_reports/ReportSalesDimensionalAnalyzeJR_data.xsql
---
a/src/org/openbravo/erpCommon/ad_reports/ReportSalesDimensionalAnalyzeJR_data.xsql
Mon Apr 29 12:02:57 2013 +0200
+++
b/src/org/openbravo/erpCommon/ad_reports/ReportSalesDimensionalAnalyzeJR_data.xsql
Mon Apr 29 14:05:40 2013 +0200
@@ -35,21 +35,24 @@
SUM(CONVAMOUNTREF) AS CONVAMOUNTREF,
C_CURRENCY_SYMBOL(?, 0, 'Y') AS CONVSYM,
C_CURRENCY_ISOSYM(?) AS CONVISOSYM,
- '' AS ID, '' AS NAME, '' AS TRANSCURRENCYID, '' AS TRANSDATE, '' AS
TRANSCLIENTID, '' AS TRANSORGID
+ '' AS ID, '' AS NAME, '' AS TRANSCURRENCYID, '' AS TRANSDATE, '' AS
TRANSCLIENTID, '' AS TRANSORGID ,MIN(WSYMBOL) AS WSYMBOL
FROM (SELECT NIVEL1, NIVEL2, NIVEL3, NIVEL4, NIVEL5, NIVEL6, NIVEL7,
NIVEL8, NIVEL9,
SUM(LINENETAMT) AS AMOUNT, SUM(QTYORDERED) AS QTY, SUM(WEIGHT) AS
WEIGHT,
SUM(LINENETREF) AS AMOUNTREF, SUM(QTYORDEREDREF) AS QTYREF,
SUM(WEIGHTREF) AS WEIGHTREF,
C_CURRENCY_CONVERT(SUM(LINENETAMT), TRCURRENCYID, ?, TO_DATE(TRDATE),
NULL, TRCLIENTID, TRORGID) AS CONVAMOUNT,
C_CURRENCY_CONVERT(SUM(LINENETREF), TRCURRENCYID, ?, TO_DATE(TRDATE),
NULL, TRCLIENTID, TRORGID) AS CONVAMOUNTREF,
- TRCURRENCYID, TRDATE, TRCLIENTID, TRORGID
+ TRCURRENCYID, TRDATE, TRCLIENTID, TRORGID,MIN(WSYMBOL) AS WSYMBOL
FROM (SELECT to_char('1') AS NIVEL1, to_char('2') AS NIVEL2,
to_char('3') AS NIVEL3, to_char('4') AS NIVEL4, to_char('5') AS NIVEL5,
to_char('6') AS NIVEL6, to_char('7') AS NIVEL7, to_char('18') AS NIVEL8,
to_char('19') AS NIVEL9,
C_ORDERLINE.LINENETAMT, C_ORDERLINE.QTYORDERED,
C_ORDERLINE.QTYORDERED*M_PRODUCT.WEIGHT AS WEIGHT,
0 AS LINENETREF, 0 AS QTYORDEREDREF, 0 AS WEIGHTREF, C_UOM.UOMSYMBOL,
COALESCE(C_ORDERLINE.C_CURRENCY_ID, C_ORDER.C_CURRENCY_ID) AS
TRCURRENCYID,
TO_DATE(COALESCE(C_ORDER.DATEORDERED, NOW())) AS TRDATE,
C_ORDERLINE.AD_CLIENT_ID AS TRCLIENTID,
- C_ORDERLINE.AD_ORG_ID AS TRORGID
- FROM C_ORDER left join AD_USER on C_ORDER.SALESREP_ID =
AD_USER.AD_USER_ID,
+ C_ORDERLINE.AD_ORG_ID AS TRORGID,
+ (select uomsymbol from c_uom where c_uom_id = aci.c_uom_weight_id) as
WSYMBOL
+ FROM C_ORDER
+ left join ad_clientinfo aci on aci.ad_client_id =c_order.ad_client_id
+ left join AD_USER on C_ORDER.SALESREP_ID = AD_USER.AD_USER_ID,
C_BPARTNER left join C_BPARTNER CB on C_BPARTNER.SALESREP_ID =
CB.C_BPARTNER_ID,
C_BP_GROUP, C_ORDERLINE, M_PRODUCT, M_PRODUCT_CATEGORY,
M_WAREHOUSE, C_UOM, AD_ORG
WHERE C_ORDER.C_BPARTNER_ID = C_BPARTNER.C_BPARTNER_ID
@@ -72,8 +75,11 @@
COALESCE(C_ORDERLINE.C_CURRENCY_ID, C_ORDER.C_CURRENCY_ID) AS
TRCURRENCYID,
TO_DATE(COALESCE(C_ORDER.DATEORDERED, NOW())) AS TRDATE,
C_ORDERLINE.AD_CLIENT_ID AS TRCLIENTID,
- C_ORDERLINE.AD_ORG_ID AS TRORGID
- FROM C_ORDER left join AD_USER on C_ORDER.SALESREP_ID =
AD_USER.AD_USER_Id,
+ C_ORDERLINE.AD_ORG_ID AS TRORGID,
+ (select uomsymbol from c_uom where c_uom_id = aci.c_uom_weight_id) as
WSYMBOL
+ FROM C_ORDER
+ left join ad_clientinfo aci on aci.ad_client_id =c_order.ad_client_id
+ left join AD_USER on C_ORDER.SALESREP_ID = AD_USER.AD_USER_Id,
C_BPARTNER left join C_BPARTNER CB on C_BPARTNER.SALESREP_ID =
CB.C_BPARTNER_ID,
C_BP_GROUP, C_ORDERLINE, M_PRODUCT, M_PRODUCT_CATEGORY, M_WAREHOUSE,
C_UOM, AD_ORG
WHERE C_ORDER.C_BPARTNER_ID = C_BPARTNER.C_BPARTNER_ID
@@ -193,21 +199,26 @@
SUM(CONVAMOUNT) AS CONVAMOUNT,
SUM(CONVAMOUNTREF) AS CONVAMOUNTREF,
C_CURRENCY_SYMBOL(?, 0, 'Y') AS CONVSYM,
- C_CURRENCY_ISOSYM(?) AS CONVISOSYM
+ C_CURRENCY_ISOSYM(?) AS CONVISOSYM,
+ MIN(WSYMBOL) AS WSYMBOL
FROM (SELECT NIVEL1, NIVEL2, NIVEL3, NIVEL4, NIVEL5, NIVEL6, NIVEL7,
NIVEL8, NIVEL9,
SUM(LINENETAMT) AS AMOUNT, SUM(QTYORDERED) AS QTY, SUM(WEIGHT) AS
WEIGHT,
SUM(LINENETREF) AS AMOUNTREF, SUM(QTYORDEREDREF) AS QTYREF,
SUM(WEIGHTREF) AS WEIGHTREF,
C_CURRENCY_CONVERT(SUM(LINENETAMT), TRCURRENCYID, ?, TO_DATE(TRDATE),
NULL, TRCLIENTID, TRORGID) AS CONVAMOUNT,
0 AS CONVAMOUNTREF,
- TRCURRENCYID, TRDATE, TRCLIENTID, TRORGID
+ TRCURRENCYID, TRDATE, TRCLIENTID, TRORGID,
+ MIN(WSYMBOL) AS WSYMBOL
FROM (SELECT to_char('1') AS NIVEL1, to_char('2') AS NIVEL2,
to_char('3') AS NIVEL3, to_char('4') AS NIVEL4, to_char('5') AS NIVEL5,
to_char('6') AS NIVEL6, to_char('7') AS NIVEL7, to_char('10') AS NIVEL8,
to_char('11') AS NIVEL9,
C_ORDERLINE.LINENETAMT, C_ORDERLINE.QTYORDERED,
C_ORDERLINE.QTYORDERED*M_PRODUCT.WEIGHT AS WEIGHT,
0 AS LINENETREF, 0 AS QTYORDEREDREF, 0 AS WEIGHTREF, C_UOM.UOMSYMBOL,
COALESCE(C_ORDERLINE.C_CURRENCY_ID, C_ORDER.C_CURRENCY_ID) AS
TRCURRENCYID,
TO_DATE(COALESCE(C_ORDER.DATEORDERED, NOW())) AS TRDATE,
C_ORDERLINE.AD_CLIENT_ID AS TRCLIENTID,
- C_ORDERLINE.AD_ORG_ID AS TRORGID
- FROM C_ORDER left join AD_USER on C_ORDER.SALESREP_ID =
AD_USER.AD_USER_ID,
+ C_ORDERLINE.AD_ORG_ID AS TRORGID,
+ (select uomsymbol from c_uom where c_uom_id = aci.c_uom_weight_id) as
WSYMBOL
+ FROM C_ORDER
+ left join ad_clientinfo aci on aci.ad_client_id =c_order.ad_client_id
+ left join AD_USER on C_ORDER.SALESREP_ID = AD_USER.AD_USER_ID,
C_BPARTNER left join C_BPARTNER CB on C_BPARTNER.SALESREP_ID =
CB.C_BPARTNER_ID,
C_BP_GROUP, C_ORDERLINE, M_PRODUCT, M_PRODUCT_CATEGORY, M_WAREHOUSE,
C_UOM, AD_ORG
WHERE C_ORDER.C_BPARTNER_ID = C_BPARTNER.C_BPARTNER_ID
diff -r fe9b93ae554e -r 9b5623c3aaf6
src/org/openbravo/erpCommon/ad_reports/WeightDimensionalComparative.jrxml
--- a/src/org/openbravo/erpCommon/ad_reports/WeightDimensionalComparative.jrxml
Mon Apr 29 12:02:57 2013 +0200
+++ b/src/org/openbravo/erpCommon/ad_reports/WeightDimensionalComparative.jrxml
Mon Apr 29 14:05:40 2013 +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="WeightDimensionalComparative" pageWidth="842" pageHeight="595"
orientation="Landscape" columnWidth="730" leftMargin="56" rightMargin="56"
topMargin="56" bottomMargin="56">
<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="7"/>
- <property name="ireport.y" value="0"/>
+ <property name="ireport.zoom" value="3.138428376721006"/>
+ <property name="ireport.x" value="1671"/>
+ <property name="ireport.y" value="105"/>
<import value="net.sf.jasperreports.engine.*"/>
<import value="java.util.*"/>
<import value="net.sf.jasperreports.engine.data.*"/>
@@ -203,6 +203,7 @@
<field name="CONVSYM" class="java.lang.String"/>
<field name="CONVAMOUNT" class="java.math.BigDecimal"/>
<field name="CONVAMOUNTREF" class="java.math.BigDecimal"/>
+ <field name="WSYMBOL" class="java.lang.String"/>
<variable name="WEIGHT_TOTAL" class="java.math.BigDecimal"
calculation="Sum">
<variableExpression><![CDATA[$F{WEIGHT}]]></variableExpression>
</variable>
@@ -542,7 +543,7 @@
<groupFooter>
<band height="20" splitType="Stretch">
<textField evaluationTime="Report"
isBlankWhenNull="false">
- <reportElement key="textField-99"
style="Total_Field" x="435" y="2" width="65" height="18"/>
+ <reportElement key="textField-99"
style="Total_Field" x="425" y="2" width="65" height="18"/>
<box leftPadding="5">
<pen lineWidth="0.0"/>
<topPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
@@ -569,7 +570,7 @@
<text><![CDATA[Totals]]></text>
</staticText>
<textField evaluationTime="Report" pattern=""
isBlankWhenNull="false">
- <reportElement key="textField-100"
style="Total_Field" x="500" y="2" width="65" height="18"/>
+ <reportElement key="textField-100"
style="Total_Field" x="490" y="2" width="75" height="18"/>
<box leftPadding="5">
<pen lineWidth="0.0"/>
<topPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
@@ -611,7 +612,7 @@
<textFieldExpression
class="java.lang.String"><![CDATA[($V{CONVAMOUNTREF_TOTAL}!=null)?$P{NUMBERFORMAT}.format($V{CONVAMOUNTREF_TOTAL}):new
String(" ")]]></textFieldExpression>
</textField>
<textField evaluationTime="Report" pattern=""
isBlankWhenNull="false">
- <reportElement key="textField-103"
style="Total_Field" x="400" y="2" width="35" height="18"/>
+ <reportElement key="textField-103"
style="Total_Field" x="400" y="2" width="25" height="18"/>
<box leftPadding="5">
<pen lineWidth="0.0"/>
<topPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
@@ -816,7 +817,7 @@
<textFieldExpression
class="java.lang.String"><![CDATA[($V{QTY_SUM1}!=null)?$P{NUMBERFORMAT}.format($V{QTY_SUM1}):new
String(" ")]]></textFieldExpression>
</textField>
<textField evaluationTime="Group"
evaluationGroup="NIVEL1" pattern="" isBlankWhenNull="false">
- <reportElement key="textField"
style="Level1_Line" stretchType="RelativeToBandHeight" mode="Opaque" x="435"
y="0" width="65" height="18"/>
+ <reportElement key="textField"
style="Level1_Line" stretchType="RelativeToBandHeight" mode="Opaque" x="425"
y="0" width="65" height="18"/>
<box rightPadding="3">
<topPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
@@ -829,7 +830,7 @@
<textFieldExpression
class="java.lang.String"><![CDATA[($V{WEIGHT_SUM1}!=null)?$P{NUMBERFORMAT}.format($V{WEIGHT_SUM1}):new
String(" ")]]></textFieldExpression>
</textField>
<textField evaluationTime="Group"
evaluationGroup="NIVEL1" pattern="" isBlankWhenNull="false">
- <reportElement key="textField"
style="Level1_Line" stretchType="RelativeToBandHeight" mode="Opaque" x="500"
y="0" width="65" height="18"/>
+ <reportElement key="textField"
style="Level1_Line" stretchType="RelativeToBandHeight" mode="Opaque" x="490"
y="0" width="75" height="18"/>
<box rightPadding="3">
<topPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
@@ -898,7 +899,7 @@
<textFieldExpression
class="java.lang.String"><![CDATA[($V{CONVAMOUNTREF_SUM1}!=null)?$P{NUMBERFORMAT}.format($V{CONVAMOUNTREF_SUM1}):new
String(" ")]]></textFieldExpression>
</textField>
<textField evaluationTime="Group"
evaluationGroup="NIVEL1" pattern="" isBlankWhenNull="false">
- <reportElement key="textField-14"
style="Level1_Line" stretchType="RelativeToBandHeight" mode="Opaque" x="400"
y="0" width="35" height="18"/>
+ <reportElement key="textField-14"
style="Level1_Line" stretchType="RelativeToBandHeight" mode="Opaque" x="400"
y="0" width="25" height="18"/>
<box rightPadding="3">
<topPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
@@ -976,7 +977,7 @@
<textFieldExpression
class="java.lang.String"><![CDATA[($V{QTY_SUM2}!=null)?$P{NUMBERFORMAT}.format($V{QTY_SUM2}):new
String(" ")]]></textFieldExpression>
</textField>
<textField evaluationTime="Group"
evaluationGroup="NIVEL2" pattern="" isBlankWhenNull="false">
- <reportElement key="textField"
style="Level2_Line" stretchType="RelativeToBandHeight" mode="Opaque" x="435"
y="0" width="65" height="18"/>
+ <reportElement key="textField"
style="Level2_Line" stretchType="RelativeToBandHeight" mode="Opaque" x="425"
y="0" width="65" height="18"/>
<box rightPadding="3">
<topPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
@@ -989,7 +990,7 @@
<textFieldExpression
class="java.lang.String"><![CDATA[($V{WEIGHT_SUM2}!=null)?$P{NUMBERFORMAT}.format($V{WEIGHT_SUM2}):new
String(" ")]]></textFieldExpression>
</textField>
<textField evaluationTime="Group"
evaluationGroup="NIVEL2" pattern="" isBlankWhenNull="false">
- <reportElement key="textField"
style="Level2_Line" stretchType="RelativeToBandHeight" mode="Opaque" x="500"
y="0" width="65" height="18"/>
+ <reportElement key="textField"
style="Level2_Line" stretchType="RelativeToBandHeight" mode="Opaque" x="490"
y="0" width="75" height="18"/>
<box rightPadding="3">
<topPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
@@ -1058,7 +1059,7 @@
<textFieldExpression
class="java.lang.String"><![CDATA[($V{CONVAMOUNTREF_SUM2}!=null)?$P{NUMBERFORMAT}.format($V{CONVAMOUNTREF_SUM2}):new
String(" ")]]></textFieldExpression>
</textField>
<textField evaluationTime="Group"
evaluationGroup="NIVEL2" pattern="" isBlankWhenNull="false">
- <reportElement key="textField-17"
style="Level2_Line" stretchType="RelativeToBandHeight" mode="Opaque" x="400"
y="0" width="35" height="18"/>
+ <reportElement key="textField-17"
style="Level2_Line" stretchType="RelativeToBandHeight" mode="Opaque" x="400"
y="0" width="25" height="18"/>
<box rightPadding="3">
<topPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
@@ -1149,7 +1150,7 @@
<textFieldExpression
class="java.lang.String"><![CDATA[($V{QTY_SUM3}!=null)?$P{NUMBERFORMAT}.format($V{QTY_SUM3}):new
String(" ")]]></textFieldExpression>
</textField>
<textField evaluationTime="Group"
evaluationGroup="NIVEL3" pattern="" isBlankWhenNull="false">
- <reportElement key="textField"
style="Level3_Line" stretchType="RelativeToBandHeight" mode="Opaque" x="435"
y="0" width="65" height="18"/>
+ <reportElement key="textField"
style="Level3_Line" stretchType="RelativeToBandHeight" mode="Opaque" x="425"
y="0" width="65" height="18"/>
<box rightPadding="3">
<topPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
@@ -1162,7 +1163,7 @@
<textFieldExpression
class="java.lang.String"><![CDATA[($V{WEIGHT_SUM3}!=null)?$P{NUMBERFORMAT}.format($V{WEIGHT_SUM3}):new
String(" ")]]></textFieldExpression>
</textField>
<textField evaluationTime="Group"
evaluationGroup="NIVEL3" pattern="" isBlankWhenNull="false">
- <reportElement key="textField"
style="Level3_Line" stretchType="RelativeToBandHeight" mode="Opaque" x="500"
y="0" width="65" height="18"/>
+ <reportElement key="textField"
style="Level3_Line" stretchType="RelativeToBandHeight" mode="Opaque" x="490"
y="0" width="75" height="18"/>
<box rightPadding="3">
<topPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="0.0"
lineStyle="Solid" lineColor="#000000"/>
@@ -1231,7 +1232,7 @@
<textFieldExpression
class="java.lang.String"><![CDATA[($V{CONVAMOUNTREF_SUM3}!=null)?$P{NUMBERFORMAT}.format($V{CONVAMOUNTREF_SUM3}):new
String(" ")]]></textFieldExpression>
</textField>
<textField evaluationTime="Group"
evaluationGroup="NIVEL3" pattern="" isBlankWhenNull="false">
- <reportElement key="textField-20"
style="Level3_Line" stretchType="RelativeToBandHeight" mode="Opaque" x="400"
y="0" width="35" height="18"/>
+ <reportElement key="textField-20"
style="Level3_Line" stretchType="RelativeToBandHeight" mode="Opaque" x="400"
y="0" width="25" height="18"/>
------------------------------------------------------------------------------
Try New Relic Now & We'll Send You this Cool Shirt
New Relic is the only SaaS-based application performance monitoring service
that delivers powerful full stack analytics. Optimize and monitor your
browser, app, & servers with just a few lines of code. Try New Relic
and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_apr
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
