OFBiz › OFBiz - Commits

svn commit: r658590 - in /ofbiz/trunk/applications: humanres/config/ humanres/data/ humanres/entitydef/ humanres/widget/ humanres/widget/forms/ party/widget/partymgr/

‹ Previous Topic Next Topic ›
 
classic Classic list List threaded Threaded
♦
♦
 1 message Options
ashish-18
Reply | Threaded
Open this post in threaded view
♦
♦
|

svn commit: r658590 - in /ofbiz/trunk/applications: humanres/config/ humanres/data/ humanres/entitydef/ humanres/widget/ humanres/widget/forms/ party/widget/partymgr/

ashish-18
Author: ashish
Date: Wed May 21 01:14:07 2008
New Revision: 658590

URL: http://svn.apache.org/viewvc?rev=658590&view=rev
Log:
Cleanups in HR module.

Modified:
    ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml
    ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml
    ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml
    ofbiz/trunk/applications/humanres/widget/Menus.xml
    ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml
    ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.xml
    ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml

Modified: ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml?rev=658590&r1=658589&r2=658590&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml (original)
+++ ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml Wed May 21 01:14:07 2008
@@ -471,7 +471,7 @@
         <value xml:lang="en">Unemployment Claims</value>
     </property>
     <property key="HumanResEmployee">
-        <value xml:lang="en">Employee</value>
+        <value xml:lang="en">Employees</value>
     </property>    
     <property key="HumanResEmplPositionId">
         <value xml:lang="en">Employee Position Id</value>
@@ -497,7 +497,7 @@
         <value xml:lang="en">emplPositionIdReportingTo and emplPositionIdManagedBy must be different</value>
     </property>
     <property key="HumanResEmployeePosition">
-        <value xml:lang="en">Employee Position</value>
+        <value xml:lang="en">Employee Positions</value>
         <value xml:lang="it">Posizione Impiegato</value>
         <value xml:lang="th">ตำแหน่งพนักงาน</value>
     </property>
@@ -512,12 +512,12 @@
         <value xml:lang="th">รหัสประเภทตำแหน่งพนักงาน</value>
     </property>
     <property key="HumanResEmployment">
-        <value xml:lang="en">Employment</value>
+        <value xml:lang="en">Employments</value>
         <value xml:lang="it">Impiegato</value>
         <value xml:lang="th">การจ้างงาน</value>
     </property>
     <property key="HumanResEmploymentApp">
-        <value xml:lang="en">Employment Application</value>
+        <value xml:lang="en">Employment Applications</value>
         <value xml:lang="it">Applicazione Impiegato</value>
         <value xml:lang="th">โปรแกรมประยุกต์ใช้การจ้างงาน</value>
     </property>
@@ -538,6 +538,9 @@
     <property key="HumanResFindPartyResume">
         <value xml:lang="en">Find Party Resume</value>
     </property>
+    <property key="HumanResFindPartySkill">
+        <value xml:lang="en">Find Party Skills</value>
+    </property>
     <property key="HumanResFindPersonTraining">
         <value xml:lang="en">Find Person Training</value>
     </property>
@@ -568,7 +571,7 @@
         <value xml:lang="th">รายการกลุ่มประวัติย่อ</value>
     </property>
     <property key="HumanResListPartySkill">
-        <value xml:lang="en">List Party Skill</value>
+        <value xml:lang="en">List Party Skills</value>
         <value xml:lang="it">Lista Abilità Soggetto</value>
         <value xml:lang="th">รายการกลุ่มทักษะ</value>
     </property>
@@ -722,6 +725,9 @@
         <value xml:lang="it">Crea/Aggiorna Riga Rassegna Prestazioni</value>
         <value xml:lang="th">สร้าง/แก้ไข รายการการตรวจสอบสิทธิพิเศษ</value>
     </property>
