svn commit: r738249 - in /ofbiz/trunk/applications/huma
Locked
 
|
Author: mrisaliti
Date: Tue Jan 27 21:25:52 2009 New Revision: 738249 URL: http://svn.apache.org/viewvc?rev=738249&view=rev Log: Artifact cleaning on humanres component after recent changes on xsd files (OFBIZ-2137) Modified: ofbiz/trunk/applications/humanres/widget/CommonScreens.xml ofbiz/trunk/applications/humanres/widget/EmplLeaveScreens.xml ofbiz/trunk/applications/humanres/widget/EmplPositionScreens.xml ofbiz/trunk/applications/humanres/widget/EmployeeScreens.xml ofbiz/trunk/applications/humanres/widget/EmploymentAppScreens.xml ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml ofbiz/trunk/applications/humanres/widget/GlobalHRSettingScreens.xml ofbiz/trunk/applications/humanres/widget/PartyQualScreens.xml ofbiz/trunk/applications/humanres/widget/PartyResumeScreens.xml ofbiz/trunk/applications/humanres/widget/PartySkillScreens.xml ofbiz/trunk/applications/humanres/widget/PartyTrees.xml ofbiz/trunk/applications/humanres/widget/PayGradeScreens.xml ofbiz/trunk/applications/humanres/widget/PerfReviewScreens.xml ofbiz/trunk/applications/humanres/widget/PersonTrainingScreens.xml ofbiz/trunk/applications/humanres/widget/forms/EmplLeaveForms.xml ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml ofbiz/trunk/applications/humanres/widget/forms/EmployeeForms.xml ofbiz/trunk/applications/humanres/widget/forms/EmploymentAppForms.xml ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml ofbiz/trunk/applications/humanres/widget/forms/LookupForms.xml ofbiz/trunk/applications/humanres/widget/forms/PartyQualForms.xml ofbiz/trunk/applications/humanres/widget/forms/PartyResumeForms.xml ofbiz/trunk/applications/humanres/widget/forms/PartySkillForms.xml ofbiz/trunk/applications/humanres/widget/forms/PayGradeForms.xml ofbiz/trunk/applications/humanres/widget/forms/PerfReviewForms.xml ofbiz/trunk/applications/humanres/widget/forms/PersonTrainingForms.xml Modified: ofbiz/trunk/applications/humanres/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/CommonScreens.xml?rev=738249&r1=738248&r2=738249&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/CommonScreens.xml (original) +++ ofbiz/trunk/applications/humanres/widget/CommonScreens.xml Tue Jan 27 21:25:52 2009 @@ -102,7 +102,7 @@ <actions> <set field="headerItem" value="EmplPosition"/> <set field="emplPositionId" from-field="parameters.emplPositionId"/> - <entity-one entity-name="EmplPosition" value-name="emplPosition"/> + <entity-one entity-name="EmplPosition" value-field="emplPosition"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> @@ -115,7 +115,7 @@ <widgets> <section> <condition> - <not><if-empty field-name="emplPosition"/></not> + <not><if-empty field="emplPosition"/></not> </condition> <widgets> <include-menu name="EmplPostionBar" location="component://humanres/widget/Menus.xml"/> @@ -140,7 +140,7 @@ <set field="partyIdFrom" from-field="parameters.partyIdFrom"/> <set field="partyIdTo" from-field="parameters.partyIdTo"/> <set field="fromDate" from-field="parameters.fromDate" type="Timestamp"/> - <entity-one entity-name="Employment" value-name="employment"/> + <entity-one entity-name="Employment" value-field="employment"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> @@ -153,7 +153,7 @@ <widgets> <section> <condition> - <not><if-empty field-name="employment"/></not> + <not><if-empty field="employment"/></not> </condition> <widgets> <include-menu name="EmploymentBar" location="component://humanres/widget/Menus.xml"/> @@ -174,7 +174,7 @@ <section> <actions> <set field="payGradeId" from-field="parameters.payGradeId"/> - <entity-one entity-name="PayGrade" value-name="payGrade"/> + <entity-one entity-name="PayGrade" value-field="payGrade"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> @@ -187,7 +187,7 @@ <widgets> <section> <condition> - <not><if-empty field-name="payGrade"/></not> + <not><if-empty field="payGrade"/></not> </condition> <widgets> <include-menu name="SalaryBar" location="component://humanres/widget/Menus.xml"/> @@ -208,7 +208,7 @@ <section> <actions> <set field="perfReviewId" from-field="parameters.perfReviewId"/> - <entity-one entity-name="PerfReview" value-name="perfReview"/> + <entity-one entity-name="PerfReview" value-field="perfReview"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> @@ -221,7 +221,7 @@ <widgets> <section> <condition> - <not><if-empty field-name="perfReviewId"/></not> + <not><if-empty field="perfReviewId"/></not> </condition> <widgets> <include-menu name="PartyBar" location="component://humanres/widget/Menus.xml"/> @@ -244,8 +244,8 @@ <actions> <set field="headerItem" value="Employees"/> <set field="partyId" from-field="parameters.partyId"/> - <entity-one entity-name="Party" value-name="party"/> - <entity-one entity-name="Person" value-name="lookupPerson"/> + <entity-one entity-name="Party" value-field="party"/> + <entity-one entity-name="Person" value-field="lookupPerson"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> @@ -254,7 +254,7 @@ <condition> <and> <if-has-permission permission="HUMANRES" action="_VIEW"/> - <not><if-empty field-name="partyId"/></not> + <not><if-empty field="partyId"/></not> </and> </condition> <widgets> @@ -269,11 +269,11 @@ </condition> <widgets> <section> - <condition><not><if-empty field-name="partyId"/></not></condition> + <condition><not><if-empty field="partyId"/></not></condition> <widgets> <container style="h1"> <section> - <condition><not><if-empty field-name="lookupPerson"/></not></condition> + <condition><not><if-empty field="lookupPerson"/></not></condition> <widgets> <label text="${uiLabelMap.PartyTheProfileOf} ${lookupPerson.personalTitle} ${lookupPerson.firstName} ${lookupPerson.middleName} ${lookupPerson.lastName} ${lookupPerson.suffix} [${partyId}]"/> </widgets> @@ -300,9 +300,9 @@ <section> <actions> <set field="partyId" from-field="parameters.partyId"/> - <entity-one entity-name="Party" value-name="party"/> - <entity-one entity-name="Person" value-name="lookupPerson"/> - <entity-one entity-name="PartyGroup" value-name="lookupGroup"/> + <entity-one entity-name="Party" value-field="party"/> + <entity-one entity-name="Person" value-field="lookupPerson"/> + <entity-one entity-name="PartyGroup" value-field="lookupGroup"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> @@ -311,7 +311,7 @@ <condition> <and> <if-has-permission permission="HUMANRES" action="_VIEW"/> - <not><if-empty field-name="partyId"/></not> + <not><if-empty field="partyId"/></not> </and> </condition> <widgets> @@ -327,14 +327,14 @@ <!-- do check for PARTYMGR, _VIEW permission --> <widgets> <section> - <condition><not><if-empty field-name="partyId"/></not></condition> + <condition><not><if-empty field="partyId"/></not></condition> <widgets> <container style="h1"> <section> <condition> <or> - <not><if-empty field-name="lookupPerson"/></not> - <not><if-empty field-name="lookupGroup"/></not> + <not><if-empty field="lookupPerson"/></not> + <not><if-empty field="lookupGroup"/></not> </or> </condition> <widgets> Modified: ofbiz/trunk/applications/humanres/widget/EmplLeaveScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/EmplLeaveScreens.xml?rev=738249&r1=738248&r2=738249&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/EmplLeaveScreens.xml (original) +++ ofbiz/trunk/applications/humanres/widget/EmplLeaveScreens.xml Tue Jan 27 21:25:52 2009 @@ -106,7 +106,7 @@ <set field="headerItem" value="GlobalHRSettings"/> <set field="tabButtonItem" value="EmplLeaveType"/> <set field="leaveTypeId" from-field="parameters.leaveTypeId"/> - <entity-one entity-name="EmplLeaveType" value-name="emplLeaveType"/> + <entity-one entity-name="EmplLeaveType" value-field="emplLeaveType"/> </actions> <widgets> <decorator-screen name="GlobalHRSettingsDecorator" location="${parameters.mainDecoratorLocation}"> Modified: ofbiz/trunk/applications/humanres/widget/EmplPositionScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/EmplPositionScreens.xml?rev=738249&r1=738248&r2=738249&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/EmplPositionScreens.xml (original) +++ ofbiz/trunk/applications/humanres/widget/EmplPositionScreens.xml Tue Jan 27 21:25:52 2009 @@ -57,7 +57,7 @@ <set field="titleProperty" value="PageTitleEditEmplPosition"/> <set field="tabButtonItem" value="EditEmplPosition"/> <set field="emplPositionId" from-field="parameters.emplPositionId"/> - <entity-one entity-name="EmplPosition" value-name="emplPosition" /> + <entity-one entity-name="EmplPosition" value-field="emplPosition" /> </actions> <widgets> <decorator-screen name="CommonEmplPositionDecorator" location="${parameters.mainDecoratorLocation}"> @@ -211,7 +211,7 @@ <set field="titleProperty" value="HumanResEmplPositionSummary"/> <set field="tabButtonItem" value="EmplPositionView"/> <set field="emplPositionId" from-field="parameters.emplPositionId"/> - <entity-one entity-name="EmplPosition" value-name="emplPosition"/> + <entity-one entity-name="EmplPosition" value-field="emplPosition"/> </actions> <widgets> <decorator-screen name="CommonEmplPositionDecorator" location="${parameters.mainDecoratorLocation}"> @@ -243,8 +243,8 @@ <screen name="EmplPositionFulfilmentView"> <section> <actions> - <entity-condition entity-name="EmplPositionFulfillment" list-name="emplPositionFulfillments"> - <condition-expr field-name="emplPositionId" operator="equals" env-name="parameters.emplPositionId"/> + <entity-condition entity-name="EmplPositionFulfillment" list="emplPositionFulfillments"> + <condition-expr field-name="emplPositionId" operator="equals" from-field="parameters.emplPositionId"/> <order-by field-name="fromDate"/> </entity-condition> </actions> @@ -262,8 +262,8 @@ <screen name="EmplPositionResponsibilityView"> <section> <actions> - <entity-condition entity-name="EmplPositionResponsibility" list-name="emplPositionResponsibilities"> - <condition-expr field-name="emplPositionId" operator="equals" env-name="parameters.emplPositionId"/> + <entity-condition entity-name="EmplPositionResponsibility" list="emplPositionResponsibilities"> + <condition-expr field-name="emplPositionId" operator="equals" from-field="parameters.emplPositionId"/> <order-by field-name="fromDate"/> </entity-condition> </actions> @@ -281,8 +281,8 @@ <screen name="EmplPositionReportsToView"> <section> <actions> - <entity-condition entity-name="EmplPositionReportingStruct" list-name="emplPositionReportingStructs"> - <condition-expr field-name="emplPositionIdManagedBy" operator="equals" env-name="parameters.emplPositionId"/> + <entity-condition entity-name="EmplPositionReportingStruct" list="emplPositionReportingStructs"> + <condition-expr field-name="emplPositionIdManagedBy" operator="equals" from-field="parameters.emplPositionId"/> <order-by field-name="fromDate"/> </entity-condition> </actions> @@ -300,8 +300,8 @@ <screen name="EmplPositionReportedToView"> <section> <actions> - <entity-condition entity-name="EmplPositionReportingStruct" list-name="emplPositionReportingStructs"> - <condition-expr field-name="emplPositionIdReportingTo" operator="equals" env-name="parameters.emplPositionId"/> + <entity-condition entity-name="EmplPositionReportingStruct" list="emplPositionReportingStructs"> + <condition-expr field-name="emplPositionIdReportingTo" operator="equals" from-field="parameters.emplPositionId"/> <order-by field-name="fromDate"/> </entity-condition> </actions> Modified: ofbiz/trunk/applications/humanres/widget/EmployeeScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/EmployeeScreens.xml?rev=738249&r1=738248&r2=738249&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/EmployeeScreens.xml (original) +++ ofbiz/trunk/applications/humanres/widget/EmployeeScreens.xml Tue Jan 27 21:25:52 2009 @@ -96,12 +96,12 @@ <decorator-section name="body"> <section> <condition> - <not><if-empty field-name="party"/></not> + <not><if-empty field="party"/></not> </condition> <widgets> <section> <condition> - <if-compare field-name="showOld" operator="equals" value="true" type="Boolean"/> + <if-compare field="showOld" operator="equals" value="true" type="Boolean"/> </condition> <widgets> <container style="button-bar button-style-2"> @@ -237,7 +237,7 @@ <set field="tabButtonItem" value="EditEmployeeResumes"/> <set field="resumeId" from-field="parameters.resumeId"/> <set field="partyId" from-field="parameters.partyId" /> - <entity-one entity-name="PartyResume" value-name="partyResume" /> + <entity-one entity-name="PartyResume" value-field="partyResume" /> </actions> <widgets> <decorator-screen name="EmployeeDecorator" location="${parameters.mainDecoratorLocation}"> Modified: ofbiz/trunk/applications/humanres/widget/EmploymentAppScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/EmploymentAppScreens.xml?rev=738249&r1=738248&r2=738249&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/EmploymentAppScreens.xml (original) +++ ofbiz/trunk/applications/humanres/widget/EmploymentAppScreens.xml Tue Jan 27 21:25:52 2009 @@ -78,7 +78,7 @@ <set field="titleProperty" value="HumanResNewEmploymentApp"/> <set field="headerItem" value="EmploymentApp"/> <set field="applicationId" from-field="parameters.applicationId"/> - <entity-one entity-name="EmploymentApp" value-name="employmentApp"/> + <entity-one entity-name="EmploymentApp" value-field="employmentApp"/> </actions> <widgets> <decorator-screen name="CommonEmploymentDecorator" location="${parameters.mainDecoratorLocation}"> Modified: ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml?rev=738249&r1=738248&r2=738249&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml (original) +++ ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml Tue Jan 27 21:25:52 2009 @@ -64,7 +64,7 @@ <set field="headerItem" value="Employment"/> <set field="tabButtonItem" value="EditEmployment"/> <set field="fromDate" from-field="parameters.fromDate" type="Timestamp"/> - <entity-one entity-name="Employment" value-name="employment"/> + <entity-one entity-name="Employment" value-field="employment"/> </actions> <widgets> <decorator-screen name="CommonEmploymentDecorator" location="${parameters.mainDecoratorLocation}"> @@ -148,7 +148,7 @@ <set field="payrollPreferenceSeqId" from-field="parameters.payrollPreferenceSeqId"/> <set field="partyId" from-field="parameters.partyIdTo"/> <set field="roleTypeId" from-field="parameters.roleTypeIdTo"/> - <entity-one entity-name="PayrollPreference" value-name="payrollPreference" /> + <entity-one entity-name="PayrollPreference" value-field="payrollPreference" /> </actions> <widgets> <decorator-screen name="CommonEmploymentDecorator" location="${parameters.mainDecoratorLocation}"> @@ -174,7 +174,7 @@ <set field="partyIdTo" from-field="parameters.partyIdTo"/> <set field="partyIdFrom" from-field="parameters.partyIdFrom"/> <set field="fromDate" from-field="parameters.fromDate" type="Timestamp"/> - <entity-one entity-name="UnemploymentClaim" value-name="unemploymentClaim" /> + <entity-one entity-name="UnemploymentClaim" value-field="unemploymentClaim" /> </actions> <widgets> <decorator-screen name="CommonEmploymentDecorator" location="${parameters.mainDecoratorLocation}"> Modified: ofbiz/trunk/applications/humanres/widget/GlobalHRSettingScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/GlobalHRSettingScreens.xml?rev=738249&r1=738248&r2=738249&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/GlobalHRSettingScreens.xml (original) +++ ofbiz/trunk/applications/humanres/widget/GlobalHRSettingScreens.xml Tue Jan 27 21:25:52 2009 @@ -26,7 +26,7 @@ <set field="headerItem" value="SkillType"/> <set field="titleProperty" value="PageTitleListSkillTypes"/> <set field="skillTypeId" from-field="parameters.skillTypeId"/> - <entity-one entity-name="SkillType" value-name="skillType" /> + <entity-one entity-name="SkillType" value-field="skillType" /> </actions> <widgets> <decorator-screen name="GlobalHRSettingsDecorator" location="${parameters.mainDecoratorLocation}"> @@ -46,7 +46,7 @@ <set field="titleProperty" value="PageTitleEditResponsibilityType"/> <set field="tabButtonItem" value="ResponsibilityType"/> <set field="responsibilityTypeId" from-field="parameters.responsibilityTypeId"/> - <entity-one entity-name="ResponsibilityType" value-name="responsibilityType"/> + <entity-one entity-name="ResponsibilityType" value-field="responsibilityType"/> </actions> <widgets> <decorator-screen name="GlobalHRSettingsDecorator" location="${parameters.mainDecoratorLocation}"> @@ -66,7 +66,7 @@ <set field="tabButtonItem" value="TerminationType"/> <set field="titleProperty" value="HumanResTerminationTypes"/> <set field="terminationTypeId" from-field="parameters.terminationTypeId"/> - <entity-one entity-name="TerminationType" value-name="terminationType" /> + <entity-one entity-name="TerminationType" value-field="terminationType" /> </actions> <widgets> <decorator-screen name="GlobalHRSettingsDecorator" location="${parameters.mainDecoratorLocation}"> @@ -118,7 +118,7 @@ <set field="tabButtonItem" value="EmplPositionTypes"/> <set field="tabButtonItem2" value="EditEmplPositionType"/> <set field="emplPositionTypeId" from-field="parameters.emplPositionTypeId"/> - <entity-one entity-name="EmplPositionType" value-name="emplPositionType"/> + <entity-one entity-name="EmplPositionType" value-field="emplPositionType"/> </actions> <widgets> <decorator-screen name="GlobalHRSettingsDecorator" location="${parameters.mainDecoratorLocation}"> @@ -126,7 +126,7 @@ <section> <condition> <not> - <if-empty field-name="emplPositionTypeId"/> + <if-empty field="emplPositionTypeId"/> </not> </condition> <widgets> @@ -153,7 +153,7 @@ <set field="tabButtonItem" value="EmplPositionTypes"/> <set field="tabButtonItem2" value="EditEmplPositionTypeRate"/> <set field="emplPositionTypeId" from-field="parameters.emplPositionTypeId"/> - <entity-one entity-name="EmplPositionTypeRate" value-name="emplPositionTypeRate"/> + <entity-one entity-name="EmplPositionTypeRate" value-field="emplPositionTypeRate"/> </actions> <widgets> <decorator-screen name="GlobalHRSettingsDecorator" location="${parameters.mainDecoratorLocation}"> @@ -174,7 +174,7 @@ <set field="titleProperty" value="HumanResAddTerminationReason"/> <set field="tabButtonItem" value="TerminationReason"/> <set field="terminationReasonId" from-field="parameters.terminationReasonId" /> - <entity-one entity-name="TerminationReason" value-name="terminationReason" /> + <entity-one entity-name="TerminationReason" value-field="terminationReason" /> </actions> <widgets> <decorator-screen name="GlobalHRSettingsDecorator" location="${parameters.mainDecoratorLocation}"> Modified: ofbiz/trunk/applications/humanres/widget/PartyQualScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/PartyQualScreens.xml?rev=738249&r1=738248&r2=738249&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/PartyQualScreens.xml (original) +++ ofbiz/trunk/applications/humanres/widget/PartyQualScreens.xml Tue Jan 27 21:25:52 2009 @@ -81,7 +81,7 @@ <section> <actions> <set field="headerItem" value="PartyQual"/> - <entity-one entity-name="PartyQual" value-name="partyQual"/> + <entity-one entity-name="PartyQual" value-field="partyQual"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> Modified: ofbiz/trunk/applications/humanres/widget/PartyResumeScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/PartyResumeScreens.xml?rev=738249&r1=738248&r2=738249&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/PartyResumeScreens.xml (original) +++ ofbiz/trunk/applications/humanres/widget/PartyResumeScreens.xml Tue Jan 27 21:25:52 2009 @@ -60,7 +60,7 @@ <set field="tabButtonItem" value="EditPartySkill"/> <set field="resumeId" from-field="parameters.resumeId"/> <set field="partyId" from-field="parameters.partyId" /> - <entity-one entity-name="PartyResume" value-name="partyResume" /> + <entity-one entity-name="PartyResume" value-field="partyResume" /> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> Modified: ofbiz/trunk/applications/humanres/widget/PartySkillScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/PartySkillScreens.xml?rev=738249&r1=738248&r2=738249&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/PartySkillScreens.xml (original) +++ ofbiz/trunk/applications/humanres/widget/PartySkillScreens.xml Tue Jan 27 21:25:52 2009 @@ -83,7 +83,7 @@ <set field="headerItem" value="PartySkills"/> <set field="partyId" from-field="parameters.employeePartyId"/> <set field="skillTypeId" from-field="parameters.skillTypeId"/> - <entity-one entity-name="PartySkill" value-name="partySkill"/> + <entity-one entity-name="PartySkill" value-field="partySkill"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> Modified: ofbiz/trunk/applications/humanres/widget/PartyTrees.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/PartyTrees.xml?rev=738249&r1=738248&r2=738249&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/PartyTrees.xml (original) +++ ofbiz/trunk/applications/humanres/widget/PartyTrees.xml Tue Jan 27 21:25:52 2009 @@ -22,34 +22,34 @@ <tree name="OrgTree" root-node-name="node-root" entity-name="PartyAndGroup" open-depth="1"> <node name="node-root" entity-name="PartyAndGroup" render-style="expand-collapse"> - <entity-one entity-name="PartyAndGroup" value-name="partyAndGroup"/> + <entity-one entity-name="PartyAndGroup" value-field="partyAndGroup"/> <include-screen name="PartyGroupTreeLine" location="component://humanres/widget/CommonScreens.xml"/> <sub-node node-name="internalOrg-list"> <entity-condition entity-name="PartyRelationship" filter-by-date="true"> <condition-list combine="and"> - <condition-expr field-name="partyIdFrom" operator="equals" env-name="partyId"/> + <condition-expr field-name="partyIdFrom" operator="equals" from-field="partyId"/> <condition-expr field-name="partyRelationshipTypeId" operator="equals" value="GROUP_ROLLUP"/> </condition-list> </entity-condition> </sub-node> </node> <node name="internalOrg-list" entry-name="partyRelationship" entity-name="PartyRelationship" join-field-name="partyIdTo" render-style="expand-collapse"> - <entity-one entity-name="PartyAndGroup" value-name="partyAndGroup"> - <field-map field-name="partyId" env-name="partyRelationship.partyIdTo"/> + <entity-one entity-name="PartyAndGroup" value-field="partyAndGroup"> + <field-map field-name="partyId" from-field="partyRelationship.partyIdTo"/> </entity-one> <include-screen name="PartyGroupTreeLine" location="component://humanres/widget/CommonScreens.xml"/> <sub-node node-name="employee-list"> <entity-condition entity-name="Employment" filter-by-date="true"> <condition-list combine="and"> - <condition-expr field-name="partyIdFrom" operator="equals" env-name="partyRelationship.partyIdTo"/> + <condition-expr field-name="partyIdFrom" operator="equals" from-field="partyRelationship.partyIdTo"/> <condition-expr field-name="roleTypeIdTo" operator="equals" value="EMPLOYEE"/> </condition-list> </entity-condition> </sub-node> </node> <node name="employee-list" entry-name="employment" entity-name="Employment" join-field-name="partyIdTo" render-style="simple"> - <entity-one entity-name="PartyAndPerson" value-name="partyAndPerson"> - <field-map field-name="partyId" env-name="employment.partyIdTo"/> + <entity-one entity-name="PartyAndPerson" value-field="partyAndPerson"> + <field-map field-name="partyId" from-field="employment.partyIdTo"/> </entity-one> <include-screen name="PartyPersonTreeLine" location="component://humanres/widget/CommonScreens.xml"/> </node> Modified: ofbiz/trunk/applications/humanres/widget/PayGradeScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/PayGradeScreens.xml?rev=738249&r1=738248&r2=738249&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/PayGradeScreens.xml (original) +++ ofbiz/trunk/applications/humanres/widget/PayGradeScreens.xml Tue Jan 27 21:25:52 2009 @@ -60,7 +60,7 @@ <set field="headerItem" value="PayGrade"/> <set field="tabButtonItem" value="EditPayGrade"/> <set field="payGradeId" from-field="parameters.payGradeId"/> - <entity-one entity-name="PayGrade" value-name="payGrade"/> + <entity-one entity-name="PayGrade" value-field="payGrade"/> </actions> <widgets> <decorator-screen name="CommonPayGradeDecorator" location="${parameters.mainDecoratorLocation}"> Modified: ofbiz/trunk/applications/humanres/widget/PerfReviewScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/PerfReviewScreens.xml?rev=738249&r1=738248&r2=738249&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/PerfReviewScreens.xml (original) +++ ofbiz/trunk/applications/humanres/widget/PerfReviewScreens.xml Tue Jan 27 21:25:52 2009 @@ -59,7 +59,7 @@ <set field="perfReviewId" from-field="parameters.perfReviewId"/> <set field="employeePartyId" from-field="parameters.employeePartyId"/> <set field="employeeRoleTypeId" from-field="parameters.employeeRoleTypeId"/> - <entity-one entity-name="PerfReview" value-name="perfReview"/> + <entity-one entity-name="PerfReview" value-field="perfReview"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> Modified: ofbiz/trunk/applications/humanres/widget/PersonTrainingScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/PersonTrainingScreens.xml?rev=738249&r1=738248&r2=738249&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/PersonTrainingScreens.xml (original) +++ ofbiz/trunk/applications/humanres/widget/PersonTrainingScreens.xml Tue Jan 27 21:25:52 2009 @@ -82,7 +82,7 @@ <set field="titleProperty" value="HumanResAddPersonTraining"/> <set field="headerItem" value="Training"/> <set field="partyId" from-field="parameters.partyId"/> - <entity-one entity-name="Party" value-name="party"/> + <entity-one entity-name="Party" value-field="party"/> <set field="trainingClassTypeId" from-field="parameters.trainingClassTypeId"/> </actions> <widgets> Modified: ofbiz/trunk/applications/humanres/widget/forms/EmplLeaveForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmplLeaveForms.xml?rev=738249&r1=738248&r2=738249&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/forms/EmplLeaveForms.xml (original) +++ ofbiz/trunk/applications/humanres/widget/forms/EmplLeaveForms.xml Tue Jan 27 21:25:52 2009 @@ -35,8 +35,8 @@ <form name="ListEmplLeaves" type="multi" use-row-submit="true" separate-columns="true" target="updateEmplLeaveExt?partyId=${partyId}" list-name="listIt" paginate-target="FindEmplLeaves" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <actions> - <service service-name="performFind" result-map-name="result" result-map-list-name="listIt"> - <field-map field-name="inputFields" env-name="parameters"/> + <service service-name="performFind" result-map="result" result-map-list="listIt"> + <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="EmplLeave"/> <field-map field-name="orderBy" value="fromDate"/> </service> Modified: ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml?rev=738249&r1=738248&r2=738249&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml (original) +++ ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml Tue Jan 27 21:25:52 2009 @@ -23,8 +23,8 @@ <form name="ListEmplPositions" type="list" separate-columns="true" default-entity-name="EmplPosition" list-name="listIt" paginate-target="FindEmplPositions" paginate="true" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <actions> - <service service-name="performFind" result-map-name="result" result-map-list-name="listIt"> - <field-map field-name="inputFields" env-name="parameters"/> + <service service-name="performFind" result-map="result" result-map-list="listIt"> + <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="EmplPosition"/> <field-map field-name="orderBy" value="emplPositionId"/> </service> @@ -85,7 +85,7 @@ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <actions> <entity-condition entity-name="EmplPositionFulfillment"> - <condition-expr field-name="emplPositionId" operator="equals" env-name="parameters.emplPositionId"/> + <condition-expr field-name="emplPositionId" operator="equals" from-field="parameters.emplPositionId"/> <order-by field-name="emplPositionId"/> </entity-condition> </actions> @@ -114,8 +114,8 @@ <form name="ListReportsToEmplPositionReportingStructs" type="list" target="updateEmplPositionReportingStruct" title="" paginate-target="EditReportsToEmplPositionReportingStruct" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <actions> - <entity-condition entity-name="EmplPositionReportingStruct" list-name="emplPositionReportingStructList"> - <condition-expr field-name="emplPositionIdManagedBy" env-name="parameters.emplPositionId"/> + <entity-condition entity-name="EmplPositionReportingStruct" list="emplPositionReportingStructList"> + <condition-expr field-name="emplPositionIdManagedBy" from-field="parameters.emplPositionId"/> <order-by field-name="emplPositionIdManagedBy"/> </entity-condition> </actions> @@ -142,8 +142,8 @@ <form name="ListReportedToEmplPositionReportingStructs" type="list" target="updateEmplPositionReportingStruct" title="" paginate-target="EditReportedToEmplPositionReportingStruct" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <actions> - <entity-condition entity-name="EmplPositionReportingStruct" list-name="emplPositionReportingStructList"> - <condition-expr field-name="emplPositionIdReportingTo" env-name="parameters.emplPositionId"/> + <entity-condition entity-name="EmplPositionReportingStruct" list="emplPositionReportingStructList"> + <condition-expr field-name="emplPositionIdReportingTo" from-field="parameters.emplPositionId"/> <order-by field-name="emplPositionIdReportingTo"/> </entity-condition> </actions> @@ -171,7 +171,7 @@ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <actions> <entity-condition entity-name="EmplPositionResponsibility"> - <condition-expr field-name="emplPositionId" operator="equals" env-name="parameters.emplPositionId"/> + <condition-expr field-name="emplPositionId" operator="equals" from-field="parameters.emplPositionId"/> <order-by field-name="emplPositionId"/> </entity-condition> </actions> Modified: ofbiz/trunk/applications/humanres/widget/forms/EmployeeForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmployeeForms.xml?rev=738249&r1=738248&r2=738249&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/forms/EmployeeForms.xml (original) +++ ofbiz/trunk/applications/humanres/widget/forms/EmployeeForms.xml Tue Jan 27 21:25:52 2009 @@ -84,7 +84,7 @@ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <actions> <entity-condition entity-name="PartySkill"> - <condition-expr field-name="partyId" env-name="partyId"/> + <condition-expr field-name="partyId" from-field="partyId"/> <order-by field-name="skillTypeId"/> </entity-condition> </actions> @@ -132,7 +132,7 @@ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <actions> <entity-condition entity-name="PartyQual"> - <condition-expr field-name="partyId" env-name="partyId"/> + <condition-expr field-name="partyId" from-field="partyId"/> <order-by field-name="fromDate"/> </entity-condition> </actions> @@ -181,7 +181,7 @@ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <actions> <entity-condition entity-name="PersonTraining"> - <condition-expr field-name="partyId" env-name="partyId"/> + <condition-expr field-name="partyId" from-field="partyId"/> <order-by field-name="fromDate"/> </entity-condition> </actions> @@ -208,7 +208,7 @@ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <actions> <entity-condition entity-name="EmplLeave"> - <condition-expr field-name="partyId" env-name="partyId"/> + <condition-expr field-name="partyId" from-field="partyId"/> <order-by field-name="fromDate"/> </entity-condition> </actions> Modified: ofbiz/trunk/applications/humanres/widget/forms/EmploymentAppForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmploymentAppForms.xml?rev=738249&r1=738248&r2=738249&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/forms/EmploymentAppForms.xml (original) +++ ofbiz/trunk/applications/humanres/widget/forms/EmploymentAppForms.xml Tue Jan 27 21:25:52 2009 @@ -25,8 +25,8 @@ <set field="partyId" from-field="parameters.partyId"/> <set field="referredByPartyId" from-field="parameters.partyId"/> <entity-one entity-name="EmploymentApp" auto-field-map="true"/> - <service service-name="performFind" result-map-name="result" result-map-list-name="listIt"> - <field-map field-name="inputFields" env-name="employmentAppCtx"/> + <service service-name="performFind" result-map="result" result-map-list="listIt"> + <field-map field-name="inputFields" from-field="employmentAppCtx"/> <field-map field-name="entityName" value="EmploymentApp"/> <field-map field-name="orderBy" value="applicationId"/> </service> Modified: ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml?rev=738249&r1=738248&r2=738249&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml (original) +++ ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml Tue Jan 27 21:25:52 2009 @@ -50,8 +50,8 @@ <form name="ListEmploymentsPerson" type="list" paginate-target="FindEmployments" default-entity-name="EmploymentAndPerson" list-name="listIt" separate-columns="true" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <actions> - <service service-name="performFind" result-map-name="result" result-map-list-name="listIt"> - <field-map field-name="inputFields" env-name="employmentCtx"/> + <service service-name="performFind" result-map="result" result-map-list="listIt"> + <field-map field-name="inputFields" from-field="employmentCtx"/> <field-map field-name="entityName" value="EmploymentAndPerson"/> </service> </actions> @@ -72,8 +72,8 @@ <form name="ListEmployments" type="list" paginate-target="FindEmployments" default-entity-name="EmploymentAndPerson" list-name="listIt" separate-columns="true" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <actions> - <service service-name="performFind" result-map-name="result" result-map-list-name="listIt"> - <field-map field-name="inputFields" env-name="employmentCtx"/> + <service service-name="performFind" result-map="result" result-map-list="listIt"> + <field-map field-name="inputFields" from-field="employmentCtx"/> <field-map field-name="entityName" value="Employment"/> </service> </actions> @@ -130,11 +130,11 @@ <actions> <entity-condition entity-name="PayHistory" filter-by-date="true"> <condition-list combine="and"> - <condition-expr field-name="roleTypeIdFrom" operator="equals" env-name="parameters.roleTypeIdFrom"/> - <condition-expr field-name="roleTypeIdTo" operator="equals" env-name="parameters.roleTypeIdTo"/> - <condition-expr field-name="partyIdFrom" operator="equals" env-name="parameters.partyIdFrom"/> - <condition-expr field-name="partyIdTo" operator="equals" env-name="parameters.partyIdTo"/> - <condition-expr field-name="fromDate" operator="equals" env-name="parameters.fromDate"/> + <condition-expr field-name="roleTypeIdFrom" operator="equals" from-field="parameters.roleTypeIdFrom"/> + <condition-expr field-name="roleTypeIdTo" operator="equals" from-field="parameters.roleTypeIdTo"/> + <condition-expr field-name="partyIdFrom" operator="equals" from-field="parameters.partyIdFrom"/> + <condition-expr field-name="partyIdTo" operator="equals" from-field="parameters.partyIdTo"/> + <condition-expr field-name="fromDate" operator="equals" from-field="parameters.fromDate"/> </condition-list> </entity-condition> </actions> @@ -216,8 +216,8 @@ <actions> <entity-condition entity-name="PayrollPreference"> <condition-list combine="and"> - <condition-expr field-name="partyId" operator="equals" env-name="parameters.partyIdTo"/> - <condition-expr field-name="roleTypeId" operator="equals" env-name="parameters.roleTypeIdTo"/> + <condition-expr field-name="partyId" operator="equals" from-field="parameters.partyIdTo"/> + <condition-expr field-name="roleTypeId" operator="equals" from-field="parameters.roleTypeIdTo"/> </condition-list> <order-by field-name="fromDate"/> </entity-condition> @@ -296,11 +296,11 @@ <actions> <entity-condition entity-name="UnemploymentClaim" filter-by-date="true"> <condition-list combine="and"> - <condition-expr field-name="partyIdFrom" operator="equals" env-name="parameters.partyIdFrom"/> - <condition-expr field-name="partyIdTo" operator="equals" env-name="parameters.partyIdTo"/> - <condition-expr field-name="roleTypeIdFrom" operator="equals" env-name="parameters.roleTypeIdFrom"/> - <condition-expr field-name="roleTypeIdTo" operator="equals" env-name="parameters.roleTypeIdTo"/> - <condition-expr field-name="fromDate" operator="equals" env-name="parameters.fromDate"/> + <condition-expr field-name="partyIdFrom" operator="equals" from-field="parameters.partyIdFrom"/> + <condition-expr field-name="partyIdTo" operator="equals" from-field="parameters.partyIdTo"/> + <condition-expr field-name="roleTypeIdFrom" operator="equals" from-field="parameters.roleTypeIdFrom"/> + <condition-expr field-name="roleTypeIdTo" operator="equals" from-field="parameters.roleTypeIdTo"/> + <condition-expr field-name="fromDate" operator="equals" from-field="parameters.fromDate"/> </condition-list> <order-by field-name="unemploymentClaimId"/> </entity-condition> Modified: ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml?rev=738249&r1=738248&r2=738249&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml (original) +++ ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml Tue Jan 27 21:25:52 2009 @@ -96,8 +96,8 @@ <form name="ListEmplPositionTypes" type="list" list-name="listIt" target="updateEmplPositionType" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <actions> - <service service-name="performFind" result-map-name="result" result-map-list-name="listIt"> - <field-map field-name="inputFields" env-name="emplPositionTypeCtx"/> + <service service-name="performFind" result-map="result" result-map-list="listIt"> + <field-map field-name="inputFields" from-field="emplPositionTypeCtx"/> <field-map field-name="entityName" value="EmplPositionType"/> </service> </actions> @@ -122,14 +122,14 @@ <set field="nowDate" value="${bsh:org.ofbiz.base.util.UtilDateTime.nowDateString("yyyy-MM-dd HH:mm:ss.S")}" type="String"/> <entity-condition entity-name="EmplPositionTypeRateAndAmount" filter-by-date="true"> <condition-list combine="and"> - <condition-expr field-name="emplPositionTypeId" env-name="parameters.emplPositionTypeId" operator="equals"/> + <condition-expr field-name="emplPositionTypeId" from-field="parameters.emplPositionTypeId" operator="equals"/> <condition-list combine="or"> - <condition-expr field-name="rateAmountFromDate" env-name="null" operator="equals"/> - <condition-expr field-name="rateAmountFromDate" env-name="nowDate" operator="less"/> + <condition-expr field-name="rateAmountFromDate" from-field="null" operator="equals"/> + <condition-expr field-name="rateAmountFromDate" from-field="nowDate" operator="less"/> </condition-list> <condition-list combine="or"> - <condition-expr field-name="rateAmountThruDate" env-name="null" operator="equals"/> - <condition-expr field-name="rateAmountThruDate" env-name="nowDate" operator="greater"/> + <condition-expr field-name="rateAmountThruDate" from-field="null" operator="equals"/> + <condition-expr field-name="rateAmountThruDate" from-field="nowDate" operator="greater"/> </condition-list> </condition-list> <order-by field-name="rateTypeId"/> Modified: ofbiz/trunk/applications/humanres/widget/forms/LookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/LookupForms.xml?rev=738249&r1=738248&r2=738249&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/forms/LookupForms.xml (original) +++ ofbiz/trunk/applications/humanres/widget/forms/LookupForms.xml Tue Jan 27 21:25:52 2009 @@ -36,8 +36,8 @@ <form name="ListBudgets" type="list" list-name="listIt" paginate-target="LookupBudget" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> - <service service-name="performFind" result-map-name="result" result-map-list-name="listIt"> - <field-map field-name="inputFields" env-name="parameters"/> + <service service-name="performFind" result-map="result" result-map-list="listIt"> + <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="Budget"/> </service> </actions> @@ -62,8 +62,8 @@ <form name="ListBudgetItems" type="list" list-name="listIt" paginate-target="LookupBudgetItem" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> - <service service-name="performFind" result-map-name="result" result-map-list-name="listIt"> - <field-map field-name="inputFields" env-name="parameters"/> + <service service-name="performFind" result-map="result" result-map-list="listIt"> + <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="BudgetItem"/> </service> </actions> @@ -95,8 +95,8 @@ <form name="ListEmplPositions" type="list" list-name="listIt" paginate-target="LookupEmplPosition" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> - <service service-name="performFind" result-map-name="result" result-map-list-name="listIt"> - <field-map field-name="inputFields" env-name="parameters"/> + <service service-name="performFind" result-map="result" result-map-list="listIt"> + <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="EmplPosition"/> </service> </actions> @@ -119,8 +119,8 @@ <form name="ListTerminationReasons" type="list" list-name="listIt" paginate-target="LookupEmplPosition" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> - <service service-name="performFind" result-map-name="result" result-map-list-name="listIt"> - <field-map field-name="inputFields" env-name="parameters"/> + <service service-name="performFind" result-map="result" result-map-list="listIt"> + <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="TerminationReason"/> </service> </actions> @@ -139,8 +139,8 @@ <form name="ListSalarySteps" type="list" list-name="listIt" paginate-target="LookupSalaryStep" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> - <service service-name="performFind" result-map-name="result" result-map-list-name="listIt"> - <field-map field-name="inputFields" env-name="parameters"/> + <service service-name="performFind" result-map="result" result-map-list="listIt"> + <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="SalaryStep"/> </service> </actions> @@ -159,8 +159,8 @@ <form name="ListPayGrades" type="list" list-name="listIt" paginate-target="LookupPayGrade" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> - <service service-name="performFind" result-map-name="result" result-map-list-name="listIt"> - <field-map field-name="inputFields" env-name="parameters"/> + <service service-name="performFind" result-map="result" result-map-list="listIt"> + <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="PayGrade"/> </service> </actions> @@ -179,8 +179,8 @@ <form name="ListPayRollPreferences" type="list" list-name="listIt" paginate-target="LookupPayRollPreference" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> - <service service-name="performFind" result-map-name="result" result-map-list-name="listIt"> - <field-map field-name="inputFields" env-name="parameters"/> + <service service-name="performFind" result-map="result" result-map-list="listIt"> + <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="PayrollPreference"/> </service> </actions> @@ -199,8 +199,8 @@ <form name="ListUnemploymentClaims" type="list" list-name="listIt" paginate-target="LookupUnemploymentClaim" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> - <service service-name="performFind" result-map-name="result" result-map-list-name="listIt"> - <field-map field-name="inputFields" env-name="parameters"/> + <service service-name="performFind" result-map="result" result-map-list="listIt"> + <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="UnemploymentClaim"/> </service> </actions> @@ -219,8 +219,8 @@ <form name="ListAgreementEmploymentAppls" type="list" list-name="listIt" paginate-target="LookupAgreementEmploymentAppl" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> - <service service-name="performFind" result-map-name="result" result-map-list-name="listIt"> - <field-map field-name="inputFields" env-name="parameters"/> + <service service-name="performFind" result-map="result" result-map-list="listIt"> + <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="AgreementEmploymentAppl"/> </service> </actions> @@ -239,8 +239,8 @@ <form name="ListPerfReviews" type="list" list-name="listIt" paginate-target="LookupPerfReview" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> - <service service-name="performFind" result-map-name="result" result-map-list-name="listIt"> - <field-map field-name="inputFields" env-name="parameters"/> + <service service-name="performFind" result-map="result" result-map-list="listIt"> + <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="PerfReview"/> </service> </actions> @@ -259,8 +259,8 @@ <form name="ListPartyResumes" type="list" list-name="listIt" paginate-target="LookupPartyResume" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> - <service service-name="performFind" result-map-name="result" result-map-list-name="listIt"> - <field-map field-name="inputFields" env-name="parameters"/> + <service service-name="performFind" result-map="result" result-map-list="listIt"> + <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="PartyResume"/> </service> </actions> @@ -279,8 +279,8 @@ <form name="ListEmploymentApps" type="list" list-name="listIt" paginate-target="LookupEmploymentApp" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> - <service service-name="performFind" result-map-name="result" result-map-list-name="listIt"> - <field-map field-name="inputFields" env-name="parameters"/> + <service service-name="performFind" result-map="result" result-map-list="listIt"> + <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="EmploymentApp"/> </service> </actions> Modified: ofbiz/trunk/applications/humanres/widget/forms/PartyQualForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/PartyQualForms.xml?rev=738249&r1=738248&r2=738249&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/forms/PartyQualForms.xml (original) +++ ofbiz/trunk/applications/humanres/widget/forms/PartyQualForms.xml Tue Jan 27 21:25:52 2009 @@ -52,8 +52,8 @@ <form name="ListPartyQuals" type="multi" list-name="listIt" use-row-submit="true" separate-columns="true" target="updatePartyQualExt?partyId=${partyId}" paginate-target="FindPartyQuals" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <actions> - <service service-name="performFind" result-map-name="result" result-map-list-name="listIt"> - <field-map field-name="inputFields" env-name="partyQualCtx"/> + <service service-name="performFind" result-map="result" result-map-list="listIt"> + <field-map field-name="inputFields" from-field="partyQualCtx"/> <field-map field-name="entityName" value="PartyQual"/> <field-map field-name="orderBy" value="fromDate"/> </service> Modified: ofbiz/trunk/applications/humanres/widget/forms/PartyResumeForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/PartyResumeForms.xml?rev=738249&r1=738248&r2=738249&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/forms/PartyResumeForms.xml (original) +++ ofbiz/trunk/applications/humanres/widget/forms/PartyResumeForms.xml Tue Jan 27 21:25:52 2009 @@ -31,8 +31,8 @@ <form name="ListPartyResumes" type="list" separate-columns="true" default-entity-name="PartyResume" list-name="listIt" paginate-target="FindPartyResumes" paginate="true" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <actions> - <service service-name="performFind" result-map-name="result" result-map-list-name="listIt"> - <field-map field-name="inputFields" env-name="partyResumeCtx"/> + <service service-name="performFind" result-map="result" result-map-list="listIt"> + <field-map field-name="inputFields" from-field="partyResumeCtx"/> <field-map field-name="entityName" value="PartyResume"/> <field-map field-name="orderBy" value="resumeId"/> </service> Modified: ofbiz/trunk/applications/humanres/widget/forms/PartySkillForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/PartySkillForms.xml?rev=738249&r1=738248&r2=738249&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/forms/PartySkillForms.xml (original) +++ ofbiz/trunk/applications/humanres/widget/forms/PartySkillForms.xml Tue Jan 27 21:25:52 2009 @@ -41,7 +41,7 @@ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <actions> <entity-condition entity-name="PartySkill"> - <condition-expr field-name="partyId" env-name="partyId"/> + <condition-expr field-name="partyId" from-field="partyId"/> <order-by field-name="skillTypeId"/> </entity-condition> </actions> Modified: ofbiz/trunk/applications/humanres/widget/forms/PayGradeForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/PayGradeForms.xml?rev=738249&r1=738248&r2=738249&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/forms/PayGradeForms.xml (original) +++ ofbiz/trunk/applications/humanres/widget/forms/PayGradeForms.xml Tue Jan 27 21:25:52 2009 @@ -30,8 +30,8 @@ <form name="ListPayGrades" type="list" list-name="listIt" title="" target="updatePayGrade" paginate-target="FindPayGrade" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <actions> - <service service-name="performFind" result-map-name="result" result-map-list-name="listIt"> - <field-map field-name="inputFields" env-name="payGradeCtx"/> + <service service-name="performFind" result-map="result" result-map-list="listIt"> + <field-map field-name="inputFields" from-field="payGradeCtx"/> <field-map field-name="entityName" value="PayGrade"/> </service> </actions> Modified: ofbiz/trunk/applications/humanres/widget/forms/PerfReviewForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/PerfReviewForms.xml?rev=738249&r1=738248&r2=738249&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/forms/PerfReviewForms.xml (original) +++ ofbiz/trunk/applications/humanres/widget/forms/PerfReviewForms.xml Tue Jan 27 21:25:52 2009 @@ -35,8 +35,8 @@ <form name="ListPerfReviews" type="list" title="" separate-columns="true" default-entity-name="PerfReview" list-name="listIt" paginate-target="FindPerfReviews" paginate="true" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <actions> - <service service-name="performFind" result-map-name="result" result-map-list-name="listIt"> - <field-map field-name="inputFields" env-name="parameters"/> + <service service-name="performFind" result-map="result" result-map-list="listIt"> + <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="PerfReview"/> <field-map field-name="orderBy" value="perfReviewId"/> </service> @@ -70,7 +70,7 @@ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <actions> <entity-condition entity-name="PerfReviewItem"> - <condition-expr field-name="perfReviewId" env-name="perfReviewId"/> + <condition-expr field-name="perfReviewId" from-field="perfReviewId"/> <order-by field-name="perfReviewItemSeqId"/> </entity-condition> </actions> Modified: ofbiz/trunk/applications/humanres/widget/forms/PersonTrainingForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/PersonTrainingForms.xml?rev=738249&r1=738248&r2=738249&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/forms/PersonTrainingForms.xml (original) +++ ofbiz/trunk/applications/humanres/widget/forms/PersonTrainingForms.xml Tue Jan 27 21:25:52 2009 @@ -37,8 +37,8 @@ <form name="ListPersonTrainings" type="list" list-name="listIt" separate-columns="true" target="updatePersonTrainingsExt?partyId=${partyId}" paginate-target="FindPersonTrainings" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <actions> - <service service-name="performFind" result-map-name="result" result-map-list-name="listIt"> - <field-map field-name="inputFields" env-name="personTrainingsCtx"/> + <service service-name="performFind" result-map="result" result-map-list="listIt"> + <field-map field-name="inputFields" from-field="personTrainingsCtx"/> <field-map field-name="entityName" value="PersonTraining"/> <field-map field-name="orderBy" value="fromDate"/> </service> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |