svn commit: r1786622 - in /ofbiz/ofbiz-framework/trunk/applications: datamodel/entitydef/party-entitymodel.xml marketing/widget/sfa/forms/AccountForms.xml marketing/widget/sfa/forms/ContactForms.xml marketing/widget/sfa/forms/LeadForms.xml

[hansbak-2]

Author: hansbak
Date: Mon Mar 13 01:30:17 2017
New Revision: 1786622

URL: http://svn.apache.org/viewvc?rev=1786622&view=rev
Log:
://issues.apache.org/jira/browse/OFBIZ-9257: various problems in SFA

Modified:
    ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/party-entitymodel.xml
    ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/forms/AccountForms.xml
    ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml
    ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml

Modified: ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/party-entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/party-entitymodel.xml?rev=1786622&r1=1786621&r2=1786622&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/party-entitymodel.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/party-entitymodel.xml Mon Mar 13 01:30:17 2017
@@ -2416,10 +2416,10 @@ under the License.
         <view-link entity-alias="PTY" rel-entity-alias="PTYGRP" rel-optional="true">
             <key-map field-name="partyId"/>
         </view-link>
-        <view-link entity-alias="PTY" rel-entity-alias="PCM">
+        <view-link entity-alias="PTY" rel-entity-alias="PCM" rel-optional="true">
             <key-map field-name="partyId"/>
         </view-link>
-        <view-link entity-alias="PCM" rel-entity-alias="CM">
+        <view-link entity-alias="PCM" rel-entity-alias="CM" rel-optional="true">
             <key-map field-name="contactMechId"/>
         </view-link>
         <view-link entity-alias="PCM" rel-entity-alias="PA" rel-optional="true">

Modified: ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/forms/AccountForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/forms/AccountForms.xml?rev=1786622&r1=1786621&r2=1786622&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/forms/AccountForms.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/forms/AccountForms.xml Mon Mar 13 01:30:17 2017
@@ -189,6 +189,7 @@ under the License.
             <set field="parameters.partyStatusId_op" value="notEqual"/>
             <set field="parameters.partyRelationshipTypeId" value="ACCOUNT"/>
             <set field="fieldList" value="${groovy:['partyIdFrom','partyId']}" type="List"/>
+            <set field="parameters.filterByDate" value="Y"/>
             <service service-name="performFind">
                 <field-map field-name="inputFields" from-field="parameters"/>
                 <field-map field-name="entityName" value="PartyRelationshipAndContactMechDetail"/>

Modified: ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml?rev=1786622&r1=1786621&r2=1786622&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml Mon Mar 13 01:30:17 2017
@@ -40,9 +40,9 @@ under the License.
     <form name="ListContacts" paginate-target="${currentUrl}"
             extends="ListAccounts" extends-resource="component://marketing/widget/sfa/forms/AccountForms.xml">
         <actions>
-            <set field="roleTypeIdFrom" value="ACCOUNT"/>
+            <set field="roleTypeIdFrom" value="OWNER"/>
             <set field="roleTypeIdTo" value="CONTACT"/>
-            <set field="partyRelationshipTypeId" value="EMPLOYMENT"/>
+            <set field="partyRelationshipTypeId" value="CONTACT_REL"/>
             <set field="relatedCompanyRoleTypeIdTo" value="CONTACT"/>
             <set field="relatedCompanyRoleTypeIdFrom" value="ACCOUNT"/>
             <set field="relatedCompanyRelationshipTypeId" value="EMPLOYMENT"/>
@@ -66,9 +66,9 @@ under the License.
                 title="${uiLabelMap.SfaAssignToMe}" widget-style="buttontext">
             <hyperlink description="${uiLabelMap.SfaAssignToMe}" target="createPartyRelationshipAndRole">
                 <parameter param-name="partyIdFrom" from-field="userLogin.partyId"/>
-                <parameter param-name="roleTypeIdFrom"/>
-                <parameter param-name="roleTypeIdTo"/>
-                <parameter param-name="partyRelationshipTypeId"/>
+                <parameter param-name="roleTypeIdFrom" value="OWNER"/>
+                <parameter param-name="roleTypeIdTo" value="CONTACT"/>
+                <parameter param-name="partyRelationshipTypeId" value="CONTACT_REL"/>
                 <parameter param-name="partyIdTo" from-field="partyId"/>
             </hyperlink>
         </field>
@@ -92,8 +92,9 @@ under the License.
             <set field="parameters.roleTypeIdTo" value="CONTACT"/>
             <set field="parameters.partyStatusId" value="PARTY_DISABLED"/>
             <set field="parameters.partyStatusId_op" value="notEqual"/>
-            <set field="parameters.partyRelationshipTypeId" value="EMPLOYMENT"/>
+            <set field="parameters.partyRelationshipTypeId" value="CONTACT_REL"/>
             <set field="fieldList" value="${groovy:['partyIdFrom','partyId']}" type="List"/>
+            <set field="parameters.filterByDate" value="Y"/>
             <service service-name="performFind">
                 <field-map field-name="inputFields" from-field="parameters"/>
                 <field-map field-name="entityName" value="PartyRelationshipAndContactMechDetail"/>

Modified: ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml?rev=1786622&r1=1786621&r2=1786622&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml Mon Mar 13 01:30:17 2017
@@ -225,6 +225,7 @@ under the License.
             <set field="parameters.partyStatusId_op" value="notEqual"/>
             <set field="parameters.partyRelationshipTypeId" value="LEAD_OWNER"/>
             <set field="fieldList" value="${groovy:['partyIdFrom','partyId']}" type="List"/>
+            <set field="parameters.filterByDate" value="Y"/>
             <service service-name="performFind">
                 <field-map field-name="inputFields" from-field="parameters"/>
                 <field-map field-name="entityName" value="PartyRelationshipAndContactMechDetail"/>