+    <property key="HumanResPartySkills">
+        <value xml:lang="en">Party Skills</value>
+    </property>
     <property key="HumanResNewPartySkill">
         <value xml:lang="en">New Party Skill</value>
         <value xml:lang="it">Nuova Abilità Soggetto</value>
@@ -782,10 +788,10 @@
         <value xml:lang="th">ถึงรหัสกลุ่มผู้ใช้</value>
     </property>
     <property key="HumanResPartyQualification">
-        <value xml:lang="en">Qualification</value>
+        <value xml:lang="en">Qualifications</value>
     </property>
     <property key="HumanResPartyResume">
-        <value xml:lang="en">Resume</value>
+        <value xml:lang="en">Resumes</value>
     </property>
     <property key="HumanResPartyReview">
         <value xml:lang="en">Party Review</value>
@@ -793,7 +799,7 @@
         <value xml:lang="th">การตรวจสอบกลุ่มผู้ใช้</value>
     </property>
     <property key="HumanResPayGrade">
-        <value xml:lang="en">Pay Grade</value>
+        <value xml:lang="en">Pay Grades</value>
         <value xml:lang="it">Grado Paga</value>
         <value xml:lang="th">ระดับการจ่าย</value>
     </property>
@@ -833,7 +839,7 @@
         <value xml:lang="en">ReportsTo</value>
     </property>
     <property key="HumanResResponsibilityType">
-        <value xml:lang="en">Responsibility Type</value>
+        <value xml:lang="en">Responsibility Types</value>
     </property>
     <property key="HumanResResponsibilityTypeId">
         <value xml:lang="en">Responsibility TypeId</value>
@@ -897,7 +903,7 @@
         <value xml:lang="zh">无法创建教育记录，缺少所需的参数</value>
     </property>
     <property key="HumanResSkillType">
-        <value xml:lang="en">Skill Type</value>
+        <value xml:lang="en">Skill Types</value>
         <value xml:lang="it">Tipo Abilità</value>
         <value xml:lang="th">ประเภททักษะ</value>
     </property>
@@ -908,7 +914,7 @@
         <value xml:lang="zh">技能类型Id</value>
     </property>
     <property key="HumanResTerminationReason">
-        <value xml:lang="en">Termination Reason</value>
+        <value xml:lang="en">Termination Reasons</value>
         <value xml:lang="it">Motivazione Licenziamento</value>
         <value xml:lang="th">ขอบเขตเหตุผล</value>
     </property>
@@ -923,7 +929,7 @@
         <value xml:lang="th">รหัสประเภทขอบเขตเหตุผล</value>
     </property>
     <property key="HumanResTraining">
-        <value xml:lang="en">Training</value>
+        <value xml:lang="en">Trainings</value>
     </property>
     <property key="HumanResViewPermissionError">
         <value xml:lang="en">View Permission Error</value>

Modified: ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml?rev=658590&r1=658589&r2=658590&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml (original)
+++ ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml Wed May 21 01:14:07 2008
@@ -45,16 +45,17 @@
     <EmplPositionType description="System Administrator" hasTable="N" parentTypeId="" emplPositionTypeId="SYS_ADMIN"/>
     <EmplPositionType description="Business Analyst" hasTable="N" parentTypeId="" emplPositionTypeId="BIZ_ANALYST"/>
     
