From 7a46c3fabf4217ce714eb13831294f8f7cda7400 Mon Sep 17 00:00:00 2001 From: "j.goderbauer" <j.goderbauer@adito.de> Date: Mon, 29 Apr 2019 16:15:39 +0200 Subject: [PATCH] =?UTF-8?q?[Projekt:=20Entwicklung=20-=20Neon][TicketNr.:?= =?UTF-8?q?=201036415][=C3=9Cbernahme=20AUDIT=20und=20Logging=20aus=20best?= =?UTF-8?q?ehendem=20xRM-Basic=20f=C3=BCr=20ADITO=202019]=20-=20offer?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customproperties/translate4log/property.js | 6 ++++-- .../net/customproperties/translate4log/property.js | 7 ++++--- .../customproperties/translate4log/property.js | 10 ++++++++-- .../vat/customproperties/translate4log/property.js | 7 ++++--- 4 files changed, 20 insertions(+), 10 deletions(-) diff --git a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/contact_id/customproperties/translate4log/property.js b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/contact_id/customproperties/translate4log/property.js index 66c0ea04fb..704213fe86 100644 --- a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/contact_id/customproperties/translate4log/property.js +++ b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/contact_id/customproperties/translate4log/property.js @@ -1,4 +1,6 @@ import("system.result"); -import("lib_addr"); +import("Address_lib"); +import("Loghistory_lib"); -result.string(new AddrObject("{value}").formatAddress("{on} - {fn} {ln} {ci}")); \ No newline at end of file +var params = Translate4LogParams.load(); +result.string(new AddrObject(params.value).getFormattedAddress()); \ No newline at end of file diff --git a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/net/customproperties/translate4log/property.js b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/net/customproperties/translate4log/property.js index e53af631e7..b5d36c467b 100644 --- a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/net/customproperties/translate4log/property.js +++ b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/net/customproperties/translate4log/property.js @@ -1,7 +1,8 @@ +import("system.translate"); import("system.vars"); import("system.result"); import("system.text"); +import("Loghistory_lib"); -var val = vars.get("$local.value"); - -result.string(text.formatDouble(val, "#,##0.00")); \ No newline at end of file +var params = Translate4LogParams.load(); +result.string(text.formatDouble(params.value, translate.text("#,##0.00", params.locale))); \ No newline at end of file diff --git a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/salesproject_id/customproperties/translate4log/property.js b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/salesproject_id/customproperties/translate4log/property.js index d2bcb07a7b..a179e03370 100644 --- a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/salesproject_id/customproperties/translate4log/property.js +++ b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/salesproject_id/customproperties/translate4log/property.js @@ -1,5 +1,11 @@ import("system.result"); import("system.db"); -import("lib_sql"); +import("Sql_lib"); +import("Loghistory_lib"); -result.string(db.cell("select " + concat(["PROJECTTITLE", "'/'", "cast( PROJECTNUMBER as char(5))"]) + " from SALESPROJECT where SALESPROJECTID = '{value}'")); \ No newline at end of file +var params = Translate4LogParams.load(); + +var res = db.cell(SqlCondition.begin() + .andPrepare("SALESPROJECT.SALESPROJECTID", params.value) + .buildSql("select " + concat(["PROJECTTITLE", "'/'", "cast( PROJECTNUMBER as char(5))"]) + " from SALESPROJECT")); +result.string(res); \ No newline at end of file diff --git a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/vat/customproperties/translate4log/property.js b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/vat/customproperties/translate4log/property.js index e53af631e7..b5d36c467b 100644 --- a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/vat/customproperties/translate4log/property.js +++ b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/vat/customproperties/translate4log/property.js @@ -1,7 +1,8 @@ +import("system.translate"); import("system.vars"); import("system.result"); import("system.text"); +import("Loghistory_lib"); -var val = vars.get("$local.value"); - -result.string(text.formatDouble(val, "#,##0.00")); \ No newline at end of file +var params = Translate4LogParams.load(); +result.string(text.formatDouble(params.value, translate.text("#,##0.00", params.locale))); \ No newline at end of file -- GitLab