Skip to content
Snippets Groups Projects
Commit 27800781 authored by Martin Groppe's avatar Martin Groppe
Browse files

Merge branch 'sales_1085045_AdvertisingFixes' into '2021.2.0' 

Sales 1085045 advertising fixes

See merge request xrm/basic!1204
parents 81aa6d7b 10a456af
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 378 additions and 129 deletions
.liquibase/Data_alias/basic/2021.1.3/Advertising/alter_AdvertisingAddDefaultColumns.xml 0 → 100644
+ 11
− 0
View file @ 27800781
<?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 author="b.ulrich" id="78759a5c-543a-499f-be89-ffafd7591017">
<addColumn tableName="ADVERTISING">
<column name="USER_NEW" type="NVARCHAR(50)"/>
</addColumn>
<addColumn tableName="ADVERTISING">
<column name="USER_EDIT" type="NVARCHAR(50)"/>
</addColumn>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
.liquibase/Data_alias/basic/2021.1.3/Advertising/alter_AdvertisingItemChangeItemPositionColumnType.xml 0 → 100644
+ 25
− 0
View file @ 27800781
<?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="b.ulrich" id="1840f738-884e-483d-9def-4ef138da5316">
<sql>
ALTER TABLE ADVERTISINGITEM ADD COLUMN ITEMPOSITION_NEW CHAR(10);
UPDATE ADVERTISINGITEM SET ITEMPOSITION_NEW=CAST ( ITEMPOSITION as CHAR(10));
ALTER TABLE ADVERTISINGITEM DROP COLUMN ITEMPOSITION;
RENAME COLUMN ADVERTISINGITEM.ITEMPOSITION_NEW TO ITEMPOSITION;
ALTER TABLE ADVERTISINGITEM ADD COLUMN ITEMPOSITION_NEW INTEGER;
UPDATE ADVERTISINGITEM SET ITEMPOSITION_NEW=CAST ( ITEMPOSITION as INTEGER);
ALTER TABLE ADVERTISINGITEM DROP COLUMN ITEMPOSITION;
RENAME COLUMN ADVERTISINGITEM.ITEMPOSITION_NEW TO ITEMPOSITION;
</sql>
</changeSet>
<changeSet author="b.ulrich" id="987b8d72-d739-4b56-9e1e-5c6f34421d24">
<preConditions onFail="CONTINUE">
<not>
<dbms type="derby" />
</not>
</preConditions>
<modifyDataType columnName="ITEMPOSITION" newDataType="INTEGER" tableName="ADVERTISINGITEM"/>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
.liquibase/Data_alias/basic/2021.1.3/Advertising/alter_AdvertisingItemDropColumns.xml 0 → 100644
+ 11
− 0
View file @ 27800781
<?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 author="b.ulrich" id="a720efc8-ac2e-45ef-a7a8-c068b42a6180">
<dropColumn tableName="ADVERTISINGITEM">
<column name="FREE"/>
</dropColumn>
<dropColumn tableName="ADVERTISINGITEM">
<column name="ACTUALAMOUNT"/>
</dropColumn>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
.liquibase/Data_alias/basic/2021.1.3/Advertising/alter_AdvertisingItemDropForeignKey.xml 0 → 100644
+ 6
− 0
View file @ 27800781
<?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 author="b.ulrich" id="e60115d8-79f7-46f3-ada0-0e2eb407f4ef">
<dropForeignKeyConstraint baseTableName="ADVERTISINGITEM" constraintName="FK_OFFERITEM_PRODUCT_ID"/>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
.liquibase/Data_alias/basic/2021.1.3/Advertising/alter_AdvertisingRenameRowId.xml 0 → 100644
+ 11
− 0
View file @ 27800781
<?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="9c2fff35-3dca-4881-9141-59d4bdd05b2a">
<renameColumn
columnDataType="CHAR(36)"
newColumnName="OBJECT_ROWID"
oldColumnName="ROW_ID"
tableName="ADVERTISING"/>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
.liquibase/Data_alias/basic/2021.1.3/Advertising/alter_productAdvertisingDatatype.xml 0 → 100644
+ 34
− 0
View file @ 27800781
<?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 author="b.ulrich" id="83e55d9f-2e47-4b71-89ca-f080e57d13b6">
<!--Add Column with correct datatype-->
<addColumn tableName="PRODUCT">
<column name="ADVERTISING_NEW" type="TINYINT"/>
</addColumn>
<!--Set Values accordingly-->
<update tableName="PRODUCT">
<column name="ADVERTISING_NEW" valueNumeric="1"></column>
<where>ADVERTISING = ?</where>
<whereParams>
<param name="ADVERTISING" value="Y"/>
</whereParams>
</update>
<update tableName="PRODUCT">
<column name="ADVERTISING_NEW" valueNumeric="0"></column>
<where>ADVERTISING = ?</where>
<whereParams>
<param name="ADVERTISING" value="N"/>
</whereParams>
</update>
<!--Drop old Column-->
<dropColumn tableName="PRODUCT">
<column name="ADVERTISING"/>
</dropColumn>
<!--Rename new Column-->
<renameColumn newColumnName="ADVERTISING" oldColumnName="ADVERTISING_NEW" columnDataType="TINYINT" tableName="PRODUCT"/>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
.liquibase/Data_alias/basic/2021.1.3/Advertising/changelog.xml 0 → 100644
+ 11
− 0
View file @ 27800781
<?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="alter_AdvertisingAddDefaultColumns.xml"/>
<include relativeToChangelogFile="true" file="alter_AdvertisingItemDropColumns.xml"/>
<include relativeToChangelogFile="true" file="alter_productAdvertisingDatatype.xml"/>
<include relativeToChangelogFile="true" file="alter_AdvertisingRenameRowId.xml"/>
<include relativeToChangelogFile="true" file="alter_AdvertisingItemDropForeignKey.xml"/>
<include relativeToChangelogFile="true" file="alter_AdvertisingItemChangeItemPositionColumnType.xml"/>
</databaseChangeLog>
\ No newline at end of file
.liquibase/Data_alias/basic/2021.1.3/changelog.xml
+ 1
− 0
View file @ 27800781
......@@ -3,6 +3,7 @@
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="defaultWeblinks/changelog.xml"/>
<include relativeToChangelogFile="true" file="Advertising/changelog.xml"/>
<include relativeToChangelogFile="true" file="Checklist/changelog.xml"/>
<include relativeToChangelogFile="true" file="Member/changelog.xml"/>
<include relativeToChangelogFile="true" file="Salesproject/changelog.xml"/>
......
.liquibase/Data_alias/basic/_demoData/generatedData/product.xml
+ 32
− 32
View file @ 27800781
......@@ -7,7 +7,7 @@
<column name="PRODUCTCODE" value="WG3_MD"/>
<column name="PRODUCTID" value="072680e3-9e5d-4228-b5a8-f4acef8f2452"/>
<column name="GROUPCODEID" value="PRODUCTGROUP3"/>
<column name="ADVERTISING" value="N"/>
<column name="ADVERTISING" valueNumeric="0"/>
<column name="USER_EDIT" value="Admin"/>
<column name="CONTACT_ID" value="449080f6-b714-4189-a261-37439d0d4010"/>
<column name="USER_NEW" value="Admin"/>
......@@ -21,7 +21,7 @@
<column name="PRODUCTCODE" value="WG1003"/>
<column name="PRODUCTID" value="155ac430-ccfc-4814-95fc-189631779064"/>
<column name="GROUPCODEID" value="PRODUCTGROUP1"/>
<column name="ADVERTISING" value="N"/>
<column name="ADVERTISING" valueNumeric="0"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
<column name="DATE_NEW" valueDate="2019-05-17T09:32:19"/>
......@@ -35,7 +35,7 @@
<column name="PRODUCTCODE" value="ET1002"/>
<column name="PRODUCTID" value="168c22e1-a196-4b99-b912-aac40d960b7e"/>
<column name="GROUPCODEID" value="PRODUCTSPARE"/>
<column name="ADVERTISING" value="N"/>
<column name="ADVERTISING" valueNumeric="0"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
<column name="DATE_NEW" valueDate="2021-06-29T01:09:01"/>
......@@ -48,7 +48,7 @@
<column name="PRODUCTCODE" value="S001"/>
<column name="PRODUCTID" value="239a4c58-5ae6-4aaa-aba3-7e40bf348ce2"/>
<column name="GROUPCODEID" value="PRODUCTSERVICE"/>
<column name="ADVERTISING" value="N"/>
<column name="ADVERTISING" valueNumeric="0"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
<column name="DATE_NEW" valueDate="2019-05-17T09:30:01"/>
......@@ -62,7 +62,7 @@
<column name="PRODUCTCODE" value="ET1003"/>
<column name="PRODUCTID" value="250f8317-228e-4b2a-8674-ffe2a79ad4a7"/>
<column name="GROUPCODEID" value="PRODUCTSPARE"/>
<column name="ADVERTISING" value="N"/>
<column name="ADVERTISING" valueNumeric="0"/>
<column name="USER_NEW" value="Admin"/>
<column name="DATE_NEW" valueDate="2021-06-29T01:14:02"/>
<column name="UNIT" value="QUANTITYPIECES"/>
......@@ -73,7 +73,7 @@
<column name="PRODUCTCODE" value="WG2003"/>
<column name="PRODUCTID" value="3d0086d3-f7fa-4328-bfc9-75cf37eb422c"/>
<column name="GROUPCODEID" value="PRODUCTGROUP2"/>
<column name="ADVERTISING" value="N"/>
<column name="ADVERTISING" valueNumeric="0"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
<column name="DATE_NEW" valueDate="2019-05-16T03:53:18"/>
......@@ -87,7 +87,7 @@
<column name="PRODUCTCODE" value="WG3_MA-C"/>
<column name="PRODUCTID" value="4004db3e-a63e-4b32-b7da-8c899996ddcd"/>
<column name="GROUPCODEID" value="PRODUCTGROUP3"/>
<column name="ADVERTISING" value="N"/>
<column name="ADVERTISING" valueNumeric="0"/>
<column name="USER_EDIT" value="Admin"/>
<column name="CONTACT_ID" value="449080f6-b714-4189-a261-37439d0d4010"/>
<column name="USER_NEW" value="Admin"/>
......@@ -101,7 +101,7 @@
<column name="PRODUCTCODE" value="WG3003-SL"/>
<column name="PRODUCTID" value="4203b3f3-e8d9-483e-a9f8-274a40f92074"/>
<column name="GROUPCODEID" value="PRODUCTGROUP3"/>
<column name="ADVERTISING" value="N"/>
<column name="ADVERTISING" valueNumeric="0"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
<column name="DATE_NEW" valueDate="2021-04-09T11:50:34"/>
......@@ -115,7 +115,7 @@
<column name="PRODUCTCODE" value="WG3_MB-C"/>
<column name="PRODUCTID" value="4775aed7-e165-495b-a147-7e3312b27d0b"/>
<column name="GROUPCODEID" value="PRODUCTGROUP3"/>
<column name="ADVERTISING" value="N"/>
<column name="ADVERTISING" valueNumeric="0"/>
<column name="USER_EDIT" value="Admin"/>
<column name="CONTACT_ID" value="449080f6-b714-4189-a261-37439d0d4010"/>
<column name="USER_NEW" value="Admin"/>
......@@ -129,7 +129,7 @@
<column name="PRODUCTCODE" value="WG1004"/>
<column name="PRODUCTID" value="488e25b2-0210-41bd-bfe6-4312a9e68a20"/>
<column name="GROUPCODEID" value="PRODUCTGROUP1"/>
<column name="ADVERTISING" value="N"/>
<column name="ADVERTISING" valueNumeric="0"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
<column name="DATE_NEW" valueDate="2021-04-09T11:11:18"/>
......@@ -143,7 +143,7 @@
<column name="PRODUCTCODE" value="WG3_MC-C"/>
<column name="PRODUCTID" value="4a234269-faab-474e-82e8-662e7600e1ea"/>
<column name="GROUPCODEID" value="PRODUCTGROUP3"/>
<column name="ADVERTISING" value="N"/>
<column name="ADVERTISING" valueNumeric="0"/>
<column name="USER_EDIT" value="Admin"/>
<column name="CONTACT_ID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
<column name="USER_NEW" value="Admin"/>
......@@ -157,7 +157,7 @@
<column name="PRODUCTCODE" value="WG2001"/>
<column name="PRODUCTID" value="535cec1a-e81c-4833-aad6-1d2348dbc0fb"/>
<column name="GROUPCODEID" value="PRODUCTGROUP2"/>
<column name="ADVERTISING" value="N"/>
<column name="ADVERTISING" valueNumeric="0"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
<column name="DATE_NEW" valueDate="2019-05-16T03:48:31"/>
......@@ -170,7 +170,7 @@
<column name="PRODUCTCODE" value="WG3001-SL"/>
<column name="PRODUCTID" value="59851fb8-e743-46bb-8df9-bc2789fd5b37"/>
<column name="GROUPCODEID" value="PRODUCTGROUP3"/>
<column name="ADVERTISING" value="N"/>
<column name="ADVERTISING" valueNumeric="0"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
<column name="DATE_NEW" valueDate="2021-04-09T11:44:53"/>
......@@ -183,7 +183,7 @@
<column name="PRODUCTCODE" value="WG2008"/>
<column name="PRODUCTID" value="6d1321d0-7777-4b6e-8a01-08b77ea3c5bf"/>
<column name="GROUPCODEID" value="PRODUCTGROUP2"/>
<column name="ADVERTISING" value="N"/>
<column name="ADVERTISING" valueNumeric="0"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
<column name="DATE_NEW" valueDate="2021-04-09T11:37:43"/>
......@@ -198,7 +198,7 @@
<column name="PRODUCTID" value="6e52e636-284d-454b-978c-8f58844c5c5b"/>
<column name="GROUPCODEID" value="PRODUCTSPARE"/>
<column name="MINSTOCK" valueNumeric="15"/>
<column name="ADVERTISING" value="N"/>
<column name="ADVERTISING" valueNumeric="0"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
<column name="DATE_NEW" valueDate="2019-05-13T03:16:36"/>
......@@ -212,7 +212,7 @@
<column name="PRODUCTCODE" value="ET1001"/>
<column name="PRODUCTID" value="7f9b1016-9a05-43d8-8b4b-e489f099ec64"/>
<column name="GROUPCODEID" value="PRODUCTSPARE"/>
<column name="ADVERTISING" value="N"/>
<column name="ADVERTISING" valueNumeric="0"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
<column name="DATE_NEW" valueDate="2021-06-29T01:03:56"/>
......@@ -225,7 +225,7 @@
<column name="PRODUCTCODE" value="WG2004"/>
<column name="PRODUCTID" value="805cd37f-d6c7-424b-99b0-b3de9ec89f7b"/>
<column name="GROUPCODEID" value="PRODUCTGROUP2"/>
<column name="ADVERTISING" value="N"/>
<column name="ADVERTISING" valueNumeric="0"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
<column name="DATE_NEW" valueDate="2019-05-17T09:23:33"/>
......@@ -238,7 +238,7 @@
<column name="PRODUCTCODE" value="WG2002"/>
<column name="PRODUCTID" value="80b77bce-5299-4c1d-bf41-5eca0add2f50"/>
<column name="GROUPCODEID" value="PRODUCTGROUP2"/>
<column name="ADVERTISING" value="N"/>
<column name="ADVERTISING" valueNumeric="0"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
<column name="DATE_NEW" valueDate="2019-05-16T03:49:51"/>
......@@ -251,7 +251,7 @@
<column name="PRODUCTCODE" value="WG2005"/>
<column name="PRODUCTID" value="895f8caf-8c91-4ba8-9619-44ea6366cbbb"/>
<column name="GROUPCODEID" value="PRODUCTGROUP2"/>
<column name="ADVERTISING" value="N"/>
<column name="ADVERTISING" valueNumeric="0"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
<column name="DATE_NEW" valueDate="2019-05-17T09:25:18"/>
......@@ -266,7 +266,7 @@
<column name="PRODUCTID" value="8cdbd2d8-70e2-4899-9ac6-3f0c3e28cab1"/>
<column name="GROUPCODEID" value="PRODUCTGROUP1"/>
<column name="MINSTOCK" valueNumeric="10"/>
<column name="ADVERTISING" value="N"/>
<column name="ADVERTISING" valueNumeric="0"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
<column name="DATE_NEW" valueDate="2019-05-16T03:43:25"/>
......@@ -280,7 +280,7 @@
<column name="PRODUCTCODE" value="WG3_MC-S"/>
<column name="PRODUCTID" value="993f6294-f1fc-42d2-8786-1c13274fd133"/>
<column name="GROUPCODEID" value="PRODUCTGROUP3"/>
<column name="ADVERTISING" value="N"/>
<column name="ADVERTISING" valueNumeric="0"/>
<column name="USER_EDIT" value="Admin"/>
<column name="CONTACT_ID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
<column name="USER_NEW" value="Admin"/>
......@@ -294,7 +294,7 @@
<column name="PRODUCTCODE" value="WG2006"/>
<column name="PRODUCTID" value="9eb8b4de-5eda-4b5c-a934-acd30a840cba"/>
<column name="GROUPCODEID" value="PRODUCTGROUP2"/>
<column name="ADVERTISING" value="N"/>
<column name="ADVERTISING" valueNumeric="0"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
<column name="DATE_NEW" valueDate="2021-04-09T11:28:11"/>
......@@ -309,7 +309,7 @@
<column name="PRODUCTID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
<column name="GROUPCODEID" value="PRODUCTSPARE"/>
<column name="MINSTOCK" valueNumeric="6"/>
<column name="ADVERTISING" value="N"/>
<column name="ADVERTISING" valueNumeric="0"/>
<column name="USER_EDIT" value="Admin"/>
<column name="CONTACT_ID" value="449080f6-b714-4189-a261-37439d0d4010"/>
<column name="USER_NEW" value="Admin"/>
......@@ -323,7 +323,7 @@
<column name="PRODUCTCODE" value="WG3002-SL"/>
<column name="PRODUCTID" value="acd4cbde-f55d-444b-b294-1c6fe8588000"/>
<column name="GROUPCODEID" value="PRODUCTGROUP3"/>
<column name="ADVERTISING" value="N"/>
<column name="ADVERTISING" valueNumeric="0"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
<column name="DATE_NEW" valueDate="2021-04-09T11:48:09"/>
......@@ -338,7 +338,7 @@
<column name="PRODUCTID" value="b973e3f9-277c-4787-96a0-7cac54472420"/>
<column name="GROUPCODEID" value="PRODUCTSPARE"/>
<column name="MINSTOCK" valueNumeric="10"/>
<column name="ADVERTISING" value="N"/>
<column name="ADVERTISING" valueNumeric="0"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
<column name="DATE_NEW" valueDate="2019-05-13T03:16:36"/>
......@@ -351,7 +351,7 @@
<column name="PRODUCTCODE" value="S002"/>
<column name="PRODUCTID" value="bb897bd1-244b-45cd-8a2f-f5a783cbbbff"/>
<column name="GROUPCODEID" value="PRODUCTSERVICE"/>
<column name="ADVERTISING" value="N"/>
<column name="ADVERTISING" valueNumeric="0"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
<column name="DATE_NEW" valueDate="2019-05-22T01:20:28"/>
......@@ -364,7 +364,7 @@
<column name="PRODUCTCODE" value="WG2007"/>
<column name="PRODUCTID" value="c08e32db-73ce-49a2-8306-860ac7081e77"/>
<column name="GROUPCODEID" value="PRODUCTGROUP2"/>
<column name="ADVERTISING" value="N"/>
<column name="ADVERTISING" valueNumeric="0"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
<column name="DATE_NEW" valueDate="2021-04-09T11:34:21"/>
......@@ -377,7 +377,7 @@
<column name="PRODUCTCODE" value="WG1002"/>
<column name="PRODUCTID" value="c8244502-73be-4ef7-9ef7-2b5ae95d3718"/>
<column name="GROUPCODEID" value="PRODUCTGROUP1"/>
<column name="ADVERTISING" value="N"/>
<column name="ADVERTISING" valueNumeric="0"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
<column name="DATE_NEW" valueDate="2019-05-17T09:34:44"/>
......@@ -391,7 +391,7 @@
<column name="PRODUCTCODE" value="WG3_MA-S"/>
<column name="PRODUCTID" value="c9f744bc-7903-4ec0-96f9-1df010ce1f37"/>
<column name="GROUPCODEID" value="PRODUCTGROUP3"/>
<column name="ADVERTISING" value="N"/>
<column name="ADVERTISING" valueNumeric="0"/>
<column name="USER_EDIT" value="Admin"/>
<column name="CONTACT_ID" value="449080f6-b714-4189-a261-37439d0d4010"/>
<column name="USER_NEW" value="Admin"/>
......@@ -406,7 +406,7 @@
<column name="PRODUCTCODE" value="WG3_MB-S"/>
<column name="PRODUCTID" value="e073ddc7-e3b8-4430-9e4f-12065106a624"/>
<column name="GROUPCODEID" value="PRODUCTGROUP3"/>
<column name="ADVERTISING" value="N"/>
<column name="ADVERTISING" valueNumeric="0"/>
<column name="USER_EDIT" value="Admin"/>
<column name="CONTACT_ID" value="449080f6-b714-4189-a261-37439d0d4010"/>
<column name="USER_NEW" value="Admin"/>
......@@ -422,7 +422,7 @@
<column name="PRODUCTID" value="f52b1d6e-bf08-4fe1-8d83-ac0728c4b1c4"/>
<column name="GROUPCODEID" value="PRODUCTSPARE"/>
<column name="MINSTOCK" valueNumeric="12"/>
<column name="ADVERTISING" value="N"/>
<column name="ADVERTISING" valueNumeric="0"/>
<column name="USER_EDIT" value="Admin"/>
<column name="CONTACT_ID" value="449080f6-b714-4189-a261-37439d0d4010"/>
<column name="USER_NEW" value="Admin"/>
......@@ -438,7 +438,7 @@
<column name="PRODUCTID" value="feefb3a9-f02a-4536-9ebb-ab7070cc71ba"/>
<column name="GROUPCODEID" value="PRODUCTSPARE"/>
<column name="MINSTOCK" valueNumeric="8"/>
<column name="ADVERTISING" value="N"/>
<column name="ADVERTISING" valueNumeric="0"/>
<column name="USER_EDIT" value="Admin"/>
<column name="CONTACT_ID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
<column name="USER_NEW" value="Admin"/>
......
aliasDefinition/Data_alias/Data_alias.aod
+ 145
− 63
View file @ 27800781
......@@ -21681,7 +21681,7 @@
<description></description>
<auditSyncConfig>
<name>auditSyncConfig</name>
<auditMode v="0" />
<auditMode v="2" />
<syncActive v="false" />
<syncComplete v="true" />
<syncDirection v="1" />
......@@ -21713,8 +21713,20 @@
<isUnique v="false" />
<index v="true" />
<documentation></documentation>
<title></title>
<title>Responsible</title>
<description></description>
<customProperties>
<customBooleanProperty>
<name>log</name>
<global v="false" />
<property v="true" />
</customBooleanProperty>
<customJDitoProperty>
<name>translate4Log</name>
<global v="false" />
<property>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/advertising/entityfields/responsible_id/customproperties/translate4log/property.js</property>
</customJDitoProperty>
</customProperties>
</entityFieldDb>
<entityFieldDb>
<name>CONTACT_ID</name>
......@@ -21727,8 +21739,20 @@
<isUnique v="false" />
<index v="true" />
<documentation></documentation>
<title></title>
<title>Contact</title>
<description></description>
<customProperties>
<customBooleanProperty>
<name>log</name>
<global v="false" />
<property v="true" />
</customBooleanProperty>
<customJDitoProperty>
<name>translate4log</name>
<global v="false" />
<property>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/advertising/entityfields/contact_id/customproperties/translate4log/property.js</property>
</customJDitoProperty>
</customProperties>
</entityFieldDb>
<entityFieldDb>
<name>OBJECT_TYPE</name>
......@@ -21745,21 +21769,28 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>ROW_ID</name>
<name>CURRENCY</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
<columnType v="12" />
<size v="36" />
<scale v="0" />
<notNull v="true" />
<notNull v="false" />
<isUnique v="false" />
<index v="true" />
<index v="false" />
<documentation></documentation>
<title></title>
<title>Currency</title>
<description></description>
<customProperties>
<customBooleanProperty>
<name>log</name>
<global v="false" />
<property v="true" />
</customBooleanProperty>
</customProperties>
</entityFieldDb>
<entityFieldDb>
<name>CURRENCY</name>
<name>STATUS</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
......@@ -21769,16 +21800,28 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<title>Status</title>
<description></description>
<customProperties>
<customBooleanProperty>
<name>log</name>
<global v="false" />
<property v="true" />
</customBooleanProperty>
<customStringProperty>
<name>keyword</name>
<global v="false" />
<property>advertisingStatus</property>
</customStringProperty>
</customProperties>
</entityFieldDb>
<entityFieldDb>
<name>STATUS</name>
<name>DATE_EDIT</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
<size v="36" />
<scale v="0" />
<columnType v="93" />
<size v="29" />
<scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
......@@ -21787,11 +21830,25 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>DATE_EDIT</name>
<name>DATE_NEW</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
<size v="19" />
<size v="29" />
<scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>USER_NEW</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
<size v="50" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
......@@ -21801,11 +21858,11 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>DATE_NEW</name>
<name>USER_EDIT</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
<size v="19" />
<columnType v="12" />
<size v="50" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
......@@ -21814,6 +21871,20 @@
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>OBJECT_ROWID</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
<index v="true" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
......@@ -21827,7 +21898,7 @@
<description></description>
<auditSyncConfig>
<name>auditSyncConfig</name>
<auditMode v="0" />
<auditMode v="2" />
<syncActive v="false" />
<syncComplete v="true" />
<syncDirection v="1" />
......@@ -21866,23 +21937,30 @@
<name>PRICE</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="3" />
<columnType v="2" />
<size v="14" />
<scale v="2" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<title>Price</title>
<description></description>
<customProperties>
<customBooleanProperty>
<name>log</name>
<global v="false" />
<property v="true" />
</customBooleanProperty>
</customProperties>
</entityFieldDb>
<entityFieldDb>
<name>DATE_EDIT</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
<size v="19" />
<scale v="0" />
<size v="29" />
<scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
......@@ -21894,29 +21972,43 @@
<name>QUANTITY</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="3" />
<columnType v="2" />
<size v="14" />
<scale v="2" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<title>Quantity</title>
<description></description>
<customProperties>
<customBooleanProperty>
<name>log</name>
<global v="false" />
<property v="true" />
</customBooleanProperty>
</customProperties>
</entityFieldDb>
<entityFieldDb>
<name>INFO</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="-1" />
<columnType v="2005" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<title>Info</title>
<description></description>
<customProperties>
<customBooleanProperty>
<name>log</name>
<global v="false" />
<property v="true" />
</customBooleanProperty>
</customProperties>
</entityFieldDb>
<entityFieldDb>
<name>PRODUCT_ID</name>
......@@ -21932,20 +22024,6 @@
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>FREE</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="-6" />
<size v="3" />
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>USER_EDIT</name>
<dbName></dbName>
......@@ -21971,22 +22049,40 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<title>delivery</title>
<description></description>
<customProperties>
<customBooleanProperty>
<name>log</name>
<global v="false" />
<property v="true" />
</customBooleanProperty>
<customStringProperty>
<name>keyword</name>
<global v="false" />
<property>KeywordDelivery</property>
</customStringProperty>
</customProperties>
</entityFieldDb>
<entityFieldDb>
<name>TARGETAMOUNT</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="3" />
<columnType v="2" />
<size v="14" />
<scale v="2" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<title>Target amount</title>
<description></description>
<customProperties>
<customBooleanProperty>
<name>log</name>
<global v="false" />
</customBooleanProperty>
</customProperties>
</entityFieldDb>
<entityFieldDb>
<name>ITEMPOSITION</name>
......@@ -22021,8 +22117,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
<size v="19" />
<scale v="0" />
<size v="29" />
<scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
......@@ -22044,26 +22140,12 @@
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>ACTUALAMOUNT</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="3" />
<size v="14" />
<scale v="2" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>SENT</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="-6" />
<size v="3" />
<columnType v="5" />
<size v="5" />
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
......
aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/advertising/entityfields/contact_id/customproperties/translate4log/property.js 0 → 100644
+ 9
− 0
View file @ 27800781
import("Contact_lib");
import("system.db");
import("system.result");
import("Loghistory_lib");
var params = Translate4LogParams.load();
var res = ContactUtils.getTitleByContactId(params.value);
result.string(res);
\ No newline at end of file
aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/advertising/entityfields/responsible_id/customproperties/translate4log/property.js 0 → 100644
+ 9
− 0
View file @ 27800781
import("Contact_lib");
import("system.db");
import("system.result");
import("Loghistory_lib");
var params = Translate4LogParams.load();
var res = ContactUtils.getTitleByContactId(params.value);
result.string(res);
\ No newline at end of file
entity/Activity_entity/Activity_entity.aod
+ 29
− 0
View file @ 27800781
......@@ -699,6 +699,10 @@
<name>ContactIds_param</name>
<valueProcess>%aditoprj%/entity/Activity_entity/entityfields/advertisinginformationconsumer/children/contactids_param/valueProcess.js</valueProcess>
</entityParameter>
<entityParameter>
<name>ObjectType_param</name>
<valueProcess>%aditoprj%/entity/Activity_entity/entityfields/advertisinginformationconsumer/children/objecttype_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
<entityParameter>
......@@ -738,6 +742,20 @@
</entityParameter>
</children>
</entityConsumer>
<entityField>
<name>advertising_id</name>
<title>Advertising material</title>
<linkedContext>Advertising</linkedContext>
<valueProcess>%aditoprj%/entity/Activity_entity/entityfields/advertising_id/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/Activity_entity/entityfields/advertising_id/displayValueProcess.js</displayValueProcess>
</entityField>
<entityConsumer>
<name>Objects</name>
<dependency>
<name>dependency</name>
<entityName>Object_entity</entityName>
</dependency>
</entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
......@@ -852,6 +870,17 @@
<expression>%aditoprj%/entity/Activity_entity/recordcontainers/db/recordfieldmappings/entryyear.value/expression.js</expression>
<isFilterable v="true" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>hasAdvertising.value</name>
<expression>%aditoprj%/entity/Activity_entity/recordcontainers/db/recordfieldmappings/hasadvertising.value/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>advertising_id.value</name>
<expression>%aditoprj%/entity/Activity_entity/recordcontainers/db/recordfieldmappings/advertising_id.value/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>advertising_id.displayValue</name>
</dbRecordFieldMapping>
</recordFieldMappings>
<linkInformation>
<linkInformation>
......
entity/Product_entity/entityfields/advertising/dropDownProcess.js → entity/Activity_entity/entityfields/advertising_id/displayValueProcess.js
+ 4
− 0
View file @ 27800781
import("system.translate");
import("system.result");
result.object([
["Y", translate.text("Yes")]
,["N", translate.text("No")]
]);
\ No newline at end of file
import("system.translate");
import("system.result");
result.string(translate.text("Advertising material"));
\ No newline at end of file
entity/Activity_entity/entityfields/advertising_id/valueProcess.js 0 → 100644
+ 8
− 0
View file @ 27800781
import("system.vars");
import("Sql_lib");
import("system.result");
result.string(newSelect("ADVERTISING.ADVERTISINGID")
.from("ADVERTISING")
.where("ADVERTISING.OBJECT_ROWID", vars.get("$field.ACTIVITYID"))
.cell());
\ No newline at end of file
entity/Activity_entity/entityfields/advertisinginformationconsumer/children/objecttype_param/valueProcess.js 0 → 100644
+ 3
− 0
View file @ 27800781
import("system.result");
result.string("Activity");
\ No newline at end of file
entity/Activity_entity/entityfields/advertisinginformationconsumer/stateProcess.js
+ 11
− 2
View file @ 27800781
import("Util_lib");
import("Sql_lib");
import("system.neon");
import("system.vars");
import("system.result");
result.string(Utils.toBoolean(vars.get("$field.hasAdvertising")) ? neon.COMPONENTSTATE_EDITABLE : neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
var count = new SqlBuilder().selectCount()
.from("ADVERTISING")
.where("ADVERTISING.OBJECT_ROWID", vars.get("$field.ACTIVITYID"))
.cell();
var state = neon.COMPONENTSTATE_INVISIBLE;
if(count == 1)
{
state = neon.COMPONENTSTATE_EDITABLE;
}
result.string(state);
\ No newline at end of file
entity/Activity_entity/entityfields/advertisingitems/stateProcess.js
+ 8
− 21
View file @ 27800781
import("Util_lib");
import("system.entities");
import("Sql_lib");
import("system.neon");
import("system.vars");
import("system.result");
import("KeywordRegistry_basic");
import("system.neon");
var count = new SqlBuilder().selectCount()
.from("ADVERTISING")
.where("ADVERTISING.OBJECT_ROWID", vars.get("$field.ACTIVITYID"))
.cell();
var state = neon.COMPONENTSTATE_INVISIBLE;
if(Utils.toBoolean(vars.get("$field.hasAdvertising")))
if(count == 1)
{
//only when there is a advertising we can load it
var conf = entities.createConfigForLoadingConsumerRows();
conf.consumer("AdvertisingInformationConsumer");
conf.fields(["STATUS"]);
var adv = entities.getRows(conf);
if(adv[0]["STATUS"] == $KeywordRegistry.advertisingStatus$Open())
{
state = neon.COMPONENTSTATE_EDITABLE;
}
else
{
state = neon.COMPONENTSTATE_READONLY;
}
state = neon.COMPONENTSTATE_EDITABLE;
}
result.string(state);
\ No newline at end of file
entity/Activity_entity/entityfields/hasadvertising/stateProcess.js
+ 2
− 2
View file @ 27800781
......@@ -4,11 +4,11 @@ import("system.vars");
var ret = neon.COMPONENTSTATE_INVISIBLE;
if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW )
if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
{
ret = neon.COMPONENTSTATE_EDITABLE;
}
else if(vars.get("$this.value") > 0)
else if(vars.get("$field.hasAdvertising") > 0)
{
ret = neon.COMPONENTSTATE_READONLY;
}
......
entity/Activity_entity/entityfields/hasadvertising/valueProcess.js
+ 8
− 9
View file @ 27800781
import("system.vars");
import("system.neon");
import("system.result");
import("system.entities");
import("system.neon");
import("system.vars");
import("Sql_lib");
if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
{
......@@ -13,10 +12,10 @@ if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
}
else if(vars.get("$field.ACTIVITYID"))
{
var conf = entities.createConfigForLoadingRows();
conf.entity("Advertising_entity");
conf.addParameter("RowId_param", vars.get("$field.ACTIVITYID"));
conf.fields(["ADVERTISINGID"]);
var count = new SqlBuilder().selectCount()
.from("ADVERTISING")
.where("ADVERTISING.OBJECT_ROWID", "ACTIVITY.ACTIVITYID")
.toString()
result.string( entities.getRowCount(conf));
result.string(count);
}
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