-    <ResponsibilityType description="Finance Management" hasTable="N" parentTypeId="" statusTypeId="FIN_MGMT"/>
-    <ResponsibilityType description="Inventory Management" hasTable="N" parentTypeId="" statusTypeId="INV_MGMT"/>
-    <ResponsibilityType description="Purchase Management" hasTable="N" parentTypeId="" statusTypeId="PUR_MGMT"/>
-    <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"/>    
+    <ResponsibilityType description="Finance Management" hasTable="N" parentTypeId="" responsibilityTypeId="FIN_MGMT"/>
+    <ResponsibilityType description="Inventory Management" hasTable="N" parentTypeId="" responsibilityTypeId="INV_MGMT"/>
+    <ResponsibilityType description="Purchase Management" hasTable="N" parentTypeId="" responsibilityTypeId="PUR_MGMT"/>
+    <ResponsibilityType description="Resource Management" hasTable="N" parentTypeId="" responsibilityTypeId="RES_MGMT"/>
+    <ResponsibilityType description="Production Management" hasTable="N" parentTypeId="" responsibilityTypeId="PROD_MGMT"/>
+    <ResponsibilityType description="Sales Management" hasTable="N" parentTypeId="" responsibilityTypeId="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"/>
+    
     <TrainingClassType trainingClassTypeId="BASIC_TRAINING" description="Basic Training"/>
     <TrainingClassType trainingClassTypeId="ONJOB_TRAINING" description="On Job Training"/>
     <TrainingClassType trainingClassTypeId="ADVAN_TRAINING" description="Advance Training"/>

Modified: ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml?rev=658590&r1=658589&r2=658590&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml Wed May 21 01:14:07 2008
@@ -118,8 +118,13 @@
             package-name="org.ofbiz.humanres.ability"
             title="Performance Rating Type Entity">
       <field name="perfRatingTypeId" type="id-ne"></field>
+      <field name="parentTypeId" type="id-ne"></field>
+      <field name="hasTable" type="indicator"></field>
       <field name="description" type="description"></field>
       <prim-key field="perfRatingTypeId"/>
+      <relation type="one" fk-name="PERF_RATNG_TYP" title="Parent" rel-entity-name="PerfRatingType">
+        <key-map field-name="parentTypeId" rel-field-name="perfRatingTypeId"/>
+      </relation>
     </entity>
     <entity entity-name="PerfReview"
             package-name="org.ofbiz.humanres.ability"
@@ -214,8 +219,13 @@
             package-name="org.ofbiz.humanres.ability"
             title="Performance Review Item Type Entity">
       <field name="perfReviewItemTypeId" type="id-ne"></field>
+      <field name="parentTypeId" type="id-ne"></field>
+      <field name="hasTable" type="indicator"></field>
       <field name="description" type="description"></field>
       <prim-key field="perfReviewItemTypeId"/>
+      <relation type="one" fk-name="PERF_REV_ITM_TYP" title="Parent" rel-entity-name="PerfReviewItemType">
+        <key-map field-name="parentTypeId" rel-field-name="perfReviewItemTypeId"/>
+      </relation>
     </entity>
     <entity entity-name="PerformanceNote"
             package-name="org.ofbiz.humanres.ability"
@@ -258,22 +268,37 @@
             package-name="org.ofbiz.humanres.ability"
             title="Responsibility Type Entity">
       <field name="responsibilityTypeId" type="id-ne"></field>
+      <field name="parentTypeId" type="id"></field>
+      <field name="hasTable" type="indicator"></field>
       <field name="description" type="description"></field>
       <prim-key field="responsibilityTypeId"/>
+      <relation type="one" fk-name="RESPON_TYPE_PAR" title="Parent" rel-entity-name="ResponsibilityType">
+        <key-map field-name="parentTypeId" rel-field-name="responsibilityTypeId"/>
+      </relation>
     </entity>
     <entity entity-name="SkillType"
             package-name="org.ofbiz.humanres.ability"
             title="Skill Type Entity">
       <field name="skillTypeId" type="id-ne"></field>
+      <field name="parentTypeId" type="id-ne"></field>
+      <field name="hasTable" type="indicator"></field>
       <field name="description" type="description"></field>
       <prim-key field="skillTypeId"/>
+      <relation type="one" fk-name="PARNT_SKILL_TYPE" title="Parent" rel-entity-name="SkillType">
+        <key-map field-name="parentTypeId" rel-field-name="skillTypeId"/>
+      </relation>
     </entity>
     <entity entity-name="TrainingClassType"
             package-name="org.ofbiz.humanres.ability"
             title="Training Class Type Entity">
       <field name="trainingClassTypeId" type="id-ne"></field>
