Commit 86ecd79a authored by holivier's avatar holivier

OHE create a patch with git format-patch for OFBIZ-11044, so remove related files

parent 32f65666
......@@ -3,9 +3,10 @@
<groupId>org.ofbizextra</groupId>
<artifactId>tmpWaitingJira</artifactId>
<name>Modif for OFBiz waiting jira process</name>
<version>0.2.0</version>
<ofbiz-version>trunk-1850155</ofbiz-version>
<version>0.3.0</version>
<ofbiz-version>trunk-1850155</ofbiz-version>
<changelog>
<changeitem date="2020-05-04-11:20" version="0.3.0" >OHE create a patch with git format-patch for OFBIZ-11044, so remove related fiels</changeitem>
<changeitem date="2019-10-28-11:34" version="0.2.0" >OHE OFBIZ-11045 has been apply to trunk, so remove modifications associated to it</changeitem>
<changeitem date="2019-04-29-12:00" version="0.1.0" >OHE multiple correction in HR needed for documentation by process</changeitem>
</changelog>
......
@@ -1953,12 +1953,16 @@
<value xml:lang="ja">職位種類レート</value>
<value xml:lang="pt-BR">Classe de Tipo de posição</value>
<value xml:lang="vi">Kiểu đánh giá</value>
<value xml:lang="zh">职位薪水管理</value>
<value xml:lang="zh-TW">職位薪水管理</value>
</property>
+ <property key="HumanResEmplPositionTypeGrade">
+ <value xml:lang="en">Position Type Grade</value>
+ <value xml:lang="fr">Grade par type de position</value>
+ </property>
<property key="HumanResEmplReasonType">
<value xml:lang="de">Art des Beurlaubungsgrundes</value>
<value xml:lang="en">EmplLeave Reason Type</value>
<value xml:lang="es">Razon de tipo de salida de empleado</value>
<value xml:lang="ja">従業員休職理由種類</value>
<value xml:lang="pt-BR">Tipo de razão de licença de empregado</value>
@@ -78,12 +116,24 @@
<call-service service-name="createPartyRelationship" in-map-name="partyRelationshipCtx"/>
</if-not-empty>
<field-to-result field="partyId"/>
</simple-method>
<simple-method method-name="updateEmplPositionTypeRate" short-description="Update/create EmplPositionTypeRate">
+ <if>
+ <condition>
+ <and>
+ <not><if-empty field="parameters.rateAmount"></if-empty></not>
+ <not><if-empty field="parameters.payGradeId"></if-empty></not>
+ </and>
+ </condition>
+ <then>
+ <add-error><fail-message message="You must choose between Rate Amount and Pay Grade + step"/></add-error>
+ <check-errors/>
+ </then>
+ </if>
<entity-one entity-name="EmplPositionTypeRate" value-field="lookedUpValue"/>
<!-- check if already exist is so expire current record -->
<entity-and entity-name="EmplPositionTypeRate" list="emplPositionTypeRates" filter-by-date="true">
<field-map field-name="emplPositionTypeId" from-field="parameters.emplPositionTypeId"/>
<field-map field-name="rateTypeId" from-field="parameters.rateTypeId"/>
</entity-and>
@@ -97,25 +147,33 @@
<set-pk-fields map="parameters" value-field="newEntity"/>
<if-empty field="newEntity.fromDate"><now-timestamp field="newEntity.fromDate"/></if-empty>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<create-value value-field="newEntity"/>
<if-not-empty field="parameters.rateAmount">
+ <if-empty field="parameters.periodTypeId">
+ <add-error><fail-message message="Period Type is mandatory when Rate Amount is used"/></add-error>
+ <check-errors/>
+ </if-empty>
<set-service-fields service-name="updateRateAmount" map="parameters" to-map="updRate"/>
<call-service service-name="updateRateAmount" in-map-name="updRate"/>
</if-not-empty>
</simple-method>
<simple-method method-name="deleteEmplPositionTypeRate" short-description="Delete EmplPositionTypeRate">
- <entity-one entity-name="EmplPositionTypeRate" value-field="lookedUpValue"/>
- <now-timestamp field="lookedUpValue.thruDate"/>
- <store-value value-field="lookedUpValue"/>
+ <if-not-empty field="parameters.payGradeId">
+ <entity-one entity-name="EmplPositionTypeRate" value-field="lookedUpValue"/>
+ <now-timestamp field="lookedUpValue.thruDate"/>
+ <store-value value-field="lookedUpValue"/>
+ </if-not-empty>
- <set-service-fields service-name="deleteRateAmount" map="parameters" to-map="delRateAmount"/>
- <set field="delRateAmount.fromDate" from-field="parameters.rateAmountFromDate"/>
- <call-service service-name="deleteRateAmount" in-map-name="delRateAmount"/>
+ <if-not-empty field="parameters.rateAmountFromDate">
+ <set-service-fields service-name="deleteRateAmount" map="parameters" to-map="delRateAmount"/>
+ <set field="delRateAmount.fromDate" from-field="parameters.rateAmountFromDate"/>
+ <call-service service-name="deleteRateAmount" in-map-name="delRateAmount"/>
+ </if-not-empty>
</simple-method>
<simple-method method-name="createEmplLeave" short-description="Create Employee Leave">
<make-value entity-name="EmplLeave" value-field="newEntity"/>
<set-pk-fields value-field="newEntity" map="parameters"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
@@ -192,13 +250,15 @@
<simple-method method-name="createSalaryStep" short-description="Create a Salary Step">
<make-value entity-name="SalaryStep" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<set field="newEntity.createdByUserLogin" from-field="parameters.userLogin.userLoginId"/>
- <sequenced-id sequence-name="SalaryStep" field="newEntity.salaryStepSeqId"/>
+ <if-empty field="newEntity.salaryStepSeqId">
+ <sequenced-id sequence-name="SalaryStep" field="newEntity.salaryStepSeqId"/>
+ </if-empty>
<field-to-result field="salaryStepSeqId" result-name="salaryStepSeqId"/>
<create-value value-field="newEntity"/>
</simple-method>
<simple-method method-name="updateSalaryStep" short-description="Update Salary Step">
<entity-one entity-name="SalaryStep" value-field="lookedUpValue"/>
@@ -568,21 +578,22 @@
<description>Update Valid EmplPositionTypeRate</description>
<permission-service service-name="humanResManagerPermission" main-action="UPDATE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
<attribute name="rateAmount" type="BigDecimal" mode="IN" optional="true"/>
<attribute name="rateCurrencyUomId" type="String" mode="IN" optional="true"/>
- <attribute name="periodTypeId" type="String" mode="IN"/>
+ <attribute name="periodTypeId" type="String" mode="IN" optional="true"/>
<override name="fromDate" optional="true"/>
</service>
<service name="deleteEmplPositionTypeRate" engine="simple" default-entity-name="EmplPositionTypeRate"
location="component://humanres/minilang/HumanResServices.xml" invoke="deleteEmplPositionTypeRate" auth="true">
<description>Delete Valid EmplPositionTypeRate</description>
<permission-service service-name="humanResManagerPermission" main-action="DELETE"/>
<auto-attributes mode="IN" include="pk" optional="false"/>
+ <attribute name="payGradeId" type="String" mode="IN" optional="true"/><!-- to be able to expire EmplPositionTypeRate specific ....-->
<attribute name="rateAmountFromDate" type="Timestamp" mode="IN" optional="true"/><!-- to be able to expire rateamount specific to a party records....-->
<attribute name="periodTypeId" type="String" mode="IN" optional="true"/>
</service>
<service name="createAgreementEmploymentAppl" engine="entity-auto" default-entity-name="AgreementEmploymentAppl" invoke="create" auth="true">
<description>Create Agreement Employment Appl</description>
@@ -729,12 +733,26 @@
</request-map>
<request-map uri="deleteEmplPositionTypeRate">
<security https="true" auth="true"/>
<event type="service" invoke="deleteEmplPositionTypeRate"/>
<response name="success" type="view" value="EditEmplPositionTypeRates"/>
</request-map>
+ <request-map uri="EditEmplPositionTypeGrades">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="EditEmplPositionTypeGrades"/>
+ </request-map>
+ <request-map uri="updateEmplPositionTypeGrade">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="updateEmplPositionTypeRate"/>
+ <response name="success" type="view" value="EditEmplPositionTypeGrades"/>
+ </request-map>
+ <request-map uri="deleteEmplPositionTypeGrade">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="deleteEmplPositionTypeRate"/>
+ <response name="success" type="view" value="EditEmplPositionTypeGrades"/>
+ </request-map>
<request-map uri="EditAgreementEmploymentAppls">
<security https="true" auth="true"/>
<response name="success" type="view" value="EditAgreementEmploymentAppls"/>
</request-map>
<request-map uri="createAgreementEmploymentAppl">
<security https="true" auth="true"/>
@@ -1194,12 +1213,13 @@
<view-map name="EditPerformanceNotes" type="screen" page="component://humanres/widget/EmploymentScreens.xml#EditPerformanceNotes"/>
<view-map name="EditSkillTypes" type="screen" page="component://humanres/widget/GlobalHRSettingScreens.xml#EditSkillTypes"/>
<view-map name="FindEmplPositionTypes" type="screen" page="component://humanres/widget/GlobalHRSettingScreens.xml#FindEmplPositionTypes"/>
<view-map name="EditEmplPositionTypes" type="screen" page="component://humanres/widget/GlobalHRSettingScreens.xml#EditEmplPositionTypes"/>
<view-map name="EditEmplPositionTypeRates" type="screen" page="component://humanres/widget/GlobalHRSettingScreens.xml#EditEmplPositionTypeRates"/>
+ <view-map name="EditEmplPositionTypeGrades" type="screen" page="component://humanres/widget/GlobalHRSettingScreens.xml#EditEmplPositionTypeGrades"/>
<view-map name="EditResponsibilityTypes" type="screen" page="component://humanres/widget/GlobalHRSettingScreens.xml#EditResponsibilityTypes"/>
<view-map name="EditTerminationTypes" type="screen" page="component://humanres/widget/GlobalHRSettingScreens.xml#EditTerminationTypes"/>
<view-map name="EditTerminationReasons" type="screen" page="component://humanres/widget/GlobalHRSettingScreens.xml#EditTerminationReasons"/>
<view-map name="EditTrainingTypes" type="screen" page="component://humanres/widget/GlobalHRSettingScreens.xml#EditTrainingTypes"/>
<view-map name="PublicHoliday" type="screen" page="component://humanres/widget/GlobalHRSettingScreens.xml#PublicHoliday"/>
@@ -165,12 +165,35 @@
<include-form name="ListEmplPositionTypeRates" location="component://humanres/widget/forms/GlobalHRSettingForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
</section>
</screen>
+ <screen name="EditEmplPositionTypeGrades">
+ <section>
+ <actions>
+ <set field="titleProperty" value="HumanResEmplPositionTypeGrade"/>
+ <set field="headerItem" value="EmplPositionTypes"/>
+ <set field="tabButtonItem" value="EmplPositionTypes"/>
+ <set field="tabButtonItem2" value="EditEmplPositionTypeGrade"/>
+ <set field="emplPositionTypeId" from-field="parameters.emplPositionTypeId"/>
+ <entity-one entity-name="EmplPositionTypeRate" value-field="emplPositionTypeRate"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="GlobalHRSettingsDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <include-menu name="EmplPositionTypeTabBar" location="component://humanres/widget/HumanresMenus.xml"/>
+ <screenlet id="AddEmplPositionTypeRatePanel" title="${uiLabelMap.CommonAdd} ${uiLabelMap.HumanResEmplPositionType} ${uiLabelMap.HumanResPayGrade}" collapsible="true">
+ <include-form name="AddEmplPositionTypeGrade" location="component://humanres/widget/forms/GlobalHRSettingForms.xml"/>
+ </screenlet>
+ <include-form name="ListEmplPositionTypeGrades" location="component://humanres/widget/forms/GlobalHRSettingForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
<screen name="EditTerminationReasons">
<section>
<actions>
<set field="titleProperty" value="HumanResAddTerminationReason"/>
<set field="tabButtonItem" value="TerminationReason"/>
<set field="terminationReasonId" from-field="parameters.terminationReasonId"/>
@@ -265,12 +265,17 @@
</menu-item>
<menu-item name="EditEmplPositionTypeRate" title="${uiLabelMap.HumanResEmplPositionTypeRate}">
<link target="EditEmplPositionTypeRates">
<parameter param-name="emplPositionTypeId"/>
</link>
</menu-item>
+ <menu-item name="EditEmplPositionTypeGrade" title="${uiLabelMap.HumanResEmplPositionTypeGrade}">
+ <link target="EditEmplPositionTypeGrades">
+ <parameter param-name="emplPositionTypeId"/>
+ </link>
+ </menu-item>
</menu>
<menu name="RecruitmentTypeMenu" type="simple" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
default-menu-item-name="JobRequisition">
<menu-item name="JobRequisition" title="${uiLabelMap.HumanResJobRequisition}">
<condition><if-has-permission permission="HUMANRES" action="_VIEW"/></condition>
@@ -113,16 +113,16 @@
<screen name="LookupSalaryStep">
<section>
<actions>
<property-map resource="HumanResUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
<set field="title" from-field="uiLabelMap.HumanResLookupSalaryStepSeqId"/>
- <set field="queryString" from-field="result.queryString"/>
- <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/>
- <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/>
- <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/>
+ <set field="payGradeId" from-field="parameters.parm0"/>
+ <set field="entityName" value="SalaryStep"/>
+ <set field="searchFields" value="[salaryStepSeqId, payGradeId]"/>
+ <set field="displayFields" value="[payGradeId, salaryStepSeqId]"/>
</actions>
<widgets>
<decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="search-options">
<include-form name="LookupSalaryStep" location="component://humanres/widget/forms/LookupForms.xml"/>
</decorator-section>
@@ -135,16 +135,14 @@
</screen>
<screen name="LookupPayGrade">
<section>
<actions>
<property-map resource="HumanResUiLabels" map-name="uiLabelMap" global="true"/>
<set field="title" from-field="uiLabelMap.HumanResLookupPayGrade"/>
- <set field="queryString" from-field="result.queryString"/>
- <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/>
- <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/>
- <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/>
+ <set field="entityName" value="PayGrade"/>
+ <set field="searchFields" value="[payGradeId, payGradeName]"/>
</actions>
<widgets>
<decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="search-options">
<include-form name="LookupPayGrade" location="component://humanres/widget/forms/LookupForms.xml"/>
</decorator-section>
@@ -154,14 +154,14 @@
<field name="rateCurrencyUomId"><hidden/></field>
<field name="emplPositionTypeId"><hidden/></field>
<field name="fromDate"><hidden/></field>
<field name="rateAmountFromDate"><hidden/></field>
<field name="rateTypeId"><display-entity entity-name="RateType"/></field>
<field name="periodTypeId"><display-entity entity-name="PeriodType"/></field>
- <field name="payGradeId"><display-entity entity-name="PayGrade"/></field>
- <field name="salaryStepSeqId" title="${uiLabelMap.HumanResSalaryStepSeqId}"><display/></field>
+<!-- <field name="payGradeId"><display-entity entity-name="PayGrade"/></field> -->
+<!-- <field name="salaryStepSeqId" title="${uiLabelMap.HumanResSalaryStepSeqId}"><display/></field> -->
<field name="rateAmount"><display type="currency" currency="${rateCurrencyUomId}"/></field>
<field name="deleteButton" widget-style="buttontext"><submit/></field>
</form>
<form name="AddEmplPositionTypeRate" type="single" target="updateEmplPositionTypeRate" default-map-name="emplPositionTypeRate" paginate-target="EditEmplPositionTypeRates"
header-row-style="header-row" default-table-style="basic-table">
<actions>
@@ -172,32 +172,62 @@
<drop-down>
<entity-options key-field-name="rateTypeId" entity-name="RateType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
</field>
- <field name="payGradeId" position="2"><lookup target-form-name="LookupPayGrade"/></field>
<field name="periodTypeId" required-field="true">
<drop-down allow-empty="false" no-current-selected-key="RATE_MONTH">
<entity-options key-field-name="periodTypeId" entity-name="PeriodType">
<entity-order-by field-name="periodTypeId"/>
</entity-options>
</drop-down>
</field>
- <field name="salaryStepSeqId" title="${uiLabelMap.HumanResSalaryStepSeqId}" position="2"><lookup target-form-name="LookupSalaryStep"/></field>
<field name="rateAmount"><text/></field>
<field name="rateCurrencyUomId" position="2">
<drop-down allow-empty="true" no-current-selected-key="${defaultOrganizationPartyCurrencyUomId}">
<entity-options key-field-name="uomId" description="${description} - ${abbreviation}" entity-name="Uom">
<entity-constraint name="uomTypeId" operator="equals" value="CURRENCY_MEASURE"/>
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
</field>
<field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="buttontext"><submit button-type="text-link"/></field>
</form>
+ <form name="ListEmplPositionTypeGrades" type="list" title="" target="deleteEmplPositionTypeGrade">
+ <actions>
+ <entity-condition entity-name="EmplPositionTypeRate">
+ <condition-expr field-name="emplPositionTypeId" operator="equals" from-field="parameters.emplPositionTypeId"/>
+ <order-by field-name="rateTypeId"/>
+ <order-by field-name="fromDate"/>
+ </entity-condition>
+ </actions>
+ <field name="emplPositionTypeId"><hidden/></field>
+ <field name="rateTypeId"><display-entity entity-name="RateType"/></field>
+ <field name="fromDate"><display/></field>
+ <field name="thruDate"><display/></field>
+ <field name="payGradeId"><display-entity entity-name="PayGrade"/></field>
+ <field name="salaryStepSeqId" title="${uiLabelMap.HumanResSalaryStepSeqId}"><display/></field>
+ <field name="deleteButton" widget-style="buttontext" use-when="${groovy:payGradeId!=null}"><submit/></field>
+ </form>
+ <form name="AddEmplPositionTypeGrade" type="single" target="updateEmplPositionTypeGrade" default-map-name="emplPositionTypeRate">
+ <actions>
+ <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD"/>
+ </actions>
+ <field name="emplPositionTypeId"><hidden value="${parameters.emplPositionTypeId}"/></field>
+ <field name="rateTypeId" required-field="true">
+ <drop-down>
+ <entity-options key-field-name="rateTypeId" entity-name="RateType">
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="payGradeId" required-field="true"><lookup target-form-name="LookupPayGrade"/></field>
+ <field name="salaryStepSeqId" title="${uiLabelMap.HumanResSalaryStepSeqId}"><lookup target-form-name="LookupSalaryStep" target-parameter="payGradeId"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="buttontext"><submit button-type="text-link"/></field>
+ </form>
<form name="ListTerminationReasons" type="multi" title="" target="updateTerminationReason" paginate-target="EditTerminationReasons"
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="TerminationReason"><order-by field-name="terminationReasonId"/></entity-condition>
</actions>
<auto-fields-service default-field-type="display" service-name="updateTerminationReason"/>
@@ -138,12 +138,13 @@
</field>
<field name="description"><display/></field>
</form>
<form name="LookupSalaryStep" type="single" target="LookupSalaryStep"
header-row-style="header-row" default-table-style="basic-table">
<auto-fields-entity entity-name="SalaryStep" default-field-type="hidden"/>
+ <field name="payGradeId"><display/></field>
<field name="salaryStepSeqId" title="${uiLabelMap.HumanResLookupSalaryStepSeqId}"><text-find/></field>
<field name="fromDate" title="${uiLabelMap.CommonFrom}"><text-find/></field>
<field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
<field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="ListSalarySteps" type="list" list-name="listIt" paginate-target="LookupSalaryStep"
@@ -153,12 +154,13 @@
<field-map field-name="inputFields" from-field="parameters"/>
<field-map field-name="entityName" value="SalaryStep"/>
<field-map field-name="viewIndex" from-field="viewIndex"/>
<field-map field-name="viewSize" from-field="viewSize"/>
</service>
</actions>
+ <field name="payGradeId"><display/></field>
<field name="salaryStepSeqId" title="${uiLabelMap.HumanResLookupSalaryStepSeqId}" widget-style="buttontext">
<hyperlink description="${salaryStepSeqId}" target="javascript:set_value('${salaryStepSeqId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="fromDate" title="${uiLabelMap.CommonFrom}"><display/></field>
<field name="thruDate" title="${uiLabelMap.CommonThru}"><display/></field>
<field name="amount" title="${uiLabelMap.AccountingAmount}"><display/></field>
@@ -78,11 +78,11 @@
</hyperlink>
</field>
</form>
<form name="AddSalaryStep" type="single" target="createSalaryStep"
header-row-style="header-row" default-table-style="basic-table">
<auto-fields-service service-name="createSalaryStep"/>
- <field name="salaryStepSeqId"><ignored/></field>
- <field name="payGradeId"><hidden/></field>
+ <field name="payGradeId"><display/></field>
+ <field name="salaryStepSeqId"><text/></field>
<field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
</forms>
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<ivy-module version="2.0">
<info module="tmpWaitingJira" organisation="org.ofbizextra" revision="0.2.0"/>
<info module="tmpWaitingJira" organisation="org.ofbizextra" revision="0.3.0"/>
<dependencies/>
<!--
<dependency org="org.ofbizextra" name="ufo-ofbiz-model" transitive="true" rev="0.5.1"/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment