Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Jasper Version of Invoice Medium #67 #69

Merged
merged 5 commits into from
Oct 23, 2017
Merged

Fix Jasper Version of Invoice Medium #67 #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1caf53d
#67 changes est subreport to the main esr report
metas-lc Oct 23, 2017
5518994
#67 make date field larger
metas-lc Oct 23, 2017
76a60b9
#67 make fields bigger
metas-lc Oct 23, 2017
bc045ce
#67 scale rate
metas-lc Oct 23, 2017
1854eac
Merge remote-tracking branch 'origin/master' into gh67
metas-ts Oct 23, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ...ain/jasperreports/de/metas/docs/sales/invoice_orgs_medium/report_description_medium.jrxml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Created with Jaspersoft Studio version 6.3.1.final using JasperReports Library version 6.3.1 -->
<!-- 2017-10-20T11:29:07 -->
<!-- Created with Jaspersoft Studio version 6.2.2.final using JasperReports Library version 6.2.2 -->
<!-- 2017-10-23T11:19:21 -->
<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="report_description_medium" pageWidth="595" pageHeight="842" columnWidth="595" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" isFloatColumnFooter="true" resourceBundle="de/metas/docs/sales/invoice_orgs_medium/report" uuid="bed26190-0a93-4012-8083-15ce9416a0bf">
<property name="ireport.scriptlethandling" value="0"/>
<property name="ireport.encoding" value="UTF-8"/>
Expand Down Expand Up @@ -41,7 +41,7 @@
<band height="90" splitType="Stretch">
<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
<textField isBlankWhenNull="false">
<reportElement key="textField-11" x="0" y="30" width="90" height="14" uuid="c2adc14d-beb1-41b9-9ad8-62e8b8eecd02">
<reportElement key="textField-11" x="0" y="30" width="100" height="14" uuid="c2adc14d-beb1-41b9-9ad8-62e8b8eecd02">
<property name="com.jaspersoft.studio.unit.x" value="pixel"/>
<property name="com.jaspersoft.studio.unit.y" value="pixel"/>
<property name="com.jaspersoft.studio.unit.width" value="pixel"/>
Expand All @@ -60,7 +60,7 @@
<textFieldExpression><![CDATA[$R{invoicedate}]]></textFieldExpression>
</textField>
<textField pattern="dd.MM.yyyy" isBlankWhenNull="false">
<reportElement key="textField-10" x="93" y="30" width="90" height="14" uuid="fe70dce0-5ca0-4031-8a21-0af1802eac75">
<reportElement key="textField-10" x="103" y="30" width="90" height="14" uuid="fe70dce0-5ca0-4031-8a21-0af1802eac75">
<property name="com.jaspersoft.studio.unit.x" value="pixel"/>
<property name="com.jaspersoft.studio.unit.y" value="pixel"/>
<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
Expand Down
24 changes: 6 additions & 18 deletions ...ain/jasperreports/de/metas/docs/sales/invoice_orgs_medium/report_details_sum_medium.jrxml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Created with Jaspersoft Studio version 6.3.1.final using JasperReports Library version 6.3.1 -->
<!-- 2017-10-20T11:33:21 -->
<!-- Created with Jaspersoft Studio version 6.2.2.final using JasperReports Library version 6.2.2 -->
<!-- 2017-10-23T11:56:00 -->
<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="report_details_sum_medium" pageWidth="595" pageHeight="842" columnWidth="595" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" resourceBundle="de/metas/docs/sales/invoice_orgs_medium/report" uuid="b62f017e-3912-43a3-99f6-cb0c797b3e75">
<property name="ireport.scriptlethandling" value="0"/>
<property name="ireport.encoding" value="UTF-8"/>
Expand Down Expand Up @@ -92,7 +92,7 @@
<textFieldExpression><![CDATA[$R{dateto}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="false">
<reportElement key="textField-13" mode="Transparent" x="92" y="1" width="80" height="14" uuid="0add03ea-975d-42c1-9842-d4a4c6ee31d0">
<reportElement key="textField-13" mode="Transparent" x="92" y="1" width="118" height="14" uuid="0add03ea-975d-42c1-9842-d4a4c6ee31d0">
<property name="com.jaspersoft.studio.unit.y" value="pixel"/>
<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
<property name="com.jaspersoft.studio.unit.width" value="pixel"/>
Expand Down Expand Up @@ -189,7 +189,7 @@
<textFieldExpression><![CDATA[$F{lineamt}]]></textFieldExpression>
</textField>
<textField pattern="dd.MM.yyyy" isBlankWhenNull="true">
<reportElement key="textField-16" mode="Transparent" x="92" y="18" width="48" height="14" uuid="a529cb3b-1766-41f6-917a-57e7ee109ff1">
<reportElement key="textField-16" mode="Transparent" x="92" y="18" width="118" height="14" uuid="a529cb3b-1766-41f6-917a-57e7ee109ff1">
<property name="com.jaspersoft.studio.unit.y" value="pixel"/>
<property name="com.jaspersoft.studio.unit.x" value="pixel"/>
<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
Expand Down Expand Up @@ -231,15 +231,15 @@
</reportElement>
</line>
<textField>
<reportElement x="106" y="2" width="20" height="20" uuid="094378e1-04e4-4630-ae98-00349c535c27">
<reportElement x="106" y="2" width="194" height="20" uuid="094378e1-04e4-4630-ae98-00349c535c27">
<property name="com.jaspersoft.studio.unit.y" value="pixel"/>
<property name="com.jaspersoft.studio.unit.x" value="pixel"/>
<property name="com.jaspersoft.studio.unit.width" value="pixel"/>
</reportElement>
<textElement>
<font size="11" isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$F{rate}]]></textFieldExpression>
<textFieldExpression><![CDATA[$F{rate}.setScale(2, java.math.RoundingMode.HALF_UP) + " " + $R{VAT}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="0" y="2" width="104" height="20" uuid="c745be88-2a21-4282-bbc9-e076d1b96a17">
Expand All @@ -253,18 +253,6 @@
</textElement>
<textFieldExpression><![CDATA[$R{totalamt}]]></textFieldExpression>
</textField>
<textField>
<reportElement key="" x="125" y="2" width="60" height="20" uuid="0b44c4f1-69de-43d0-a87d-1dc016475904">
<property name="com.jaspersoft.studio.unit.x" value="pixel"/>
<property name="com.jaspersoft.studio.unit.y" value="pixel"/>
<property name="com.jaspersoft.studio.unit.width" value="pixel"/>
<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
</reportElement>
<textElement>
<font size="11" isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$R{VAT}]]></textFieldExpression>
</textField>
</band>
</detail>
<pageFooter>
Expand Down
8 changes: 4 additions & 4 deletions base/src/main/jasperreports/de/metas/docs/sales/invoice_orgs_medium/report_medium.jrxml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Created with Jaspersoft Studio version 6.3.1.final using JasperReports Library version 6.2.2 -->
<!-- 2017-10-22T20:27:41 -->
<!-- Created with Jaspersoft Studio version 6.2.2.final using JasperReports Library version 6.2.2 -->
<!-- 2017-10-23T10:38:26 -->
<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="report" pageWidth="595" pageHeight="842" columnWidth="595" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" resourceBundle="de/metas/docs/sales/invoice_orgs_medium/report" uuid="2fa464b6-5b59-45d9-8f05-3c4f9b99aa01">
<property name="ireport.scriptlethandling" value="0"/>
<property name="ireport.encoding" value="UTF-8"/>
<property name="ireport.zoom" value="0.9090909090909095"/>
<property name="ireport.x" value="0"/>
<property name="ireport.y" value="240"/>
<property name="com.jaspersoft.studio.data.defaultdataadapter" value="New Data Adapter "/>
<property name="com.jaspersoft.studio.data.defaultdataadapter" value="One Empty Record"/>
<property name="com.jaspersoft.studio.data.sql.tables" value=""/>
<import value="net.sf.jasperreports.engine.*"/>
<import value="java.util.*"/>
Expand Down Expand Up @@ -170,7 +170,7 @@
<subreportParameterExpression><![CDATA[$P{RECORD_ID}]]></subreportParameterExpression>
</subreportParameter>
<connectionExpression><![CDATA[$P{REPORT_CONNECTION}]]></connectionExpression>
<subreportExpression><![CDATA["de/metas/docs/sales/invoice_orgs_medium/report_esr_medium.jasper"]]></subreportExpression>
<subreportExpression><![CDATA["de/metas/docs/sales/invoice_orgs_medium/report_esr.jasper"]]></subreportExpression>
</subreport>
</band>
</pageFooter>
Expand Down