From 8d20050a146736ed1648dbfe985d291d302f0cb8 Mon Sep 17 00:00:00 2001
From: Sophia Leierseder <s.leierseder@adito.de>
Date: Fri, 30 Aug 2019 14:04:35 +0200
Subject: [PATCH] changes order
---
.../ordercode_versnr_fieldgroup/valueProcess.js | 2 +-
language/_____LANGUAGE_de/_____LANGUAGE_de.aod | 5 +++++
neonView/OrderFilter_view/OrderFilter_view.aod | 12 ++++++------
3 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/entity/Order_entity/entityfields/ordercode_versnr_fieldgroup/valueProcess.js b/entity/Order_entity/entityfields/ordercode_versnr_fieldgroup/valueProcess.js
index e63d77e5ef..7e065cc1c9 100644
--- a/entity/Order_entity/entityfields/ordercode_versnr_fieldgroup/valueProcess.js
+++ b/entity/Order_entity/entityfields/ordercode_versnr_fieldgroup/valueProcess.js
@@ -5,4 +5,4 @@ import("system.vars");
if(!vars.get("$field.SALESORDERCODE") && !vars.get("$field.VERSNR"))
result.string(translate.text("Receipt"));
else
- result.string(vars.get("$field.SALESORDERCODE") + "-" + vars.get("$field.VERSNR"));
+ result.string(vars.getString("$field.ORDERTYPE.displayValue") + " " + vars.get("$field.SALESORDERCODE") + "-" + vars.get("$field.VERSNR"));
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index 754a4a757b..8ec7ccfadf 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -6349,15 +6349,18 @@
</entry>
<entry>
<key>Invoice</key>
+ <value>Rechnung</value>
</entry>
<entry>
<key>Receipt Footer Text</key>
</entry>
<entry>
<key>Delivery note</key>
+ <value>Lieferschein</value>
</entry>
<entry>
<key>Order confirmation</key>
+ <value>Auftragsbestätigung</value>
</entry>
<entry>
<key>Email blocked</key>
@@ -6370,6 +6373,7 @@
</entry>
<entry>
<key>Cancellation</key>
+ <value>Stornierung</value>
</entry>
<entry>
<key>Vacation examination by</key>
@@ -6379,6 +6383,7 @@
</entry>
<entry>
<key>Credit</key>
+ <value>Gutschrift</value>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
diff --git a/neonView/OrderFilter_view/OrderFilter_view.aod b/neonView/OrderFilter_view/OrderFilter_view.aod
index 98f6a4b089..1c2cd1ed43 100644
--- a/neonView/OrderFilter_view/OrderFilter_view.aod
+++ b/neonView/OrderFilter_view/OrderFilter_view.aod
@@ -63,17 +63,13 @@
<entityField>IMAGE</entityField>
</neonTableColumn>
<neonTableColumn>
- <name>443c8480-5676-43a3-9617-f86dae39c960</name>
- <entityField>SALESORDERDATE</entityField>
+ <name>60b83daa-9349-4bef-94d8-5f1fc350da59</name>
+ <entityField>FullOrderCode</entityField>
</neonTableColumn>
<neonTableColumn>
<name>dba5604f-cc1b-4083-8115-7bbe1ba07bf4</name>
<entityField>ORDERTYPE</entityField>
</neonTableColumn>
- <neonTableColumn>
- <name>60b83daa-9349-4bef-94d8-5f1fc350da59</name>
- <entityField>FullOrderCode</entityField>
- </neonTableColumn>
<neonTableColumn>
<name>5688908f-7c50-46a3-8899-2767ea5b4a90</name>
<entityField>CONTACT_ORG_ID</entityField>
@@ -88,6 +84,10 @@
<name>513826d9-7bb3-4cdd-b26a-f3c3976a6063</name>
<entityField>ORDERSTATUS</entityField>
</neonTableColumn>
+ <neonTableColumn>
+ <name>443c8480-5676-43a3-9617-f86dae39c960</name>
+ <entityField>SALESORDERDATE</entityField>
+ </neonTableColumn>
<neonTableColumn>
<name>f0b61831-07b1-41dc-bac6-0e27252f6b74</name>
<entityField>CANCELLATION</entityField>
--
GitLab