Skip to content

Commit

Permalink
#10500 Add product infos in intratrade report
Browse files Browse the repository at this point in the history
  • Loading branch information
@cristinamghita
cristinamghita committed Jan 21, 2021
1 parent 8f18e4e commit 3b1633e
Show file tree
Hide file tree
Showing 9 changed files with 188 additions and 62 deletions.
2 changes: 1 addition & 1 deletion ...metas.fresh.base/src/main/jasperreports/de/metas/reports/intracommunity/report.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ InvoiceNo=RG. Nr.
Currency=Währung
Amount=RG. Betrag
Euro_Amount=EURO Betrag
Recap=Rekapitulation Aufträge nach Länder
Recap=Rekapitulation Aufträge nach Ländern
Total=Gesamttotal
2 changes: 1 addition & 1 deletion ...fresh.base/src/main/jasperreports/de/metas/reports/intracommunity/report_de_CH.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ InvoiceNo=RG. Nr.
Currency=Währung
Amount=RG. Betrag
Euro_Amount=EURO Betrag
Recap=Rekapitulation Aufträge nach Länder
Recap=Rekapitulation Aufträge nach Ländern
Total=Gesamttotal
2 changes: 1 addition & 1 deletion ...fresh.base/src/main/jasperreports/de/metas/reports/intracommunity/report_de_DE.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ InvoiceNo=RG. Nr.
Currency=Währung
Amount=RG. Betrag
Euro_Amount=EURO Betrag
Recap=Rekapitulation Aufträge nach Länder
Recap=Rekapitulation Aufträge nach Ländern
Total=Gesamttotal
73 changes: 49 additions & 24 deletions ...fresh/de.metas.fresh.base/src/main/jasperreports/de/metas/reports/intratrade/report.jrxml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<![CDATA[select *
from (
select row_number()
over (order by deliveryCountry, commoditynumber, deliveredFromCountry, OriginCountry, UOMSymbol, cursymbol, C_Period_ID),
over (order by deliveryCountry, commoditynumber, deliveredFromCountry, OriginCountry, ProductName, UOMSymbol, cursymbol, C_Period_ID),
*
from de_metas_endcustomer_fresh_reports.M_InOut_V i
where C_Period_ID = $P{C_Period_ID}
Expand All @@ -38,6 +38,12 @@ order by row_number;]]>
<field name="commoditynumber" class="java.lang.String">
<property name="com.jaspersoft.studio.field.label" value="commoditynumber"/>
</field>
<field name="productname" class="java.lang.String">
<property name="com.jaspersoft.studio.field.label" value="productname"/>
</field>
<field name="productdescription" class="java.lang.String">
<property name="com.jaspersoft.studio.field.label" value="productdescription"/>
</field>
<field name="deliveredfromcountry" class="java.lang.String">
<property name="com.jaspersoft.studio.field.label" value="deliveredfromcountry"/>
</field>
Expand Down Expand Up @@ -66,9 +72,9 @@ order by row_number;]]>
<property name="com.jaspersoft.studio.field.label" value="period"/>
</field>
<pageHeader>
<band height="90">
<band height="94">
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement key="textField-13" x="60" y="67" width="26" height="22" forecolor="#000000" uuid="bc0c873c-2d79-4802-a06e-fe6d51c8b562"/>
<reportElement key="textField-13" x="50" y="67" width="26" height="22" forecolor="#000000" uuid="bc0c873c-2d79-4802-a06e-fe6d51c8b562"/>
<box>
<pen lineWidth="0.0"/>
</box>
Expand All @@ -79,7 +85,7 @@ order by row_number;]]>
<textFieldExpression><![CDATA["Pos."]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement key="textField-13" x="85" y="67" width="107" height="22" forecolor="#000000" uuid="1c58aa42-8a29-473a-9002-c37f38659eed"/>
<reportElement key="textField-13" x="200" y="67" width="56" height="22" forecolor="#000000" uuid="1c58aa42-8a29-473a-9002-c37f38659eed"/>
<box>
<pen lineWidth="0.0"/>
</box>
Expand All @@ -90,7 +96,7 @@ order by row_number;]]>
<textFieldExpression><![CDATA[$R{commoditynumber}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement key="textField-13" x="239" y="67" width="46" height="22" forecolor="#000000" uuid="531a54d9-7974-442c-b2b9-f3524f16eb57"/>
<reportElement key="textField-13" x="302" y="67" width="46" height="22" forecolor="#000000" uuid="531a54d9-7974-442c-b2b9-f3524f16eb57"/>
<box>
<pen lineWidth="0.0"/>
</box>
Expand All @@ -100,7 +106,7 @@ order by row_number;]]>
<textFieldExpression><![CDATA[$R{deliverycountry}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement key="textField-13" x="287" y="67" width="52" height="22" forecolor="#000000" uuid="cf4fefa3-119d-4eda-a0b7-1df443d731ab"/>
<reportElement key="textField-13" x="349" y="67" width="52" height="22" forecolor="#000000" uuid="cf4fefa3-119d-4eda-a0b7-1df443d731ab"/>
<box>
<pen lineWidth="0.0"/>
</box>
Expand All @@ -110,7 +116,7 @@ order by row_number;]]>
<textFieldExpression><![CDATA[$R{origincountry}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement key="textField-13" x="340" y="67" width="45" height="22" forecolor="#000000" uuid="1b72454c-4e56-44f8-91cd-50d698f79923"/>
<reportElement key="textField-13" x="400" y="67" width="41" height="22" forecolor="#000000" uuid="1b72454c-4e56-44f8-91cd-50d698f79923"/>
<box>
<pen lineWidth="0.0"/>
</box>
Expand All @@ -120,7 +126,7 @@ order by row_number;]]>
<textFieldExpression><![CDATA[$R{Qty}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement key="textField-13" x="492" y="67" width="51" height="22" forecolor="#000000" uuid="bf1caf75-0b46-41f1-808d-38f4614d8bc2"/>
<reportElement key="textField-13" x="532" y="67" width="51" height="22" forecolor="#000000" uuid="bf1caf75-0b46-41f1-808d-38f4614d8bc2"/>
<box>
<pen lineWidth="0.0"/>
</box>
Expand All @@ -130,7 +136,7 @@ order by row_number;]]>
<textFieldExpression><![CDATA[$R{Currency}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement key="textField-13" x="423" y="67" width="67" height="22" forecolor="#000000" uuid="1c133352-75e0-4289-ba94-8e06886ddd1e"/>
<reportElement key="textField-13" x="463" y="67" width="67" height="22" forecolor="#000000" uuid="1c133352-75e0-4289-ba94-8e06886ddd1e"/>
<box>
<pen lineWidth="0.0"/>
</box>
Expand All @@ -140,7 +146,7 @@ order by row_number;]]>
<textFieldExpression><![CDATA[$R{Amount}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement key="textField-13" x="388" y="67" width="36" height="22" forecolor="#000000" uuid="8d52decb-b741-486c-a51b-c8dbc77bf074"/>
<reportElement key="textField-13" x="442" y="67" width="27" height="22" forecolor="#000000" uuid="8d52decb-b741-486c-a51b-c8dbc77bf074"/>
<box>
<pen lineWidth="0.0"/>
</box>
Expand All @@ -150,7 +156,7 @@ order by row_number;]]>
<textFieldExpression><![CDATA[$R{Unit}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement key="textField-13" x="192" y="67" width="45" height="22" forecolor="#000000" uuid="1e455e49-2461-4882-b8e3-38bc6d7e1dae"/>
<reportElement key="textField-13" x="256" y="67" width="45" height="22" forecolor="#000000" uuid="1e455e49-2461-4882-b8e3-38bc6d7e1dae"/>
<box>
<pen lineWidth="0.0"/>
</box>
Expand All @@ -160,7 +166,7 @@ order by row_number;]]>
<textFieldExpression><![CDATA[$R{deliveredfromcountry}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement x="60" y="45" width="523" height="14" uuid="285aba6a-0a15-4208-af82-b6562c35578b"/>
<reportElement x="50" y="45" width="523" height="14" uuid="285aba6a-0a15-4208-af82-b6562c35578b"/>
<textElement>
<font fontName="Arial" size="10" isBold="true"/>
</textElement>
Expand All @@ -173,81 +179,100 @@ order by row_number;]]>
</textElement>
<textFieldExpression><![CDATA[$R{Title}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement key="textField-13" x="76" y="67" width="124" height="22" forecolor="#000000" uuid="d2c60a71-2e7f-4fca-8b81-d4457e64beef"/>
<box>
<pen lineWidth="0.0"/>
</box>
<textElement textAlignment="Left" verticalAlignment="Top" markup="none">
<font fontName="Arial" size="9" isBold="true"/>
<paragraph leftIndent="5"/>
</textElement>
<textFieldExpression><![CDATA[$R{Product}]]></textFieldExpression>
</textField>
</band>
</pageHeader>
<detail>
<band height="16">
<band height="20">
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement key="textField-13" x="60" y="3" width="26" height="12" isPrintInFirstWholeBand="true" forecolor="#000000" uuid="a1f526a6-350f-413e-9baa-e62fb56196d1"/>
<reportElement key="textField-13" x="50" y="3" width="26" height="12" isPrintInFirstWholeBand="true" forecolor="#000000" uuid="a1f526a6-350f-413e-9baa-e62fb56196d1"/>
<textElement textAlignment="Left" verticalAlignment="Top" markup="none">
<font fontName="Arial" size="9" isBold="false"/>
</textElement>
<textFieldExpression><![CDATA[$F{row_number}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement key="textField-13" x="238" y="3" width="46" height="12" forecolor="#000000" uuid="5a1388b5-bf52-4855-aa8b-99f7a395cf25"/>
<reportElement key="textField-13" x="301" y="3" width="46" height="12" forecolor="#000000" uuid="5a1388b5-bf52-4855-aa8b-99f7a395cf25"/>
<textElement textAlignment="Left" verticalAlignment="Top" markup="none">
<font fontName="Arial" size="9" isBold="false"/>
</textElement>
<textFieldExpression><![CDATA[$F{deliverycountry}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement key="textField-13" x="286" y="3" width="52" height="12" forecolor="#000000" uuid="6ecb8b31-4bcc-4d75-a0b0-af40f3a11b29"/>
<reportElement key="textField-13" x="348" y="3" width="52" height="12" forecolor="#000000" uuid="6ecb8b31-4bcc-4d75-a0b0-af40f3a11b29"/>
<textElement textAlignment="Left" verticalAlignment="Top" markup="none">
<font fontName="Arial" size="9" isBold="false"/>
</textElement>
<textFieldExpression><![CDATA[$F{origincountry}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="0.00" isBlankWhenNull="true">
<reportElement key="textField-13" x="339" y="3" width="45" height="12" forecolor="#000000" uuid="563802ec-c3b9-413e-a78f-4ade8c235ea0"/>
<reportElement key="textField-13" x="399" y="3" width="41" height="12" forecolor="#000000" uuid="563802ec-c3b9-413e-a78f-4ade8c235ea0"/>
<textElement textAlignment="Right" verticalAlignment="Top" markup="none">
<font fontName="Arial" size="9" isBold="false"/>
</textElement>
<textFieldExpression><![CDATA[$F{movementqty}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement key="textField-13" x="387" y="3" width="37" height="12" forecolor="#000000" uuid="f0c0bdf5-7df1-4372-9cf3-47b6ae0ac340"/>
<reportElement key="textField-13" x="441" y="3" width="28" height="12" forecolor="#000000" uuid="f0c0bdf5-7df1-4372-9cf3-47b6ae0ac340"/>
<textElement textAlignment="Left" verticalAlignment="Top" markup="none">
<font fontName="Arial" size="9" isBold="false"/>
</textElement>
<textFieldExpression><![CDATA[$F{uomsymbol}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement key="textField-13" x="422" y="3" width="67" height="12" forecolor="#000000" uuid="e0ba4494-7037-48fc-8d67-ba4db300af27"/>
<reportElement key="textField-13" x="462" y="3" width="67" height="12" forecolor="#000000" uuid="e0ba4494-7037-48fc-8d67-ba4db300af27"/>
<textElement textAlignment="Right" verticalAlignment="Top" markup="none">
<font fontName="Arial" size="9" isBold="false"/>
<paragraph rightIndent="4"/>
</textElement>
<textFieldExpression><![CDATA[$F{grandtotal}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement key="textField-13" x="491" y="3" width="51" height="12" forecolor="#000000" uuid="477d16f8-7827-4cf0-b690-2ed35025be16"/>
<reportElement key="textField-13" x="531" y="3" width="51" height="12" forecolor="#000000" uuid="477d16f8-7827-4cf0-b690-2ed35025be16"/>
<textElement textAlignment="Left" verticalAlignment="Top" markup="none">
<font fontName="Arial" size="9" isBold="false"/>
<paragraph rightIndent="4"/>
</textElement>
<textFieldExpression><![CDATA[$F{cursymbol}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement key="textField-13" x="192" y="3" width="45" height="12" forecolor="#000000" uuid="7cd0acbf-6ab2-4347-a51c-44f6498ce7a8"/>
<reportElement key="textField-13" x="256" y="3" width="45" height="12" forecolor="#000000" uuid="7cd0acbf-6ab2-4347-a51c-44f6498ce7a8"/>
<textElement textAlignment="Left" verticalAlignment="Top" markup="none">
<font fontName="Arial" size="9" isBold="false"/>
</textElement>
<textFieldExpression><![CDATA[$F{deliveredfromcountry}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement key="textField-13" x="85" y="3" width="107" height="12" forecolor="#000000" uuid="3cbb6b7b-5808-46ec-81e8-104a1e9615d8"/>
<reportElement key="textField-13" x="200" y="3" width="56" height="12" forecolor="#000000" uuid="3cbb6b7b-5808-46ec-81e8-104a1e9615d8"/>
<textElement textAlignment="Left" verticalAlignment="Top" markup="none">
<font fontName="Arial" size="9" isBold="false"/>
</textElement>
<textFieldExpression><![CDATA[$F{commoditynumber}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement key="textField-13" x="76" y="3" width="124" height="12" forecolor="#000000" uuid="1d77ad21-8fda-48eb-95da-66101aebf43a"/>
<textElement textAlignment="Left" verticalAlignment="Top" markup="none">
<font fontName="Arial" size="9" isBold="false"/>
</textElement>
<textFieldExpression><![CDATA[$F{productname}+
($F{productdescription} != null ? ("\n" + $F{productdescription}) : "")]]></textFieldExpression>
</textField>
</band>
</detail>
<pageFooter>
<band height="29">
<textField pattern="" isBlankWhenNull="false">
<reportElement key="textField-62" x="468" y="8" width="68" height="12" forecolor="#000000" backcolor="#FFFFFF" uuid="babdc065-1fe7-4691-80d9-92b36bf755eb"/>
<reportElement key="textField-62" x="482" y="8" width="68" height="12" forecolor="#000000" backcolor="#FFFFFF" uuid="babdc065-1fe7-4691-80d9-92b36bf755eb"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
Expand All @@ -260,7 +285,7 @@ order by row_number;]]>
<textFieldExpression><![CDATA[$V{PAGE_NUMBER} + " /"]]></textFieldExpression>
</textField>
<textField evaluationTime="Report" pattern="" isBlankWhenNull="false">
<reportElement key="textField-64" x="531" y="8" width="37" height="12" forecolor="#000000" backcolor="#FFFFFF" uuid="9464ab1b-285a-4fe9-a0d5-f8d3d389674c"/>
<reportElement key="textField-64" x="545" y="8" width="37" height="12" forecolor="#000000" backcolor="#FFFFFF" uuid="9464ab1b-285a-4fe9-a0d5-f8d3d389674c"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
Expand Down
6 changes: 4 additions & 2 deletions ...tas.fresh.base/src/main/jasperreports/de/metas/reports/intratrade/report_de_CH.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,13 @@ Page = Seite
Title=Bericht für Intrahandel DE

Month=Monat:
commoditynumber=Warennummer
commoditynumber=Warennr.
deliveredfromcountry=Land \ngeliefert von
deliverycountry=Land \ngeliefert nach
origincountry=Ursprungs \nLand
Currency=Währung
Amount=RG. Betrag
Qty=Menge
Unit=Einh.
Unit=Einh.
Product=Produkt
Description=Beschreibungs
6 changes: 4 additions & 2 deletions ...tas.fresh.base/src/main/jasperreports/de/metas/reports/intratrade/report_de_DE.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,13 @@ Page = Seite
Title=Bericht für Intrahandel DE

Month=Monat:
commoditynumber=Warennummer
commoditynumber=Warennr.
deliveredfromcountry=Land \ngeliefert von
deliverycountry=Land \ngeliefert nach
origincountry=Ursprungs \nLand
Currency=Währung
Amount=RG. Betrag
Qty=Menge
Unit=Einh.
Unit=Einh.
Product=Produkt
Description=Beschreibungs
4 changes: 3 additions & 1 deletion ...tas.fresh.base/src/main/jasperreports/de/metas/reports/intratrade/report_en_US.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,6 @@ origincountry=Origin \nCountry
Currency=fromcountry
Amount=fromcountry
Qty=Qty
Unit=UOM
Unit=UOM
Product=Product
Description=Description

0 comments on commit 3b1633e

Please sign in to comment.