Skip to content
Snippets Groups Projects
Commit 61d1e65b authored by Benjamin Ulrich's avatar Benjamin Ulrich :speech_balloon:
Browse files

Merge branch 'sales_2001386_rabatt_fehlt_auf_beleg' into '2021.2' 

[Projekt: xRM-Sales][TicketNr.: 2001386][Rabatt fehlt auf Beleg]

See merge request xrm/basic!1461
parents 22142566 e2e5547e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
process/Order_lib/process.js
+ 10
− 10
View file @ 61d1e65b
......@@ -403,7 +403,7 @@ OrderUtils.buildOrderReport = function (pOrderID)
"PaymentConditions" : translate.text("Conditions of payment", language),
"Articledescription" : translate.text("Article Description", language),
"DeliveryConditions" : translate.text("Deliveryspecification", language),
"OrderType" : KeywordUtils.getViewValue($KeywordRegistry.orderType(), orderData[15]),
"OrderType" : KeywordUtils.getViewValue($KeywordRegistry.orderType(), orderData[14]),
"Articlenumber" : translate.text("Article Number", language),
"SALESORDERAddr" : translate.text(orderData[0].trim(), language),
"zzglUMST" : translate.text("Plus Salestax", language),
......@@ -500,15 +500,15 @@ OrderUtils.buildReminderReport = function (pOrderID)
"HEADER", //8
"VAT",
sqlUtil.isNull("SALESORDERCODE", "0"),
"OBJECT_TYPE", //12
"OBJECT_ROWID", //13
"FOOTER", //14
"ORDERTYPE", // 15
"PAID", //16
"NET", //17
"DUNNINGDATE", //18
"DUNNINGLEVEL",//19
"DUNNINGTEXT" //20
"OBJECT_TYPE", //11
"OBJECT_ROWID", //12
"FOOTER", //13
"ORDERTYPE", // 14
"PAID", //15
"NET", //16
"DUNNINGDATE", //17
"DUNNINGLEVEL",//18
"DUNNINGTEXT" //19
];
var orderData = newSelect(orderFields)
......
report/Salesorder_report/reportData.jrxml
+ 11
− 13
View file @ 61d1e65b
<?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="Beleg" 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.3579476910000023"/>
<property name="ireport.x" value="29"/>
<property name="ireport.y" value="905"/>
<property name="ireport.zoom" value="1.5"/>
<property name="ireport.x" value="0"/>
<property name="ireport.y" value="463"/>
<parameter name="myAddr" class="java.lang.String"/>
<parameter name="Artikelbezeichnung" class="java.lang.String"/>
<parameter name="Artikel-Nr" class="java.lang.String"/>
......@@ -27,7 +27,7 @@
<parameter name="SUMITEMSUM" class="java.lang.Double"/>
<parameter name="TOTAL" class="java.lang.String"/>
<parameter name="SUBREPORT_DIR" class="java.lang.String" isForPrompting="false">
<defaultValueExpression><![CDATA["C:\\Entwicklung\\2020.2\\project\\basic2\\report\\Salesorder_report\\"]]></defaultValueExpression>
<defaultValueExpression><![CDATA["C:\\dev\\project\\xRM-Basic\\report\\Salesorder_report\\"]]></defaultValueExpression>
</parameter>
<parameter name="adito.datasource.subdata" class="java.lang.Object" isForPrompting="false"/>
<parameter name="adito.image.myLogo" class="java.lang.String"/>
......@@ -89,35 +89,35 @@
<textFieldExpression><![CDATA[$P{SALESORDERAddr}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="347" y="0" width="100" height="15" uuid="358dc7c8-e5fe-430d-bd83-a2d76d2e2179"/>
<reportElement x="449" y="0" width="105" height="15" uuid="358dc7c8-e5fe-430d-bd83-a2d76d2e2179"/>
<textElement>
<font size="8" isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$P{OrderType}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="347" y="20" width="50" height="15" uuid="f27d5581-b73b-4a1c-97fe-809debd77775"/>
<reportElement x="449" y="20" width="50" height="15" uuid="f27d5581-b73b-4a1c-97fe-809debd77775"/>
<textElement>
<font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$P{Number}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="348" y="35" width="50" height="15" uuid="731882eb-328c-4e30-b44a-fd17b8a8b95a"/>
<reportElement x="450" y="35" width="50" height="15" uuid="731882eb-328c-4e30-b44a-fd17b8a8b95a"/>
<textElement>
<font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$P{Date}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="397" y="20" width="55" height="15" uuid="14ec5c0b-29bf-4719-95c0-05e3779175b6"/>
<reportElement x="499" y="20" width="55" height="15" uuid="14ec5c0b-29bf-4719-95c0-05e3779175b6"/>
<textElement textAlignment="Right">
<font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$F{ORDERCODE}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="397" y="35" width="55" height="15" uuid="3451e207-2ac2-4045-b2be-0d1476b21380"/>
<reportElement x="499" y="35" width="55" height="15" uuid="3451e207-2ac2-4045-b2be-0d1476b21380"/>
<textElement textAlignment="Right">
<font size="8"/>
</textElement>
......@@ -182,9 +182,7 @@
<textFieldExpression><![CDATA[$P{Amount}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true">
<reportElement x="330" y="9" width="53" height="15" uuid="b0482e3e-3e46-4867-bef5-69febaa17928">
<printWhenExpression><![CDATA[!$P{anzahl}.equals("0")]]></printWhenExpression>
</reportElement>
<reportElement x="330" y="9" width="53" height="15" uuid="b0482e3e-3e46-4867-bef5-69febaa17928"/>
<textElement textAlignment="Right">
<font size="8"/>
</textElement>
......@@ -409,7 +407,7 @@
<pageFooter>
<band height="46" splitType="Stretch">
<textField pattern="EEEEE dd MMMMM yyyy">
<reportElement x="370" y="24" width="83" height="20" forecolor="#999999" uuid="07424005-2256-4514-a2da-6b00b8e5e5c9"/>
<reportElement x="319" y="24" width="134" height="20" forecolor="#999999" uuid="07424005-2256-4514-a2da-6b00b8e5e5c9"/>
<textElement>
<font size="8"/>
</textElement>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment