Thanks Scott, Fixed in rev. 658251.
Vikas On Tue, May 20, 2008 at 5:02 PM, Scott Gray <[EMAIL PROTECTED]> wrote: > Hi Ashish > > The RateType entity is already defined in the workeffort app, so warnings > are being thrown when ofbiz starts. > > Regards > Scott > > 2008/5/17 <[EMAIL PROTECTED]>: > > > Author: ashish > > Date: Fri May 16 07:40:22 2008 > > New Revision: 657085 > > > > URL: http://svn.apache.org/viewvc?rev=657085&view=rev > > Log: > > Applied patch from JIRA issue :- > > https://issues.apache.org/jira/browse/OFBIZ-1659. > > > > Following things are covered in this patch :- > > 1) Created Entities PositionTypeRate and RateType. > > (Details of entities are taken from Data Model Resource Book 1) > > 2) Added the sample data for the BenefitType entity. > > > > > > Thanks Parimal Gain for your patch. > > > > Modified: > > ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml > > ofbiz/trunk/applications/humanres/entitydef/entitygroup.xml > > ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml > > > > Modified: ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml > > URL: > > > http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml?rev=657085&r1=657084&r2=657085&view=diff > > > > > ============================================================================== > > --- ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml > (original) > > +++ ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml Fri May > 16 > > 07:40:22 2008 > > @@ -51,4 +51,8 @@ > > <ResponsibilityType description="Resource Management" hasTable="N" > > parentTypeId="" statusTypeId="RES_MGMT"/> > > <ResponsibilityType description="Production Management" hasTable="N" > > parentTypeId="" statusTypeId="PROD_MGMT"/> > > <ResponsibilityType description="Sales Management" hasTable="N" > > parentTypeId="" statusTypeId="SALES_MGMT"/> > > + > > + <BenefitType description="Health" hasTable="N" parentTypeId="" > > benefitTypeId="HEALTH"/> > > + <BenefitType description="Vacation" hasTable="N" parentTypeId="" > > benefitTypeId="VACATION"/> > > + <BenefitType description="Sick Leave" hasTable="N" parentTypeId="" > > benefitTypeId="SICK_LEAVE"/> > > </entity-engine-xml> > > > > Modified: ofbiz/trunk/applications/humanres/entitydef/entitygroup.xml > > URL: > > > http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/entitydef/entitygroup.xml?rev=657085&r1=657084&r2=657085&view=diff > > > > > ============================================================================== > > --- ofbiz/trunk/applications/humanres/entitydef/entitygroup.xml > (original) > > +++ ofbiz/trunk/applications/humanres/entitydef/entitygroup.xml Fri May > 16 > > 07:40:22 2008 > > @@ -68,6 +68,8 @@ > > <entity-group group="org.ofbiz" entity="EmplPositionType" /> > > <entity-group group="org.ofbiz" entity="EmplPositionTypeClass" /> > > <entity-group group="org.ofbiz" entity="ValidResponsibility" /> > > + <entity-group group="org.ofbiz" entity="EmplPositionTypeRate" /> > > + <entity-group group="org.ofbiz" entity="RateType" /> > > > > </entitygroup> > > > > > > Modified: ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml > > URL: > > > http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml?rev=657085&r1=657084&r2=657085&view=diff > > > > > ============================================================================== > > --- ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml > (original) > > +++ ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml Fri May > 16 > > 07:40:22 2008 > > @@ -687,5 +687,38 @@ > > <key-map field-name="responsibilityTypeId"/> > > </relation> > > </entity> > > + <entity entity-name="EmplPositionTypeRate" > > + package-name="org.ofbiz.humanres.position" > > + title="EmplPosition Type Rate Entity"> > > + <field name="emplPositionTypeId" type="id-ne"/> > > + <field name="periodTypeId" type="id-ne"/> > > + <field name="salaryStepSeqId" type="id"/> > > + <field name="rateTypeId" type="id"/> > > + <field name="payGradeId" type="id"/> > > + <field name="fromDate" type="date-time"/> > > + <field name="thruDate" type="date-time"/> > > + <field name="rate" type="id"/> > > + <prim-key field="fromDate"/> > > + <relation type="one" fk-name="EMPL_PSTPRT_EPTP" > > rel-entity-name="EmplPositionType"> > > + <key-map field-name="emplPositionTypeId"/> > > + </relation> > > + <relation type="one" fk-name="EMPL_PSTPRT_PRDTYP" > > rel-entity-name="PeriodType"> > > + <key-map field-name="periodTypeId"/> > > + </relation> > > + <relation type="one-nofk" fk-name="EMPL_PSTPRT_SSTP" > > rel-entity-name="SalaryStep"> > > + <key-map field-name="salaryStepSeqId"/> > > + <key-map field-name="payGradeId"/> > > + </relation> > > + <relation type="one-nofk" fk-name="EMPL_PSTPRT_RTTYP" > > rel-entity-name="RateType"> > > + <key-map field-name="rateTypeId"/> > > + </relation> > > + </entity> > > + <entity entity-name="RateType" > > + package-name="org.ofbiz.humanres.position" > > + title="Rate Type Entity"> > > + <field name="rateTypeId" type="id-ne"/> > > + <field name="description" type="description"/> > > + <prim-key field="rateTypeId"/> > > + </entity> > > </entitymodel> > > > > > > > > >
