merge fixes

process/KeywordRegistry_basic/process.js

@@ -21,22 +21,26 @@ $KeywordRegistry._autoPad = function(pKey){return pKey + " ".repeat(Math.max(0,
 $KeywordRegistry.attributeType = function(){return "AttributeType";};
 $KeywordRegistry.keywordAttributeType = function(){return "KeywordAttributeType";};
 $KeywordRegistry.contractPayment = function(){return "ContractPayment";};
+
 $KeywordRegistry.contractStatus = function(){return "ContractStatus";};
 $KeywordRegistry.contractState$validLimited = function(){return "CONTRACTSTATVALIDLI                 ";};
 $KeywordRegistry.contractState$validUnlimited = function(){return "CONTRACTSTATVALIDUNLI               ";};
 $KeywordRegistry.contractState$notSigned = function(){return "CONTRACTSTATSIGN                    ";};
+
 $KeywordRegistry.contractType = function(){return "ContractType";};
 
 $KeywordRegistry.activityDirection = function(){return "ActivityDirection";};
-$KeywordRegistry.activityDirection$incoming = function(){return "i";};
-$KeywordRegistry.activityDirection$outgoing = function(){return "o";};
 $KeywordRegistry.activityDirection$incoming = function(){return $KeywordRegistry._autoPad("i");};
 $KeywordRegistry.activityDirection$outgoing = function(){return $KeywordRegistry._autoPad("o");};
-$KeywordRegistry.contactStatus$active = function(){return "CONTACTSTATACTIVE";};
 
+$KeywordRegistry.contactStatus = function(){return "ContactStatus";};
 $KeywordRegistry.contactStatus$active = function(){return $KeywordRegistry._autoPad("CONTACTSTATACTIVE");};
+
+$KeywordRegistry.currency = function(){return "Currency";};
 $KeywordRegistry.currency$eur = function(){return "EUR                                 ";};
+
 $KeywordRegistry.productGroupcode = function(){return "ProductGroupcode";};
+
 $KeywordRegistry.offerStatus = function(){return "OfferStatus";};
 $KeywordRegistry.offerStatus$open = function(){return "OFFERSTATOPEN                       ";};
 $KeywordRegistry.offerStatus$checked = function(){return "OFFERSTATCHECK                      ";};
@@ -71,24 +75,27 @@ $KeywordRegistry.productPricelist$standardList = function(){return "PRICELISTDEF
 
 $KeywordRegistry.quantityUnit = function(){return "QuantityUnit";};
 $KeywordRegistry.quantityUnit$pieces = function(){return "QUANTITYPIECES";};
+
 $KeywordRegistry.MemberRole = function(){return "MemberRole";};
 $KeywordRegistry.salesprojectSource = function(){return "SalesprojectSource";};
 $KeywordRegistry.salesorderState = function(){return "SalesorderState";};
 $KeywordRegistry.salesprojectWonLost = function(){return "SalesprojectWonLost";};
 $KeywordRegistry.stockWarehouse = function(){return "StockWarehouse";};
 $KeywordRegistry.salesprojectProbability = function(){return "SalesprojectProbability";};
+
 $KeywordRegistry.activityCategory = function(){return "ActivityCategory";};
+$KeywordRegistry.activityCategory$mail = function(){return "MAIL                                ";};
 
 $KeywordRegistry.addressType = function(){return "AddressType";};
 $KeywordRegistry.addressType$private = function(){return "HOMEADDR";};
 $KeywordRegistry.addressType$office = function(){return "OFFICEADDR";};
 
 $KeywordRegistry.offerProbability = function(){return "OfferProbability";};
-$KeywordRegistry.activityCategory$mail = function(){return "MAIL                                ";};
 $KeywordRegistry.communicationMedium = function(){return "CommunicationMedium";};
 $KeywordRegistry.salesprojectPricePolitics = function(){return "SalesprojectPricePolitics";};
 $KeywordRegistry.salesprojectWeakness = function(){return "SalesprojectWeakness";};
 $KeywordRegistry.salesprojectStrenght = function(){return "SalesprojectStrenght";};
+
 $KeywordRegistry.salesprojectState = function(){return "SalesprojectState";};
 $KeywordRegistry.salesprojectState$open = function(){return "SALPROJSTATOPEN                     ";};
 $KeywordRegistry.salesprojectState$postponed = function(){return "SALPROJSTATPOSTPONED                ";};
@@ -96,15 +103,19 @@ $KeywordRegistry.salesprojectState$aborted = function(){return "SALPROJSTATABORT
 $KeywordRegistry.salesprojectState$partialOrder = function(){return "SALPROJSTATPARTIAL                  ";};
 $KeywordRegistry.salesprojectState$order = function(){return "SALPROJSTATORDER                    ";};
 $KeywordRegistry.salesprojectState$lost = function(){return "SALPROJSTATLOST                     ";};
+
 $KeywordRegistry.salesprojectPhase = function(){return "SalesprojectPhase";};
 $KeywordRegistry.salesprojectPhase$nqc = function(){return "SALPROJPHASENQC                     ";};
+
 $KeywordRegistry.taskPriority = function(){return "TaskPriority";};
 $KeywordRegistry.taskPriority$none = function(){return "TASKPRIONONE                        ";};
 $KeywordRegistry.taskPriority$low = function(){return "TASKPRIOLOW                         ";};
 $KeywordRegistry.taskPriority$medium = function(){return "TASKPRIOMEDIUM                      ";};
 $KeywordRegistry.taskPriority$high = function(){return "TASKPRIOHIGH                        ";};
+
 $KeywordRegistry.taskProgress = function(){return "TaskProgress";};
 $KeywordRegistry.taskProgress$0 = function(){return "TASKPROG0                           ";};
+
 $KeywordRegistry.CompetitionState = function(){return "CompetitionState";};
 $KeywordRegistry.objectRelationType = function(){return "ObjectRelationType";};
 $KeywordRegistry.deliveryTerm = function(){return "DeliveryTerm";};
@@ -112,42 +123,52 @@ $KeywordRegistry.paymentTerm = function(){return "PaymentTerm";};
 $KeywordRegistry.contactDepartment = function(){return "ContactDepartment";};
 $KeywordRegistry.contactPosition = function(){return "ContactPosition";};
 $KeywordRegistry.contactContactrole = function(){return "ContactContactrole";};
+
 $KeywordRegistry.campaignState = function(){return "CampaignManagementStates";};
 $KeywordRegistry.campaignState$planning = function(){return "PLANNING                            ";};
 $KeywordRegistry.campaignState$approved = function(){return "APPROVED                            ";};
+
 $KeywordRegistry.campaignStepState = function(){return "CampaignManagementStepStates";};
 $KeywordRegistry.campaignStepState$open = function(){return "OPEN                                ";};
+
 $KeywordRegistry.campaignStepCostCategory = function(){return "CampaignManagementCostCategory";};
+
 $KeywordRegistry.documentTemplateType = function(){return "DocumentTemplateType";};
 $KeywordRegistry.documentTemplateType$letter = function(){return "LET                                 ";};
 $KeywordRegistry.documentTemplateType$mail = function(){return "MAI                                 ";};
 $KeywordRegistry.documentTemplateType$attachment = function(){return "ATT                                 ";};
+
 $KeywordRegistry.documentTemplateTypeCategory = function(){return "DocumentTemplateTypeCategory";};
 $KeywordRegistry.documentTemplateTypeCategory$single = function(){return "1                                   ";};
 $KeywordRegistry.documentTemplateTypeCategory$serial = function(){return "2                                   ";};
+
 $KeywordRegistry.classificationType = function(){return "ClassificationType";};
 $KeywordRegistry.classificationType$salesproject = function(){return "SALESPROJ";};
+
 $KeywordRegistry.personGender = function(){return "PersonGender";};
 $KeywordRegistry.personGender$other = function(){return "o";};
+
 $KeywordRegistry.permissionCondType = function(){return "PermissionCondType";};
 $KeywordRegistry.permissionAccessType = function(){return "PermissionAccessType";};
 $KeywordRegistry.DSGVOPurpose = function(){return "DSGVOPurpose";};
 $KeywordRegistry.DSGVOStatuoritysource = function(){return "DSGVOStatuoritysource";};
+
 $KeywordRegistry.DSGVOType = function() {return "DSGVOType";};
 $KeywordRegistry.DSGVOType$birth = function() {return "TYPE_BIRTH                          ";};
+
 $KeywordRegistry.DSGVOTransmission = function() {return "DSGVOTransmission";};
 $KeywordRegistry.DSGVOTransmission$none = function() {return   "DSGVONONE                           ";};
 $KeywordRegistry.DSGVOTransmission$inland = function() {return "DSGVOINLAND                         ";};
-$KeywordRegistry.DSGVOTransmission$
-foreign = function() {return "DSGVOFOREIGN                        ";};
+$KeywordRegistry.DSGVOTransmission$foreign = function() {return "DSGVOFOREIGN                        ";};
+
 $KeywordRegistry.DSGVODeadline = function() {return "DSGVODeadline";};
 $KeywordRegistry.DSGVODeadline$onTime = function() {return "DSGVOONTIME                         ";};
 $KeywordRegistry.DSGVODeadline$complex = function() {return "DSGVODEADLINECOMPLEX                ";};
-$KeywordRegistry.DSGVODeadlin$KeywordRegistry.DSGVOGuarantee = function() {return "DSGVOGuarantee";};
-e$count = function() {return "DSGVODEADLINECOUNT                  ";};
+$KeywordRegistry.DSGVODeadline$count = function() {return "DSGVODEADLINECOUNT                  ";};
+$KeywordRegistry.DSGVOGuarantee = function() {return "DSGVOGuarantee";};
+
+$KeywordRegistry.textPlaceholder = function(){return "textPlaceholder";};
 
-$K
-eywordRegistry.textPlaceholder = function(){return "textPlaceholder";};
 $KeywordRegistry.communicationMediumCampaign = function(){return "CommunicationMediumCampaign";};
 $KeywordRegistry.communicationMediumCampaign$mail = function(){return "CAMPAIGNEMAIL                       ";};
 $KeywordRegistry.communicationMediumCampaign$letter = function(){return "CAMPAIGNLETTER                      ";};
@@ -169,3 +190,6 @@ $KeywordRegistry.callDirection$outgoing = function(){return $KeywordRegistry._au
 $KeywordRegistry.callAnswerMode = function(){return "CallAnswerMode";};
 $KeywordRegistry.callAnswerMode$accepted = function(){return $KeywordRegistry._autoPad("ACCEPTED");};
 $KeywordRegistry.callAnswerMode$missed = function(){return $KeywordRegistry._autoPad("MISSED");};
+
+$KeywordRegistry.orderType = function(){return "OrderType";};
+$KeywordRegistry.dunningLevel = function(){return "DunningLevel";};
\ No newline at end of file