+      <field name="parentTypeId" type="id"></field>
+      <field name="hasTable" type="indicator"></field>
       <field name="description" type="description"></field>
       <prim-key field="trainingClassTypeId"/>
+      <relation type="one" fk-name="TRAIN_TYPE_PAR" title="Parent" rel-entity-name="TrainingClassType">
+        <key-map field-name="parentTypeId" rel-field-name="trainingClassTypeId"/>
+      </relation>
     </entity>
 
   <!-- ========================================================= -->
@@ -285,9 +310,14 @@
             title="Benefit Type Entity">
       <field name="benefitTypeId" type="id-ne"></field>
       <field name="benefitName" type="name"></field>
+      <field name="parentTypeId" type="id-ne"></field>
+      <field name="hasTable" type="indicator"></field>
       <field name="description" type="description"></field>
       <field name="employerPaidPercentage" type="floating-point"></field>
       <prim-key field="benefitTypeId"/>
+      <relation type="one" fk-name="BEN_TYPE_PAR" title="Parent" rel-entity-name="BenefitType">
+        <key-map field-name="parentTypeId" rel-field-name="benefitTypeId"/>
+      </relation>
     </entity>
     <entity entity-name="Employment"
             package-name="org.ofbiz.humanres.employment"
@@ -357,8 +387,13 @@
             package-name="org.ofbiz.humanres.employment"
             title="Employment Application Source Type Entity">
       <field name="employmentAppSourceTypeId" type="id-ne"></field>
+      <field name="parentTypeId" type="id-ne"></field>
+      <field name="hasTable" type="indicator"></field>
       <field name="description" type="description"></field>
       <prim-key field="employmentAppSourceTypeId"/>
+      <relation type="one" fk-name="EMPL_APP_SRC_TYP" title="Parent" rel-entity-name="EmploymentAppSourceType">
+        <key-map field-name="parentTypeId" rel-field-name="employmentAppSourceTypeId"/>
+      </relation>
     </entity>
     <entity entity-name="PartyBenefit"
             package-name="org.ofbiz.humanres.employment"
@@ -506,8 +541,13 @@
             package-name="org.ofbiz.humanres.employment"
             title="Termination Type Entity">
       <field name="terminationTypeId" type="id-ne"></field>
+      <field name="parentTypeId" type="id-ne"></field>
+      <field name="hasTable" type="indicator"></field>
       <field name="description" type="description"></field>
       <prim-key field="terminationTypeId"/>
+      <relation type="one" fk-name="TERM_TYP_PAR" title="Parent" rel-entity-name="TerminationType">
+        <key-map field-name="parentTypeId" rel-field-name="terminationTypeId"/>
+      </relation>
     </entity>
     <entity entity-name="UnemploymentClaim"
             package-name="org.ofbiz.humanres.employment"
@@ -575,8 +615,13 @@
             package-name="org.ofbiz.humanres.position"
             title="EmplPosition Classification Type Entity">
       <field name="emplPositionClassTypeId" type="id-ne"></field>
+      <field name="parentTypeId" type="id-ne"></field>
+      <field name="hasTable" type="indicator"></field>
       <field name="description" type="description"></field>
       <prim-key field="emplPositionClassTypeId"/>
+      <relation type="one" fk-name="EMPL_CLS_TYP_PAR" title="Parent" rel-entity-name="EmplPositionClassType">
+        <key-map field-name="parentTypeId" rel-field-name="emplPositionClassTypeId"/>
+      </relation>
     </entity>
     <entity entity-name="EmplPositionFulfillment"
             package-name="org.ofbiz.humanres.position"
@@ -637,8 +682,13 @@
             package-name="org.ofbiz.humanres.position"
             title="EmplPosition Type Entity">
       <field name="emplPositionTypeId" type="id-ne"></field>
