diff --git a/entity/Order_entity/entityfields/ordercode_versnr_fieldgroup/valueProcess.js b/entity/Order_entity/entityfields/ordercode_versnr_fieldgroup/valueProcess.js index e63d77e5efd06bcf3bf3e63254ae41fbf574e49b..7e065cc1c9e17fbfa7155cf31690ea680577f12d 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 754a4a757b1606d62ebe65efcb2247cfc4f0f0f8..8ec7ccfadfbd3816758d997a7a4084255ce87449 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 98f6a4b089df7378599d8952c612182ab15238c0..1c2cd1ed438c54cdd09e0925756274f3bca6c675 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>