svn commit: r1039651 [22/38] - in /ofbiz/branches/jquery: ./ applications/accounting/config/ applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/ applications/commonext/config/ applications/content/config/ applications/content/w...

Modified: ofbiz/branches/jquery/applications/party/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/entitydef/entitymodel.xml?rev=1039651&r1=1039650&r2=1039651&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/party/entitydef/entitymodel.xml (original)
+++ ofbiz/branches/jquery/applications/party/entitydef/entitymodel.xml Sat Nov 27 10:59:21 2010
@@ -736,14 +736,14 @@ under the License.
         </view-link>
     </view-entity>
     <view-entity entity-name="CommunicationEventAndRole" package-name="org.ofbiz.party.communication" title="Communication Event And Role View Entity">
-      <member-entity entity-alias="CR" entity-name="CommunicationEventRole"/>
       <member-entity entity-alias="CE" entity-name="CommunicationEvent"/>
+      <member-entity entity-alias="CR" entity-name="CommunicationEventRole"/>
       <alias-all entity-alias="CE"/>
       <alias entity-alias="CR" name="partyId"/>
       <alias entity-alias="CR" name="roleTypeId"/>
       <alias entity-alias="CR" name="roleStatusId" field="statusId"/>
       <alias entity-alias="CR" name="contactMechId"/>
-      <view-link entity-alias="CR" rel-entity-alias="CE">
+      <view-link entity-alias="CE" rel-entity-alias="CR" rel-optional="true">
         <key-map field-name="communicationEventId"/>
       </view-link>
       <relation type="one-nofk" rel-entity-name="Party">

Propchange: ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 27 10:59:21 2010
@@ -1,3 +1,3 @@
 /incubator/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:418499-490456
 /ofbiz/branches/multitenant20100310/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:921280-927264
-/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:951708-1036339
+/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:951708-1039648