+      <field name="parentTypeId" type="id-ne"></field>
+      <field name="hasTable" type="indicator"></field>
       <field name="description" type="description"></field>
       <prim-key field="emplPositionTypeId"/>
+      <relation type="one" fk-name="EMPL_POSI_TYP_PAR" title="Parent" rel-entity-name="EmplPositionType">
+        <key-map field-name="parentTypeId" rel-field-name="emplPositionTypeId"/>
+      </relation>
     </entity>
     <entity entity-name="EmplPositionTypeClass"
             package-name="org.ofbiz.humanres.position"

Modified: ofbiz/trunk/applications/humanres/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/Menus.xml?rev=658590&r1=658589&r2=658590&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/Menus.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/Menus.xml Wed May 21 01:14:07 2008
@@ -23,18 +23,18 @@
     <menu name="HumanResAppBar" default-menu-item-name="main" id="app-navigation" type="simple" title="${uiLabelMap.HumanResManagerApplication}"
         default-selected-style="selected" menu-container-style="button-bar tab-bar" selected-menuitem-context-field-name="headerItem">
         <menu-item name="main" title="${uiLabelMap.CommonMain}"><link target="main"/></menu-item>
-        <menu-item name="EmplPosition" title="${uiLabelMap.HumanResEmployeePosition}"><link target="FindEmplPosition"/></menu-item>
         <menu-item name="Employment" title="${uiLabelMap.HumanResEmployment}"><link target="FindEmployments"/></menu-item>
+        <menu-item name="Employee" title="${uiLabelMap.HumanResEmployee}"><link target="findEmployees"/></menu-item>
+        <menu-item name="EmplPosition" title="${uiLabelMap.HumanResEmployeePosition}"><link target="FindEmplPosition"/></menu-item>
+        <menu-item name="PartySkills" title="${uiLabelMap.HumanResPartySkills}"><link target="FindPartySkills"/></menu-item>
+        <menu-item name="PartyQual" title="${uiLabelMap.HumanResPartyQualification}"><link target="FindPartyQual"/></menu-item>
+        <menu-item name="Training" title="${uiLabelMap.HumanResTraining}"><link target="FindPersonTrainings"/></menu-item>
+        <menu-item name="EmploymentApp" title="${uiLabelMap.HumanResEmploymentApp}"><link target="FindEmploymentApp"/></menu-item>
+        <menu-item name="PartyResume" title="${uiLabelMap.HumanResPartyResume}"><link target="FindPartyResume"/></menu-item>
         <menu-item name="PayGrade" title="${uiLabelMap.HumanResPayGrade}"><link target="FindPayGrade"/></menu-item>
         <menu-item name="TerminationReason" title="${uiLabelMap.HumanResTerminationReason}"><link target="FindTerminationReason"/></menu-item>
-        <menu-item name="EmploymentApp" title="${uiLabelMap.HumanResEmploymentApp}"><link target="FindEmploymentApp"/></menu-item>
-        <menu-item name="PartySkills" title="${uiLabelMap.HumanResListPartySkill}"><link target="FindPartySkills"/></menu-item>
         <menu-item name="SkillType" title="${uiLabelMap.HumanResSkillType}"><link target="findSkillTypes"/></menu-item>
-        <menu-item name="Employee" title="${uiLabelMap.HumanResEmployee}"><link target="findEmployees"/></menu-item>
         <menu-item name="ResponsibilityType" title="${uiLabelMap.HumanResResponsibilityType}"><link target="EditResponsibilityType"/></menu-item>
-        <menu-item name="Training" title="${uiLabelMap.HumanResTraining}"><link target="FindPersonTrainings"/></menu-item>
-        <menu-item name="PartyResume" title="${uiLabelMap.HumanResPartyResume}"><link target="FindPartyResume"/></menu-item>
-        <menu-item name="PartyQual" title="${uiLabelMap.HumanResPartyQualification}"><link target="FindPartyQual"/></menu-item>
         <menu-item name="Logout" title="${uiLabelMap.CommonLogout}" align-style="col-right" selected-style="selected">
             <condition><not><if-empty field-name="userLogin"/></not></condition>
             <link target="logout"/>

