Skip to content
Snippets Groups Projects
Commit fd755bc4 authored by Sascha Schmidt's avatar Sascha Schmidt
Browse files

Merge branch '1057152_FixOrderRemoveOptional' into '2021.0' 

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

See merge request xrm/basic!660
parents 450d5d3c 5fad9863
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
.liquibase/Data_alias/basic/2021.0.1/changelog.xml 0 → 100644
+ 5
− 0
View file @ fd755bc4
<?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">
<include relativeToChangelogFile="true" file="update_SalesOrderItemRemoveOptional.xml"/>
</databaseChangeLog>
\ No newline at end of file
.liquibase/Data_alias/basic/2021.0.1/update_SalesOrderItemRemoveOptional.xml 0 → 100644
+ 10
− 0
View file @ fd755bc4
<?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="b.ulrich" id="2bbb96a8-077f-43de-af4c-e279d993fff8">
<dropColumn tableName="SALESORDERITEM">
<column name="OPTIONAL"/>
</dropColumn>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
.liquibase/Data_alias/basic/_demoData/generatedData/salesorderitem.xml
+ 0
− 20
View file @ fd755bc4
......@@ -7,7 +7,6 @@
<column name="GROUPCODEID" value="PRODUCTGROUP2 "/>
<column name="ITEMNAME" value="Klimaanlage 2-Zonen"/>
<column name="SALESORDER_ID" value="9069d098-7237-4fed-a365-ad2e60bf740f"/>
<column name="OPTIONAL" valueNumeric="0"/>
<column name="ITEMSORT" valueNumeric="2"/>
<column name="ITEMPOSITION" value="2"/>
<column name="UNIT" value="QUANTITYPIECES"/>
......@@ -21,7 +20,6 @@
<column name="GROUPCODEID" value="PRODUCTGROUP2 "/>
<column name="ITEMNAME" value="Turbolader"/>
<column name="SALESORDER_ID" value="4eb43698-a4e7-4617-8150-1b279dcce9f2"/>
<column name="OPTIONAL" valueNumeric="0"/>
<column name="ITEMSORT" valueNumeric="1"/>
<column name="ITEMPOSITION" value="1"/>
<column name="UNIT" value="QUANTITYPIECES"/>
......@@ -34,7 +32,6 @@
<column name="GROUPCODEID" value="PRODUCTGROUP2 "/>
<column name="ITEMNAME" value="Turbolader"/>
<column name="SALESORDER_ID" value="1b9bd530-f45b-4074-872f-b8362cfc5ed0"/>
<column name="OPTIONAL" valueNumeric="0"/>
<column name="ITEMSORT" valueNumeric="1"/>
<column name="ITEMPOSITION" value="1"/>
<column name="UNIT" value="QUANTITYPIECES"/>
......@@ -45,7 +42,6 @@
<insert tableName="salesorderitem">
<column name="QUANTITY" valueNumeric="1.00"/>
<column name="SALESORDER_ID" value="66f6ffc1-702a-4ebe-9158-6214884d658d"/>
<column name="OPTIONAL" valueNumeric="0"/>
<column name="ITEMSORT" valueNumeric="1"/>
<column name="ITEMPOSITION" value="1"/>
<column name="PRICE" valueNumeric="145000.00"/>
......@@ -58,7 +54,6 @@
<column name="ITEMNAME" value="AX45"/>
<column name="SALESORDER_ID" value="373f28a5-a812-433b-8196-a6bf8bdd5656"/>
<column name="VAT" valueNumeric="19.00"/>
<column name="OPTIONAL" valueNumeric="0"/>
<column name="ITEMSORT" valueNumeric="1"/>
<column name="ITEMPOSITION" value="1"/>
<column name="UNIT" value="QUANTITYPIECES"/>
......@@ -71,7 +66,6 @@
<column name="GROUPCODEID" value="PRODUCTGROUP2 "/>
<column name="ITEMNAME" value="Klimaanlage 4-Zonen"/>
<column name="SALESORDER_ID" value="4eb43698-a4e7-4617-8150-1b279dcce9f2"/>
<column name="OPTIONAL" valueNumeric="0"/>
<column name="ITEMSORT" valueNumeric="2"/>
<column name="ITEMPOSITION" value="2"/>
<column name="UNIT" value="QUANTITYPIECES"/>
......@@ -85,7 +79,6 @@
<column name="GROUPCODEID" value="PRODUCTGROUP1 "/>
<column name="ITEMNAME" value="Stahlträger Standard"/>
<column name="SALESORDER_ID" value="63a33308-4ae4-4de7-bd59-162f3677e819"/>
<column name="OPTIONAL" valueNumeric="0"/>
<column name="ITEMSORT" valueNumeric="2"/>
<column name="ITEMPOSITION" value="2"/>
<column name="UNIT" value="QUANTITYKGS"/>
......@@ -99,7 +92,6 @@
<column name="GROUPCODEID" value="PRODUCTGROUP2 "/>
<column name="ITEMNAME" value="Klimaanlage 4-Zonen"/>
<column name="SALESORDER_ID" value="1b9bd530-f45b-4074-872f-b8362cfc5ed0"/>
<column name="OPTIONAL" valueNumeric="0"/>
<column name="ITEMSORT" valueNumeric="2"/>
<column name="ITEMPOSITION" value="2"/>
<column name="UNIT" value="QUANTITYPIECES"/>
......@@ -113,7 +105,6 @@
<column name="GROUPCODEID" value="PRODUCTGROUP3 "/>
<column name="ITEMNAME" value="Standard Gerüst"/>
<column name="SALESORDER_ID" value="fc691949-4f61-485c-8e97-8f3d0d3d3962"/>
<column name="OPTIONAL" valueNumeric="0"/>
<column name="ITEMSORT" valueNumeric="2"/>
<column name="ITEMPOSITION" value="2"/>
<column name="UNIT" value="QUANTITYPIECES"/>
......@@ -127,7 +118,6 @@
<column name="ITEMNAME" value="Ersatzteil 3"/>
<column name="SALESORDER_ID" value="50c64e0f-6a21-4842-ab41-b27c70d0939a"/>
<column name="VAT" valueNumeric="19.00"/>
<column name="OPTIONAL" valueNumeric="0"/>
<column name="ITEMSORT" valueNumeric="1"/>
<column name="ITEMPOSITION" value="1"/>
<column name="UNIT" value="QUANTITYPIECES"/>
......@@ -141,7 +131,6 @@
<column name="ITEMNAME" value="AX45"/>
<column name="SALESORDER_ID" value="545ffd81-cfa5-4be6-b62c-df269909dcd4"/>
<column name="VAT" valueNumeric="19.00"/>
<column name="OPTIONAL" valueNumeric="0"/>
<column name="ITEMSORT" valueNumeric="1"/>
<column name="ITEMPOSITION" value="1"/>
<column name="UNIT" value="QUANTITYHOUR"/>
......@@ -155,7 +144,6 @@
<column name="ITEMNAME" value="AX45"/>
<column name="SALESORDER_ID" value="3ce30718-ecc6-4543-95c8-1b25e1b6db43"/>
<column name="VAT" valueNumeric="19.00"/>
<column name="OPTIONAL" valueNumeric="0"/>
<column name="ITEMSORT" valueNumeric="1"/>
<column name="ITEMPOSITION" value="1"/>
<column name="UNIT" value="QUANTITYPIECES"/>
......@@ -169,7 +157,6 @@
<column name="ITEMNAME" value="WG2 Proudkt 3"/>
<column name="SALESORDER_ID" value="5e082fe5-99d4-43be-aaad-e596f844fa8a"/>
<column name="VAT" valueNumeric="19.00"/>
<column name="OPTIONAL" valueNumeric="0"/>
<column name="ITEMSORT" valueNumeric="3"/>
<column name="ITEMPOSITION" value="3"/>
<column name="UNIT" value="QUANTITYPIECES"/>
......@@ -183,7 +170,6 @@
<column name="ITEMNAME" value="AX45"/>
<column name="SALESORDER_ID" value="4b0e2423-d09d-47fc-b274-5a9fde013b64"/>
<column name="VAT" valueNumeric="19.00"/>
<column name="OPTIONAL" valueNumeric="0"/>
<column name="ITEMSORT" valueNumeric="1"/>
<column name="ITEMPOSITION" value="1"/>
<column name="UNIT" value="QUANTITYPIECES"/>
......@@ -197,7 +183,6 @@
<column name="ITEMNAME" value="WG2 Produkt 5"/>
<column name="SALESORDER_ID" value="e40eb96e-1f1f-4afa-9bd3-f70eff9041c0"/>
<column name="VAT" valueNumeric="19.00"/>
<column name="OPTIONAL" valueNumeric="0"/>
<column name="ITEMSORT" valueNumeric="1"/>
<column name="ITEMPOSITION" value="1"/>
<column name="UNIT" value="QUANTITYPIECES"/>
......@@ -211,7 +196,6 @@
<column name="ITEMNAME" value="Förderanlage"/>
<column name="SALESORDER_ID" value="63a33308-4ae4-4de7-bd59-162f3677e819"/>
<column name="DISCOUNT" valueNumeric="5.00"/>
<column name="OPTIONAL" valueNumeric="0"/>
<column name="ITEMSORT" valueNumeric="1"/>
<column name="ITEMPOSITION" value="1"/>
<column name="UNIT" value="QUANTITYPIECES"/>
......@@ -224,7 +208,6 @@
<column name="GROUPCODEID" value="PRODUCTGROUP2 "/>
<column name="ITEMNAME" value="Bremsscheiben"/>
<column name="SALESORDER_ID" value="9069d098-7237-4fed-a365-ad2e60bf740f"/>
<column name="OPTIONAL" valueNumeric="0"/>
<column name="ITEMSORT" valueNumeric="1"/>
<column name="ITEMPOSITION" value="1"/>
<column name="UNIT" value="QUANTITYPIECES"/>
......@@ -237,7 +220,6 @@
<column name="GROUPCODEID" value="PRODUCTGROUP3 "/>
<column name="ITEMNAME" value="Gipsplatten"/>
<column name="SALESORDER_ID" value="fc691949-4f61-485c-8e97-8f3d0d3d3962"/>
<column name="OPTIONAL" valueNumeric="0"/>
<column name="ITEMSORT" valueNumeric="1"/>
<column name="ITEMPOSITION" value="1"/>
<column name="UNIT" value="QUANTITYPIECES"/>
......@@ -251,7 +233,6 @@
<column name="ITEMNAME" value="Service Einsatz"/>
<column name="SALESORDER_ID" value="5e082fe5-99d4-43be-aaad-e596f844fa8a"/>
<column name="VAT" valueNumeric="19.00"/>
<column name="OPTIONAL" valueNumeric="0"/>
<column name="ITEMSORT" valueNumeric="2"/>
<column name="ITEMPOSITION" value="2"/>
<column name="UNIT" value="QUANTITYHOUR"/>
......@@ -265,7 +246,6 @@
<column name="ITEMNAME" value="WG2 Produkt 4"/>
<column name="SALESORDER_ID" value="5e082fe5-99d4-43be-aaad-e596f844fa8a"/>
<column name="VAT" valueNumeric="19.00"/>
<column name="OPTIONAL" valueNumeric="0"/>
<column name="ITEMSORT" valueNumeric="1"/>
<column name="ITEMPOSITION" value="1"/>
<column name="UNIT" value="QUANTITYPIECES"/>
......
.liquibase/Data_alias/changelog.xml
+ 1
− 0
View file @ fd755bc4
......@@ -20,6 +20,7 @@
<include relativeToChangelogFile="true" file="basic/2020.2.2/changelog.xml"/>
<include relativeToChangelogFile="true" file="basic/2020.2.3/changelog.xml"/>
<include relativeToChangelogFile="true" file="basic/2021.0.0/changelog.xml"/>
<include relativeToChangelogFile="true" file="basic/2021.0.1/changelog.xml"/>
<!--enable this only when you definetly want to overwrite the existing data with demo records:-->
<!--<include relativeToChangelogFile="true" file="basic/_demoData/changelog.xml" context="example"/>-->
......
process/Neon_lib/process.js
+ 5
− 1
View file @ fd755bc4
......@@ -89,7 +89,11 @@ CopyModuleUtils.copyModule = function(pInputMapping)
var AliasDefinitionStructure = project.getAliasDefinitionStructure("Data_alias", null);
var ModulesMapping = {};
var statements = [];
if(pInputMapping["OFFERITEM"]["destinationModuleName"] == "SALESORDERITEM") //SalesOrder and Offer don't have the exact smae structure anymore: Order don't have the field "optional"
{
delete AliasDefinitionStructure["tables"]["OFFERITEM"]["columns"]["OPTIONAL"];
}
buildMapping( pInputMapping );
buildStatements( ModulesMapping );
......
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