You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ha...@apache.org on 2011/10/05 09:28:26 UTC
svn commit: r1179073 - in /ofbiz/trunk/applications/humanres:
config/HumanResUiLabels.xml widget/forms/EmplPositionForms.xml
Author: hansbak
Date: Wed Oct 5 07:28:25 2011
New Revision: 1179073
URL: http://svn.apache.org/viewvc?rev=1179073&view=rev
Log:
be able to move a position to another department/organization
Modified:
ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml
ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml
Modified: ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml?rev=1179073&r1=1179072&r2=1179073&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml (original)
+++ ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml Wed Oct 5 07:28:25 2011
@@ -1226,7 +1226,7 @@
</property>
<property key="HumanResEmployeePosition">
<value xml:lang="de">Stellen</value>
- <value xml:lang="en">Employee Positions</value>
+ <value xml:lang="en">Employee Position</value>
<value xml:lang="fr">Positions d'employé</value>
<value xml:lang="it">Posizione Impiegato</value>
<value xml:lang="pt_BR">Posição do empregado</value>
Modified: ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml?rev=1179073&r1=1179072&r2=1179073&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml Wed Oct 5 07:28:25 2011
@@ -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&&emplPositionId==null" name="emplPositionId" title="${uiLabelMap.HumanResEmplPositionId}"><lookup target-form-name="LookupEmplPosition"/></field>
<field use-when="emplPosition==null&&emplPositionId!=null" name="emplPositionId" title="${uiLabelMap.HumanResEmplPositionId}" tooltip="${uiLabelMap.CommonCannotBeFound}: [${emplPositionId}]"><display/></field>
- <field name="partyId" parameter-name="partyId">
+ <field name="partyId" use-when="emplPosition!=null" parameter-name="partyId" title="organization partyId">
<drop-down allow-empty="false">
<entity-options description="${partyId}" entity-name="PartyRole" key-field-name="partyId">
<entity-constraint name="roleTypeId" value="INTERNAL_ORGANIZATIO"/>
@@ -71,13 +71,13 @@ under the License.
</entity-options>
</drop-down>
</field>
- <field name="partyId" use-when="emplPosition!=null" title="${uiLabelMap.PartyPartyId}">
+ <!--<field name="partyId" title="Organization PartyId">
<display-entity description="${groupName}" entity-name="PartyNameView">
<sub-hyperlink target="viewprofile" link-style="smallSubmit" target-type="inter-app" description="${partyId}">
<parameter param-name="partyId"/>
</sub-hyperlink>
</display-entity>
- </field>
+ </field>-->
<field name="statusId" title="${uiLabelMap.CommonStatus}">
<drop-down allow-empty="false">
<entity-options description="${description}" key-field-name="statusId" entity-name="StatusItem">