Return-Path: 
 <commits-return-22521-apmail-ofbiz-commits-archive=ofbiz.apache.org@ofbiz.apache.org>
X-Original-To: apmail-ofbiz-commits-archive@www.apache.org
Delivered-To: apmail-ofbiz-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id AF8F19415
	for <apmail-ofbiz-commits-archive@www.apache.org>;
 Wed,  5 Oct 2011 07:28:48 +0000 (UTC)
Received: (qmail 72321 invoked by uid 500); 5 Oct 2011 07:28:48 -0000
Delivered-To: apmail-ofbiz-commits-archive@ofbiz.apache.org
Received: (qmail 72277 invoked by uid 500); 5 Oct 2011 07:28:47 -0000
Mailing-List: contact commits-help@ofbiz.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@ofbiz.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@ofbiz.apache.org>
List-Post: <mailto:commits@ofbiz.apache.org>
List-Id: <commits.ofbiz.apache.org>
Reply-To: dev@ofbiz.apache.org
Delivered-To: mailing list commits@ofbiz.apache.org
Received: (qmail 72270 invoked by uid 99); 5 Oct 2011 07:28:47 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 Oct 2011 07:28:47 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 Oct 2011 07:28:46 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 2949E23888E4
	for <commits@ofbiz.apache.org>; Wed,  5 Oct 2011 07:28:26 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: svn commit: r1179073 - in /ofbiz/trunk/applications/humanres:
 config/HumanResUiLabels.xml widget/forms/EmplPositionForms.xml
Date: Wed, 05 Oct 2011 07:28:26 -0000
To: commits@ofbiz.apache.org
From: hansbak@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20111005072826.2949E23888E4@eris.apache.org>

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&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" 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">