svn commit: r811840 - in /ofbiz/branches/release09.04: ./ applications/humanres/script/org/ofbiz/humanres/ applications/humanres/servicedef/ applications/humanres/webapp/humanres/WEB-INF/ applications/humanres/widget/ applications/humanres/widget/forms/

Author: jleroux
Date: Sun Sep  6 17:18:48 2009
New Revision: 811840

URL: http://svn.apache.org/viewvc?rev=811840&view=rev
Log:
"Applied fix from trunk for revision: 811838  "
------------------------------------------------------------------------
r811838 | jleroux | 2009-09-06 19:13:04 +0200 (dim. 06 sept. 2009) | 2 lignes

A patch from Anil Soni "Improvements in HR module." (https://issues.apache.org/jira/browse/OFBIZ-2604) - OFBIZ-2604

------------------------------------------------------------------------


Modified:
    ofbiz/branches/release09.04/   (props changed)
    ofbiz/branches/release09.04/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml
    ofbiz/branches/release09.04/applications/humanres/servicedef/services.xml
    ofbiz/branches/release09.04/applications/humanres/webapp/humanres/WEB-INF/controller.xml
    ofbiz/branches/release09.04/applications/humanres/widget/CommonScreens.xml
    ofbiz/branches/release09.04/applications/humanres/widget/forms/GlobalHRSettingForms.xml
    ofbiz/branches/release09.04/applications/humanres/widget/forms/PartyResumeForms.xml
    ofbiz/branches/release09.04/applications/humanres/widget/forms/PayGradeForms.xml

Propchange: ofbiz/branches/release09.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Sep  6 17:18:48 2009
@@ -1 +1 @@
-/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663,783257,783266,783833,783913,783917,785123,785764,785967,786778,787126,787435-787436,787442,787520,788965,788983,788987,789329,789337,789506,789548,796769,799185,800461,800846,801023,802346,804364,805307,806127,806377,808786-808787,808792,809141,810370,810438,810465,810807,810809,810814,810832,810
 836,810878,810917,811020,811280,811297,811419,811528,811708,811714,811716,811793
+/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663,783257,783266,783833,783913,783917,785123,785764,785967,786778,787126,787435-787436,787442,787520,788965,788983,788987,789329,789337,789506,789548,796769,799185,800461,800846,801023,802346,804364,805307,806127,806377,808786-808787,808792,809141,810370,810438,810465,810807,810809,810814,810832,810
 836,810878,810917,811020,811280,811297,811419,811528,811708,811714,811716,811793,811838

Modified: ofbiz/branches/release09.04/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml?rev=811840&r1=811839&r2=811840&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml (original)
+++ ofbiz/branches/release09.04/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml Sun Sep  6 17:18:48 2009
@@ -52,7 +52,7 @@
         <make-value entity-name="PartyResume" value-field="newEntity"/>
         <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <sequenced-id sequence-name="PartyResume" field="newEntity.resumeId"/>
-        <field-to-result field="resumeId" result-name="resumeId"/>
+        <field-to-result field="resumeId" result-name="newEntity.resumeId"/>
         <create-value value-field="newEntity"/>
     </simple-method>
 
@@ -347,8 +347,11 @@
 
     <simple-method method-name="createTerminationReason" short-description="Create a Termination Reason">
         <make-value entity-name="TerminationReason" value-field="newEntity"/>
+        <set-pk-fields map="parameters" value-field="newEntity"/>
         <set-nonpk-fields map="parameters" value-field="newEntity"/>
-        <sequenced-id sequence-name="TerminationReason" field="newEntity.terminationReasonId"/>
+        <if-empty field="newEntity.terminationReasonId">
+            <sequenced-id sequence-name="TerminationReason" field="newEntity.terminationReasonId"/>
+        </if-empty>
         <field-to-result field="newEntity.terminationReasonId" result-name="terminationReasonId"/>
         <create-value value-field="newEntity"/>
     </simple-method>
@@ -508,8 +511,11 @@
     <!-- Skill Types -->
     <simple-method method-name="createSkillType" short-description="Create a SkillType">
         <make-value entity-name="SkillType" value-field="newEntity"/>
+        <set-pk-fields map="parameters" value-field="newEntity"/>
         <set-nonpk-fields map="parameters" value-field="newEntity"/>
-        <sequenced-id sequence-name="SkillType" field="newEntity.skillTypeId"/>
+        <if-empty field="newEntity.skillTypeId">
+            <sequenced-id sequence-name="SkillType" field="newEntity.skillTypeId"/>
+        </if-empty>
         <field-to-result field="newEntity.skillTypeId" result-name="skillTypeId"/>
         <create-value value-field="newEntity"/>
     </simple-method>
@@ -570,9 +576,10 @@
 
     <simple-method method-name="createTerminationType" short-description="Create a TerminationType">
         <make-value entity-name="TerminationType" value-field="newEntity"/>
+        <set-pk-fields map="parameters" value-field="newEntity"/>
         <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <if-empty field="newEntity.terminationTypeId">
-        <sequenced-id sequence-name="TerminationType" field="newEntity.terminationTypeId"/>
+            <sequenced-id sequence-name="TerminationType" field="newEntity.terminationTypeId"/>
         </if-empty>
         <field-to-result field="newEntity.terminationTypeId" result-name="terminationTypeId"/>
         <create-value value-field="newEntity"/>
@@ -604,6 +611,11 @@
         <set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
         <store-value value-field="lookedUpValue"/>
     </simple-method>
+    
+    <simple-method method-name="deleteEmplPositionType" short-description="Delete EmplPositionType">
+        <entity-one entity-name="EmplPositionType" value-field="lookedUpValue"/>
+        <remove-value value-field="lookedUpValue"/>
+    </simple-method>
 
     <simple-method method-name="updateEmplPositionTypeRate" short-description="Update/create EmplPositionTypeRate">
         <entity-one entity-name="EmplPositionTypeRate" value-field="lookedUpValue"/>

Modified: ofbiz/branches/release09.04/applications/humanres/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/humanres/servicedef/services.xml?rev=811840&r1=811839&r2=811840&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/humanres/servicedef/services.xml (original)
+++ ofbiz/branches/release09.04/applications/humanres/servicedef/services.xml Sun Sep  6 17:18:48 2009
@@ -279,6 +279,7 @@
         <permission-service service-name="humanResManagerPermission" main-action="UPDATE"/>
         <auto-attributes mode="IN" include="pk" optional="false"/>
         <auto-attributes mode="IN" include="nonpk" optional="true"/>
+        <override name="payGradeName" optional="false"/>
     </service>
 
     <service name="deletePayGrade" engine="simple" default-entity-name="PayGrade"
@@ -367,6 +368,7 @@
         <permission-service service-name="humanResManagerPermission" main-action="CREATE"/>
         <auto-attributes mode="INOUT" include="pk" optional="true"/>
         <auto-attributes mode="IN" include="nonpk" optional="true"/>
+        <override name="description" optional="false"/>
     </service>
 
     <service name="updateTerminationReason" engine="simple" default-entity-name="TerminationReason"
@@ -375,6 +377,7 @@
         <permission-service service-name="humanResManagerPermission" main-action="UPDATE"/>
         <auto-attributes mode="IN" include="pk" optional="false"/>
         <auto-attributes mode="IN" include="nonpk" optional="true"/>
+        <override name="description" optional="false"/>
     </service>
 
     <service name="deleteTerminationReason" engine="simple" default-entity-name="TerminationReason"
@@ -545,6 +548,7 @@
         <permission-service service-name="humanResManagerPermission" main-action="UPDATE"/>
         <auto-attributes mode="IN" include="pk" optional="false"/>
         <auto-attributes mode="IN" include="nonpk" optional="true"/>
+        <override name="description" optional="false"/>
     </service>
     <service name="deleteSkillType" engine="simple" default-entity-name="SkillType"
              location="component://humanres/script/org/ofbiz/humanres/HumanResServices.xml" invoke="deleteSkillType" auth="true">
@@ -608,6 +612,7 @@
         <permission-service service-name="humanResManagerPermission" main-action="UPDATE"/>
         <auto-attributes mode="IN" include="pk" optional="false"/>
         <auto-attributes mode="IN" include="nonpk" optional="true"/>
+        <override name="description" optional="false"/>
     </service>
     <service name="deleteTerminationType" engine="simple" default-entity-name="TerminationType"
              location="component://humanres/script/org/ofbiz/humanres/HumanResServices.xml" invoke="deleteTerminationType" auth="true">
@@ -631,6 +636,14 @@
         <permission-service service-name="humanResManagerPermission" main-action="UPDATE"/>
         <auto-attributes mode="IN" include="pk" optional="false"/>
         <auto-attributes mode="IN" include="nonpk" optional="true"/>
+        <override name="description" optional="false"/>
+    </service>
+    
+    <service name="deleteEmplPositionType" engine="simple" default-entity-name="EmplPositionType"
+             location="component://humanres/script/org/ofbiz/humanres/HumanResServices.xml" invoke="deleteEmplPositionType" auth="true">
+        <description>Delete EmplPositionType</description>
+        <permission-service service-name="humanResManagerPermission" main-action="DELETE"/>
+        <auto-attributes mode="IN" include="pk" optional="false"/>
     </service>
 
     <service name="updateEmplPositionTypeRate" engine="simple" default-entity-name="EmplPositionTypeRate"
@@ -706,6 +719,7 @@
         <permission-service service-name="humanResManagerPermission" main-action="UPDATE"/>
         <auto-attributes mode="IN" include="pk" optional="false"/>
         <auto-attributes mode="IN" include="nonpk" optional="true"/>
+        <override name="description" optional="false"/>
     </service>
 
     <service name="deleteEmplLeaveType" engine="simple" default-entity-name="EmplLeaveType"

Modified: ofbiz/branches/release09.04/applications/humanres/webapp/humanres/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/humanres/webapp/humanres/WEB-INF/controller.xml?rev=811840&r1=811839&r2=811840&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/humanres/webapp/humanres/WEB-INF/controller.xml (original)
+++ ofbiz/branches/release09.04/applications/humanres/webapp/humanres/WEB-INF/controller.xml Sun Sep  6 17:18:48 2009
@@ -110,7 +110,7 @@
     <request-map uri="deletePartyResume">
         <security https="true" auth="true"/>
         <event type="service" invoke="deletePartyResume"/>
-        <response name="success" type="view" value="EditPartyResume"/>
+        <response name="success" type="view" value="FindPartyResumes"/>
     </request-map>
     <request-map uri="FindPartySkills">
         <security https="true" auth="true"/>
@@ -312,12 +312,12 @@
     <request-map uri="createPayGrade">
         <security https="true" auth="true"/>
         <event type="service" invoke="createPayGrade"/>
-        <response name="success" type="view" value="FindPayGrades"/>
+        <response name="success" type="view" value="EditPayGrade"/>
         <response name="error" type="view" value="EditPayGrade"/>
     </request-map>
     <request-map uri="updatePayGrade">
         <security https="true" auth="true"/>
-        <event type="service-multi" invoke="updatePayGrade"/>
+        <event type="service" invoke="updatePayGrade"/>
         <response name="success" type="view" value="EditPayGrade"/>
         <response name="error" type="view" value="EditPayGrade"/>
     </request-map>
@@ -761,6 +761,11 @@
         <event type="service" invoke="updateEmplPositionType"/>
         <response name="success" type="view" value="EditEmplPositionTypes"/>
     </request-map>
+    <request-map uri="deleteEmplPositionType">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="deleteEmplPositionType"/>
+        <response name="success" type="view" value="FindEmplPositionTypes"/>
+    </request-map>
     <request-map uri="EditEmplPositionTypeRates">
         <security https="true" auth="true"/>
         <response name="success" type="view" value="EditEmplPositionTypeRates"/>

Modified: ofbiz/branches/release09.04/applications/humanres/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/humanres/widget/CommonScreens.xml?rev=811840&r1=811839&r2=811840&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/humanres/widget/CommonScreens.xml (original)
+++ ofbiz/branches/release09.04/applications/humanres/widget/CommonScreens.xml Sun Sep  6 17:18:48 2009
@@ -164,12 +164,19 @@
                                         </entity-one>
                                     </actions>
                                     <widgets>
-                                        <include-menu name="EmploymentBar" location="component://humanres/widget/Menus.xml"/>
-                                        <container style="button-bar">
-                                            <link target="EditEmployment" text="${uiLabelMap.HumanResNewEmployment}" style="buttontext"/>
-                                        </container>
-                                        <label style="h1" text="${emplName.lastName},${emplName.firstName} ${emplName.middleName} [${emplName.partyId}] ${uiLabelMap.CommonFor}"></label>
-                                        <label style="h1" text="${orgName.groupName} [${orgName.partyId}]"></label>
+                                        <section>
+                                            <condition>
+                                                <not><if-empty field="parameters.fromDate"/></not>
+                                            </condition>
+                                            <widgets>
+                                                <include-menu name="EmploymentBar" location="component://humanres/widget/Menus.xml"/>
+                                                <container style="button-bar">
+                                                    <link target="EditEmployment" text="${uiLabelMap.HumanResNewEmployment}" style="buttontext"/>
+                                                </container>
+                                                <label style="h1" text="${emplName.lastName},${emplName.firstName} ${emplName.middleName} [${emplName.partyId}] ${uiLabelMap.CommonFor}"></label>
+                                                <label style="h1" text="${orgName.groupName} [${orgName.partyId}]"></label>
+                                            </widgets>
+                                        </section>
                                     </widgets>
                                 </section>
                                 <decorator-section-include name="body"/>

Modified: ofbiz/branches/release09.04/applications/humanres/widget/forms/GlobalHRSettingForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/humanres/widget/forms/GlobalHRSettingForms.xml?rev=811840&r1=811839&r2=811840&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/humanres/widget/forms/GlobalHRSettingForms.xml (original)
+++ ofbiz/branches/release09.04/applications/humanres/widget/forms/GlobalHRSettingForms.xml Sun Sep  6 17:18:48 2009
@@ -62,7 +62,7 @@
     <form name="AddResponsibilityType" type="single" target="createResponsibilityType" title="" default-map-name="responsibilityType">
         <auto-fields-service service-name="createResponsibilityType" default-field-type="hidden"/>
         <field name="responsibilityTypeId" title="${uiLabelMap.HumanResResponsibilityTypeId}"><text/></field>
-        <field name="description" title="${uiLabelMap.CommonDescription}" tooltip="${uiLabelMap.CommonRequired}"><text/></field>
+        <field name="description" title="${uiLabelMap.CommonDescription}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text/></field>
         <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="buttontext"><submit button-type="text-link"/></field>
     </form>
     <form name="ListTerminationTypes" type="multi" title="" target="updateTerminationType"
@@ -114,15 +114,21 @@
             </hyperlink>
         </field>
         <field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
+        <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
+            <hyperlink target="deleteEmplPositionType" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+                <parameter param-name="emplPositionTypeId"/>
+            </hyperlink>
+        </field>
     </form>
     <form name="EditEmplPositionTypes" type="single" target="updateEmplPositionType" default-map-name="emplPositionType"
         header-row-style="header-row" default-table-style="basic-table">
         <alt-target use-when="emplPositionType==null" target="createEmplPositionType"/>
         <auto-fields-service service-name="updateEmplPositionType"/>
-        <field name="emplPositionTypeId" use-when="emplPositionType==null" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text/></field>
+        <field name="emplPositionTypeId" use-when="emplPositionType==null"><text/></field>
         <field name="emplPositionTypeId" use-when="emplPositionType!=null"><display/></field>
-        <field name="description" title="${uiLabelMap.CommonDescription}"><text/></field>
+        <field name="description" title="${uiLabelMap.CommonDescription}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text/></field>
         <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonUpdate}" use-when="emplPositionType!=null" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
     <form name="ListEmplPositionTypeRates" type="list" title="" target="deleteEmplPositionTypeRate"
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">

