svn commit: r1561288 - in /ofbiz/branches/release12.04: ./ applications/humanres/widget/forms/EmplPositionForms.xml

Author: jleroux
Date: Sat Jan 25 12:09:39 2014
New Revision: 1561288

URL: http://svn.apache.org/r1561288
Log:
"Applied fix from trunk for revision: 1561286"
------------------------------------------------------------------------
r1561286 | jleroux | 2014-01-25 12:58:09 +0100 (sam. 25 janv. 2014) | 6 lignes

A (slightly enhanced) patch from Christian Carlow for "EditEmplPosition form widget missing Internal Org drop down and title incorrect" https://issues.apache.org/jira/browse/OFBIZ-5509

EditEmplPosition shows a partyId field as a text box instead of a <select> drop down that lists the internal orgs.  The field title should also be set to Internal Org instead of PartyId for consistency.

jleroux: while at it I added a tooltip

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


Modified:
    ofbiz/branches/release12.04/   (props changed)
    ofbiz/branches/release12.04/applications/humanres/widget/forms/EmplPositionForms.xml

Propchange: ofbiz/branches/release12.04/
------------------------------------------------------------------------------
  Merged /ofbiz/trunk:r1561286

Modified: ofbiz/branches/release12.04/applications/humanres/widget/forms/EmplPositionForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/humanres/widget/forms/EmplPositionForms.xml?rev=1561288&r1=1561287&r2=1561288&view=diff
==============================================================================
--- ofbiz/branches/release12.04/applications/humanres/widget/forms/EmplPositionForms.xml (original)
+++ ofbiz/branches/release12.04/applications/humanres/widget/forms/EmplPositionForms.xml Sat Jan 25 12:09:39 2014
@@ -63,7 +63,7 @@ under the License.
         <field use-when="emplPosition!=null" name="emplPositionId" title="${uiLabelMap.HumanResEmplPositionId}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
         <field use-when="emplPosition==null&amp;&amp;emplPositionId==null" name="emplPositionId" title="${uiLabelMap.HumanResEmplPositionId}"><lookup target-form-name="LookupEmplPosition"/></field>
         <field use-when="emplPosition==null&amp;&amp;emplPositionId!=null" name="emplPositionId" title="${uiLabelMap.HumanResEmplPositionId}" tooltip="${uiLabelMap.CommonCannotBeFound}: [${emplPositionId}]"><display/></field>
-        <field name="partyId" use-when="emplPosition!=null" parameter-name="partyId" title="organization partyId">
+        <field name="partyId" parameter-name="partyId" title="${uiLabelMap.HumanResEmploymentPartyIdFrom}" tooltip="${uiLabelMap.HumanResEmploymentPartyIdFromToolTip}">
             <drop-down allow-empty="false">
                 <entity-options description="${groupName}" entity-name="PartyRoleAndPartyDetail" key-field-name="partyId">
                     <entity-constraint name="roleTypeId" value="INTERNAL_ORGANIZATIO"/>