Something went wrong on our end
-
Johannes Hörmann authored# Conflicts: # entity/Activity_entity/Activity_entity.aod # entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmentname_param/code.js # entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmentrowid_param/code.js # entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmenttable_param/code.js # entity/Activity_entity/entityfields/activitymaindocument_dfo/children/keyword_param/code.js # entity/Activity_entity/entityfields/alldocuments/children/assignmentname_param/code.js # entity/Activity_entity/entityfields/alldocuments/children/assignmentrowid_param/code.js # entity/Activity_entity/entityfields/alldocuments/children/assignmenttable_param/code.js # entity/Activity_entity/entityfields/documents/children/assignmentname_param/code.js # entity/Activity_entity/entityfields/documents/children/assignmentrowid_param/code.js # entity/Activity_entity/entityfields/documents/children/assignmenttable_param/code.js # entity/Activity_entity/entityfields/maindocuments/children/keyword_param/code.js # entity/Address_entity/Address_entity.aod # entity/Address_entity/entityfields/orgaddresses/children/relationtype_param/code.js # entity/Address_entity/entityfields/organisationaddresses/children/relationtype_param/code.js # entity/Address_entity/entityfields/persaddresses/children/relationtype_param/code.js # entity/AttributeRelation_entity/AttributeRelation_entity.aod # entity/AttributeUsage_entity/AttributeUsage_entity.aod # entity/Attribute_entity/Attribute_entity.aod # entity/Communication_entity/Communication_entity.aod # entity/Contact_entity/Contact_entity.aod # entity/Contact_entity/entityfields/activities/children/objectid_param/code.js # entity/Contact_entity/entityfields/activities/children/rowid_param/code.js # entity/Contact_entity/entityfields/communications/children/relid_param/code.js # entity/Contact_entity/entityfields/contracts/children/relid_param/code.js # entity/Contact_entity/entityfields/documents/children/assignmentrowid_param/code.js # entity/Contact_entity/entityfields/documents/children/assignmenttable_param/code.js # entity/Contact_entity/entityfields/emailcommunications/children/relid_param/code.js # entity/Contact_entity/entityfields/objectrelation_dfo/children/anyobjectrowid_param/code.js # entity/Contact_entity/entityfields/objectrelation_dfo/children/anyobjecttype_param/code.js # entity/Contact_entity/entityfields/objectrelations/children/anyobjectrowid_param/code.js # entity/Contact_entity/entityfields/objectrelations/children/anyobjecttype_param/code.js # entity/Contact_entity/entityfields/orgaddresses/children/relid_param/code.js # entity/Contact_entity/entityfields/persactivity_dfo/children/objectid_param/code.js # entity/Contact_entity/entityfields/persactivity_dfo/children/rowid_param/code.js # entity/Contact_entity/entityfields/persaddress_dfo/children/defaultaddressid_param/code.js # entity/Contact_entity/entityfields/persaddress_dfo/children/relationtype_param/code.js # entity/Contact_entity/entityfields/persaddress_dfo/children/relid_param/code.js # entity/Contact_entity/entityfields/persaddresses/children/defaultaddressid_param/code.js # entity/Contact_entity/entityfields/persaddresses/children/relid_param/code.js # entity/Contact_entity/entityfields/perscomm_dfo/children/relid_param/code.js # entity/Contact_entity/entityfields/perscommemail_dfo/children/commcategory_param/code.js # entity/Contact_entity/entityfields/perscommemail_dfo/children/relid_param/code.js # entity/Contact_entity/entityfields/perscommphone_dfo/children/commcategory_param/code.js # entity/Contact_entity/entityfields/perscommphone_dfo/children/relid_param/code.js # entity/Contact_entity/entityfields/perscontract_dfo/children/relid_param/code.js # entity/Contact_entity/entityfields/persdocument_dfo/children/assignmentname_param/code.js # entity/Contact_entity/entityfields/persdocument_dfo/children/assignmentrowid_param/code.js # entity/Contact_entity/entityfields/persdocument_dfo/children/assignmenttable_param/code.js # entity/Contact_entity/entityfields/persorgsaddresses_dfo/children/relationtype_param/code.js # entity/Contact_entity/entityfields/persorgsaddresses_dfo/children/relid_param/code.js # entity/Contact_entity/entityfields/perspricelist_dfo/children/relid_param/code.js # entity/Contact_entity/entityfields/perspricelist_dfo/stateProcess.js # entity/Contact_entity/entityfields/phonecommunications/children/relid_param/code.js # entity/Contact_entity/entityfields/pricelists/children/relid_param/code.js # entity/Contact_entity/entityfields/pricelists/stateProcess.js # entity/Context_entity/Context_entity.aod # entity/Contract_entity/Contract_entity.aod # entity/Countries_Entity/Countries_Entity.aod # entity/Document_entity/Document_entity.aod # entity/Document_entity/entityfields/maindocuments/children/keyword_param/code.js # entity/Gender_keyword/Gender_keyword.aod # entity/Keyword_entity/entityfields/onlyactives/code.js # entity/ObjectRelation_entity/ObjectRelation_entity.aod # entity/Order_entity/entityfields/maindocuments/children/assignmentname_param/code.js # entity/Org_entity/entityfields/activities/children/objectid_param/code.js # entity/Org_entity/entityfields/activities/children/rowid_param/code.js # entity/Org_entity/entityfields/addresses/children/defaultaddressid_param/code.js # entity/Org_entity/entityfields/addresses/children/relationtype_param/code.js # entity/Org_entity/entityfields/addresses/children/relid_param/code.js # entity/Org_entity/entityfields/attributes/children/objectrowid_param/code.js # entity/Org_entity/entityfields/attributes/children/objecttype_param/code.js # entity/Org_entity/entityfields/communications/children/relid_param/code.js # entity/Org_entity/entityfields/contacts/children/orgid_param/code.js # entity/Org_entity/entityfields/contracts/children/relid_param/code.js # entity/Org_entity/entityfields/documents/children/assignmentname_param/code.js # entity/Org_entity/entityfields/documents/children/assignmentrowid_param/code.js # entity/Org_entity/entityfields/documents/children/assignmenttable_param/code.js # entity/Org_entity/entityfields/emailcommunications/children/relid_param/code.js # entity/Org_entity/entityfields/objectrelations/children/anyobjectrowid_param/code.js # entity/Org_entity/entityfields/objectrelations/children/anyobjecttype_param/code.js # entity/Org_entity/entityfields/phonecommunications/children/commcategory_param/code.js # entity/Org_entity/entityfields/phonecommunications/children/relid_param/code.js # entity/Org_entity/entityfields/productprices/children/relid_param/code.js # entity/Org_entity/entityfields/products/children/relationid_param/code.js # entity/Organisation_entity/Organisation_entity.aod # entity/Organisation_entity/entityfields/activities/children/objectid_param/code.js # entity/Organisation_entity/entityfields/addresses/children/defaultaddressid_param/code.js # entity/Organisation_entity/entityfields/addresses/children/relid_param/code.js # entity/Organisation_entity/entityfields/attributes/children/objectrowid_param/code.js # entity/Organisation_entity/entityfields/attributes/children/objecttype_param/code.js # entity/Organisation_entity/entityfields/communications/children/relid_param/code.js # entity/Organisation_entity/entityfields/contacts/children/orgid_param/code.js # entity/Organisation_entity/entityfields/contracts/children/relid_param/code.js # entity/Organisation_entity/entityfields/documents/children/assignmentname_param/code.js # entity/Organisation_entity/entityfields/documents/children/assignmentrowid_param/code.js # entity/Organisation_entity/entityfields/documents/children/assignmenttable_param/code.js # entity/Organisation_entity/entityfields/emailcommunications/children/relid_param/code.js # entity/Organisation_entity/entityfields/objectrelation_dfo/children/anyobjectrowid_param/code.js # entity/Organisation_entity/entityfields/objectrelation_dfo/children/anyobjecttype_param/code.js # entity/Organisation_entity/entityfields/objectrelations/children/anyobjectrowid_param/code.js # entity/Organisation_entity/entityfields/orgactivity_dfo/children/objectid_param/code.js # entity/Organisation_entity/entityfields/orgactivity_dfo/children/rowid_param/code.js # entity/Organisation_entity/entityfields/orgaddress_dfo/children/defaultaddressid_param/code.js # entity/Organisation_entity/entityfields/orgaddress_dfo/children/relationtype_param/code.js # entity/Organisation_entity/entityfields/orgaddress_dfo/children/relid_param/code.js # entity/Organisation_entity/entityfields/orgattr_dfo/children/objectrowid_param/code.js # entity/Organisation_entity/entityfields/orgcomm_dfo/children/relid_param/code.js # entity/Organisation_entity/entityfields/orgcommemail_dfo/children/commcategory_param/code.js # entity/Organisation_entity/entityfields/orgcommemail_dfo/children/relid_param/code.js # entity/Organisation_entity/entityfields/orgcommphone_dfo/children/commcategory_param/code.js # entity/Organisation_entity/entityfields/orgcommphone_dfo/children/relid_param/code.js # entity/Organisation_entity/entityfields/orgcontract_dfo/children/relid_param/code.js # entity/Organisation_entity/entityfields/orgdocument_dfo/children/assignmentname_param/code.js # entity/Organisation_entity/entityfields/orgdocument_dfo/children/assignmentrowid_param/code.js # entity/Organisation_entity/entityfields/orgdocument_dfo/children/assignmenttable_param/code.js # entity/Organisation_entity/entityfields/orgproduct_dfo/children/relationid_param/code.js # entity/Organisation_entity/entityfields/orgproductprice_dfo/children/relid_param/code.js # entity/Organisation_entity/entityfields/persorg_dfo/children/orgid_param/code.js # entity/Organisation_entity/entityfields/phonecommunications/children/relid_param/code.js # entity/Organisation_entity/entityfields/productprices/children/relid_param/code.js # entity/Pers_entity/entityfields/activities/children/objectid_param/code.js # entity/Pers_entity/entityfields/activities/children/rowid_param/code.js # entity/Pers_entity/entityfields/communications/children/relid_param/code.js # entity/Pers_entity/entityfields/contracts/children/relid_param/code.js # entity/Pers_entity/entityfields/documents/children/assignmentname_param/code.js # entity/Pers_entity/entityfields/documents/children/assignmentrowid_param/code.js # entity/Pers_entity/entityfields/documents/children/assignmenttable_param/code.js # entity/Pers_entity/entityfields/emailcommunications/children/relid_param/code.js # entity/Pers_entity/entityfields/objectrelations/children/anyobjectrowid_param/code.js # entity/Pers_entity/entityfields/orgaddresses/children/relationtype_param/code.js # entity/Pers_entity/entityfields/orgaddresses/children/relid_param/code.js # entity/Pers_entity/entityfields/persaddresses/children/defaultaddressid_param/code.js # entity/Pers_entity/entityfields/persaddresses/children/relationtype_param/code.js # entity/Pers_entity/entityfields/persaddresses/children/relid_param/code.js # entity/Pers_entity/entityfields/phonecommunications/children/relid_param/code.js # entity/Pers_entity/entityfields/pricelists/stateProcess.js # entity/Product_entity/Product_entity.aod # entity/Productprice_entity/Productprice_entity.aod # entity/Relation_entity/Relation_entity.aod # entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod # entity/Salesproject_entity/Salesproject_entity.aod # entity/Salesproject_entity/entityfields/objectrelations/children/anyobjecttype_param/code.js # entity/Turnover_entity/Turnover_entity.aod # neonView/ActivityMain_view/ActivityMain_view.aod # neonView/ContactEdit_view/ContactEdit_view.aod # neonView/ContactPreview_view/ContactPreview_view.aod # neonView/OrganisationEdit_view/OrganisationEdit_view.aod # neonView/OrganisationMain_view/OrganisationMain_view.aod # neonView/OrganisationPreview_view/OrganisationPreview_view.aod # others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_activityDirection.xml
Johannes Hörmann authored# Conflicts: # entity/Activity_entity/Activity_entity.aod # entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmentname_param/code.js # entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmentrowid_param/code.js # entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmenttable_param/code.js # entity/Activity_entity/entityfields/activitymaindocument_dfo/children/keyword_param/code.js # entity/Activity_entity/entityfields/alldocuments/children/assignmentname_param/code.js # entity/Activity_entity/entityfields/alldocuments/children/assignmentrowid_param/code.js # entity/Activity_entity/entityfields/alldocuments/children/assignmenttable_param/code.js # entity/Activity_entity/entityfields/documents/children/assignmentname_param/code.js # entity/Activity_entity/entityfields/documents/children/assignmentrowid_param/code.js # entity/Activity_entity/entityfields/documents/children/assignmenttable_param/code.js # entity/Activity_entity/entityfields/maindocuments/children/keyword_param/code.js # entity/Address_entity/Address_entity.aod # entity/Address_entity/entityfields/orgaddresses/children/relationtype_param/code.js # entity/Address_entity/entityfields/organisationaddresses/children/relationtype_param/code.js # entity/Address_entity/entityfields/persaddresses/children/relationtype_param/code.js # entity/AttributeRelation_entity/AttributeRelation_entity.aod # entity/AttributeUsage_entity/AttributeUsage_entity.aod # entity/Attribute_entity/Attribute_entity.aod # entity/Communication_entity/Communication_entity.aod # entity/Contact_entity/Contact_entity.aod # entity/Contact_entity/entityfields/activities/children/objectid_param/code.js # entity/Contact_entity/entityfields/activities/children/rowid_param/code.js # entity/Contact_entity/entityfields/communications/children/relid_param/code.js # entity/Contact_entity/entityfields/contracts/children/relid_param/code.js # entity/Contact_entity/entityfields/documents/children/assignmentrowid_param/code.js # entity/Contact_entity/entityfields/documents/children/assignmenttable_param/code.js # entity/Contact_entity/entityfields/emailcommunications/children/relid_param/code.js # entity/Contact_entity/entityfields/objectrelation_dfo/children/anyobjectrowid_param/code.js # entity/Contact_entity/entityfields/objectrelation_dfo/children/anyobjecttype_param/code.js # entity/Contact_entity/entityfields/objectrelations/children/anyobjectrowid_param/code.js # entity/Contact_entity/entityfields/objectrelations/children/anyobjecttype_param/code.js # entity/Contact_entity/entityfields/orgaddresses/children/relid_param/code.js # entity/Contact_entity/entityfields/persactivity_dfo/children/objectid_param/code.js # entity/Contact_entity/entityfields/persactivity_dfo/children/rowid_param/code.js # entity/Contact_entity/entityfields/persaddress_dfo/children/defaultaddressid_param/code.js # entity/Contact_entity/entityfields/persaddress_dfo/children/relationtype_param/code.js # entity/Contact_entity/entityfields/persaddress_dfo/children/relid_param/code.js # entity/Contact_entity/entityfields/persaddresses/children/defaultaddressid_param/code.js # entity/Contact_entity/entityfields/persaddresses/children/relid_param/code.js # entity/Contact_entity/entityfields/perscomm_dfo/children/relid_param/code.js # entity/Contact_entity/entityfields/perscommemail_dfo/children/commcategory_param/code.js # entity/Contact_entity/entityfields/perscommemail_dfo/children/relid_param/code.js # entity/Contact_entity/entityfields/perscommphone_dfo/children/commcategory_param/code.js # entity/Contact_entity/entityfields/perscommphone_dfo/children/relid_param/code.js # entity/Contact_entity/entityfields/perscontract_dfo/children/relid_param/code.js # entity/Contact_entity/entityfields/persdocument_dfo/children/assignmentname_param/code.js # entity/Contact_entity/entityfields/persdocument_dfo/children/assignmentrowid_param/code.js # entity/Contact_entity/entityfields/persdocument_dfo/children/assignmenttable_param/code.js # entity/Contact_entity/entityfields/persorgsaddresses_dfo/children/relationtype_param/code.js # entity/Contact_entity/entityfields/persorgsaddresses_dfo/children/relid_param/code.js # entity/Contact_entity/entityfields/perspricelist_dfo/children/relid_param/code.js # entity/Contact_entity/entityfields/perspricelist_dfo/stateProcess.js # entity/Contact_entity/entityfields/phonecommunications/children/relid_param/code.js # entity/Contact_entity/entityfields/pricelists/children/relid_param/code.js # entity/Contact_entity/entityfields/pricelists/stateProcess.js # entity/Context_entity/Context_entity.aod # entity/Contract_entity/Contract_entity.aod # entity/Countries_Entity/Countries_Entity.aod # entity/Document_entity/Document_entity.aod # entity/Document_entity/entityfields/maindocuments/children/keyword_param/code.js # entity/Gender_keyword/Gender_keyword.aod # entity/Keyword_entity/entityfields/onlyactives/code.js # entity/ObjectRelation_entity/ObjectRelation_entity.aod # entity/Order_entity/entityfields/maindocuments/children/assignmentname_param/code.js # entity/Org_entity/entityfields/activities/children/objectid_param/code.js # entity/Org_entity/entityfields/activities/children/rowid_param/code.js # entity/Org_entity/entityfields/addresses/children/defaultaddressid_param/code.js # entity/Org_entity/entityfields/addresses/children/relationtype_param/code.js # entity/Org_entity/entityfields/addresses/children/relid_param/code.js # entity/Org_entity/entityfields/attributes/children/objectrowid_param/code.js # entity/Org_entity/entityfields/attributes/children/objecttype_param/code.js # entity/Org_entity/entityfields/communications/children/relid_param/code.js # entity/Org_entity/entityfields/contacts/children/orgid_param/code.js # entity/Org_entity/entityfields/contracts/children/relid_param/code.js # entity/Org_entity/entityfields/documents/children/assignmentname_param/code.js # entity/Org_entity/entityfields/documents/children/assignmentrowid_param/code.js # entity/Org_entity/entityfields/documents/children/assignmenttable_param/code.js # entity/Org_entity/entityfields/emailcommunications/children/relid_param/code.js # entity/Org_entity/entityfields/objectrelations/children/anyobjectrowid_param/code.js # entity/Org_entity/entityfields/objectrelations/children/anyobjecttype_param/code.js # entity/Org_entity/entityfields/phonecommunications/children/commcategory_param/code.js # entity/Org_entity/entityfields/phonecommunications/children/relid_param/code.js # entity/Org_entity/entityfields/productprices/children/relid_param/code.js # entity/Org_entity/entityfields/products/children/relationid_param/code.js # entity/Organisation_entity/Organisation_entity.aod # entity/Organisation_entity/entityfields/activities/children/objectid_param/code.js # entity/Organisation_entity/entityfields/addresses/children/defaultaddressid_param/code.js # entity/Organisation_entity/entityfields/addresses/children/relid_param/code.js # entity/Organisation_entity/entityfields/attributes/children/objectrowid_param/code.js # entity/Organisation_entity/entityfields/attributes/children/objecttype_param/code.js # entity/Organisation_entity/entityfields/communications/children/relid_param/code.js # entity/Organisation_entity/entityfields/contacts/children/orgid_param/code.js # entity/Organisation_entity/entityfields/contracts/children/relid_param/code.js # entity/Organisation_entity/entityfields/documents/children/assignmentname_param/code.js # entity/Organisation_entity/entityfields/documents/children/assignmentrowid_param/code.js # entity/Organisation_entity/entityfields/documents/children/assignmenttable_param/code.js # entity/Organisation_entity/entityfields/emailcommunications/children/relid_param/code.js # entity/Organisation_entity/entityfields/objectrelation_dfo/children/anyobjectrowid_param/code.js # entity/Organisation_entity/entityfields/objectrelation_dfo/children/anyobjecttype_param/code.js # entity/Organisation_entity/entityfields/objectrelations/children/anyobjectrowid_param/code.js # entity/Organisation_entity/entityfields/orgactivity_dfo/children/objectid_param/code.js # entity/Organisation_entity/entityfields/orgactivity_dfo/children/rowid_param/code.js # entity/Organisation_entity/entityfields/orgaddress_dfo/children/defaultaddressid_param/code.js # entity/Organisation_entity/entityfields/orgaddress_dfo/children/relationtype_param/code.js # entity/Organisation_entity/entityfields/orgaddress_dfo/children/relid_param/code.js # entity/Organisation_entity/entityfields/orgattr_dfo/children/objectrowid_param/code.js # entity/Organisation_entity/entityfields/orgcomm_dfo/children/relid_param/code.js # entity/Organisation_entity/entityfields/orgcommemail_dfo/children/commcategory_param/code.js # entity/Organisation_entity/entityfields/orgcommemail_dfo/children/relid_param/code.js # entity/Organisation_entity/entityfields/orgcommphone_dfo/children/commcategory_param/code.js # entity/Organisation_entity/entityfields/orgcommphone_dfo/children/relid_param/code.js # entity/Organisation_entity/entityfields/orgcontract_dfo/children/relid_param/code.js # entity/Organisation_entity/entityfields/orgdocument_dfo/children/assignmentname_param/code.js # entity/Organisation_entity/entityfields/orgdocument_dfo/children/assignmentrowid_param/code.js # entity/Organisation_entity/entityfields/orgdocument_dfo/children/assignmenttable_param/code.js # entity/Organisation_entity/entityfields/orgproduct_dfo/children/relationid_param/code.js # entity/Organisation_entity/entityfields/orgproductprice_dfo/children/relid_param/code.js # entity/Organisation_entity/entityfields/persorg_dfo/children/orgid_param/code.js # entity/Organisation_entity/entityfields/phonecommunications/children/relid_param/code.js # entity/Organisation_entity/entityfields/productprices/children/relid_param/code.js # entity/Pers_entity/entityfields/activities/children/objectid_param/code.js # entity/Pers_entity/entityfields/activities/children/rowid_param/code.js # entity/Pers_entity/entityfields/communications/children/relid_param/code.js # entity/Pers_entity/entityfields/contracts/children/relid_param/code.js # entity/Pers_entity/entityfields/documents/children/assignmentname_param/code.js # entity/Pers_entity/entityfields/documents/children/assignmentrowid_param/code.js # entity/Pers_entity/entityfields/documents/children/assignmenttable_param/code.js # entity/Pers_entity/entityfields/emailcommunications/children/relid_param/code.js # entity/Pers_entity/entityfields/objectrelations/children/anyobjectrowid_param/code.js # entity/Pers_entity/entityfields/orgaddresses/children/relationtype_param/code.js # entity/Pers_entity/entityfields/orgaddresses/children/relid_param/code.js # entity/Pers_entity/entityfields/persaddresses/children/defaultaddressid_param/code.js # entity/Pers_entity/entityfields/persaddresses/children/relationtype_param/code.js # entity/Pers_entity/entityfields/persaddresses/children/relid_param/code.js # entity/Pers_entity/entityfields/phonecommunications/children/relid_param/code.js # entity/Pers_entity/entityfields/pricelists/stateProcess.js # entity/Product_entity/Product_entity.aod # entity/Productprice_entity/Productprice_entity.aod # entity/Relation_entity/Relation_entity.aod # entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod # entity/Salesproject_entity/Salesproject_entity.aod # entity/Salesproject_entity/entityfields/objectrelations/children/anyobjecttype_param/code.js # entity/Turnover_entity/Turnover_entity.aod # neonView/ActivityMain_view/ActivityMain_view.aod # neonView/ContactEdit_view/ContactEdit_view.aod # neonView/ContactPreview_view/ContactPreview_view.aod # neonView/OrganisationEdit_view/OrganisationEdit_view.aod # neonView/OrganisationMain_view/OrganisationMain_view.aod # neonView/OrganisationPreview_view/OrganisationPreview_view.aod # others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_activityDirection.xml
project.version 113 B
#This file is generated by ADITO designer. Do NOT delete or modify!
#Tue Feb 05 08:37:18 CET 2019
version=5.1.8