Modified: ofbiz/branches/release09.04/applications/humanres/widget/forms/PartyResumeForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/humanres/widget/forms/PartyResumeForms.xml?rev=811840&r1=811839&r2=811840&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/humanres/widget/forms/PartyResumeForms.xml (original)
+++ ofbiz/branches/release09.04/applications/humanres/widget/forms/PartyResumeForms.xml Sun Sep  6 17:18:48 2009
@@ -59,8 +59,8 @@
     <form name="EditPartyResume" type="single" target="createPartyResume" title="" default-map-name="partyResume"
         header-row-style="header-row" default-table-style="basic-table">
         <alt-target use-when="partyResume != null" target="updatePartyResume"/>
-        <field name="resumeId" use-when="resumeId!=null" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
-        <field name="resumeId" use-when="resumeId==null" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text/></field>
+        <field name="resumeId" use-when="partyResume!=null" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
+        <field name="resumeId" use-when="partyResume==null" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text/></field>
         <field name="contentId"><lookup target-form-name="LookupContent"/></field>
         <field name="partyId" use-when="partyResume!=null&amp;&amp;partyId!=null" title="${uiLabelMap.FormFieldTitle_partyId}"><hidden/></field>
         <field name="partyId" use-when="partyResume==null&amp;&amp;partyId==null" title="${uiLabelMap.FormFieldTitle_partyId}"><lookup target-form-name="LookupPartyName"/></field>

