Attached Files | issue29763.diff [^] (14,150 bytes) 2015-07-09 16:15 [Show Content] [Hide Content]diff --git a/src-db/database/sourcedata/AD_TEXTINTERFACES.xml b/src-db/database/sourcedata/AD_TEXTINTERFACES.xml
--- a/src-db/database/sourcedata/AD_TEXTINTERFACES.xml
+++ b/src-db/database/sourcedata/AD_TEXTINTERFACES.xml
@@ -19237,6 +19237,17 @@
<!--90333AD8F13346419056F038E249A6C4--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--90333AD8F13346419056F038E249A6C4--></AD_TEXTINTERFACES>
+<!--907ABC375C2D4A2BB73DD09945CD0FAD--><AD_TEXTINTERFACES>
+<!--907ABC375C2D4A2BB73DD09945CD0FAD--> <AD_TEXTINTERFACES_ID><![CDATA[907ABC375C2D4A2BB73DD09945CD0FAD]]></AD_TEXTINTERFACES_ID>
+<!--907ABC375C2D4A2BB73DD09945CD0FAD--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--907ABC375C2D4A2BB73DD09945CD0FAD--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--907ABC375C2D4A2BB73DD09945CD0FAD--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--907ABC375C2D4A2BB73DD09945CD0FAD--> <TEXT><![CDATA[Product Search Key]]></TEXT>
+<!--907ABC375C2D4A2BB73DD09945CD0FAD--> <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesXLS.jrxml]]></FILENAME>
+<!--907ABC375C2D4A2BB73DD09945CD0FAD--> <ISUSED><![CDATA[Y]]></ISUSED>
+<!--907ABC375C2D4A2BB73DD09945CD0FAD--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--907ABC375C2D4A2BB73DD09945CD0FAD--></AD_TEXTINTERFACES>
+
<!--91C8B575671B7107E040007F0100283A--><AD_TEXTINTERFACES>
<!--91C8B575671B7107E040007F0100283A--> <AD_TEXTINTERFACES_ID><![CDATA[91C8B575671B7107E040007F0100283A]]></AD_TEXTINTERFACES_ID>
<!--91C8B575671B7107E040007F0100283A--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -19919,6 +19930,17 @@
<!--99F8F59FF2304614AA4282ABFAA64A86--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--99F8F59FF2304614AA4282ABFAA64A86--></AD_TEXTINTERFACES>
+<!--9A8A37D02CFC4A15ADE40E3656F8785D--><AD_TEXTINTERFACES>
+<!--9A8A37D02CFC4A15ADE40E3656F8785D--> <AD_TEXTINTERFACES_ID><![CDATA[9A8A37D02CFC4A15ADE40E3656F8785D]]></AD_TEXTINTERFACES_ID>
+<!--9A8A37D02CFC4A15ADE40E3656F8785D--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9A8A37D02CFC4A15ADE40E3656F8785D--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9A8A37D02CFC4A15ADE40E3656F8785D--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9A8A37D02CFC4A15ADE40E3656F8785D--> <TEXT><![CDATA[Unit Price]]></TEXT>
+<!--9A8A37D02CFC4A15ADE40E3656F8785D--> <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesXLS.jrxml]]></FILENAME>
+<!--9A8A37D02CFC4A15ADE40E3656F8785D--> <ISUSED><![CDATA[Y]]></ISUSED>
+<!--9A8A37D02CFC4A15ADE40E3656F8785D--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--9A8A37D02CFC4A15ADE40E3656F8785D--></AD_TEXTINTERFACES>
+
<!--9B926CFD21334E8991EF48C89971F139--><AD_TEXTINTERFACES>
<!--9B926CFD21334E8991EF48C89971F139--> <AD_TEXTINTERFACES_ID><![CDATA[9B926CFD21334E8991EF48C89971F139]]></AD_TEXTINTERFACES_ID>
<!--9B926CFD21334E8991EF48C89971F139--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff --git a/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesJR_data.xsql b/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesJR_data.xsql
--- a/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesJR_data.xsql
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesJR_data.xsql
@@ -12,7 +12,7 @@
* under the License.
* The Original Code is Openbravo ERP.
* The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2001-2014 Openbravo SLU
+ * All portions are Copyright (C) 2001-2015 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
@@ -32,7 +32,8 @@
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 ORG, '' AS PARTNERGROUP, '' AS PARTNER, '' AS DOCUMENTNO, '' AS INVOICEDATE, '' AS PRODCATEGORY, '' AS PRODUCT
+ '' AS ORG, '' AS PARTNERGROUP, '' AS PARTNER, '' AS DOCUMENTNO, '' AS INVOICEDATE, '' AS PRODCATEGORY, '' AS PRODUCT,
+ '' AS SEARCHKEY, '' AS UNITPRICE
FROM (SELECT NIVEL1, NIVEL2, NIVEL3, NIVEL4, NIVEL5,
SUM(LINENETAMT) AS AMOUNT, SUM(QTYINVOICED) AS QTY,
SUM(LINENETREF) AS AMOUNTREF, SUM(QTYINVOICEDREF) AS QTYREF,
@@ -269,7 +270,7 @@
<SqlMethodComment></SqlMethodComment>
<Sql>
<![CDATA[
- SELECT ORG, PARTNERGROUP, PARTNER, DOCUMENTNO, INVOICEDATE, PRODCATEGORY, PRODUCT, AMOUNT, QTY
+ SELECT ORG, PARTNERGROUP, PARTNER, DOCUMENTNO, INVOICEDATE, PRODCATEGORY, PRODUCT, SEARCHKEY, UNITPRICE, AMOUNT, QTY
FROM
(SELECT (SELECT O.NAME FROM AD_ORG O WHERE O.AD_ORG_ID = C_INVOICE.AD_ORG_ID) AS ORG,
C_BP_GROUP.NAME AS PARTNERGROUP,
@@ -278,6 +279,8 @@
TO_DATE(COALESCE(C_INVOICE.DATEINVOICED, NOW())) AS INVOICEDATE,
M_PRODUCT_CATEGORY.NAME AS PRODCATEGORY,
M_PRODUCT.NAME AS PRODUCT,
+ M_PRODUCT.VALUE AS SEARCHKEY,
+ C_INVOICELINE.PRICEACTUAL AS UNITPRICE,
CASE WHEN C_DOCTYPE.DOCBASETYPE = 'APC' THEN C_CURRENCY_CONVERT(C_INVOICELINE.LINENETAMT*-1, C_INVOICE.C_CURRENCY_ID, ?, TO_DATE(COALESCE(C_INVOICE.DATEINVOICED, NOW())), NULL, C_INVOICE.AD_CLIENT_ID, C_INVOICE.AD_ORG_ID) ELSE C_CURRENCY_CONVERT(C_INVOICELINE.LINENETAMT, C_INVOICE.C_CURRENCY_ID, ?, TO_DATE(COALESCE(C_INVOICE.DATEINVOICED, NOW())), NULL, C_INVOICE.AD_CLIENT_ID, C_INVOICE.AD_ORG_ID) END AS AMOUNT,
CASE WHEN C_DOCTYPE.DOCBASETYPE = 'APC' THEN C_INVOICELINE.QTYINVOICED*-1 ELSE C_INVOICELINE.QTYINVOICED END AS QTY
FROM C_INVOICELINE left join M_PRODUCT on C_INVOICELINE.M_PRODUCT_ID = M_PRODUCT.M_PRODUCT_ID
diff --git a/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesXLS.jrxml b/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesXLS.jrxml
--- a/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesXLS.jrxml
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesXLS.jrxml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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="eportInvoiceVendorDimensionalAnalysesXLS" pageWidth="1500" pageHeight="842" orientation="Landscape" columnWidth="1500" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" isIgnorePagination="true" uuid="40dc54a6-0046-4a72-8725-73936874bae9">
+<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="eportInvoiceVendorDimensionalAnalysesXLS" pageWidth="1720" pageHeight="842" orientation="Landscape" columnWidth="1720" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" isIgnorePagination="true" uuid="40dc54a6-0046-4a72-8725-73936874bae9">
<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="1635"/>
+ <property name="ireport.x" value="0"/>
<property name="ireport.y" value="0"/>
<import value="net.sf.jasperreports.engine.*"/>
<import value="java.util.*"/>
@@ -66,7 +66,7 @@
<defaultValueExpression><![CDATA["dd/MM/yyyy"]]></defaultValueExpression>
</parameter>
<queryString>
- <![CDATA[SELECT ORG, PARTNERGROUP, PARTNER, DOCUMENTNO, INVOICEDATE, PRODCATEGORY, PRODUCT, AMOUNT, QTY
+ <![CDATA[SELECT ORG, PARTNERGROUP, PARTNER, DOCUMENTNO, INVOICEDATE, PRODCATEGORY, PRODUCT, SEARCHKEY, UNITPRICE, AMOUNT, QTY
FROM
(SELECT (SELECT O.NAME FROM AD_ORG O WHERE O.AD_ORG_ID = C_INVOICE.AD_ORG_ID) AS ORG,
C_BP_GROUP.NAME AS PARTNERGROUP,
@@ -75,6 +75,8 @@
TO_DATE(COALESCE(C_INVOICE.DATEINVOICED, NOW())) AS INVOICEDATE,
M_PRODUCT_CATEGORY.NAME AS PRODCATEGORY,
M_PRODUCT.NAME AS PRODUCT,
+ M_PRODUCT.VALUE AS SEARCHKEY,
+ C_INVOICELINE.PRICEACTUAL AS UNITPRICE,
CASE WHEN C_DOCTYPE.DOCBASETYPE = 'APC' THEN C_CURRENCY_CONVERT(C_INVOICELINE.LINENETAMT*-1, C_INVOICE.C_CURRENCY_ID, ?, TO_DATE(COALESCE(C_INVOICE.DATEINVOICED, NOW())), NULL, C_INVOICE.AD_CLIENT_ID, C_INVOICE.AD_ORG_ID) ELSE C_CURRENCY_CONVERT(C_INVOICELINE.LINENETAMT, C_INVOICE.C_CURRENCY_ID, ?, TO_DATE(COALESCE(C_INVOICE.DATEINVOICED, NOW())), NULL, C_INVOICE.AD_CLIENT_ID, C_INVOICE.AD_ORG_ID) END AS AMOUNT,
CASE WHEN C_DOCTYPE.DOCBASETYPE = 'APC' THEN C_INVOICELINE.QTYINVOICED*-1 ELSE C_INVOICELINE.QTYINVOICED END AS QTY
FROM C_INVOICELINE left join M_PRODUCT on C_INVOICELINE.M_PRODUCT_ID = M_PRODUCT.M_PRODUCT_ID
@@ -100,6 +102,8 @@
<field name="INVOICEDATE" class="java.util.Date"/>
<field name="PRODCATEGORY" class="java.lang.String"/>
<field name="PRODUCT" class="java.lang.String"/>
+ <field name="SEARCHKEY" class="java.lang.String"/>
+ <field name="UNITPRICE" class="java.math.BigDecimal"/>
<field name="AMOUNT" class="java.math.BigDecimal"/>
<field name="QTY" class="java.math.BigDecimal"/>
<background>
@@ -202,7 +206,33 @@
<text><![CDATA[Product]]></text>
</staticText>
<staticText>
- <reportElement key="element-8" style="Detail_Header" x="1300" y="0" width="100" height="15" uuid="bd70f22d-7f1c-4d11-a3d6-c402dc8a10ec"/>
+ <reportElement key="element-7-1" style="Detail_Header" x="1300" y="0" width="120" height="15"/>
+ <box leftPadding="5" rightPadding="2">
+ <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="#333333"/>
+ </box>
+ <textElement>
+ <font size="8"/>
+ </textElement>
+ <text><![CDATA[Product Search Key]]></text>
+ </staticText>
+ <staticText>
+ <reportElement key="element-7-2" style="Detail_Header" x="1420" y="0" width="100" height="15"/>
+ <box leftPadding="5" rightPadding="2">
+ <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="#333333"/>
+ </box>
+ <textElement textAlignment="Right">
+ <font size="8"/>
+ </textElement>
+ <text><![CDATA[Unit Price]]></text>
+ </staticText>
+ <staticText>
+ <reportElement key="element-8" style="Detail_Header" x="1520" y="0" width="100" height="15" uuid="bd70f22d-7f1c-4d11-a3d6-c402dc8a10ec"/>
<box leftPadding="5" rightPadding="2">
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -215,7 +245,7 @@
<text><![CDATA[Amount]]></text>
</staticText>
<staticText>
- <reportElement key="element-9" style="Detail_Header" x="1400" y="0" width="100" height="15" uuid="b0747cc2-9380-4f8e-852e-08998bc98bb8"/>
+ <reportElement key="element-9" style="Detail_Header" x="1620" y="0" width="100" height="15" uuid="b0747cc2-9380-4f8e-852e-08998bc98bb8"/>
<box leftPadding="5" rightPadding="2">
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -315,8 +345,29 @@
</textElement>
<textFieldExpression><![CDATA[$F{PRODUCT}]]></textFieldExpression>
</textField>
+ <textField isStretchWithOverflow="true" isBlankWhenNull="true">
+ <reportElement key="textField-7" stretchType="RelativeToBandHeight" x="1300" y="0" width="120" height="13"/>
+ <box rightPadding="2"/>
+ <textElement>
+ <font size="8"/>
+ </textElement>
+ <textFieldExpression class="java.lang.String"><![CDATA[$F{SEARCHKEY}]]></textFieldExpression>
+ </textField>
<textField pattern="" isBlankWhenNull="false">
- <reportElement key="textField-8" stretchType="RelativeToBandHeight" x="1300" y="0" width="100" height="13" uuid="b230f45b-0364-40cb-ae4d-72fc46e0a1c4"/>
+ <reportElement key="textField-8" stretchType="RelativeToBandHeight" x="1420" y="0" width="100" height="13" uuid="b230f45b-0364-40cb-ae4d-72fc46e0a1c4"/>
+ <box rightPadding="2">
+ <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">
+ <font size="8"/>
+ </textElement>
+ <textFieldExpression class="java.math.BigDecimal"><![CDATA[$F{UNITPRICE}]]></textFieldExpression>
+ </textField>
+ <textField pattern="" isBlankWhenNull="false">
+ <reportElement key="textField-8" stretchType="RelativeToBandHeight" x="1520" y="0" width="100" height="13"/>
<box rightPadding="2">
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -329,7 +380,7 @@
<textFieldExpression><![CDATA[$F{AMOUNT}]]></textFieldExpression>
</textField>
<textField pattern="" isBlankWhenNull="true">
- <reportElement key="textField-9" stretchType="RelativeToBandHeight" x="1400" y="0" width="100" height="13" uuid="5ada6fb4-da6b-473e-a02c-d9c6179d984c"/>
+ <reportElement key="textField-9" stretchType="RelativeToBandHeight" x="1620" y="0" width="100" height="13" uuid="5ada6fb4-da6b-473e-a02c-d9c6179d984c"/>
<box rightPadding="2">
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
issue_29763_2.diff [^] (8,650 bytes) 2015-08-13 13:25 [Show Content] [Hide Content]diff --git a/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesJR_data.xsql b/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesJR_data.xsql
--- a/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesJR_data.xsql
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesJR_data.xsql
@@ -280,7 +280,7 @@
M_PRODUCT_CATEGORY.NAME AS PRODCATEGORY,
M_PRODUCT.NAME AS PRODUCT,
M_PRODUCT.VALUE AS SEARCHKEY,
- C_INVOICELINE.PRICEACTUAL AS UNITPRICE,
+ C_CURRENCY_CONVERT(CASE WHEN C_INVOICELINE.QTYINVOICED = 0 THEN 0 ELSE C_INVOICELINE.LINENETAMT/C_INVOICELINE.QTYINVOICED END, C_INVOICE.C_CURRENCY_ID, ?, TO_DATE(COALESCE(C_INVOICE.DATEINVOICED, NOW())), NULL, C_INVOICE.AD_CLIENT_ID, C_INVOICE.AD_ORG_ID) AS UNITPRICE,
CASE WHEN C_DOCTYPE.DOCBASETYPE = 'APC' THEN C_CURRENCY_CONVERT(C_INVOICELINE.LINENETAMT*-1, C_INVOICE.C_CURRENCY_ID, ?, TO_DATE(COALESCE(C_INVOICE.DATEINVOICED, NOW())), NULL, C_INVOICE.AD_CLIENT_ID, C_INVOICE.AD_ORG_ID) ELSE C_CURRENCY_CONVERT(C_INVOICELINE.LINENETAMT, C_INVOICE.C_CURRENCY_ID, ?, TO_DATE(COALESCE(C_INVOICE.DATEINVOICED, NOW())), NULL, C_INVOICE.AD_CLIENT_ID, C_INVOICE.AD_ORG_ID) END AS AMOUNT,
CASE WHEN C_DOCTYPE.DOCBASETYPE = 'APC' THEN C_INVOICELINE.QTYINVOICED*-1 ELSE C_INVOICELINE.QTYINVOICED END AS QTY
FROM C_INVOICELINE left join M_PRODUCT on C_INVOICELINE.M_PRODUCT_ID = M_PRODUCT.M_PRODUCT_ID
@@ -301,6 +301,7 @@
]]></Sql>
<Parameter name="cCurrencyConv"/>
<Parameter name="cCurrencyConv"/>
+ <Parameter name="cCurrencyConv"/>
<Parameter name="adOrgId" optional="true" type="replace" after="AND 0=0 AND C_INVOICE.AD_ORG_ID IN (" text="'1'"/>
<Parameter name="adUserClient" type="replace" optional="true" after="AND C_INVOICE.AD_CLIENT_ID IN (" text="'6'"/>
<Parameter name="dateFrom" optional="true" after="AND 1=1"><![CDATA[AND C_INVOICE.DATEINVOICED >= to_date(?)]]></Parameter>
diff --git a/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesXLS.jrxml b/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesXLS.jrxml
--- a/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesXLS.jrxml
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesXLS.jrxml
@@ -76,7 +76,7 @@
M_PRODUCT_CATEGORY.NAME AS PRODCATEGORY,
M_PRODUCT.NAME AS PRODUCT,
M_PRODUCT.VALUE AS SEARCHKEY,
- C_INVOICELINE.PRICEACTUAL AS UNITPRICE,
+ CASE WHEN C_INVOICELINE.QTYINVOICED = 0 THEN 0 ELSE C_INVOICELINE.LINENETAMT/C_INVOICELINE.QTYINVOICED END AS UNITPRICE,
CASE WHEN C_DOCTYPE.DOCBASETYPE = 'APC' THEN C_CURRENCY_CONVERT(C_INVOICELINE.LINENETAMT*-1, C_INVOICE.C_CURRENCY_ID, ?, TO_DATE(COALESCE(C_INVOICE.DATEINVOICED, NOW())), NULL, C_INVOICE.AD_CLIENT_ID, C_INVOICE.AD_ORG_ID) ELSE C_CURRENCY_CONVERT(C_INVOICELINE.LINENETAMT, C_INVOICE.C_CURRENCY_ID, ?, TO_DATE(COALESCE(C_INVOICE.DATEINVOICED, NOW())), NULL, C_INVOICE.AD_CLIENT_ID, C_INVOICE.AD_ORG_ID) END AS AMOUNT,
CASE WHEN C_DOCTYPE.DOCBASETYPE = 'APC' THEN C_INVOICELINE.QTYINVOICED*-1 ELSE C_INVOICELINE.QTYINVOICED END AS QTY
FROM C_INVOICELINE left join M_PRODUCT on C_INVOICELINE.M_PRODUCT_ID = M_PRODUCT.M_PRODUCT_ID
@@ -219,7 +219,20 @@
<text><![CDATA[Product Search Key]]></text>
</staticText>
<staticText>
- <reportElement key="element-7-2" style="Detail_Header" x="1420" y="0" width="100" height="15"/>
+ <reportElement key="element-9" style="Detail_Header" x="1420" y="0" width="100" height="15" uuid="b0747cc2-9380-4f8e-852e-08998bc98bb8"/>
+ <box leftPadding="5" rightPadding="2">
+ <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="#333333"/>
+ </box>
+ <textElement textAlignment="Right">
+ <font size="8"/>
+ </textElement>
+ <text><![CDATA[Quantity]]></text>
+ </staticText>
+ <staticText>
+ <reportElement key="element-7-2" style="Detail_Header" x="1520" y="0" width="100" height="15"/>
<box leftPadding="5" rightPadding="2">
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -232,7 +245,7 @@
<text><![CDATA[Unit Price]]></text>
</staticText>
<staticText>
- <reportElement key="element-8" style="Detail_Header" x="1520" y="0" width="100" height="15" uuid="bd70f22d-7f1c-4d11-a3d6-c402dc8a10ec"/>
+ <reportElement key="element-8" style="Detail_Header" x="1620" y="0" width="100" height="15" uuid="bd70f22d-7f1c-4d11-a3d6-c402dc8a10ec"/>
<box leftPadding="5" rightPadding="2">
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -244,19 +257,6 @@
</textElement>
<text><![CDATA[Amount]]></text>
</staticText>
- <staticText>
- <reportElement key="element-9" style="Detail_Header" x="1620" y="0" width="100" height="15" uuid="b0747cc2-9380-4f8e-852e-08998bc98bb8"/>
- <box leftPadding="5" rightPadding="2">
- <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="#333333"/>
- </box>
- <textElement textAlignment="Right">
- <font size="8"/>
- </textElement>
- <text><![CDATA[Quantity]]></text>
- </staticText>
</band>
</pageHeader>
<columnHeader>
@@ -353,8 +353,21 @@
</textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$F{SEARCHKEY}]]></textFieldExpression>
</textField>
+ <textField pattern="" isBlankWhenNull="true">
+ <reportElement key="textField-9" stretchType="RelativeToBandHeight" x="1420" y="0" width="100" height="13" uuid="5ada6fb4-da6b-473e-a02c-d9c6179d984c"/>
+ <box rightPadding="2">
+ <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">
+ <font size="8"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$F{QTY}]]></textFieldExpression>
+ </textField>
<textField pattern="" isBlankWhenNull="false">
- <reportElement key="textField-8" stretchType="RelativeToBandHeight" x="1420" y="0" width="100" height="13" uuid="b230f45b-0364-40cb-ae4d-72fc46e0a1c4"/>
+ <reportElement key="textField-8" stretchType="RelativeToBandHeight" x="1520" y="0" width="100" height="13" uuid="b230f45b-0364-40cb-ae4d-72fc46e0a1c4"/>
<box rightPadding="2">
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -367,7 +380,7 @@
<textFieldExpression class="java.math.BigDecimal"><![CDATA[$F{UNITPRICE}]]></textFieldExpression>
</textField>
<textField pattern="" isBlankWhenNull="false">
- <reportElement key="textField-8" stretchType="RelativeToBandHeight" x="1520" y="0" width="100" height="13"/>
+ <reportElement key="textField-8" stretchType="RelativeToBandHeight" x="1620" y="0" width="100" height="13"/>
<box rightPadding="2">
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -379,19 +392,6 @@
</textElement>
<textFieldExpression><![CDATA[$F{AMOUNT}]]></textFieldExpression>
</textField>
- <textField pattern="" isBlankWhenNull="true">
- <reportElement key="textField-9" stretchType="RelativeToBandHeight" x="1620" y="0" width="100" height="13" uuid="5ada6fb4-da6b-473e-a02c-d9c6179d984c"/>
- <box rightPadding="2">
- <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">
- <font size="8"/>
- </textElement>
- <textFieldExpression><![CDATA[$F{QTY}]]></textFieldExpression>
- </textField>
</band>
</detail>
<columnFooter>
|