From 4299149fbdf93fe3d4487b64a29be2d4cdf1225a Mon Sep 17 00:00:00 2001 From: Benjamin Ulrich <b.ulrich@adito.de> Date: Fri, 31 Jan 2020 15:49:28 +0100 Subject: [PATCH] =?UTF-8?q?[Projekt:=20Entwicklung=20-=20Neon][TicketNr.:?= =?UTF-8?q?=201042982][Beleg=20-=20=C3=84nderungen=20nicht=20im=20Log=20er?= =?UTF-8?q?fasst]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- aliasDefinition/Data_alias/Data_alias.aod | 203 ++++++++++++++++-- .../translate4log/property.js | 10 + .../translate4log/property.js | 11 + .../translate4log/property.js | 6 + .../translate4log/property.js | 5 + .../translate4log/property.js | 10 + 6 files changed, 228 insertions(+), 17 deletions(-) create mode 100644 aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesorder/entityfields/cancellation/customproperties/translate4log/property.js create mode 100644 aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesorder/entityfields/object_rowid/customproperties/translate4log/property.js create mode 100644 aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesorder/entityfields/object_type/customproperties/translate4log/property.js create mode 100644 aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesorder/entityfields/offer_id/customproperties/translate4log/property.js create mode 100644 aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesorder/entityfields/orderstatus/customproperties/translate4log/property.js diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod index 54d9a6d9633..24521d74210 100644 --- a/aliasDefinition/Data_alias/Data_alias.aod +++ b/aliasDefinition/Data_alias/Data_alias.aod @@ -4095,6 +4095,11 @@ <global v="false" /> <property v="true" /> </customBooleanProperty> + <customStringProperty> + <name>keyword</name> + <global v="false" /> + <property>Currency</property> + </customStringProperty> </customProperties> </entityFieldDb> <entityFieldDb> @@ -4324,6 +4329,11 @@ <global v="false" /> <property v="true" /> </customBooleanProperty> + <customJDitoProperty> + <name>translate4Log</name> + <global v="false" /> + <property>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesorder/entityfields/offer_id/customproperties/translate4log/property.js</property> + </customJDitoProperty> </customProperties> </entityFieldDb> <entityFieldDb> @@ -4337,8 +4347,15 @@ <isUnique v="false" /> <index v="false" /> <documentation></documentation> - <title></title> + <title>Language</title> <description></description> + <customProperties> + <customBooleanProperty> + <name>log</name> + <global v="false" /> + <property v="true" /> + </customBooleanProperty> + </customProperties> </entityFieldDb> <entityFieldDb> <name>OBJECT_TYPE</name> @@ -4351,8 +4368,20 @@ <isUnique v="false" /> <index v="false" /> <documentation></documentation> - <title></title> + <title>Connection Type</title> <description></description> + <customProperties> + <customBooleanProperty> + <name>log</name> + <global v="false" /> + <property v="true" /> + </customBooleanProperty> + <customJDitoProperty> + <name>translate4Log</name> + <global v="false" /> + <property>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesorder/entityfields/object_type/customproperties/translate4log/property.js</property> + </customJDitoProperty> + </customProperties> </entityFieldDb> <entityFieldDb> <name>NOTICE</name> @@ -4365,8 +4394,15 @@ <isUnique v="false" /> <index v="false" /> <documentation></documentation> - <title></title> + <title>Notice</title> <description></description> + <customProperties> + <customBooleanProperty> + <name>log</name> + <global v="false" /> + <property v="true" /> + </customBooleanProperty> + </customProperties> </entityFieldDb> <entityFieldDb> <name>PAYDUEDATE</name> @@ -4379,8 +4415,15 @@ <isUnique v="false" /> <index v="false" /> <documentation></documentation> - <title></title> + <title>Pay due date</title> <description></description> + <customProperties> + <customBooleanProperty> + <name>log</name> + <global v="false" /> + <property v="true" /> + </customBooleanProperty> + </customProperties> </entityFieldDb> <entityFieldDb> <name>CANCELLATION</name> @@ -4393,8 +4436,20 @@ <isUnique v="false" /> <index v="false" /> <documentation></documentation> - <title></title> + <title>Cancelled</title> <description></description> + <customProperties> + <customBooleanProperty> + <name>log</name> + <global v="false" /> + <property v="true" /> + </customBooleanProperty> + <customJDitoProperty> + <name>translate4Log</name> + <global v="false" /> + <property>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesorder/entityfields/cancellation/customproperties/translate4log/property.js</property> + </customJDitoProperty> + </customProperties> </entityFieldDb> <entityFieldDb> <name>PAYDATE</name> @@ -4407,8 +4462,15 @@ <isUnique v="false" /> <index v="false" /> <documentation></documentation> - <title></title> + <title>Pay date</title> <description></description> + <customProperties> + <customBooleanProperty> + <name>log</name> + <global v="false" /> + <property v="true" /> + </customBooleanProperty> + </customProperties> </entityFieldDb> <entityFieldDb> <name>DUNNINGTEXT</name> @@ -4421,8 +4483,15 @@ <isUnique v="false" /> <index v="false" /> <documentation></documentation> - <title></title> + <title>Dunning text</title> <description></description> + <customProperties> + <customBooleanProperty> + <name>log</name> + <global v="false" /> + <property v="true" /> + </customBooleanProperty> + </customProperties> </entityFieldDb> <entityFieldDb> <name>UNPAID</name> @@ -4449,8 +4518,20 @@ <isUnique v="false" /> <index v="false" /> <documentation></documentation> - <title></title> + <title>Dunning level</title> <description></description> + <customProperties> + <customBooleanProperty> + <name>log</name> + <global v="false" /> + <property v="true" /> + </customBooleanProperty> + <customStringProperty> + <name>keyword</name> + <global v="false" /> + <property>DunningLevel</property> + </customStringProperty> + </customProperties> </entityFieldDb> <entityFieldDb> <name>DUNNINGDATE</name> @@ -4463,8 +4544,15 @@ <isUnique v="false" /> <index v="false" /> <documentation></documentation> - <title></title> + <title>Dunning date</title> <description></description> + <customProperties> + <customBooleanProperty> + <name>log</name> + <global v="false" /> + <property v="true" /> + </customBooleanProperty> + </customProperties> </entityFieldDb> <entityFieldDb> <name>PAYMENTTERMS</name> @@ -4477,8 +4565,20 @@ <isUnique v="false" /> <index v="false" /> <documentation></documentation> - <title></title> + <title>Payment term</title> <description></description> + <customProperties> + <customBooleanProperty> + <name>log</name> + <global v="false" /> + <property v="true" /> + </customBooleanProperty> + <customStringProperty> + <name>keyword</name> + <global v="false" /> + <property>PaymentTerm</property> + </customStringProperty> + </customProperties> </entityFieldDb> <entityFieldDb> <name>DELIVERYTERMS</name> @@ -4491,8 +4591,20 @@ <isUnique v="false" /> <index v="false" /> <documentation></documentation> - <title></title> + <title>Delivery specification</title> <description></description> + <customProperties> + <customBooleanProperty> + <name>log</name> + <global v="false" /> + <property v="true" /> + </customBooleanProperty> + <customStringProperty> + <name>keyword</name> + <global v="false" /> + <property>DeliveryTerm</property> + </customStringProperty> + </customProperties> </entityFieldDb> <entityFieldDb> <name>OBJECT_ROWID</name> @@ -4505,8 +4617,20 @@ <isUnique v="false" /> <index v="true" /> <documentation></documentation> - <title></title> + <title>Link</title> <description></description> + <customProperties> + <customBooleanProperty> + <name>log</name> + <global v="false" /> + <property v="true" /> + </customBooleanProperty> + <customJDitoProperty> + <name>translate4Log</name> + <global v="false" /> + <property>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesorder/entityfields/object_rowid/customproperties/translate4log/property.js</property> + </customJDitoProperty> + </customProperties> </entityFieldDb> <entityFieldDb> <name>PAYMENTADDRESS</name> @@ -4519,8 +4643,15 @@ <isUnique v="false" /> <index v="false" /> <documentation></documentation> - <title></title> + <title>Payment address</title> <description></description> + <customProperties> + <customBooleanProperty> + <name>log</name> + <global v="false" /> + <property v="true" /> + </customBooleanProperty> + </customProperties> </entityFieldDb> <entityFieldDb> <name>ORDERTYPE</name> @@ -4533,8 +4664,20 @@ <isUnique v="false" /> <index v="false" /> <documentation></documentation> - <title></title> + <title>Order Type</title> <description></description> + <customProperties> + <customBooleanProperty> + <name>log</name> + <global v="false" /> + <property v="true" /> + </customBooleanProperty> + <customStringProperty> + <name>keyword</name> + <global v="false" /> + <property>OrderType</property> + </customStringProperty> + </customProperties> </entityFieldDb> <entityFieldDb> <name>PAID</name> @@ -4547,8 +4690,15 @@ <isUnique v="false" /> <index v="false" /> <documentation></documentation> - <title></title> + <title>Paid</title> <description></description> + <customProperties> + <customBooleanProperty> + <name>log</name> + <global v="false" /> + <property v="true" /> + </customBooleanProperty> + </customProperties> </entityFieldDb> <entityFieldDb> <name>DELIVERYADDRESS</name> @@ -4561,8 +4711,15 @@ <isUnique v="false" /> <index v="false" /> <documentation></documentation> - <title></title> + <title>Delivery address</title> <description></description> + <customProperties> + <customBooleanProperty> + <name>log</name> + <global v="false" /> + <property v="true" /> + </customBooleanProperty> + </customProperties> </entityFieldDb> <entityFieldDb> <name>ORDERSTATUS</name> @@ -4575,8 +4732,20 @@ <isUnique v="false" /> <index v="false" /> <documentation></documentation> - <title></title> + <title>Sent</title> <description></description> + <customProperties> + <customBooleanProperty> + <name>log</name> + <global v="false" /> + <property v="true" /> + </customBooleanProperty> + <customJDitoProperty> + <name>translate4Log</name> + <global v="false" /> + <property>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesorder/entityfields/orderstatus/customproperties/translate4log/property.js</property> + </customJDitoProperty> + </customProperties> </entityFieldDb> </entityFields> </entityDb> diff --git a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesorder/entityfields/cancellation/customproperties/translate4log/property.js b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesorder/entityfields/cancellation/customproperties/translate4log/property.js new file mode 100644 index 00000000000..46135672c89 --- /dev/null +++ b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesorder/entityfields/cancellation/customproperties/translate4log/property.js @@ -0,0 +1,10 @@ +import("system.translate"); +import("system.vars"); +import("system.result"); + +var val = vars.get("$local.value") + +if(val == 1) + result.string(translate.text("Yes")); +else + result.string(translate.text("No")); diff --git a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesorder/entityfields/object_rowid/customproperties/translate4log/property.js b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesorder/entityfields/object_rowid/customproperties/translate4log/property.js new file mode 100644 index 00000000000..d6dbb56344e --- /dev/null +++ b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesorder/entityfields/object_rowid/customproperties/translate4log/property.js @@ -0,0 +1,11 @@ +import("Loghistory_lib"); +import("system.vars"); +import("system.db"); +import("system.result"); +import("Context_lib"); + +var val = vars.get("$local.value"); +var type = db.cell("select OBJECT_TYPE from SALESORDER where OBJECT_ROWID = '" + val + "'") + + +result.string(db.cell(ContextUtils.getNameSql(type, val))); diff --git a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesorder/entityfields/object_type/customproperties/translate4log/property.js b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesorder/entityfields/object_type/customproperties/translate4log/property.js new file mode 100644 index 00000000000..893615e7fef --- /dev/null +++ b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesorder/entityfields/object_type/customproperties/translate4log/property.js @@ -0,0 +1,6 @@ +import("system.result"); +import("system.neon"); +import("system.vars"); +import("system.project"); + +result.string(project.getDataModel(project.DATAMODEL_KIND_CONTEXT, vars.get("$local.value"))[1]); \ No newline at end of file diff --git a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesorder/entityfields/offer_id/customproperties/translate4log/property.js b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesorder/entityfields/offer_id/customproperties/translate4log/property.js new file mode 100644 index 00000000000..e403e822342 --- /dev/null +++ b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesorder/entityfields/offer_id/customproperties/translate4log/property.js @@ -0,0 +1,5 @@ +import("system.vars"); +import("system.result"); +import("Offer_lib"); + +result.string(OfferUtils.getOfferTitleById(vars.get("$local.value"))); \ No newline at end of file diff --git a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesorder/entityfields/orderstatus/customproperties/translate4log/property.js b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesorder/entityfields/orderstatus/customproperties/translate4log/property.js new file mode 100644 index 00000000000..46135672c89 --- /dev/null +++ b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesorder/entityfields/orderstatus/customproperties/translate4log/property.js @@ -0,0 +1,10 @@ +import("system.translate"); +import("system.vars"); +import("system.result"); + +var val = vars.get("$local.value") + +if(val == 1) + result.string(translate.text("Yes")); +else + result.string(translate.text("No")); -- GitLab