Modified: ofbiz/branches/release09.04/applications/humanres/widget/forms/PayGradeForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/humanres/widget/forms/PayGradeForms.xml?rev=811840&r1=811839&r2=811840&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/humanres/widget/forms/PayGradeForms.xml (original)
+++ ofbiz/branches/release09.04/applications/humanres/widget/forms/PayGradeForms.xml Sun Sep  6 17:18:48 2009
@@ -41,15 +41,21 @@
                 <parameter param-name="payGradeId"/>
             </hyperlink>
         </field>
+        <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
+            <hyperlink target="deletePayGrade" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+                <parameter param-name="payGradeId"/>
+            </hyperlink>
+        </field>
     </form>
     <form name="EditPayGrade" type="single" target="updatePayGrade" title=""
         header-row-style="header-row" default-table-style="basic-table" default-map-name="payGrade">
         <alt-target use-when="payGradeId==null" target="createPayGrade"/>
-        <auto-fields-service default-field-type="edit" service-name="createPayGrade"/>
+        <auto-fields-service service-name="updatePayGrade"/>
         <field use-when="payGrade!=null" name="payGradeId" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
-        <field use-when="payGrade==null" name="payGradeId" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text/></field>
-        <field name="payGradeName"><text/></field>
-        <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field use-when="payGrade==null" name="payGradeId"><text/></field>
+        <field name="payGradeName" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonUpdate}" use-when="payGrade!=null" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
     <form name="ListSalarySteps" type="multi" target="updateSalaryStep?salaryStepSeqId=${salaryStepSeqId}&amp;payGradeId=${payGradeId}" paginate-target="findSalarySteps"
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">