Skip to content
Snippets Groups Projects
Commit c2ac0d7e authored by Andreas Schindlbeck's avatar Andreas Schindlbeck
Browse files

Merge branch 'master' of gitlab.adito.de:xrm/basic

parents 0febc14a 3787ccfd
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 755 additions and 415 deletions
entity/Stock_entity/Stock_entity.aod
+ 1
− 1
View file @ c2ac0d7e
<?xml version="1.0" encoding="UTF-8"?>
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.3" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.0.3">
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.0.4">
<name>Stock_entity</name>
<title>Stock</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
......
language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+ 69
− 0
View file @ c2ac0d7e
......@@ -696,6 +696,75 @@
<entry>
<key>New offer verison</key>
</entry>
<entry>
<key>ISO3 Code</key>
</entry>
<entry>
<key>zusagen</key>
</entry>
<entry>
<key>EU Member</key>
</entry>
<entry>
<key>Zip exists</key>
</entry>
<entry>
<key>ISO2 Code</key>
</entry>
<entry>
<key>Sum</key>
</entry>
<entry>
<key>absagen</key>
</entry>
<entry>
<key>Option4</key>
</entry>
<entry>
<key>Option3</key>
</entry>
<entry>
<key>Option2</key>
</entry>
<entry>
<key>Option1</key>
</entry>
<entry>
<key>Countries</key>
</entry>
<entry>
<key>Euro zone</key>
</entry>
<entry>
<key>NAME</key>
</entry>
<entry>
<key>Options</key>
</entry>
<entry>
<key>Country code</key>
</entry>
<entry>
<key>Country Code</key>
</entry>
<entry>
<key>PO-box name</key>
</entry>
<entry>
<key>Adress format</key>
</entry>
<entry>
<key>vielleicht</key>
</entry>
<entry>
<key>Administration</key>
</entry>
<entry>
<key>Flag</key>
</entry>
<entry>
<key>Total gross</key>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
<sqlModels>
......
language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+ 71
− 0
View file @ c2ac0d7e
......@@ -909,6 +909,77 @@
<key>New offer verison</key>
<value>Neue Angebotsversion</value>
</entry>
<entry>
<key>ISO3 Code</key>
</entry>
<entry>
<key>zusagen</key>
</entry>
<entry>
<key>EU Member</key>
</entry>
<entry>
<key>Zip exists</key>
</entry>
<entry>
<key>ISO2 Code</key>
</entry>
<entry>
<key>Sum</key>
<value>Summe</value>
</entry>
<entry>
<key>absagen</key>
</entry>
<entry>
<key>Option4</key>
</entry>
<entry>
<key>Option3</key>
</entry>
<entry>
<key>Option2</key>
</entry>
<entry>
<key>Option1</key>
</entry>
<entry>
<key>Countries</key>
</entry>
<entry>
<key>Euro zone</key>
</entry>
<entry>
<key>NAME</key>
</entry>
<entry>
<key>Options</key>
</entry>
<entry>
<key>Country code</key>
</entry>
<entry>
<key>Country Code</key>
</entry>
<entry>
<key>PO-box name</key>
</entry>
<entry>
<key>Adress format</key>
</entry>
<entry>
<key>vielleicht</key>
</entry>
<entry>
<key>Administration</key>
</entry>
<entry>
<key>Flag</key>
</entry>
<entry>
<key>Total gross</key>
<value>Betrag brutto</value>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+ 69
− 0
View file @ c2ac0d7e
......@@ -704,6 +704,75 @@
<entry>
<key>New offer verison</key>
</entry>
<entry>
<key>ISO3 Code</key>
</entry>
<entry>
<key>zusagen</key>
</entry>
<entry>
<key>EU Member</key>
</entry>
<entry>
<key>Zip exists</key>
</entry>
<entry>
<key>ISO2 Code</key>
</entry>
<entry>
<key>Sum</key>
</entry>
<entry>
<key>absagen</key>
</entry>
<entry>
<key>Option4</key>
</entry>
<entry>
<key>Option3</key>
</entry>
<entry>
<key>Option2</key>
</entry>
<entry>
<key>Option1</key>
</entry>
<entry>
<key>Countries</key>
</entry>
<entry>
<key>Euro zone</key>
</entry>
<entry>
<key>NAME</key>
</entry>
<entry>
<key>Options</key>
</entry>
<entry>
<key>Country code</key>
</entry>
<entry>
<key>Country Code</key>
</entry>
<entry>
<key>PO-box name</key>
</entry>
<entry>
<key>Adress format</key>
</entry>
<entry>
<key>vielleicht</key>
</entry>
<entry>
<key>Administration</key>
</entry>
<entry>
<key>Flag</key>
</entry>
<entry>
<key>Total gross</key>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
neonContext/Offeritem_context/Offeritem_context.aod
+ 3
− 0
View file @ c2ac0d7e
<?xml version="1.0" encoding="UTF-8"?>
<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.0.0">
<name>Offeritem_context</name>
<title>Offeritem</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<filterview>OfferitemFilter_view</filterview>
<preview>OfferitemPreview_view</preview>
<entity>Offeritem_entity</entity>
<references>
<neonViewReference>
......
neonView/OfferPreview_view/OfferPreview_view.aod
+ 10
− 2
View file @ c2ac0d7e
......@@ -11,7 +11,7 @@
<cardViewTemplate>
<name>OfferHeader_template</name>
<iconField>IMAGE</iconField>
<titleField>OFFERCODE</titleField>
<titleField>PreviewTitle</titleField>
<descriptionField>RELATION_ID</descriptionField>
<entityField>#ENTITY</entityField>
</cardViewTemplate>
......@@ -33,13 +33,17 @@
<entityField>LANGUAGE</entityField>
</entityFieldLink>
<entityFieldLink>
<name>9e876b07-3029-42fe-a1e7-5c19b845e50d</name>
<name>4843f0f0-4ee8-47c2-bc0f-99241bad4c51</name>
<entityField>NET</entityField>
</entityFieldLink>
<entityFieldLink>
<name>cd72899a-69b2-4fe2-bf58-4fb9f594324e</name>
<entityField>VAT</entityField>
</entityFieldLink>
<entityFieldLink>
<name>10d8f38b-1e01-45a1-bc57-424284bf87be</name>
<entityField>TotalGross</entityField>
</entityFieldLink>
<entityFieldLink>
<name>16d38881-d3d3-4c4d-9f23-39d60eadce8d</name>
<entityField>CURRENCY</entityField>
......@@ -52,6 +56,10 @@
<name>3317b73e-68e8-41a8-a678-89c7c7c8513e</name>
<entityField>SALESPROJECT_ID</entityField>
</entityFieldLink>
<entityFieldLink>
<name>683e3a86-0f9f-4b40-85c0-ae102a5a4a9a</name>
<entityField>HEADER</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
</children>
......
neonView/OfferitemFilter_view/OfferitemFilter_view.aod
+ 2
− 1
View file @ c2ac0d7e
......@@ -10,6 +10,7 @@
<children>
<tableViewTemplate>
<name>OfferitemFilter_table</name>
<autoNewRow v="true" />
<entityField>#ENTITY</entityField>
<columns>
<neonTableColumn>
......@@ -18,7 +19,7 @@
</neonTableColumn>
<neonTableColumn>
<name>545f79bf-2fee-4112-9541-0889d0e514eb</name>
<entityField>ITEMNAME</entityField>
<entityField>PRODUCT_ID</entityField>
</neonTableColumn>
<neonTableColumn>
<name>2a907da4-b48d-4933-bc17-a40e7d4556f9</name>
......
neonView/OfferitemPreview_view/OfferitemPreview_view.aod
+ 21
− 0
View file @ c2ac0d7e
......@@ -10,8 +10,29 @@
<children>
<cardViewTemplate>
<name>OfferitemPreview_header</name>
<iconField>IMAGE</iconField>
<titleField>ITEMNAME</titleField>
<descriptionField>DESCRIPTION</descriptionField>
<entityField>#ENTITY</entityField>
</cardViewTemplate>
<genericViewTemplate>
<name>Offeritem_generic</name>
<showDrawer v="true" />
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
<name>9868560c-41c7-4641-b0f1-627a61b796b3</name>
<entityField>TotalPrice</entityField>
</entityFieldLink>
<entityFieldLink>
<name>c0c04d1c-90a7-4c0b-9323-1f0783757987</name>
<entityField>GROUPCODEID</entityField>
</entityFieldLink>
<entityFieldLink>
<name>e25386dc-a740-4f93-a1f0-32317cf5a36a</name>
<entityField>OPTIONAL</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
</children>
</neonView>
neonView/OrgPreview_view/OrgPreview_view.aod
+ 62
− 52
View file @ c2ac0d7e
<?xml version="1.0" encoding="UTF-8"?>
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.0">
<name>OrgPreview_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<boxLayout>
<name>layout</name>
</boxLayout>
</layout>
<children>
<cardViewTemplate>
<name>BasicCard_template</name>
<iconField>IMAGE</iconField>
<titleField>NAME</titleField>
<descriptionField>CUSTOMERCODE_DISPLAY_fieldGroup</descriptionField>
<entityField>#ENTITY</entityField>
</cardViewTemplate>
<neonViewReference>
<name>df605bb6-5d18-4233-abc0-1da82e4910ca</name>
<entityField>OrgAddress_dfo</entityField>
<view>AddressList_view</view>
</neonViewReference>
<neonViewReference>
<name>7fbd6034-4213-41f9-bb0d-c73d55b88d82</name>
<entityField>OrgComm_dfo</entityField>
<view>CommList_view</view>
</neonViewReference>
<genericViewTemplate>
<name>OrgInfo_template</name>
<showDrawer v="true" />
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
<name>4bad7219-1a3a-4e6e-ae5a-533d3acb6845</name>
<entityField>LANGUAGE</entityField>
</entityFieldLink>
<entityFieldLink>
<name>5a397737-2768-4e16-8c58-890b8a26b4a2</name>
<entityField>STATUS</entityField>
</entityFieldLink>
<entityFieldLink>
<name>89e9aa74-1568-4f74-b42a-a02b13752802</name>
<entityField>TYPE</entityField>
</entityFieldLink>
<entityFieldLink>
<name>180e8467-4eb2-4f89-a59f-ff76b8810925</name>
<entityField>INFO</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
</children>
</neonView>
<?xml version="1.0" encoding="UTF-8"?>
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.0">
<name>OrgPreview_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<boxLayout>
<name>layout</name>
</boxLayout>
</layout>
<children>
<cardViewTemplate>
<name>BasicCard_template</name>
<iconField>IMAGE</iconField>
<titleField>NAME</titleField>
<descriptionField>CUSTOMERCODE_DISPLAY_fieldGroup</descriptionField>
<entityField>#ENTITY</entityField>
</cardViewTemplate>
<neonViewReference>
<name>df605bb6-5d18-4233-abc0-1da82e4910ca</name>
<entityField>OrgAddress_dfo</entityField>
<view>AddressList_view</view>
</neonViewReference>
<genericViewTemplate>
<name>OrgInfo_template</name>
<showDrawer v="true" />
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
<name>4bad7219-1a3a-4e6e-ae5a-533d3acb6845</name>
<entityField>LANGUAGE</entityField>
</entityFieldLink>
<entityFieldLink>
<name>5a397737-2768-4e16-8c58-890b8a26b4a2</name>
<entityField>STATUS</entityField>
</entityFieldLink>
<entityFieldLink>
<name>89e9aa74-1568-4f74-b42a-a02b13752802</name>
<entityField>TYPE</entityField>
</entityFieldLink>
<entityFieldLink>
<name>180e8467-4eb2-4f89-a59f-ff76b8810925</name>
<entityField>INFO</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
<neonViewReference>
<name>7b3f1253-f671-4cf4-83ec-81e229910014</name>
<entityField>OrgCommEmail_dfo</entityField>
<view>CommList_view</view>
</neonViewReference>
<neonViewReference>
<name>23f420cb-fd45-433f-b385-55a49e98744f</name>
<entityField>OrgCommPhone_dfo</entityField>
<view>CommList_view</view>
</neonViewReference>
<neonViewReference>
<name>c45d71cf-b81f-4d75-876d-7f9c26b1eb12</name>
<entityField>OrgCommOthers_dfo</entityField>
<view>CommList_view</view>
</neonViewReference>
</children>
</neonView>
neonView/PersEdit_view/PersEdit_view.aod
+ 4
− 0
View file @ c2ac0d7e
......@@ -48,6 +48,10 @@
<name>74de507e-75e0-4957-a4fb-7070fa3c5a4a</name>
<entityField>DATEOFBIRTH</entityField>
</entityFieldLink>
<entityFieldLink>
<name>d8d04e36-de46-48a3-994a-fa72d1f2ea89</name>
<entityField>LANGUAGE</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
<neonViewReference>
......
neonView/PersFilter_view/PersFilter_view.aod
+ 3
− 0
View file @ c2ac0d7e
......@@ -29,6 +29,9 @@
<children>
<tableViewTemplate>
<name>PersFilter_template</name>
<favoriteActionGroup1>MyActions</favoriteActionGroup1>
<favoriteActionGroup2>ServusGruppe</favoriteActionGroup2>
<favoriteActionGroup3>HalloGruppe</favoriteActionGroup3>
<showHeader v="true" />
<entityField>#ENTITY</entityField>
<columns>
......
neonView/PersPreview_view/PersPreview_view.aod
+ 4
− 0
View file @ c2ac0d7e
......@@ -66,6 +66,10 @@
<name>5d4e0828-b7fe-4f54-a47a-f9b5838fb1ae</name>
<entityField>DATEOFBIRTH</entityField>
</entityFieldLink>
<entityFieldLink>
<name>3aa3e89b-91ce-4607-8d76-53ee309a688f</name>
<entityField>LANGUAGE</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
</children>
......
neonView/ProductpriceFilter_view/ProductpriceFilter_view.aod
+ 1
− 1
View file @ c2ac0d7e
......@@ -20,7 +20,7 @@
</neonTableColumn>
<neonTableColumn>
<name>695ce7be-d738-48a9-833d-e8815c6eff74</name>
<entityField>Pricelist_Relation</entityField>
<entityField>PRICELIST</entityField>
</neonTableColumn>
<neonTableColumn>
<name>472a96ca-10ff-49c7-b2ae-6550e04c4e6f</name>
......
neonView/ProductpriceRelation_view/ProductpriceRelation_view.aod
+ 4
− 4
View file @ c2ac0d7e
......@@ -18,10 +18,6 @@
<name>bc7ca35e-c454-4cc0-9b2e-0656e03f1f65</name>
<entityField>IMAGE</entityField>
</neonTableColumn>
<neonTableColumn>
<name>0b2271ca-f55f-4339-b63f-f6f95d1d18e6</name>
<entityField>PRODUCT_GROUPCODEID</entityField>
</neonTableColumn>
<neonTableColumn>
<name>9b809450-cbe5-40f3-8d64-b4a5bac5eb5b</name>
<entityField>PRODUCT_ID</entityField>
......@@ -46,6 +42,10 @@
<name>20efd64c-297d-4774-b020-437d3610e798</name>
<entityField>CURRENCY</entityField>
</neonTableColumn>
<neonTableColumn>
<name>787d2cce-ddb0-4d7e-8df4-5675e0d96d76</name>
<entityField>VAT</entityField>
</neonTableColumn>
</columns>
</tableViewTemplate>
</children>
......
others/db_changes/masterChangelog.xml
+ 1
− 1
View file @ c2ac0d7e
<?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">
<include file="struct/Create_Pers.xml"/>
<include file="struct/create_pers.xml"/>
<include file="struct/create_org.xml"/>
<include file="struct/create_history.xml"/>
<include file="struct/1022526_orgChange.xml"/>
......
others/db_changes/struct/create_org.xml
+ 3
− 1
View file @ c2ac0d7e
......@@ -2,7 +2,9 @@
<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="j.goderbauer" id="1528803466364-1">
<createTable tableName="ORG">
<column name="NAME" type="NVARCHAR(255)"/>
<column name="NAME" type="NVARCHAR(255)">
<constraints nullable="false"/>
</column>
<column name="INFO" type="NCLOB"/>
<column name="TYPE" type="SMALLINT"/>
<column name="CUSTOMERCODE" type="VARCHAR(30)"/>
......
others/db_changes/struct/Create_Pers.xml → others/db_changes/struct/create_pers.xml
+ 3
− 1
View file @ c2ac0d7e
......@@ -12,7 +12,9 @@
<column name="USER_NEW" type="VARCHAR(50)"/>
<column name="FIRSTNAME" type="VARCHAR(50)"/>
<column name="MIDDLENAME" type="VARCHAR(50)"/>
<column name="LASTNAME" type="VARChAR(50)"/>
<column name="LASTNAME" type="VARCHAR(50)">
<constraints nullable="false"/>
</column>
<column name="GENDER" type="VARCHAR(50)"/>
<column name="SALUTATION" type="VARCHAR(16)"/>
<column name="TITLE" type="VARCHAR(50)"/>
......
process/Comm_lib/Comm_lib.aod 0 → 100644
+ 6
− 0
View file @ c2ac0d7e
<?xml version="1.0" encoding="UTF-8"?>
<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.7" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.1.7">
<name>Comm_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/Comm_lib/process.js</process>
</process>
process/Comm_lib/process.js 0 → 100644
+ 65
− 0
View file @ c2ac0d7e
import("system.translate");
import("system.net");
import("system.mail");
import("system.cti");
/**
* provides somehow static methods for validation of communication data
* do not create an instance of this
*/
function CommValidationUtil(){
}
/**
* creates a function depending on a given COMM-category (like PHONE, EMAIL, etc.) or null if no validation-function was defined for the given category
* @param {string} commCategory category that determines which function shall be created, e.g. "EMAIL"
* @return {function} function that receives the following arguments:
* <br/> - commAddress
* <br/> - extensions
* <br/>the function has to return null if everything is OK or a value with details if validation failed
*/
CommValidationUtil.makeValidationFn = function (commCategory){
var callbackFn;
switch (commCategory) {
case "EMAIL":
callbackFn = function (addrValue){
// if (!mail.isValidMailAddress(addrValue)) //TODO: enable JDito-methods
// return translate.text("no valid mail-address format");
return null;
}
break;
case "LINK":
callbackFn = function (addrValue){
// if (!net.isValidUrl(addrValue, ["http", "https"]))//TODO: enable JDito-methods
// return translate.text("no valid format");
return null;
}
break;
case "TELEPHONE":
callbackFn = function (addrValue, ext){
var country = null;
if (addrValue[0] != "+") //if the number starts with a country-identifier (e.g. +49) no country needs to be specified
country = ext.countryCode;
// if (!cti.isValidPhoneNumber(addrValue, country))//TODO: enable JDito-methods
// return translate.text("no valid phone number");
return null;
}
break;
default:
callbackFn = null;
break;
}
return callbackFn;
}
/**
* returns a blueprint for validation extensions; these extensions are needed for validating comm data and can be passed to other functions
* @return {object} a object with properties that have a specific default value; normally you want to overwrite that value
*/
CommValidationUtil.getExtensionsBlueprint = function(){
return {
countryCode: null
};
}
process/Keyword_lib/process.js
+ 353
− 351
View file @ c2ac0d7e
This diff is collapsed.
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