Modified: ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml?rev=658590&r1=658589&r2=658590&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml Wed May 21 01:14:07 2008
@@ -169,14 +169,12 @@
                 <set field="titleProperty" value="HumanResEditPartySkill"/>
                 <set field="headerItem" value="PartySkills"/>
                 <set field="partyId" from-field="parameters.partyId"/>
-                <entity-and entity-name="PartySkill" list-name="partySkills">
-                    <field-map field-name="partyId"/>
-                </entity-and>
+                <set field="partySkillsCtx" from-field="parameters"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonPartyAbilityDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <screenlet title="${uiLabelMap.HumanResEditPartySkill}">
+                        <screenlet title="${uiLabelMap.HumanResFindPartySkill}">
                             <section>
                                 <widgets>
                                     <container style="button-bar">
@@ -435,7 +433,7 @@
                                 </widgets>
                             </section>
                         </screenlet>
-                        <screenlet title="${uiLabelMap.HumanResFindPartyQual}">
+                        <screenlet title="${uiLabelMap.HumanResListPartyQual}">
                             <section>
                                 <widgets>
                                     <include-form name="ListPartyQuals" location="component://humanres/widget/forms/PartyAbilityForms.xml"/>

Modified: ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.xml?rev=658590&r1=658589&r2=658590&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.xml Wed May 21 01:14:07 2008
@@ -142,10 +142,8 @@
     <form name="ListPartySkills" type="multi" list-name="listIt" use-row-submit="true" separate-columns="true" target="updatePartySkill?partyId=${partyId}" paginate-target="findPartySkills"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
-            <set field="partyId" from-field="parameters.partyId"/>
-            <entity-one entity-name="Party" auto-field-map="true"/>
             <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
-                <field-map field-name="inputFields" env-name="parameters"/>
+                <field-map field-name="inputFields" env-name="partySkillsCtx"/>
                 <field-map field-name="entityName" value="PartySkill"/>
                 <field-map field-name="orderBy" value="partyId"/>
                 <field-map field-name="orderBy" value="skillTypeId"/>
@@ -178,12 +176,12 @@
         <field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><hidden value="Y"/></field>
         <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit/></field>
     </form>      
-    <form name="AddPartySkills" type="single" target="createPartySkill" paginate-target="FindEmploymentApp"
+    <form name="AddPartySkills" type="single" target="createPartySkill" default-map-name="party"
         header-row-style="header-row" default-table-style="basic-table">
-        <field name="partyId" use-when="partyId != null"><hidden/></field>
-        <field name="partyId" use-when="skillTypeId == null&amp;&amp;partyId == null"><lookup target-form-name="LookupPartyName"/></field>
+        <field name="partyId" use-when="partySkill != null"><hidden/></field>
+        <field name="partyId" use-when="partySkill == null"><lookup target-form-name="LookupPartyName"/></field>
         <field name="skillTypeId">
-            <drop-down allow-empty="true">
+            <drop-down>
                 <entity-options description="${description}" entity-name="SkillType">
                     <entity-order-by field-name="description"/>
                 </entity-options>

Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml?rev=658590&r1=658589&r2=658590&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml Wed May 21 01:14:07 2008
@@ -1049,9 +1049,7 @@
                 <set field="tabButtonItem" value="PartySkills"/>    
                 <set field="partyId" from-field="parameters.partyId"/>
                 <set field="skillTypeId" from-field="parameters.skillTypeId"/>
-                <entity-and entity-name="PartySkill" list-name="partySkills">
-                    <field-map field-name="partyId"/>
-                </entity-and>
+                <set field="partySkillsCtx.partyId" from-field="parameters.partyId"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">


Free forum by Nabble Edit this page