[ofbiz-framework] branch trunk updated: Improved: Marketing/SFA demo data (OFBIZ-11043) (#107)

This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git


The following commit(s) were added to refs/heads/trunk by this push:
     new df66cca  Improved: Marketing/SFA demo data (OFBIZ-11043) (#107)
df66cca is described below

commit df66cca3ff9356b09062cb5a3a18d8fa6cbf1485
Author: Pierre Smits <[hidden email]>
AuthorDate: Mon May 4 21:45:07 2020 +0200

    Improved: Marketing/SFA demo data (OFBIZ-11043) (#107)
   
    * Improved: Marketing/SFA demo data
   
    (OFBIZ-11043)
   
    modified: UserLoginSecurityGroup for DemoLeadOwner
    modified: UserLoginSecurityGroup for DemoLeadOwner1
    modified: roleTypeId for DemoLeadOwnerGroup
    modified: PartyRelationship between DemoLeadOwnerGroup and DemoLeadOwner
    modified: PartyRelationship between DemoLeadOwnerGroup and DemoLeadOwner1
   
    * Improved: Marketing/SFA demo data
   
    (OFBIZ-11043)
   
    removed: related comments
---
 applications/datamodel/data/demo/MarketingDemoData.xml | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/applications/datamodel/data/demo/MarketingDemoData.xml b/applications/datamodel/data/demo/MarketingDemoData.xml
index 0c413c2..ea4d24f 100644
--- a/applications/datamodel/data/demo/MarketingDemoData.xml
+++ b/applications/datamodel/data/demo/MarketingDemoData.xml
@@ -81,8 +81,7 @@ under the License.
     <PartyStatus partyId="DemoLeadOwner" statusId="PARTY_ENABLED" statusDate="2001-01-01 12:00:00.0"/>
     <PartyRelationship partyIdFrom="Company" roleTypeIdFrom="_NA_" partyIdTo="DemoLeadOwner" roleTypeIdTo="_NA_" partyRelationshipTypeId="EMPLOYMENT" fromDate="2000-01-01 00:00:00"/>
     <UserLogin userLoginId="DemoLeadOwner" currentPassword="{SHA}47b56994cbc2b6d10aa1be30f70165adb305a41a" partyId="DemoLeadOwner" enabled="Y"/>
-    <!-- FIXME: Establish SecurityGroup for SFA. This user should have access only to SFA -->
-    <UserLoginSecurityGroup groupId="FULLADMIN" userLoginId="DemoLeadOwner" fromDate="2001-05-13 00:00:00.000"/>
+    <UserLoginSecurityGroup groupId="VIEWADMIN" userLoginId="DemoLeadOwner" fromDate="2001-05-13 00:00:00.000"/>
 
     <Party partyId="DemoLeadOwner1" partyTypeId="PERSON" statusId="PARTY_ENABLED"/>
     <Person partyId="DemoLeadOwner1" firstName="Demo" lastName="LeadOwner1"/>
@@ -91,8 +90,7 @@ under the License.
     <PartyStatus partyId="DemoLeadOwner1" statusId="PARTY_ENABLED" statusDate="2001-01-01 12:00:00.0"/>
     <PartyRelationship partyIdFrom="Company" roleTypeIdFrom="_NA_" partyIdTo="DemoLeadOwner1" roleTypeIdTo="_NA_" partyRelationshipTypeId="EMPLOYMENT" fromDate="2000-01-01 00:00:00"/>
     <UserLogin userLoginId="DemoLeadOwner1" currentPassword="{SHA}47b56994cbc2b6d10aa1be30f70165adb305a41a" partyId="DemoLeadOwner1" enabled="Y"/>
-    <!-- FIXME: Establish SecurityGroup for SFA. This user should have access only to SFA -->
-    <UserLoginSecurityGroup groupId="FULLADMIN" userLoginId="DemoLeadOwner1" fromDate="2001-05-13 00:00:00.000"/>
+    <UserLoginSecurityGroup groupId="VIEWADMIN" userLoginId="DemoLeadOwner1" fromDate="2001-05-13 00:00:00.000"/>
 
     <!-- Demo Leads -->
     <Party partyId="sfa102" partyTypeId="PARTY_GROUP" statusId="PARTY_ENABLED"/>
@@ -150,7 +148,7 @@ under the License.
     <Party partyId="DemoLeadOwnersGroup" partyTypeId="TEAM" statusId="PARTY_ENABLED"/>
     <PartyGroup partyId="DemoLeadOwnersGroup" groupName="A Group of Lead Owners"/>
     <PartyRole partyId="DemoLeadOwnersGroup" roleTypeId="_NA_"/>
-    <PartyRole partyId="DemoLeadOwnersGroup" roleTypeId="INTERNAL_ORGANIZATIO"/>
+    <PartyRole partyId="DemoLeadOwnersGroup" roleTypeId="OTHER_ORGANIZATION_U"/>
     <PartyStatus partyId="DemoLeadOwnersGroup" statusId="PARTY_ENABLED" statusDate="2001-01-01 12:00:00.0"/>
     <PartyRelationship partyIdFrom="Company" partyIdTo="DemoLeadOwnersGroup" partyRelationshipTypeId="GROUP_ROLLUP" roleTypeIdFrom="_NA_" roleTypeIdTo="_NA_" fromDate="2001-05-13 00:00:00.000"/>
 
@@ -163,8 +161,8 @@ under the License.
     <PartyRelationship partyIdFrom="DemoLeadOwner1" roleTypeIdFrom="OWNER" partyIdTo="DemoLead3" roleTypeIdTo="LEAD" fromDate="2001-05-13 00:00:00.000" partyRelationshipTypeId="LEAD_OWNER"/>
     <PartyRelationship partyIdFrom="DemoLeadOwner1" roleTypeIdFrom="OWNER" partyIdTo="DemoLead4" roleTypeIdTo="LEAD" fromDate="2001-05-13 00:00:00.000" partyRelationshipTypeId="LEAD_OWNER"/>
 
-    <PartyRelationship partyIdFrom="DemoLeadOwnersGroup" roleTypeIdFrom="INTERNAL_ORGANIZATIO" partyIdTo="DemoLeadOwner" roleTypeIdTo="OWNER" fromDate="2001-05-13 00:00:00.000" partyRelationshipTypeId="LEAD_OWN_GRP_MEMBER"/>
-    <PartyRelationship partyIdFrom="DemoLeadOwnersGroup" roleTypeIdFrom="INTERNAL_ORGANIZATIO" partyIdTo="DemoLeadOwner1" roleTypeIdTo="OWNER" fromDate="2001-05-13 00:00:00.000" partyRelationshipTypeId="LEAD_OWN_GRP_MEMBER"/>
+    <PartyRelationship partyIdFrom="DemoLeadOwnersGroup" roleTypeIdFrom="OTHER_ORGANIZATION_U" partyIdTo="DemoLeadOwner" roleTypeIdTo="OWNER" fromDate="2001-05-13 00:00:00.000" partyRelationshipTypeId="LEAD_OWN_GRP_MEMBER"/>
+    <PartyRelationship partyIdFrom="DemoLeadOwnersGroup" roleTypeIdFrom="OTHER_ORGANIZATION_U" partyIdTo="DemoLeadOwner1" roleTypeIdTo="OWNER" fromDate="2001-05-13 00:00:00.000" partyRelationshipTypeId="LEAD_OWN_GRP_MEMBER"/>
 
     <SalesOpportunityStage opportunityStageId="SOSTG_PROSPECT" description="Prospect" defaultProbability="0.050000" sequenceNum="1"/>
     <SalesOpportunityStage opportunityStageId="SOSTG_PROPOSAL" description="Proposal" defaultProbability="0.200000" sequenceNum="2"/>