Author: hansbak
Date: Mon Jan 4 09:03:38 2010
New Revision: 895583
URL: http://svn.apache.org/viewvc?rev=895583&view=rev
Log:
changed view entities so there are no warnings of duplicated fields at start-up
Modified:
ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml
ofbiz/trunk/applications/order/entitydef/entitymodel_view.xml
ofbiz/trunk/applications/party/entitydef/entitymodel.xml
Modified: ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml?rev=895583&r1=895582&r2=895583&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml Mon Jan 4
09:03:38 2010
@@ -1576,7 +1576,9 @@
<member-entity entity-alias="INTM" entity-name="InvoiceItem"/>
<member-entity entity-alias="IIA" entity-name="InvoiceItemAssoc"/>
<member-entity entity-alias="PROD" entity-name="Product"/>
- <alias-all entity-alias="IIA"/>
+ <alias-all entity-alias="IIA">
+ <exclude field="amount"/>
+ </alias-all>
<alias name="termAmount" field="amount" entity-alias="IIA"/>
<alias name="productId" entity-alias="PROD"/>
<alias name="productName" entity-alias="PROD"/>
@@ -3958,6 +3960,8 @@
<alias-all entity-alias="FA"/>
<alias-all entity-alias="PM">
<exclude field="finAccountId"/>
+ <exclude field="fromDate"/>
+ <exclude field="thruDate"/>
</alias-all>
<view-link rel-entity-alias="PM" entity-alias="FA">
<key-map field-name="finAccountId"/>
Modified: ofbiz/trunk/applications/order/entitydef/entitymodel_view.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/entitydef/entitymodel_view.xml?rev=895583&r1=895582&r2=895583&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/entitydef/entitymodel_view.xml (original)
+++ ofbiz/trunk/applications/order/entitydef/entitymodel_view.xml Mon Jan 4
09:03:38 2010
@@ -1605,7 +1605,9 @@
<member-entity entity-alias="OH" entity-name="OrderHeader"/>
<member-entity entity-alias="OHWE" entity-name="OrderHeaderWorkEffort"/>
<alias-all entity-alias="WE"/>
- <alias-all entity-alias="OH"/>
+ <alias-all entity-alias="OH">
+ <exclude field="priority"/>
+ </alias-all>
<alias-all entity-alias="OHWE"/>
<view-link entity-alias="WE" rel-entity-alias="OHWE">
<key-map field-name="workEffortId"/>
Modified: ofbiz/trunk/applications/party/entitydef/entitymodel.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/entitydef/entitymodel.xml?rev=895583&r1=895582&r2=895583&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/party/entitydef/entitymodel.xml Mon Jan 4
09:03:38 2010
@@ -2368,14 +2368,80 @@
</relation>
</view-entity>
<view-entity entity-name="PartyRelationshipAndContactMechDetail"
package-name="org.ofbiz.party.party" title="Party Relationship And Contact Mech
Details">
- <member-entity entity-alias="PTYREL"
entity-name="PartyRelationshipAndDetail"/>
- <member-entity entity-alias="PTYCM" entity-name="PartyAndContactMech"/>
+ <member-entity entity-alias="PTY" entity-name="Party"/>
+ <member-entity entity-alias="PTYREL" entity-name="PartyRelationship"/>
+ <member-entity entity-alias="PER" entity-name="Person"/>
+ <member-entity entity-alias="PTYGRP" entity-name="PartyGroup"/>
+ <member-entity entity-alias="PCM" entity-name="PartyContactMech"/>
+ <member-entity entity-alias="CM" entity-name="ContactMech"/>
+ <member-entity entity-alias="PA" entity-name="PostalAddress"/>
+ <member-entity entity-alias="TN" entity-name="TelecomNumber"/>
+ <alias-all entity-alias="PTY">
+ <exclude field="statusId"/>
+ </alias-all>
<alias-all entity-alias="PTYREL"/>
- <alias-all entity-alias="PTYCM"/>
- <alias entity-alias="PTYCM" field="statusId" name="partyStatusId"/>
- <view-link entity-alias="PTYREL" rel-entity-alias="PTYCM"
rel-optional="true">
- <key-map field-name="partyIdTo" rel-field-name="partyId"/>
+ <alias-all entity-alias="CM"/>
+ <alias-all entity-alias="PA" prefix="pa"/>
+ <alias-all entity-alias="TN" prefix="tn"/>
+ <alias entity-alias="PER" name="firstName"/>
+ <alias entity-alias="PER" name="middleName"/>
+ <alias entity-alias="PER" name="lastName"/>
+ <alias entity-alias="PER" name="firstNameLocal"/>
+ <alias entity-alias="PER" name="lastNameLocal"/>
+ <alias entity-alias="PER" name="personalTitle"/>
+ <alias entity-alias="PER" name="suffix"/>
+ <alias entity-alias="PTYGRP" name="groupName"/>
+ <alias entity-alias="PTYGRP" name="groupNameLocal"/>
+ <alias entity-alias="PCM" name="contactMechId"/>
+ <alias entity-alias="PTY" field="statusId" name="partyStatusId"/>
+ <view-link entity-alias="PTY" rel-entity-alias="PTYREL"
rel-optional="true">
+ <key-map field-name="partyId" rel-field-name="partyIdTo"/>
+ </view-link>
+ <view-link entity-alias="PTY" rel-entity-alias="PER"
rel-optional="true">
+ <key-map field-name="partyId"/>
+ </view-link>
+ <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">
+ <key-map field-name="partyId"/>
</view-link>
+ <view-link entity-alias="PCM" rel-entity-alias="CM">
+ <key-map field-name="contactMechId"/>
+ </view-link>
+ <view-link entity-alias="PCM" rel-entity-alias="PA"
rel-optional="true">
+ <key-map field-name="contactMechId"/>
+ </view-link>
+ <view-link entity-alias="PCM" rel-entity-alias="TN"
rel-optional="true">
+ <key-map field-name="contactMechId"/>
+ </view-link>
+ <relation type="one-nofk" rel-entity-name="PartyRelationship">
+ <key-map field-name="partyIdFrom"/>
+ <key-map field-name="partyIdTo"/>
+ <key-map field-name="roleTypeIdFrom"/>
+ <key-map field-name="roleTypeIdTo"/>
+ <key-map field-name="fromDate"/>
+ </relation>
+ <relation type="one-nofk" rel-entity-name="PartyRelationshipType">
+ <key-map field-name="partyRelationshipTypeId"/>
+ </relation>
+ <relation type="one-nofk" rel-entity-name="PartyContactMech">
+ <key-map field-name="partyId"/>
+ <key-map field-name="contactMechId"/>
+ <key-map field-name="fromDate"/>
+ </relation>
+ <relation type="one-nofk" rel-entity-name="Party">
+ <key-map field-name="partyId"/>
+ </relation>
+ <relation type="one-nofk" rel-entity-name="ContactMech">
+ <key-map field-name="contactMechId"/>
+ </relation>
+ <relation type="one-nofk" rel-entity-name="PostalAddress">
+ <key-map field-name="contactMechId"/>
+ </relation>
+ <relation type="one-nofk" rel-entity-name="TelecomNumber">
+ <key-map field-name="contactMechId"/>
+ </relation>
</view-entity>
<entity entity-name="PartyRole"
package-name="org.ofbiz.party.party"
@@ -2493,13 +2559,82 @@
</view-link>
</view-entity>
<view-entity entity-name="PartyRoleAndContactMechDetail"
package-name="org.ofbiz.party.party" title="Party Role And Contact Mech
Details">
- <member-entity entity-alias="PTYRL"
entity-name="PartyRoleDetailAndPartyDetail"/>
- <member-entity entity-alias="PTYCM" entity-name="PartyAndContactMech"/>
- <alias-all entity-alias="PTYRL"/>
- <alias-all entity-alias="PTYCM"/>
- <view-link entity-alias="PTYRL" rel-entity-alias="PTYCM"
rel-optional="true">
- <key-map field-name="partyId" rel-field-name="partyId"/>
+ <member-entity entity-alias="PTY" entity-name="Party"/>
+ <member-entity entity-alias="PR" entity-name="PartyRole"/>
+ <member-entity entity-alias="RT" entity-name="RoleType"/>
+ <member-entity entity-alias="PERSON" entity-name="Person"/>
+ <member-entity entity-alias="PTYGRP" entity-name="PartyGroup"/>
+ <member-entity entity-alias="PCM" entity-name="PartyContactMech"/>
+ <member-entity entity-alias="CM" entity-name="ContactMech"/>
+ <member-entity entity-alias="PA" entity-name="PostalAddress"/>
+ <member-entity entity-alias="TN" entity-name="TelecomNumber"/>
+ <alias-all entity-alias="PTY">
+ <exclude field="description"/>
+ </alias-all>
+ <alias-all entity-alias="PR"/>
+ <alias-all entity-alias="RT"/>
+ <alias-all entity-alias="PERSON">
+ <exclude field="comments"/>
+ </alias-all>
+ <alias-all entity-alias="PTYGRP">
+ <exclude field="comments"/>
+ </alias-all>
+ <alias-all entity-alias="PCM">
+ <exclude field="roleTypeId"/>
+ </alias-all>
+ <alias-all entity-alias="CM"/>
+ <alias-all entity-alias="PA" prefix="pa"/>
+ <alias-all entity-alias="TN" prefix="tn"/>
+ <alias entity-alias="PERSON" name="personComments" field="comments"/>
+ <alias entity-alias="PTYGRP" name="partyGroupComments"
field="comments"/>
+ <view-link entity-alias="PTY" rel-entity-alias="PR">
+ <key-map field-name="partyId"/>
+ </view-link>
+ <view-link entity-alias="PTY" rel-entity-alias="PERSON"
rel-optional="true">
+ <key-map field-name="partyId"/>
+ </view-link>
+ <view-link entity-alias="PTY" rel-entity-alias="PTYGRP"
rel-optional="true">
+ <key-map field-name="partyId"/>
+ </view-link>
+ <view-link entity-alias="PR" rel-entity-alias="RT">
+ <key-map field-name="roleTypeId"/>
+ </view-link>
+ <view-link entity-alias="PTY" rel-entity-alias="PCM">
+ <key-map field-name="partyId"/>
+ </view-link>
+ <view-link entity-alias="PCM" rel-entity-alias="CM">
+ <key-map field-name="contactMechId"/>
+ </view-link>
+ <view-link entity-alias="PCM" rel-entity-alias="PA"
rel-optional="true">
+ <key-map field-name="contactMechId"/>
</view-link>
+ <view-link entity-alias="PCM" rel-entity-alias="TN"
rel-optional="true">
+ <key-map field-name="contactMechId"/>
+ </view-link>
+ <relation type="one-nofk" rel-entity-name="PartyRole">
+ <key-map field-name="partyId"/>
+ <key-map field-name="roleTypeId"/>
+ </relation>
+ <relation type="one-nofk" rel-entity-name="PartyContactMech">
+ <key-map field-name="partyId"/>
+ <key-map field-name="contactMechId"/>
+ <key-map field-name="fromDate"/>
+ </relation>
+ <relation type="one-nofk" rel-entity-name="Party">
+ <key-map field-name="partyId"/>
+ </relation>
+ <relation type="one-nofk" rel-entity-name="RoleType">
+ <key-map field-name="roleTypeId"/>
+ </relation>
+ <relation type="one-nofk" rel-entity-name="ContactMech">
+ <key-map field-name="contactMechId"/>
+ </relation>
+ <relation type="one-nofk" rel-entity-name="PostalAddress">
+ <key-map field-name="contactMechId"/>
+ </relation>
+ <relation type="one-nofk" rel-entity-name="TelecomNumber">
+ <key-map field-name="contactMechId"/>
+ </relation>
</view-entity>
<entity entity-name="PartyStatus"
package-name="org.ofbiz.party.party"
