Skip to content
Snippets Groups Projects
Commit 11d017ae authored by Johannes Goderbauer's avatar Johannes Goderbauer
Browse files

Merge branch '#1063183_DokumentenVorlage' into '2020.2.0' 

#1063183 dokumenten vorlage

See merge request xrm/basic!406
parents 85be0f35 e44f6307
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 64 additions and 72 deletions
entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
+ 1
− 0
View file @ 11d017ae
......@@ -320,6 +320,7 @@
</entityField>
<entityConsumer>
<name>DocumentTemplatePlaceOfUse</name>
<stateProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/documenttemplateplaceofuse/stateProcess.js</stateProcess>
<dependency>
<name>dependency</name>
<entityName>DocumentTemplatePlaceOfUse_entity</entityName>
......
entity/DocumentTemplate_entity/entityfields/documenttemplateplaceofuse/stateProcess.js 0 → 100644
+ 10
− 0
View file @ 11d017ae
import("KeywordRegistry_basic");
import("system.result");
import("system.vars");
import("system.neon");
if (vars.get("$field.KIND") == $KeywordRegistry.documentTemplateType$textModular())
result.string(neon.COMPONENTSTATE_INVISIBLE);
else
result.string(neon.COMPONENTSTATE_EDITABLE);
entity/Offer_entity/entityfields/footer/valueProcess.js
+ 0
− 6
View file @ 11d017ae
......@@ -7,9 +7,3 @@ import("system.util");
if(vars.exists("$param.OfferFooter_param") && vars.get("$param.OfferFooter_param"))
result.string(vars.get("$param.OfferFooter_param"));
else if(vars.get("$this.value"))
result.string(vars.get("$this.value"));
else if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
result.string("Vielen Dank!"); //TODO: translate
entity/Offer_entity/entityfields/header/valueProcess.js
+ 0
− 6
View file @ 11d017ae
......@@ -7,9 +7,3 @@ import("system.util");
if(vars.exists("$param.OfferHeader_param") && vars.get("$param.OfferHeader_param"))
result.string(vars.get("$param.OfferHeader_param"));
else if(vars.get("$this.value"))
result.string(vars.get("$this.value"));
else if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
result.string("Gerne bieten wir Ihnen wie folgt an:"); //TODO: translate
entity/Offer_entity/entityfields/neworder/onActionProcess.js
+ 1
− 2
View file @ 11d017ae
......@@ -7,9 +7,8 @@ var pRowId = vars.getString("$field.OBJECT_ROWID");
var pContext=vars.getString("$field.OBJECT_TYPE")
var currency = vars.getString("$field.CURRENCY");
var language = vars.getString("$field.ISOLANGUAGE");
var header = vars.getString("$field.HEADER");
var address = vars.getString("$field.ADDRESS");
var offerId = vars.getString("$field.OFFERID");
OfferUtils.copyToOrder(offerId, pContext, pRowId, contactId, language, currency, address, header);
OfferUtils.copyToOrder(offerId, pContext, pRowId, contactId, language, currency, address);
\ No newline at end of file
entity/Order_entity/Order_entity.aod
+ 4
− 2
View file @ 11d017ae
......@@ -91,13 +91,11 @@
<name>HEADER</name>
<title>Header text</title>
<contentType>LONG_TEXT</contentType>
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/header/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>FOOTER</name>
<title>Footer text</title>
<contentType>LONG_TEXT</contentType>
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/footer/valueProcess.js</valueProcess>
</entityField>
<entityConsumer>
<name>Orderitems</name>
......@@ -718,11 +716,15 @@
<name>ChosenTexHeader</name>
<title>Choose Header</title>
<consumer>DocumentTemplateTexHeader</consumer>
<stateProcess>%aditoprj%/entity/Order_entity/entityfields/chosentexheader/stateProcess.js</stateProcess>
<onValueChange>%aditoprj%/entity/Order_entity/entityfields/chosentexheader/onValueChange.js</onValueChange>
</entityField>
<entityField>
<name>ChosenTexFooter</name>
<title>Choose Footer</title>
<consumer>DocumentTemplateTexFooter</consumer>
<stateProcess>%aditoprj%/entity/Order_entity/entityfields/chosentexfooter/stateProcess.js</stateProcess>
<onValueChange>%aditoprj%/entity/Order_entity/entityfields/chosentexfooter/onValueChange.js</onValueChange>
</entityField>
<entityField>
<name>ChosenPaymentAddress</name>
......
entity/Order_entity/entityfields/chosentexfooter/onValueChange.js 0 → 100644
+ 9
− 0
View file @ 11d017ae
import("DocumentTemplate_lib");
import("system.vars");
if (vars.get("$field.ChosenTexFooter"))
{
let docTemp = DocumentTemplateUtils.getTemplate(vars.get("$field.ChosenTexFooter"))
vars.set("$field.FOOTER", docTemp.getReplacedContent({}));
}
entity/Order_entity/entityfields/chosentexfooter/stateProcess.js 0 → 100644
+ 10
− 0
View file @ 11d017ae
import("system.vars");
import("system.neon");
import("system.result");
let state = vars.get("$sys.recordstate");
if(state == neon.OPERATINGSTATE_NEW || state == neon.OPERATINGSTATE_EDIT)
result.string(neon.COMPONENTSTATE_EDITABLE);
else
result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
entity/Order_entity/entityfields/chosentexheader/onValueChange.js 0 → 100644
+ 9
− 0
View file @ 11d017ae
import("DocumentTemplate_lib");
import("system.vars");
if (vars.get("$field.ChosenTexHeader"))
{
let docTemp = DocumentTemplateUtils.getTemplate(vars.get("$field.ChosenTexHeader"))
vars.set("$field.HEADER", docTemp.getReplacedContent({}));
}
\ No newline at end of file
entity/Order_entity/entityfields/chosentexheader/stateProcess.js 0 → 100644
+ 10
− 0
View file @ 11d017ae
import("system.vars");
import("system.neon");
import("system.result");
let state = vars.get("$sys.recordstate");
if(state == neon.OPERATINGSTATE_NEW || state == neon.OPERATINGSTATE_EDIT)
result.string(neon.COMPONENTSTATE_EDITABLE);
else
result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
entity/Order_entity/entityfields/footer/valueProcess.js deleted 100644 → 0
+ 0
− 26
View file @ 85be0f35
import("Sql_lib");
import("system.result");
import("system.vars");
import("system.neon");
import("system.db");
import("system.util");
if (vars.get("$this.value") == null)
{
if(vars.get("$this.value"))
result.string(vars.get("$this.value"));
else if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
result.string("Danke sehr:"); //TODO: translate
if (vars.get("$field.ChosenTexFooter") != "")
{
var binaryId = newSelect("ID", SqlUtils.getBinariesAlias())
.from("ASYS_BINARIES")
.whereIfSet("ASYS_BINARIES.ROW_ID", "$field.ChosenTexFooter")
.cell(true);
if (binaryId)
result.string(util.decodeBase64String(db.getBinaryContent(binaryId, SqlUtils.getBinariesAlias())));
}
}
\ No newline at end of file
entity/Order_entity/entityfields/header/valueProcess.js deleted 100644 → 0
+ 0
− 26
View file @ 85be0f35
import("Sql_lib");
import("system.result");
import("system.vars");
import("system.neon");
import("system.db");
import("system.util");
if (vars.get("$this.value") == null)
{
if(vars.get("$this.value"))
result.string(vars.get("$this.value"));
else if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
result.string("Gerne bieten wir Ihnen wie folgt an:"); //TODO: translation
if (vars.get("$field.ChosenTexHeader") != "")
{
var binaryId = newSelect("ID", SqlUtils.getBinariesAlias())
.from("ASYS_BINARIES")
.whereIfSet("ASYS_BINARIES.ROW_ID", "$field.ChosenTexHeader")
.cell(true);
if (binaryId)
result.string(util.decodeBase64String(db.getBinaryContent(binaryId, SqlUtils.getBinariesAlias())));
}
}
\ No newline at end of file
language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+ 1
− 1
View file @ 11d017ae
......@@ -6709,7 +6709,7 @@
</entry>
<entry>
<key>Receipt Header Text</key>
<value>Beleg kopftext</value>
<value>Beleg Kopftext</value>
</entry>
<entry>
<key>Cancellation</key>
......
neonView/OrderDetail_view/OrderDetail_view.aod
+ 8
− 0
View file @ 11d017ae
......@@ -15,10 +15,18 @@
<drawerCaption>Detail</drawerCaption>
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
<name>6813f374-363c-4f99-8ee0-17362635c6d5</name>
<entityField>ChosenTexHeader</entityField>
</entityFieldLink>
<entityFieldLink>
<name>8bf2a10e-e7e9-4f33-98cf-4ded02bf68a9</name>
<entityField>HEADER</entityField>
</entityFieldLink>
<entityFieldLink>
<name>4812559a-afe1-4036-8688-869d02564db8</name>
<entityField>ChosenTexFooter</entityField>
</entityFieldLink>
<entityFieldLink>
<name>d6f2774b-34c2-4db8-9730-e98b4c83503a</name>
<entityField>FOOTER</entityField>
......
process/Offer_lib/process.js
+ 1
− 3
View file @ 11d017ae
......@@ -384,9 +384,8 @@ OfferUtils.copyOfferItems = function (pSourceOfferId, pTargetOfferId)
* @param pLanguage {String} language
* @param pCurrency {String} [currency=""]
* @param pAddress {String} [address=""]
* @param pHeader {String} [header=""]
*/
OfferUtils.copyToOrder = function (pOfferId, pContextId, pRowId, pContactId, pLanguage, pCurrency, pAddress, pHeader)
OfferUtils.copyToOrder = function (pOfferId, pContextId, pRowId, pContactId, pLanguage, pCurrency, pAddress)
{
var fieldparams =
{
......@@ -394,7 +393,6 @@ OfferUtils.copyToOrder = function (pOfferId, pContextId, pRowId, pContactId, pLa
"$field.ISOLANGUAGE" : pLanguage,
"$field.OFFER_ID" : pOfferId,
"$field.CURRENCY" : pCurrency || "",
"$field.HEADER" : pHeader || "",
"$field.PAYMENTADDRESS" : pAddress || "",
"$field.OBJECT_TYPE" : pContextId || "",
"$field.OBJECT_ROWID" : pRowId || ""
......
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