svn commit: r965711 - /ofbiz/trunk/applications/party/entitydef/entitymodel.xml

[hansbak-2]

Author: hansbak
Date: Tue Jul 20 01:51:59 2010
New Revision: 965711

URL: http://svn.apache.org/viewvc?rev=965711&view=rev
Log:
corrected conflict in PartyRelationshipAndDetail on status Id introduced oin previous commit

Modified:
    ofbiz/trunk/applications/party/entitydef/entitymodel.xml

Modified: ofbiz/trunk/applications/party/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/entitydef/entitymodel.xml?rev=965711&r1=965710&r2=965711&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/party/entitydef/entitymodel.xml Tue Jul 20 01:51:59 2010
@@ -2344,7 +2344,7 @@ under the License.
       <alias entity-alias="PTY" name="partyId"/>
       <alias entity-alias="PTY" name="partyTypeId"/>
       <alias entity-alias="PTY" name="description"/>
-      <alias entity-alias="PTY" name="statusId"/>
+      <alias entity-alias="PTY" name="partyStatusId" field="statusId"/>
       <alias entity-alias="PER" name="firstName"/>
       <alias entity-alias="PER" name="middleName"/>
       <alias entity-alias="PER" name="lastName"/>