Skip to content
Snippets Groups Projects
Commit dede71d2 authored by Sebastian Listl's avatar Sebastian Listl :speech_balloon:
Browse files

Merge branch '1065877_FixOrderReportIncorrectSpelling' into '2020.2.1'

1065877 fix order report incorrect spelling

See merge request xrm/basic!479
parents 3e8ed424 2119941a
No related branches found
No related tags found
No related merge requests found
......@@ -6568,7 +6568,7 @@
</entry>
<entry>
<key>Print reminder</key>
<value>Mahnung drucken</value>
<value>Mahnung anzeigen</value>
</entry>
<entry>
<key>Rech.-Betrag</key>
......
......@@ -545,7 +545,8 @@ OrderUtils.buildReminderReport = function (pOrderID)
"Ordernumber": translate.text("Order number",language),
"Orderdate": translate.text("Order date",language),
"Orderamount": translate.text("Order amount",language),
"Dunninglevel": translate.text("Dunning level",language)
"Dunninglevel": translate.text("Dunning level",language),
"OutstandingAmount": translate.text("Outstanding Amount",language)
};
......
......@@ -2,7 +2,7 @@
<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="Mahnung" pageWidth="595" pageHeight="842" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="e7a916c8-3f9a-497d-84bb-3909b15271ea">
<property name="ireport.zoom" value="2.1435888100000016"/>
<property name="ireport.x" value="0"/>
<property name="ireport.y" value="57"/>
<property name="ireport.y" value="0"/>
<parameter name="myAddr" class="java.lang.String"/>
<parameter name="Kontenabstimmung" class="java.lang.String"/>
<parameter name="Rech.-Nr" class="java.lang.String"/>
......@@ -22,6 +22,7 @@
<parameter name="Due" class="java.lang.String"/>
<parameter name="DUEDATE" class="java.lang.String"/>
<parameter name="Dunninglevel" class="java.lang.String"/>
<parameter name="OutstandingAmount" class="java.lang.String"/>
<field name="PAYED" class="java.lang.String"/>
<field name="RELATION_ID" class="java.lang.String"/>
<field name="CURRENCY" class="java.lang.String"/>
......@@ -59,13 +60,6 @@
</textElement>
<textFieldExpression><![CDATA[$P{DueDate}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="408" y="0" width="103" height="15" uuid="62a0909f-ef03-4242-969a-8a9532d1aa9a"/>
<textElement textAlignment="Right">
<font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$P{Outstanding Amount}]]></textFieldExpression>
</textField>
<line>
<reportElement x="13" y="33" width="527" height="1" uuid="d5108302-191f-4e27-8920-fcd330d335e8"/>
</line>
......@@ -125,6 +119,13 @@
</textElement>
<textFieldExpression><![CDATA[$R{Rechnungsbetrag}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="430" y="0" width="81" height="15" uuid="8eee46c0-f3c3-4563-b1b1-746aeb7e73c6"/>
<textElement>
<font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$P{OutstandingAmount}]]></textFieldExpression>
</textField>
</band>
</groupHeader>
</group>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment