details: /erp/stable/2.50/rev/045be613fc01
changeset: 9376:045be613fc01
user: Egoitz Castillo <egoitz.castillo <at> openbravo.com>
date: Mon Apr 18 19:15:38 2011 +0200
summary: Fixes issue 0016003: Invoice Dimensional Report does not calculate
the column 'Q%' properly
diffstat:
src/org/openbravo/erpCommon/ad_reports/SimpleDimensionalComparative.jrxml |
34 +++++-----
1 files changed, 17 insertions(+), 17 deletions(-)
diffs (76 lines):
diff -r 076027044766 -r 045be613fc01
src/org/openbravo/erpCommon/ad_reports/SimpleDimensionalComparative.jrxml
--- a/src/org/openbravo/erpCommon/ad_reports/SimpleDimensionalComparative.jrxml
Fri Apr 15 16:53:17 2011 +0200
+++ b/src/org/openbravo/erpCommon/ad_reports/SimpleDimensionalComparative.jrxml
Mon Apr 18 19:15:38 2011 +0200
@@ -635,55 +635,55 @@
<variableExpression><![CDATA[$F{CONVAMOUNTREF}]]></variableExpression>
</variable>
<variable name="AMT_PCT_1" class="java.math.BigDecimal"
resetType="Group" resetGroup="NIVEL1" calculation="Nothing">
- <variableExpression><![CDATA[($V{AMOUNTREF_SUM1}.equals(new
BigDecimal(0.0)))?null:$V{AMOUNT_SUM1}.subtract( $V{AMOUNTREF_SUM1} ).divide(
$V{AMOUNTREF_SUM1}, 6).multiply(new BigDecimal(100.0))]]></variableExpression>
+ <variableExpression><![CDATA[($V{AMOUNTREF_SUM1}.equals(new
BigDecimal(0.0)))?null:$V{AMOUNT_SUM1}.subtract( $V{AMOUNTREF_SUM1}
).multiply(new BigDecimal(100.0)).divide( $V{AMOUNTREF_SUM1},
6)]]></variableExpression>
</variable>
<variable name="AMT_PCT_2" class="java.math.BigDecimal"
resetType="Group" resetGroup="NIVEL2" calculation="Nothing">
- <variableExpression><![CDATA[($V{AMOUNTREF_SUM2}.equals(new
BigDecimal(0.0)))?null:$V{AMOUNT_SUM2}.subtract( $V{AMOUNTREF_SUM2} ).divide(
$V{AMOUNTREF_SUM2}, 6).multiply(new BigDecimal(100.0))]]></variableExpression>
+ <variableExpression><![CDATA[($V{AMOUNTREF_SUM2}.equals(new
BigDecimal(0.0)))?null:$V{AMOUNT_SUM2}.subtract( $V{AMOUNTREF_SUM2}
).multiply(new BigDecimal(100.0)).divide( $V{AMOUNTREF_SUM2},
6)]]></variableExpression>
</variable>
<variable name="AMT_PCT_3" class="java.math.BigDecimal"
resetType="Group" resetGroup="NIVEL3" calculation="Nothing">
- <variableExpression><![CDATA[($V{AMOUNTREF_SUM3}.equals(new
BigDecimal(0.0)))?null:$V{AMOUNT_SUM3}.subtract( $V{AMOUNTREF_SUM3} ).divide(
$V{AMOUNTREF_SUM3}, 6).multiply(new BigDecimal(100.0))]]></variableExpression>
+ <variableExpression><![CDATA[($V{AMOUNTREF_SUM3}.equals(new
BigDecimal(0.0)))?null:$V{AMOUNT_SUM3}.subtract( $V{AMOUNTREF_SUM3}
).multiply(new BigDecimal(100.0)).divide( $V{AMOUNTREF_SUM3},
6)]]></variableExpression>
</variable>
<variable name="AMT_PCT_4" class="java.math.BigDecimal"
resetType="Group" resetGroup="NIVEL4" calculation="Nothing">
- <variableExpression><![CDATA[($V{AMOUNTREF_SUM4}.equals(new
BigDecimal(0.0)))?null:$V{AMOUNT_SUM4}.subtract( $V{AMOUNTREF_SUM4} ).divide(
$V{AMOUNTREF_SUM4}, 6).multiply(new BigDecimal(100.0))]]></variableExpression>
+ <variableExpression><![CDATA[($V{AMOUNTREF_SUM4}.equals(new
BigDecimal(0.0)))?null:$V{AMOUNT_SUM4}.subtract( $V{AMOUNTREF_SUM4}
).multiply(new BigDecimal(100.0)).divide( $V{AMOUNTREF_SUM4},
6)]]></variableExpression>
</variable>
<variable name="AMT_PCT_5" class="java.math.BigDecimal"
resetType="Group" resetGroup="LEVEL5" calculation="Nothing">
- <variableExpression><![CDATA[($V{AMOUNTREF_SUM5}.equals(new
BigDecimal(0.0)))?null:$V{AMOUNT_SUM5}.subtract( $V{AMOUNTREF_SUM5} ).divide(
$V{AMOUNTREF_SUM5}, 6).multiply(new BigDecimal(100.0))]]></variableExpression>
+ <variableExpression><![CDATA[($V{AMOUNTREF_SUM5}.equals(new
BigDecimal(0.0)))?null:$V{AMOUNT_SUM5}.subtract( $V{AMOUNTREF_SUM5}
).multiply(new BigDecimal(100.0)).divide( $V{AMOUNTREF_SUM5},
6)]]></variableExpression>
</variable>
<variable name="AMT_PCT_T" class="java.math.BigDecimal"
resetType="Report" calculation="Nothing">
-
<variableExpression><![CDATA[($V{CONVAMOUNTREF_TOTAL}.equals(new
BigDecimal(0.0)))?null:$V{CONVAMOUNT_TOTAL}.subtract( $V{CONVAMOUNTREF_TOTAL}
).divide( $V{CONVAMOUNTREF_TOTAL}, 6).multiply(new
BigDecimal(100.0))]]></variableExpression>
+
<variableExpression><![CDATA[($V{CONVAMOUNTREF_TOTAL}.equals(new
BigDecimal(0.0)))?null:$V{CONVAMOUNT_TOTAL}.subtract( $V{CONVAMOUNTREF_TOTAL}
).multiply(new BigDecimal(100.0)).divide( $V{CONVAMOUNTREF_TOTAL},
6)]]></variableExpression>
</variable>
<variable name="CONVAMT_PCT_1" class="java.math.BigDecimal"
resetType="Group" resetGroup="NIVEL1" calculation="Nothing">
- <variableExpression><![CDATA[($V{CONVAMOUNTREF_SUM1}.equals(new
BigDecimal(0.0)))?null:$V{CONVAMOUNT_SUM1}.subtract( $V{CONVAMOUNTREF_SUM1}
).divide( $V{CONVAMOUNTREF_SUM1}, 6).multiply(new
BigDecimal(100.0))]]></variableExpression>
+ <variableExpression><![CDATA[($V{CONVAMOUNTREF_SUM1}.equals(new
BigDecimal(0.0)))?null:$V{CONVAMOUNT_SUM1}.subtract( $V{CONVAMOUNTREF_SUM1}
).multiply(new BigDecimal(100.0)).divide( $V{CONVAMOUNTREF_SUM1},
6)]]></variableExpression>
</variable>
<variable name="CONVAMT_PCT_2" class="java.math.BigDecimal"
resetType="Group" resetGroup="NIVEL2" calculation="Nothing">
- <variableExpression><![CDATA[($V{CONVAMOUNTREF_SUM2}.equals(new
BigDecimal(0.0)))?null:$V{CONVAMOUNT_SUM2}.subtract( $V{CONVAMOUNTREF_SUM2}
).divide( $V{CONVAMOUNTREF_SUM2}, 6).multiply(new
BigDecimal(100.0))]]></variableExpression>
+ <variableExpression><![CDATA[($V{CONVAMOUNTREF_SUM2}.equals(new
BigDecimal(0.0)))?null:$V{CONVAMOUNT_SUM2}.subtract( $V{CONVAMOUNTREF_SUM2}
).multiply(new BigDecimal(100.0)).divide( $V{CONVAMOUNTREF_SUM2},
6)]]></variableExpression>
</variable>
<variable name="CONVAMT_PCT_3" class="java.math.BigDecimal"
resetType="Group" resetGroup="NIVEL3" calculation="Nothing">
- <variableExpression><![CDATA[($V{CONVAMOUNTREF_SUM3}.equals(new
BigDecimal(0.0)))?null:$V{CONVAMOUNT_SUM3}.subtract( $V{CONVAMOUNTREF_SUM3}
).divide( $V{CONVAMOUNTREF_SUM3}, 6).multiply(new
BigDecimal(100.0))]]></variableExpression>
+ <variableExpression><![CDATA[($V{CONVAMOUNTREF_SUM3}.equals(new
BigDecimal(0.0)))?null:$V{CONVAMOUNT_SUM3}.subtract( $V{CONVAMOUNTREF_SUM3}
).multiply(new BigDecimal(100.0)).divide( $V{CONVAMOUNTREF_SUM3},
6)]]></variableExpression>
</variable>
<variable name="CONVAMT_PCT_4" class="java.math.BigDecimal"
resetType="Group" resetGroup="NIVEL4" calculation="Nothing">
- <variableExpression><![CDATA[($V{CONVAMOUNTREF_SUM4}.equals(new
BigDecimal(0.0)))?null:$V{CONVAMOUNT_SUM4}.subtract( $V{CONVAMOUNTREF_SUM4}
).divide( $V{CONVAMOUNTREF_SUM4}, 6).multiply(new
BigDecimal(100.0))]]></variableExpression>
+ <variableExpression><![CDATA[($V{CONVAMOUNTREF_SUM4}.equals(new
BigDecimal(0.0)))?null:$V{CONVAMOUNT_SUM4}.subtract( $V{CONVAMOUNTREF_SUM4}
).multiply(new BigDecimal(100.0)).divide( $V{CONVAMOUNTREF_SUM4},
6)]]></variableExpression>
</variable>
<variable name="CONVAMT_PCT_5" class="java.math.BigDecimal"
resetType="Group" resetGroup="LEVEL5" calculation="Nothing">
- <variableExpression><![CDATA[($V{CONVAMOUNTREF_SUM5}.equals(new
BigDecimal(0.0)))?null:$V{CONVAMOUNT_SUM5}.subtract( $V{CONVAMOUNTREF_SUM5}
).divide( $V{CONVAMOUNTREF_SUM5}, 6).multiply(new
BigDecimal(100.0))]]></variableExpression>
+ <variableExpression><![CDATA[($V{CONVAMOUNTREF_SUM5}.equals(new
BigDecimal(0.0)))?null:$V{CONVAMOUNT_SUM5}.subtract( $V{CONVAMOUNTREF_SUM5}
).multiply(new BigDecimal(100.0)).divide( $V{CONVAMOUNTREF_SUM5},
6)]]></variableExpression>
</variable>
<variable name="CONVAMT_PCT_T" class="java.math.BigDecimal"
resetType="Report" calculation="Nothing">
-
<variableExpression><![CDATA[($V{CONVAMOUNTREF_TOTAL}.equals(new
BigDecimal(0.0)))?null:$V{CONVAMOUNT_TOTAL}.subtract( $V{CONVAMOUNTREF_TOTAL}
).divide( $V{CONVAMOUNTREF_TOTAL}, 6).multiply(new
BigDecimal(100.0))]]></variableExpression>
+
<variableExpression><![CDATA[($V{CONVAMOUNTREF_TOTAL}.equals(new
BigDecimal(0.0)))?null:$V{CONVAMOUNT_TOTAL}.subtract( $V{CONVAMOUNTREF_TOTAL}
).multiply(new BigDecimal(100.0)).divide( $V{CONVAMOUNTREF_TOTAL},
6)]]></variableExpression>
</variable>
<variable name="QTY_PCT_1" class="java.math.BigDecimal"
resetType="Group" resetGroup="NIVEL1" calculation="Nothing">
- <variableExpression><![CDATA[($V{QTYREF_SUM1}.equals(new
BigDecimal(0.0)))?null:$V{QTY_SUM1}.subtract( $V{QTYREF_SUM1} ).divide(
$V{QTYREF_SUM1}, 6).multiply(new BigDecimal(100.0))]]></variableExpression>
+ <variableExpression><![CDATA[($V{QTYREF_SUM1}.equals(new
BigDecimal(0.0)))?null:$V{QTY_SUM1}.subtract( $V{QTYREF_SUM1} ).multiply(new
BigDecimal(100.0)).divide( $V{QTYREF_SUM2}, 2, 6)]]></variableExpression>
</variable>
<variable name="QTY_PCT_2" class="java.math.BigDecimal"
resetType="Group" resetGroup="NIVEL2" calculation="Nothing">
- <variableExpression><![CDATA[($V{QTYREF_SUM2}.equals(new
BigDecimal(0.0)))?null:$V{QTY_SUM2}.subtract( $V{QTYREF_SUM2} ).divide(
$V{QTYREF_SUM2}, 6).multiply(new BigDecimal(100.0))]]></variableExpression>
+ <variableExpression><![CDATA[($V{QTYREF_SUM2}.equals(new
BigDecimal(0.0)))?null:$V{QTY_SUM2}.subtract( $V{QTYREF_SUM2} ).multiply(new
BigDecimal(100.0)).divide( $V{QTYREF_SUM2}, 2, 6)]]></variableExpression>
</variable>
<variable name="QTY_PCT_3" class="java.math.BigDecimal"
resetType="Group" resetGroup="NIVEL3" calculation="Nothing">
- <variableExpression><![CDATA[($V{QTYREF_SUM3}.equals(new
BigDecimal(0.0)))?null:$V{QTY_SUM3}.subtract( $V{QTYREF_SUM3} ).divide(
$V{QTYREF_SUM3}, 6).multiply(new BigDecimal(100.0))]]></variableExpression>
+ <variableExpression><![CDATA[($V{QTYREF_SUM3}.equals(new
BigDecimal(0.0)))?null:$V{QTY_SUM3}.subtract( $V{QTYREF_SUM3} ).multiply(new
BigDecimal(100.0)).divide( $V{QTYREF_SUM3}, 2, 6)]]></variableExpression>
</variable>
<variable name="QTY_PCT_4" class="java.math.BigDecimal"
resetType="Group" resetGroup="NIVEL4" calculation="Nothing">
- <variableExpression><![CDATA[($V{QTYREF_SUM4}.equals(new
BigDecimal(0.0)))?null:$V{QTY_SUM4}.subtract( $V{QTYREF_SUM4} ).divide(
$V{QTYREF_SUM4}, 6).multiply(new BigDecimal(100.0))]]></variableExpression>
+ <variableExpression><![CDATA[($V{QTYREF_SUM4}.equals(new
BigDecimal(0.0)))?null:$V{QTY_SUM4}.subtract( $V{QTYREF_SUM4} ).multiply(new
BigDecimal(100.0)).divide( $V{QTYREF_SUM4}, 2, 6)]]></variableExpression>
</variable>
<variable name="QTY_PCT_5" class="java.math.BigDecimal"
resetType="Group" resetGroup="LEVEL5" calculation="Nothing">
- <variableExpression><![CDATA[($V{QTYREF_SUM5}.equals(new
BigDecimal(0.0)))?null:$V{QTY_SUM5}.subtract( $V{QTYREF_SUM5} ).divide(
$V{QTYREF_SUM5}, 6).multiply(new BigDecimal(100.0))]]></variableExpression>
+ <variableExpression><![CDATA[($V{QTYREF_SUM5}.equals(new
BigDecimal(0.0)))?null:$V{QTY_SUM5}.subtract( $V{QTYREF_SUM5} ).multiply(new
BigDecimal(100.0)).divide( $V{QTYREF_SUM5}, 2, 6)]]></variableExpression>
</variable>
<group name="TOTALIZE" >
------------------------------------------------------------------------------
Benefiting from Server Virtualization: Beyond Initial Workload
Consolidation -- Increasing the use of server virtualization is a top
priority.Virtualization can reduce costs, simplify management, and improve
application availability and disaster protection. Learn more about boosting
the value of server virtualization. http://p.sf.net/sfu/vmware-sfdev2dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
