svn commit: r501963 - in /ofbiz/trunk/applications/product: entitydef/entitymodel.xml webapp/catalog/product/ProductForms.xml

[jonesde]

Author: jonesde
Date: Wed Jan 31 11:46:04 2007
New Revision: 501963

URL: http://svn.apache.org/viewvc?view=rev&rev=501963
Log:
Applied patch from Anil Patel in Jira #OFBIZ-678 to add template workEffortId to the ProductMaint entity

Modified:
    ofbiz/trunk/applications/product/entitydef/entitymodel.xml
    ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml

Modified: ofbiz/trunk/applications/product/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/entitydef/entitymodel.xml?view=diff&rev=501963&r1=501962&r2=501963
==============================================================================
--- ofbiz/trunk/applications/product/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/product/entitydef/entitymodel.xml Wed Jan 31 11:46:04 2007
@@ -2211,6 +2211,7 @@
         <field name="productMaintSeqId" type="id-ne"></field>
         <field name="productMaintTypeId" type="id"></field>
         <field name="maintName" type="name"></field>
+        <field name="maintTemplateWorkEffortId" type="id"><description>Template of Maintenance Plan. WorkEffort may have WorkEffortAssocs for tasks/breakdown detailes</description></field>
         <field name="intervalQuantity" type="floating-point"></field>
         <field name="intervalUomId" type="id"><description>UOM for intervalQuantity; if used intervalMeterTypeId is generally not used (ie one or the other)</description></field>
         <field name="intervalMeterTypeId" type="id"><description>Meter Type for intervalQuantity; if used intervalUomId is generally not used (ie one or the other)</description></field>
@@ -2222,6 +2223,9 @@
         </relation>
         <relation type="one" fk-name="PRODMNT_MNTTYP" rel-entity-name="ProductMaintType">
             <key-map field-name="productMaintTypeId"/>
+        </relation>
+        <relation type="one" fk-name="PRODMNT_TPLHWE" title="MaintTemplate" rel-entity-name="WorkEffort">
+            <key-map field-name="maintTemplateWorkEffortId" rel-field-name="workEffortId"/>
         </relation>
         <relation type="one" fk-name="PRODMNT_INTUOM" title="Interval" rel-entity-name="Uom">
             <key-map field-name="intervalUomId" rel-field-name="uomId"/>

Modified: ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml?view=diff&rev=501963&r1=501962&r2=501963
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml Wed Jan 31 11:46:04 2007
@@ -948,6 +948,7 @@
                 </entity-options>
             </drop-down>
         </field>
+        <field name="maintTemplateWorkEffortId"><lookup target-form-name="LookupWorkEffort"/></field>
         <field name="intervalUomId" widget-style="selectBox">
             <drop-down allow-empty="false">
                 <entity-options entity-name="Uom" description="${description}" key-field-name="uomId">
@@ -982,6 +983,7 @@
             </drop-down>
         </field>
         <field name="maintName"><text size="20" /></field>
+        <field name="maintTemplateWorkEffortId"><lookup target-form-name="LookupWorkEffort"/></field>
         <field name="intervalUomId" widget-style="selectBox">
             <drop-down allow-empty="false">
                 <entity-options entity-name="Uom" description="${description}" key-field-name="uomId">