svn commit: r547869 - in /ofbiz/trunk/applications/party/entitydef: entitygroup.xml entitymodel.xml

[jonesde]

Author: jonesde
Date: Fri Jun 15 22:41:28 2007
New Revision: 547869

URL: http://svn.apache.org/viewvc?view=rev&rev=547869
Log:
Added new PartyCarrierAccount entity; also removed old commented field from 2005 that should be well and dead now (related to TaxAuthory refactoring done then)

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

Modified: ofbiz/trunk/applications/party/entitydef/entitygroup.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/entitydef/entitygroup.xml?view=diff&rev=547869&r1=547868&r2=547869
==============================================================================
--- ofbiz/trunk/applications/party/entitydef/entitygroup.xml (original)
+++ ofbiz/trunk/applications/party/entitydef/entitygroup.xml Fri Jun 15 22:41:28 2007
@@ -106,6 +106,7 @@
     <entity-group group="org.ofbiz" entity="PartyAndUserLoginAndPerson" />
     <entity-group group="org.ofbiz" entity="UserLoginAndPartyDetails" />
     <entity-group group="org.ofbiz" entity="PartyAttribute" />
+    <entity-group group="org.ofbiz" entity="PartyCarrierAccount" />
     <entity-group group="org.ofbiz" entity="PartyClassification" />
     <entity-group group="org.ofbiz" entity="PartyClassificationGroup" />
     <entity-group group="org.ofbiz" entity="PartyClassificationType" />

Modified: ofbiz/trunk/applications/party/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/entitydef/entitymodel.xml?view=diff&rev=547869&r1=547868&r2=547869
==============================================================================
--- ofbiz/trunk/applications/party/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/party/entitydef/entitymodel.xml Fri Jun 15 22:41:28 2007
@@ -1472,6 +1472,24 @@
         <key-map field-name="attrName"/>
       </relation>
     </entity>
+    <entity entity-name="PartyCarrierAccount"
+        package-name="org.ofbiz.party.party"
+        title="Party Carrier Account Entity">
+        <field name="partyId" type="id-ne"></field>
+        <field name="carrierPartyId" type="id-ne"></field>
+        <field name="fromDate" type="date-time"></field>
+        <field name="thruDate" type="date-time"></field>
+        <field name="accountNumber" type="date-time"><!-- the customer's or user's account number, also known as the shipper number sometimes --></field>
+        <prim-key field="partyId"/>
+        <prim-key field="carrierPartyId"/>
+        <prim-key field="fromDate"/>
+        <relation type="one" fk-name="PARTY_CRRACT_PTY" rel-entity-name="Party">
+            <key-map field-name="partyId"/>
+        </relation>
+        <relation type="one" fk-name="PARTY_CRRACT_CPT" title="Carrier" rel-entity-name="Party">
+            <key-map field-name="carrierPartyId" rel-field-name="partyId"/>
+        </relation>
+    </entity>
     <entity entity-name="PartyClassification"
             package-name="org.ofbiz.party.party"
             title="Party Classification Entity">
@@ -1610,7 +1628,6 @@
       <field name="groupName" type="name"></field>
       <field name="groupNameLocal" type="name"></field>  
       <field name="officeSiteName" type="name"></field>
-      <!-- DEJ20050628 getting rid of this, deprecated by PartyTaxAuthInfo <field name="federalTaxId" type="long-varchar" encrypt="true"></field> -->
       <field name="comments" type="comment"></field>
       <field name="logoImageUrl" type="url"></field>
       <prim-key field="partyId"/>