Skip to content
Snippets Groups Projects
Commit 9dd0e2a0 authored by Jessica Luginger's avatar Jessica Luginger Committed by Sascha Schmidt
Browse files

[Projekt: xRM-Sales][TicketNr.: 1057152][Rechnungen haben keine Versionsnummer... 

[Projekt: xRM-Sales][TicketNr.: 1057152][Rechnungen haben keine Versionsnummer und keine optionalen Positionen]
[Projekt: xRM-Sales][TicketNr.: 1071449][Beleg - Gesamtrabatt / Rechnungsrabatt]
parent 20b8e312
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 392 additions and 172 deletions
.liquibase/Data_alias/basic/2021.0.0/addDiscountToOrder.xml 0 → 100644
+ 12
− 0
View file @ 9dd0e2a0
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<changeSet author="j.luginger" id="fc76d687-c5d8-4b12-919c-0324eb7f8f72">
<addColumn tableName="SALESORDER">
<column name="DISCOUNT" type="NUMERIC(14,2)" />
<column name="DISCOUNTED_NET" type="NUMERIC(14,2)" />
<column name="DISCOUNTED_VAT" type="NUMERIC(14,2)" />
</addColumn>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
.liquibase/Data_alias/basic/2021.0.0/changelog.xml
+ 1
− 0
View file @ 9dd0e2a0
......@@ -15,4 +15,5 @@
<include relativeToChangelogFile="true" file="KeywordMigration/changelog.xml"/>
<include relativeToChangelogFile="true" file="addDateNewToSalesproject.xml"/>
<include relativeToChangelogFile="true" file="EwsContactSync/create_ab_synccontact.xml"/>
<include relativeToChangelogFile="true" file="addDiscountToOrder.xml"/>
</databaseChangeLog>
\ No newline at end of file
aliasDefinition/Data_alias/Data_alias.aod
+ 42
− 26
View file @ 9dd0e2a0
......@@ -4914,6 +4914,48 @@
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>DISCOUNTED_VAT</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="2" />
<size v="14" />
<scale v="2" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>DISCOUNT</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="2" />
<size v="14" />
<scale v="2" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>DISCOUNTED_NET</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="2" />
<size v="14" />
<scale v="2" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
......@@ -5096,32 +5138,6 @@
</customBooleanProperty>
</customProperties>
</entityFieldDb>
<entityFieldDb>
<name>OPTIONAL</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="5" />
<size v="5" />
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title>Optional</title>
<description></description>
<customProperties>
<customBooleanProperty>
<name>log</name>
<global v="false" />
<property v="true" />
</customBooleanProperty>
<customBooleanProperty>
<name>autoMapTrueFalse4Log</name>
<global v="false" />
<property v="true" />
</customBooleanProperty>
</customProperties>
</entityFieldDb>
<entityFieldDb>
<name>GROUPCODEID</name>
<dbName></dbName>
......
entity/Offer_entity/entityfields/neworder/onActionProcess.js
+ 2
− 1
View file @ 9dd0e2a0
......@@ -9,6 +9,7 @@ var currency = vars.getString("$field.CURRENCY");
var language = vars.getString("$field.ISOLANGUAGE");
var address = vars.getString("$field.ADDRESS");
var offerId = vars.getString("$field.OFFERID");
var discount = vars.getString("$field.DISCOUNT");
OfferUtils.copyToOrder(offerId, pContext, pRowId, contactId, language, currency, address);
OfferUtils.copyToOrder(offerId, pContext, pRowId, contactId, language, currency, address, discount);
\ No newline at end of file
entity/Order_entity/Order_entity.aod
+ 159
− 102
View file @ 9dd0e2a0
......@@ -87,6 +87,7 @@
<title>Total VAT</title>
<contentType>NUMBER</contentType>
<state>READONLY</state>
<stateProcess>%aditoprj%/entity/Order_entity/entityfields/vat/stateProcess.js</stateProcess>
<displayValueProcess>%aditoprj%/entity/Order_entity/entityfields/vat/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
......@@ -108,6 +109,11 @@
<entityConsumer>
<name>Orderitems</name>
<description></description>
<dependency>
<name>dependency</name>
<entityName>Orderitem_entity</entityName>
<fieldName>Orderitems</fieldName>
</dependency>
<children>
<entityParameter>
<name>OrderId_param</name>
......@@ -132,12 +138,11 @@
<expose v="true" />
<mandatory v="true" />
</entityParameter>
<entityParameter>
<name>Discount_param</name>
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/orderitems/children/discount_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
<dependency>
<name>dependency</name>
<entityName>Orderitem_entity</entityName>
<fieldName>Orderitems</fieldName>
</dependency>
</entityConsumer>
<entityField>
<name>NET</name>
......@@ -199,6 +204,11 @@
<entityConsumer>
<name>Documents</name>
<selectionMode>MULTI</selectionMode>
<dependency>
<name>dependency</name>
<entityName>Document_entity</entityName>
<fieldName>Documents</fieldName>
</dependency>
<children>
<entityParameter>
<name>AssignmentRowId_param</name>
......@@ -209,15 +219,15 @@
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
<dependency>
<name>dependency</name>
<entityName>Document_entity</entityName>
<fieldName>Documents</fieldName>
</dependency>
</entityConsumer>
<entityConsumer>
<name>MainDocuments</name>
<stateProcess>%aditoprj%/entity/Order_entity/entityfields/maindocuments/stateProcess.js</stateProcess>
<dependency>
<name>dependency</name>
<entityName>Document_entity</entityName>
<fieldName>MainDocuments</fieldName>
</dependency>
<children>
<entityParameter>
<name>AssignmentRowId_param</name>
......@@ -228,28 +238,28 @@
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/maindocuments/children/assignmenttable_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
<dependency>
<name>dependency</name>
<entityName>Document_entity</entityName>
<fieldName>MainDocuments</fieldName>
</dependency>
</entityConsumer>
<entityConsumer>
<name>Salesprojects</name>
<dependency>
<name>dependency</name>
<entityName>Salesproject_entity</entityName>
<fieldName>Salesprojects</fieldName>
</dependency>
<children>
<entityParameter>
<name>ContactId_param</name>
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/salesprojects/children/contactid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
<dependency>
<name>dependency</name>
<entityName>Salesproject_entity</entityName>
<fieldName>Salesprojects</fieldName>
</dependency>
</entityConsumer>
<entityConsumer>
<name>KeywordCurrencies</name>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
......@@ -257,14 +267,14 @@
<expose v="false" />
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
<name>KeywordStates</name>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
</entityConsumer>
<entityConsumer>
<name>KeywordStates</name>
<children>
<entityParameter>
<name>ContainerName_param</name>
......@@ -272,11 +282,6 @@
<expose v="false" />
</entityParameter>
</children>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
</entityConsumer>
<entityConsumer>
<name>Languages</name>
......@@ -295,6 +300,11 @@
</entityParameter>
<entityConsumer>
<name>Activities</name>
<dependency>
<name>dependency</name>
<entityName>Activity_entity</entityName>
<fieldName>LinkedObjects</fieldName>
</dependency>
<children>
<entityParameter>
<name>RowId_param</name>
......@@ -309,11 +319,6 @@
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/activities/children/presetlinks_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
<dependency>
<name>dependency</name>
<entityName>Activity_entity</entityName>
<fieldName>LinkedObjects</fieldName>
</dependency>
</entityConsumer>
<entityField>
<name>OFFER_ID</name>
......@@ -327,6 +332,11 @@
<entityConsumer>
<name>Tasks</name>
<stateProcess>%aditoprj%/entity/Order_entity/entityfields/tasks/stateProcess.js</stateProcess>
<dependency>
<name>dependency</name>
<entityName>Task_entity</entityName>
<fieldName>Tasks</fieldName>
</dependency>
<children>
<entityParameter>
<name>RowId_param</name>
......@@ -341,15 +351,15 @@
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/tasks/children/presetlinks_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
<dependency>
<name>dependency</name>
<entityName>Task_entity</entityName>
<fieldName>Tasks</fieldName>
</dependency>
</entityConsumer>
<entityConsumer>
<name>Attributes</name>
<onValidation>%aditoprj%/entity/Order_entity/entityfields/attributes/onValidation.js</onValidation>
<dependency>
<name>dependency</name>
<entityName>AttributeRelation_entity</entityName>
<fieldName>AttributeRelations</fieldName>
</dependency>
<children>
<entityParameter>
<name>ObjectRowId_param</name>
......@@ -360,15 +370,15 @@
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
<dependency>
<name>dependency</name>
<entityName>AttributeRelation_entity</entityName>
<fieldName>AttributeRelations</fieldName>
</dependency>
</entityConsumer>
<entityConsumer>
<name>AttributeTree</name>
<stateProcess>%aditoprj%/entity/Order_entity/entityfields/attributetree/stateProcess.js</stateProcess>
<dependency>
<name>dependency</name>
<entityName>AttributeRelation_entity</entityName>
<fieldName>TreeProvider</fieldName>
</dependency>
<children>
<entityParameter>
<name>ObjectType_param</name>
......@@ -379,25 +389,20 @@
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
<dependency>
<name>dependency</name>
<entityName>AttributeRelation_entity</entityName>
<fieldName>TreeProvider</fieldName>
</dependency>
</entityConsumer>
<entityConsumer>
<name>LogHistories</name>
<dependency>
<name>dependency</name>
<entityName>LogHistory_entity</entityName>
<fieldName>LogHistoryProvider</fieldName>
</dependency>
<children>
<entityParameter>
<name>tablenames_param</name>
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/loghistories/children/tablenames_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
<dependency>
<name>dependency</name>
<entityName>LogHistory_entity</entityName>
<fieldName>LogHistoryProvider</fieldName>
</dependency>
</entityConsumer>
<entityField>
<name>ORDERTYPE</name>
......@@ -473,31 +478,31 @@
</entityField>
<entityConsumer>
<name>KeywordOrderTypes</name>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/keywordordertypes/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
<name>KeywordDunningLevels</name>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
</entityConsumer>
<entityConsumer>
<name>KeywordDunningLevels</name>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/keyworddunninglevels/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
</entityConsumer>
<entityField>
<name>OBJECT_ROWID</name>
......@@ -525,6 +530,11 @@
</entityField>
<entityConsumer>
<name>Objects</name>
<dependency>
<name>dependency</name>
<entityName>Object_entity</entityName>
<fieldName>FilteredObjects</fieldName>
</dependency>
<children>
<entityParameter>
<name>ContactId_param</name>
......@@ -535,14 +545,14 @@
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/objects/children/objecttype_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
<dependency>
<name>dependency</name>
<entityName>Object_entity</entityName>
<fieldName>FilteredObjects</fieldName>
</dependency>
</entityConsumer>
<entityConsumer>
<name>Contexts</name>
<dependency>
<name>dependency</name>
<entityName>Context_entity</entityName>
<fieldName>Exclusive</fieldName>
</dependency>
<children>
<entityParameter>
<name>Blacklist_param</name>
......@@ -553,11 +563,6 @@
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/contexts/children/invertblacklist_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
<dependency>
<name>dependency</name>
<entityName>Context_entity</entityName>
<fieldName>Exclusive</fieldName>
</dependency>
</entityConsumer>
<entityParameter>
<name>PossibleConnectionTypes</name>
......@@ -610,46 +615,46 @@
</entityField>
<entityConsumer>
<name>KeywordPaymentTerms</name>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/keywordpaymentterms/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
<name>KeywordDeliveryTerms</name>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
</entityConsumer>
<entityConsumer>
<name>KeywordDeliveryTerms</name>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/keyworddeliveryterms/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
</entityConsumer>
<entityConsumer>
<name>PossibleAddresses</name>
<documentation>%aditoprj%/entity/Order_entity/entityfields/possibleaddresses/documentation.adoc</documentation>
<dependency>
<name>dependency</name>
<entityName>Address_entity</entityName>
<fieldName>OrganisationAndContactAddresses</fieldName>
</dependency>
<children>
<entityParameter>
<name>ContactId_param</name>
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/possibleaddresses/children/contactid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
<dependency>
<name>dependency</name>
<entityName>Address_entity</entityName>
<fieldName>OrganisationAndContactAddresses</fieldName>
</dependency>
</entityConsumer>
<entityField>
<name>NOTICE</name>
......@@ -666,20 +671,25 @@
</entityField>
<entityConsumer>
<name>Offers</name>
<dependency>
<name>dependency</name>
<entityName>Offer_entity</entityName>
<fieldName>ContactOffers</fieldName>
</dependency>
<children>
<entityParameter>
<name>ContactId_param</name>
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/offers/children/contactid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
<dependency>
<name>dependency</name>
<entityName>Offer_entity</entityName>
<fieldName>ContactOffers</fieldName>
</dependency>
</entityConsumer>
<entityConsumer>
<name>DocumentTemplateTexHeader</name>
<dependency>
<name>dependency</name>
<entityName>DocumentTemplate_entity</entityName>
<fieldName>DocumentTemplateProvider</fieldName>
</dependency>
<children>
<entityParameter>
<name>DocumentTemplateType_param</name>
......@@ -690,14 +700,14 @@
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/documenttemplatetexheader/children/documenttemplatetypeclassification_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
<name>DocumentTemplateTexFooter</name>
<dependency>
<name>dependency</name>
<entityName>DocumentTemplate_entity</entityName>
<fieldName>DocumentTemplateProvider</fieldName>
</dependency>
</entityConsumer>
<entityConsumer>
<name>DocumentTemplateTexFooter</name>
<children>
<entityParameter>
<name>DocumentTemplateType_param</name>
......@@ -708,11 +718,6 @@
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/documenttemplatetexfooter/children/documenttemplatetypeclassification_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
<dependency>
<name>dependency</name>
<entityName>DocumentTemplate_entity</entityName>
<fieldName>DocumentTemplateProvider</fieldName>
</dependency>
</entityConsumer>
<entityField>
<name>ChosenTexHeader</name>
......@@ -957,6 +962,11 @@
</entityActionField>
<entityConsumer>
<name>Products</name>
<dependency>
<name>dependency</name>
<entityName>Product_entity</entityName>
<fieldName>Products</fieldName>
</dependency>
<children>
<entityParameter>
<name>OrderOfferInformations_param</name>
......@@ -967,12 +977,47 @@
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/products/children/showninordermainview_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
<dependency>
<name>dependency</name>
<entityName>Product_entity</entityName>
<fieldName>Products</fieldName>
</dependency>
</entityConsumer>
<entityField>
<name>DISCOUNT</name>
<title>Discount</title>
<contentType>NUMBER</contentType>
<outputFormat>0.00'%'</outputFormat>
<inputFormat>0.00</inputFormat>
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/discount/valueProcess.js</valueProcess>
<onValueChange>%aditoprj%/entity/Order_entity/entityfields/discount/onValueChange.js</onValueChange>
<onValueChangeTypes>
<element>MASK</element>
</onValueChangeTypes>
<onValidation>%aditoprj%/entity/Order_entity/entityfields/discount/onValidation.js</onValidation>
</entityField>
<entityField>
<name>DISCOUNTED_NET</name>
<title>discounted Price</title>
<contentType>NUMBER</contentType>
<outputFormat>#,##0.00</outputFormat>
<inputFormat>#,##0.00</inputFormat>
<state>READONLY</state>
<stateProcess>%aditoprj%/entity/Order_entity/entityfields/discounted_net/stateProcess.js</stateProcess>
<displayValueProcess>%aditoprj%/entity/Order_entity/entityfields/discounted_net/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>DISCOUNTED_VAT</name>
<title>discounted Vat</title>
<contentType>NUMBER</contentType>
<outputFormat>#,##0.00</outputFormat>
<inputFormat>#,##0.00</inputFormat>
<state>READONLY</state>
<stateProcess>%aditoprj%/entity/Order_entity/entityfields/discounted_vat/stateProcess.js</stateProcess>
<displayValueProcess>%aditoprj%/entity/Order_entity/entityfields/discounted_vat/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>DiscountChanged</name>
</entityField>
<entityParameter>
<name>Discount_param</name>
<expose v="true" />
</entityParameter>
</entityFields>
<recordContainers>
<dbRecordContainer>
......@@ -1185,6 +1230,18 @@
<recordfield>SALESORDER.INFO</recordfield>
<isFilterable v="true" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>DISCOUNT.value</name>
<recordfield>SALESORDER.DISCOUNT</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>DISCOUNTED_NET.value</name>
<recordfield>SALESORDER.DISCOUNTED_NET</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>DISCOUNTED_VAT.value</name>
<recordfield>SALESORDER.DISCOUNTED_VAT</recordfield>
</dbRecordFieldMapping>
</recordFieldMappings>
<linkInformation>
<linkInformation>
......
entity/Order_entity/entityfields/copyorder/onActionProcess.js
+ 2
− 1
View file @ 9dd0e2a0
......@@ -23,7 +23,8 @@ var fieldValues = {
dunningLevel: vars.getString("$field.DUNNINGLEVEL"),
orderType: vars.getString("$field.ORDERTYPE"),
cancellation: vars.getString("$field.CANCELLATION"),
orderStatus:vars.getString("$field.ORDERSTATUS")
orderStatus:vars.getString("$field.ORDERSTATUS"),
discount:vars.getString("$field.DISCOUNT")
};
OrderUtils.copyOrder(orderId, fieldValues);
entity/Order_entity/entityfields/discount/onValidation.js 0 → 100644
+ 12
− 0
View file @ 9dd0e2a0
import("system.result");
import("system.vars");
import("Util_lib");
import("Entity_lib");
var value = vars.get("local.value");
var validationResult = NumberUtils.validateIsBetweenFloat("Discount", value, 0, 100);
if (validationResult)
{
result.string(validationResult);
}
\ No newline at end of file
entity/Order_entity/entityfields/discount/onValueChange.js 0 → 100644
+ 5
− 0
View file @ 9dd0e2a0
import("system.neon");
import("system.vars");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon. OPERATINGSTATE_EDIT){
neon.setFieldValue("$field.DiscountChanged", "true");
}
\ No newline at end of file
entity/Order_entity/entityfields/discount/valueProcess.js 0 → 100644
+ 8
− 0
View file @ 9dd0e2a0
import("system.neon");
import("system.vars");
import("system.result");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.Discount_param")
&& vars.get("$param.Discount_param")){
result.string(vars.get("$param.Discount_param"));
}
\ No newline at end of file
entity/Order_entity/entityfields/discounted_net/displayValueProcess.js 0 → 100644
+ 6
− 0
View file @ 9dd0e2a0
import("Util_lib");
import("system.vars");
import("system.translate");
import("system.result");
result.string(NumberUtils.formatWithCurrency(vars.get("$field.DISCOUNTED_NET"), translate.text("#,##0.00"), vars.get("$field.CURRENCY")));
\ No newline at end of file
entity/Order_entity/entityfields/discounted_net/stateProcess.js 0 → 100644
+ 14
− 0
View file @ 9dd0e2a0
import("system.vars");
import("system.neon");
import("system.result");
var discount = vars.get("$field.DISCOUNT");
if(parseInt(discount) == 0 || !discount)
{
result.string(neon.COMPONENTSTATE_INVISIBLE);
}
else
{
result.string(neon.COMPONENTSTATE_READONLY);
}
\ No newline at end of file
entity/Order_entity/entityfields/discounted_vat/displayValueProcess.js 0 → 100644
+ 6
− 0
View file @ 9dd0e2a0
import("Util_lib");
import("system.vars");
import("system.translate");
import("system.result");
result.string(NumberUtils.formatWithCurrency(vars.get("$field.DISCOUNTED_VAT"), translate.text("#,##0.00"), vars.get("$field.CURRENCY")));
\ No newline at end of file
entity/Order_entity/entityfields/discounted_vat/stateProcess.js 0 → 100644
+ 14
− 0
View file @ 9dd0e2a0
import("system.vars");
import("system.neon");
import("system.result");
var discount = vars.get("$field.DISCOUNT");
if(parseInt(discount) == 0 || !discount)
{
result.string(neon.COMPONENTSTATE_INVISIBLE);
}
else
{
result.string(neon.COMPONENTSTATE_READONLY);
}
\ No newline at end of file
entity/Order_entity/entityfields/orderitems/children/discount_param/valueProcess.js 0 → 100644
+ 4
− 0
View file @ 9dd0e2a0
import("system.vars");
import("system.result");
result.string(vars.get("$field.DISCOUNT"));
\ No newline at end of file
entity/Order_entity/entityfields/totalgross/valueProcess.js
+ 4
− 3
View file @ 9dd0e2a0
......@@ -2,7 +2,8 @@ import("system.result");
import("system.vars");
import("system.eMath");
var netValue = vars.get("$field.NET");
var vatValue = vars.get("$field.VAT");
var discount = vars.get("$field.DISCOUNT");
var netValue = discount && parseInt(discount) != 0 ? vars.get("$field.DISCOUNTED_NET") : vars.get("$field.NET");
var vatValue = discount && parseInt(discount) != 0 ? vars.get("$field.DISCOUNTED_VAT") : vars.get("$field.VAT");
result.string( eMath.addDec(netValue, vatValue) );
\ No newline at end of file
result.string(eMath.addDec(netValue, vatValue));
\ No newline at end of file
entity/Order_entity/entityfields/transferdeliverynote/onActionProcess.js
+ 23
− 19
View file @ 9dd0e2a0
......@@ -4,23 +4,27 @@ import("Order_lib");
import("Keyword_lib");
import("KeywordRegistry_basic");
var contactId = vars.getString("$field.CONTACT_ID");
var currency = vars.getString("$field.CURRENCY");
var language = vars.getString("$field.ISOLANGUAGE");
var header = vars.getString("$field.HEADER");
var footer = vars.getString("$field.FOOTER");
var offerId = vars.getString("$field.OFFER_ID");
var deliveryTerm = vars.getString("$field.DELIVERYTERMS");
var paymentTerm = vars.getString("$field.PAYMENTTERMS");
var deliveryAddress = vars.getString("$field.DELIVERYADDRESS");
var paymentAddress = vars.getString("$field.PAYMENTADDRESS");
var rowId = vars.getString("$field.OBJECT_ROWID");
var objectType = vars.getString("$field.OBJECT_TYPE");
var dunningDate = vars.getString("$field.DUNNINGDATE");
var dunningLevel = vars.getString("$field.DUNNINGLEVEL");
var orderType= $KeywordRegistry.orderType$deliverynote();
var cancellation= vars.getString("$field.CANCELLATION");
var orderStatus=vars.getString("$field.ORDERSTATUS");
OrderUtils.copyOrder(offerId, contactId, orderType, language, currency, header, footer, deliveryTerm, paymentTerm, paymentAddress, deliveryAddress, objectType, rowId, dunningDate, dunningLevel, cancellation, orderStatus);
\ No newline at end of file
var orderId = vars.get("$field.SALESORDERID");
var fieldValues = {
contactId: vars.getString("$field.CONTACT_ID"),
currency: vars.getString("$field.CURRENCY"),
language: vars.getString("$field.ISOLANGUAGE"),
header: vars.getString("$field.HEADER"),
footer: vars.getString("$field.FOOTER"),
offerId: vars.getString("$field.OFFER_ID"),
deliveryTerm: vars.getString("$field.DELIVERYTERMS"),
paymentTerm: vars.getString("$field.PAYMENTTERMS"),
paymentAddress: vars.getString("$field.PAYMENTADDRESS"),
deliveryAddress: vars.getString("$field.DELIVERYADDRESS"),
objectRowId: vars.getString("$field.OBJECT_ROWID"),
objectType: vars.getString("$field.OBJECT_TYPE"),
dunningDate: vars.getString("$field.DUNNINGDATE"),
dunningLevel: vars.getString("$field.DUNNINGLEVEL"),
orderType: $KeywordRegistry.orderType$deliverynote(),
cancellation: vars.getString("$field.CANCELLATION"),
orderStatus:vars.getString("$field.ORDERSTATUS"),
discount:vars.getString("$field.DISCOUNT")
};
OrderUtils.copyOrder(orderId, fieldValues);
\ No newline at end of file
entity/Order_entity/entityfields/transferinvoice/onActionProcess.js
+ 23
− 18
View file @ 9dd0e2a0
......@@ -4,22 +4,27 @@ import("Order_lib");
import("Keyword_lib");
import("KeywordRegistry_basic");
var contactId = vars.getString("$field.CONTACT_ID");
var currency = vars.getString("$field.CURRENCY");
var language = vars.getString("$field.ISOLANGUAGE");
var header = vars.getString("$field.HEADER");
var footer = vars.getString("$field.FOOTER");
var offerId = vars.getString("$field.OFFER_ID");
var deliveryTerm = vars.getString("$field.DELIVERYTERMS");
var paymentTerm = vars.getString("$field.PAYMENTTERMS");
var deliveryAddress = vars.getString("$field.DELIVERYADDRESS");
var paymentAddress = vars.getString("$field.PAYMENTADDRESS");
var rowId = vars.getString("$field.OBJECT_ROWID");
var objectType = vars.getString("$field.OBJECT_TYPE");
var dunningDate = vars.getString("$field.DUNNINGDATE");
var dunningLevel = vars.getString("$field.DUNNINGLEVEL");
var orderType= $KeywordRegistry.orderType$invoice();
var cancellation= vars.getString("$field.CANCELLATION");
var orderStatus=vars.getString("$field.ORDERSTATUS");
OrderUtils.copyOrder(offerId, contactId, orderType, language, currency, header, footer, deliveryTerm, paymentTerm, paymentAddress, deliveryAddress, objectType, rowId, dunningDate, dunningLevel, cancellation, orderStatus);
\ No newline at end of file
var orderId = vars.get("$field.SALESORDERID");
var fieldValues = {
contactId: vars.getString("$field.CONTACT_ID"),
currency: vars.getString("$field.CURRENCY"),
language: vars.getString("$field.ISOLANGUAGE"),
header: vars.getString("$field.HEADER"),
footer: vars.getString("$field.FOOTER"),
offerId: vars.getString("$field.OFFER_ID"),
deliveryTerm: vars.getString("$field.DELIVERYTERMS"),
paymentTerm: vars.getString("$field.PAYMENTTERMS"),
paymentAddress: vars.getString("$field.PAYMENTADDRESS"),
deliveryAddress: vars.getString("$field.DELIVERYADDRESS"),
objectRowId: vars.getString("$field.OBJECT_ROWID"),
objectType: vars.getString("$field.OBJECT_TYPE"),
dunningDate: vars.getString("$field.DUNNINGDATE"),
dunningLevel: vars.getString("$field.DUNNINGLEVEL"),
orderType: $KeywordRegistry.orderType$invoice(),
cancellation: vars.getString("$field.CANCELLATION"),
orderStatus:vars.getString("$field.ORDERSTATUS"),
discount:vars.getString("$field.DISCOUNT")
};
OrderUtils.copyOrder(orderId, fieldValues);
\ No newline at end of file
entity/Order_entity/entityfields/vat/stateProcess.js 0 → 100644
+ 14
− 0
View file @ 9dd0e2a0
import("system.neon");
import("system.result");
import("system.vars");
var discount = vars.get("$field.DISCOUNT");
if(discount && parseInt(discount) != 0)
{
result.string(neon.COMPONENTSTATE_INVISIBLE);
}
else
{
result.string(neon.COMPONENTSTATE_READONLY);
}
\ No newline at end of file
entity/Order_entity/recordcontainers/db/onDBInsert.js
+ 6
− 2
View file @ 9dd0e2a0
import("Offer_lib");
import("Workflow_lib");
import("Order_lib");
import("system.neon");
import("system.vars");
//@TODO: OfferId_param is also set by 'copy order' -> the items of the offer are copied. What should happen?
var rowdata = vars.get("$local.rowdata");
if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
{
var discount = rowdata["OFFER.DISCOUNT"];
if (vars.get("$param.OfferId_param") || vars.get("$field.OFFER_ID"))
{
let offerId = vars.get("$param.OfferId_param") || vars.get("$field.OFFER_ID");
OrderUtils.copyOfferItemsToOrder(offerId, vars.get("$local.uid"));//copy the offerItems to the order
OrderUtils.copyOfferItemsToOrder(offerId, vars.get("$local.uid"), discount);
}
if (vars.exists("$param.SourceOrderId_param") && vars.get("$param.SourceOrderId_param"))
{
OrderUtils.copyOrderItems(vars.get("$param.SourceOrderId_param"), vars.get("$local.uid"));
OrderUtils.copyOrderItems(vars.get("$param.SourceOrderId_param"), vars.get("$local.uid"), discount);
}
}
WorkflowSignalSender.inserted();
\ No newline at end of file
entity/Order_entity/recordcontainers/db/onDBUpdate.js
+ 35
− 0
View file @ 9dd0e2a0
import("Order_lib");
import("system.entities");
import("system.vars");
import("Workflow_lib");
var rowdata = vars.get("$local.rowdata");
var oid = rowdata["SALESORDER.SALESORDERID"];
if(vars.get("$field.DiscountChanged") == "true" && oid){
var discount = rowdata["SALESORDER.DISCOUNT"];
var oiUtils = new OrderItemUtils(oid);
var vals = oiUtils.getNetAndVat();
var discountedVals = OrderItemUtils.getDiscountedNet(null, oid, discount);
let config = entities.createConfigForUpdatingRows();
config.entity("Order_entity");
if(discountedVals){
config.fieldValues({
"NET": vals[0],
"VAT": vals[1],
"DISCOUNTED_NET": discountedVals[0],
"DISCOUNTED_VAT": discountedVals[1]
});
}
else
{
config.fieldValues({
"NET": vals[0],
"VAT": vals[1]
});
}
config.uid(oid);
entities.updateRow(config);
}
WorkflowSignalSender.updated();
\ No newline at end of file
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