[OFBiz] SVN: r7278 - trunk/applications/party/entitydef

[jonesde@svn.ofbiz.org]

Author: jonesde
Date: 2006-04-11 16:33:00 -0500 (Tue, 11 Apr 2006)
New Revision: 7278

Modified:
   trunk/applications/party/entitydef/entitygroup.xml
   trunk/applications/party/entitydef/entitymodel.xml
Log:
Added entity to apply a WorkEffort to an AgreementItem, to use for projects and other tasks associated with an Agreement (like a Contract)

Modified: trunk/applications/party/entitydef/entitygroup.xml
===================================================================
--- trunk/applications/party/entitydef/entitygroup.xml	2006-04-11 15:25:38 UTC (rev 7277)
+++ trunk/applications/party/entitydef/entitygroup.xml	2006-04-11 21:33:00 UTC (rev 7278)
@@ -44,6 +44,7 @@
     <entity-group group="org.ofbiz" entity="AgreementTermAttribute" />
     <entity-group group="org.ofbiz" entity="AgreementType" />
     <entity-group group="org.ofbiz" entity="AgreementTypeAttr" />
+    <entity-group group="org.ofbiz" entity="AgreementWorkEffortAppl" />
     <entity-group group="org.ofbiz" entity="TermType" />
     <entity-group group="org.ofbiz" entity="TermTypeAttr" />
 

Modified: trunk/applications/party/entitydef/entitymodel.xml
===================================================================
--- trunk/applications/party/entitydef/entitymodel.xml	2006-04-11 15:25:38 UTC (rev 7277)
+++ trunk/applications/party/entitydef/entitymodel.xml	2006-04-11 21:33:00 UTC (rev 7278)
@@ -230,7 +230,7 @@
     </entity>
     <entity entity-name="AgreementPartyApplic"
             package-name="org.ofbiz.party.agreement"
-            title="Agreement Party Applicability Entity">
+            title="Agreement Party Application Entity">
       <field name="agreementId" type="id-ne"></field>
       <field name="agreementItemSeqId" type="id-ne"></field>
       <field name="partyId" type="id-ne"></field>
@@ -240,7 +240,7 @@
       <relation type="one" fk-name="AGRMNT_PTYA_AGR" rel-entity-name="Agreement">
         <key-map field-name="agreementId"/>
       </relation>
-      <relation type="one" fk-name="AGRMNT_PTYA_AITM" rel-entity-name="AgreementItem">
+      <relation type="one-nofk" rel-entity-name="AgreementItem">
         <key-map field-name="agreementId"/>
         <key-map field-name="agreementItemSeqId"/>
       </relation>
@@ -250,14 +250,14 @@
     </entity>
     <entity entity-name="AgreementProductAppl"
             package-name="org.ofbiz.party.agreement"
-            title="Agreement Product Applicability Entity">
+            title="Agreement Product Application Entity">
       <field name="agreementId" type="id-ne"></field>
       <field name="agreementItemSeqId" type="id-ne"></field>
       <field name="productId" type="id-ne"></field>
       <prim-key field="agreementId"/>
       <prim-key field="agreementItemSeqId"/>
       <prim-key field="productId"/>
-      <relation type="one" fk-name="AGRMNT_PRDA_AGR" rel-entity-name="Agreement">
+      <relation type="one-nofk" rel-entity-name="Agreement">
         <key-map field-name="agreementId"/>
       </relation>
       <relation type="one" fk-name="AGRMNT_PRDA_AITM" rel-entity-name="AgreementItem">
@@ -284,7 +284,7 @@
       <relation type="one" fk-name="AGRMNT_PROM_PRO" rel-entity-name="ProductPromo">
         <key-map field-name="productPromoId"/>
       </relation>
-      <relation type="one" fk-name="AGRMNT_PROM_AGR" rel-entity-name="Agreement">
+      <relation type="one-nofk" rel-entity-name="Agreement">
         <key-map field-name="agreementId"/>
       </relation>
       <relation type="one" fk-name="AGRMNT_PROM_AITM" rel-entity-name="AgreementItem">
@@ -379,6 +379,24 @@
         <key-map field-name="agreementTypeId"/>
       </relation>
     </entity>
+    <entity entity-name="AgreementWorkEffortAppl" package-name="org.ofbiz.party.agreement" title="Agreement Product Application Entity">
+        <field name="agreementId" type="id-ne"></field>
+        <field name="agreementItemSeqId" type="id-ne"></field>
+        <field name="workEffortId" type="id-ne"></field>
+        <prim-key field="agreementId"/>
+        <prim-key field="agreementItemSeqId"/>
+        <prim-key field="workEffortId"/>
+        <relation type="one-nofk" rel-entity-name="Agreement">
+            <key-map field-name="agreementId"/>
+        </relation>
+        <relation type="one" fk-name="AGRMNT_WEA_AITM" rel-entity-name="AgreementItem">
+            <key-map field-name="agreementId"/>
+            <key-map field-name="agreementItemSeqId"/>
+        </relation>
+        <relation type="one" fk-name="AGRMNT_WEA_WEFF" rel-entity-name="WorkEffort">
+            <key-map field-name="workEffortId"/>
+        </relation>
+    </entity>
     <entity entity-name="TermType"
             package-name="org.ofbiz.party.agreement"
             title="Term Type Entity" default-resource-name="PartyEntityLabels">