svn commit: r813704 - in /ofbiz/branches/release09.04: ./ applications/humanres/widget/PayGradeScreens.xml applications/humanres/widget/forms/PayGradeForms.xml

Author: jleroux
Date: Fri Sep 11 07:57:41 2009
New Revision: 813704

URL: http://svn.apache.org/viewvc?rev=813704&view=rev
Log:
"Applied fix from trunk for revision: 813702"
------------------------------------------------------------------------
r813702 | jleroux | 2009-09-11 09:54:45 +0200 (ven. 11 sept. 2009) | 3 lignes

A patch from Pradeep Ruhil "This patch is for Improvent in HR module in Global Hr Setting tabs in Paygrade section." (https://issues.apache.org/jira/browse/OFBIZ-2739) - OFBIZ-2739
This issue is that when you select any payGradeId that is already created and then you check the Salary Steps for that payGradeId, it was showing the Salary Steps of all the payGradeId present. So I resolved that issue and now it will display the Salary Step for the selected payGradeId only.

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


Modified:
    ofbiz/branches/release09.04/   (props changed)
    ofbiz/branches/release09.04/applications/humanres/widget/PayGradeScreens.xml
    ofbiz/branches/release09.04/applications/humanres/widget/forms/PayGradeForms.xml

Propchange: ofbiz/branches/release09.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 11 07:57:41 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,811838,811860,811865,811870,812159,812182,812192,812456,812540,813126,813131,813283,813672
+/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,811860,811865,811870,812159,812182,812192,812456,812540,813126,813131,813283,813672,813702

Modified: ofbiz/branches/release09.04/applications/humanres/widget/PayGradeScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/humanres/widget/PayGradeScreens.xml?rev=813704&r1=813703&r2=813704&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/humanres/widget/PayGradeScreens.xml (original)
+++ ofbiz/branches/release09.04/applications/humanres/widget/PayGradeScreens.xml Fri Sep 11 07:57:41 2009
@@ -74,7 +74,7 @@
                                 <include-menu name="SalaryBar" location="component://humanres/widget/Menus.xml"/>
                             </widgets>
                         </section>
-                        <screenlet title="${uiLabelMap.HumanResEditPayGrade}">
+                        <screenlet title="${uiLabelMap.HumanResEditPayGrade} [${payGradeId}]">
                             <section>
                                 <widgets>
                                     <include-form name="EditPayGrade" location="component://humanres/widget/forms/PayGradeForms.xml"/>
@@ -106,7 +106,7 @@
                                 <include-menu name="SalaryBar" location="component://humanres/widget/Menus.xml"/>
                             </widgets>
                         </section>
-                        <screenlet id="AddSalaryStepPanel" title="${uiLabelMap.HumanResAddSalaryStep}" collapsible="true">
+                        <screenlet id="AddSalaryStepPanel" title="${uiLabelMap.HumanResAddSalaryStep} [${payGradeId}]" collapsible="true">
                             <include-form name="AddSalaryStep" location="component://humanres/widget/forms/PayGradeForms.xml"/>
                         </screenlet>
                         <include-form name="ListSalarySteps" location="component://humanres/widget/forms/PayGradeForms.xml"/>

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=813704&r1=813703&r2=813704&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/humanres/widget/forms/PayGradeForms.xml (original)
+++ ofbiz/branches/release09.04/applications/humanres/widget/forms/PayGradeForms.xml Fri Sep 11 07:57:41 2009
@@ -61,7 +61,7 @@
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <actions>
             <entity-one entity-name="SalaryStep" auto-field-map="true"/>
-            <entity-condition entity-name="SalaryStep"><order-by field-name="salaryStepSeqId"/></entity-condition>
+            <entity-condition entity-name="SalaryStep"> <condition-expr field-name="payGradeId" operator="equals" from-field="payGradeId"/><order-by field-name="salaryStepSeqId"/></entity-condition>
         </actions>
         <auto-fields-service service-name="updateSalaryStep"/>
         <field name="salaryStepSeqId" title="${uiLabelMap.HumanResSalaryStepSeqId}"><display also-hidden="true"/></field>