diff --git a/.aditoprj/project.version b/.aditoprj/project.version
index a563311ba6cafa45e90c746c9a52d25332b14979..2a99306b4f55d45d587ab183bf39b2e7b85ed5a9 100644
--- a/.aditoprj/project.version
+++ b/.aditoprj/project.version
@@ -1,3 +1,3 @@
#This file is generated by ADITO designer. Do NOT delete or modify!
-#Thu Mar 05 10:21:32 CET 2020
+#Mon Mar 16 10:08:50 CET 2020
version=6.1.1
diff --git a/.liquibase/Data_alias/basic/2020.1.0/changeType_SALESORDER_PAID_UNPAID.xml b/.liquibase/Data_alias/basic/2020.1.0/changeType_SALESORDER_PAID_UNPAID.xml
new file mode 100644
index 0000000000000000000000000000000000000000..54b00a8c152c4312bbae398c9b4db76fafc70012
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.1.0/changeType_SALESORDER_PAID_UNPAID.xml
@@ -0,0 +1,24 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet dbms="derby" author="d.tran" id="34f73f03-86cf-4757-8b03-efb2e74b0762">
+ <sql>
+ ALTER TABLE SALESORDER ADD COLUMN UNPAID_NEW DECIMAL(14,2);
+ UPDATE SALESORDER SET UNPAID_NEW=UNPAID;
+ ALTER TABLE SALESORDER DROP COLUMN UNPAID;
+ RENAME COLUMN SALESORDER.UNPAID_NEW TO UNPAID;
+ ALTER TABLE SALESORDER ADD COLUMN PAID_NEW DECIMAL(14,2);
+ UPDATE SALESORDER SET PAID_NEW=PAID;
+ ALTER TABLE SALESORDER DROP COLUMN PAID;
+ RENAME COLUMN SALESORDER.PAID_NEW TO PAID;
+ </sql>
+ </changeSet>
+ <changeSet author="d.tran" id="917d172f-307e-4412-a648-78f03b019cce">
+ <preConditions onFail="CONTINUE">
+ <not>
+ <dbms type="derby" />
+ </not>
+ </preConditions>
+
+ <modifyDataType tableName="SALESORDER" columnName="PAID" newDataType="DECIMAL(14,2)"/>
+ </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.1.0/changelog.xml b/.liquibase/Data_alias/basic/2020.1.0/changelog.xml
index f28da066a3539dfca3b3329d53da58625ea702e9..675bcc89b29a99abd7ce610851264fe5a495c272 100644
--- a/.liquibase/Data_alias/basic/2020.1.0/changelog.xml
+++ b/.liquibase/Data_alias/basic/2020.1.0/changelog.xml
@@ -4,4 +4,5 @@
<include file="ExportTemplate/create_ExportTemplateTables.xml" relativeToChangelogFile="true"/>
<include file="PermissionCalendar/changelog.xml" relativeToChangelogFile="true"/>
<include file="DocumentTemplate/create_DocumentTemplatePlaceOfUse.xml" relativeToChangelogFile="true"/>
+ <include relativeToChangelogFile="true" file="changeType_SALESORDER_PAID_UNPAID.xml"/>
</databaseChangeLog>
diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod
index c548ee5a465ae768adeb04b944f0063984abe01a..d22879200e3fb2f39e5f517f034d975ac7d65180 100644
--- a/entity/Order_entity/Order_entity.aod
+++ b/entity/Order_entity/Order_entity.aod
@@ -450,6 +450,9 @@
<entityField>
<name>PAID</name>
<title>Paid</title>
+ <contentType>NUMBER</contentType>
+ <outputFormat>#,##0.00</outputFormat>
+ <inputFormat>#,##0.00</inputFormat>
<stateProcess>%aditoprj%/entity/Order_entity/entityfields/paid/stateProcess.js</stateProcess>
<displayValueProcess>%aditoprj%/entity/Order_entity/entityfields/paid/displayValueProcess.js</displayValueProcess>
</entityField>
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index c2da5c08ba04f1042e5a8e475639dd2a95ee6bd7..57cc63a297567e754eecef19f9d82d36ad04c50c 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -147,7 +147,7 @@
<title>Company</title>
<description>Important: This field should not be visible in the UI. Use ORGANISATION_CONTACTID instead!
-This field only calculates the Orgid from the ORGANISATION_CONTACTID to save it to the db correctly. all interactions should go through ORGANISATION_CONTACTID!!</description>
+ This field only calculates the Orgid from the ORGANISATION_CONTACTID to save it to the db correctly. all interactions should go through ORGANISATION_CONTACTID!!</description>
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/organisation_id/valueProcess.js</valueProcess>
</entityField>
<entityConsumer>
@@ -190,7 +190,7 @@ This field only calculates the Orgid from the ORGANISATION_CONTACTID to save it
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/communications/children/contactid_param/valueProcess.js</valueProcess>
<expose v="false" />
<description>This parameter is used for specifing a related &quot;CONTACTID&quot; to a COMMUNICATION-entry.
-Usually this is used for filtering COMMUNICATION-entries by a specified contact or creating a new entry that is related to a contact.</description>
+ Usually this is used for filtering COMMUNICATION-entries by a specified contact or creating a new entry that is related to a contact.</description>
</entityParameter>
<entityParameter>
<name>ShowDsgvoMessage_param</name>
@@ -400,7 +400,7 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/phonecommunications/children/contactid_param/valueProcess.js</valueProcess>
<expose v="false" />
<description>This parameter is used for specifing a related &quot;CONTACTID&quot; to a COMMUNICATION-entry.
-Usually this is used for filtering COMMUNICATION-entries by a specified contact or creating a new entry that is related to a contact.</description>
+ Usually this is used for filtering COMMUNICATION-entries by a specified contact or creating a new entry that is related to a contact.</description>
</entityParameter>
</children>
</entityConsumer>
@@ -418,7 +418,7 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/emailcommunications/children/contactid_param/valueProcess.js</valueProcess>
<expose v="false" />
<description>This parameter is used for specifing a related &quot;CONTACTID&quot; to a COMMUNICATION-entry.
-Usually this is used for filtering COMMUNICATION-entries by a specified contact or creating a new entry that is related to a contact.</description>
+ Usually this is used for filtering COMMUNICATION-entries by a specified contact or creating a new entry that is related to a contact.</description>
</entityParameter>
</children>
</entityConsumer>