Commit 32f65666 authored by holivier's avatar holivier

0.2.0 OHE OFBIZ-11045 has been apply to trunk,

so remove modifications associated to it
parent c6a338a6
......@@ -3,9 +3,10 @@
<groupId>org.ofbizextra</groupId>
<artifactId>tmpWaitingJira</artifactId>
<name>Modif for OFBiz waiting jira process</name>
<version>0.1.0</version>
<version>0.2.0</version>
<ofbiz-version>trunk-1850155</ofbiz-version>
<changelog>
<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>
<license>
......
@@ -153,40 +153,55 @@
</section>
</screen>
<screen name="ListValidResponsibilities">
<section>
<actions>
<set field="titleProperty" value="PageTitleListValidResponsibilities"/>
+ <set field="headerItem" value="EmplPositionTypes"/>
+ <set field="tabButtonItem" value="EmplPositionTypes"/>
+ <set field="tabButtonItem2" value="EditValidResponsibilities"/>
+ <set field="emplPositionTypeId" from-field="parameters.emplPositionTypeId"/>
</actions>
<widgets>
- <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="GlobalHRSettingsDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
+ <include-menu name="EmplPositionTypeTabBar" location="component://humanres/widget/HumanresMenus.xml"/>
<screenlet title="${uiLabelMap.HumanResListValidResponsibility}">
<container>
- <link target="EditValidResponsibility" text="${uiLabelMap.HumanResAddValidResponsibility}" style="buttontext"/>
+ <link target="EditValidResponsibility" text="${uiLabelMap.HumanResAddValidResponsibility}" style="buttontext">
+ <parameter param-name="emplPositionTypeId"/>
+ </link>
</container>
<include-form name="ListValidResponsibilities" location="component://humanres/widget/forms/EmplPositionForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
</widgets>
</section>
</screen>
<screen name="EditValidResponsibility">
<section>
<actions>
<set field="titleProperty" value="PageTitleEditValidResponsibility"/>
+ <set field="headerItem" value="EmplPositionTypes"/>
+ <set field="tabButtonItem" value="EmplPositionTypes"/>
+ <set field="tabButtonItem2" value="EditValidResponsibilities"/>
+ <set field="emplPositionTypeId" from-field="parameters.emplPositionTypeId"/>
</actions>
<widgets>
- <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="GlobalHRSettingsDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
+ <include-menu name="EmplPositionTypeTabBar" location="component://humanres/widget/HumanresMenus.xml"/>
<screenlet title="${uiLabelMap.HumanResAddValidResponsibility}">
<container>
- <link target="EditValidResponsibility" text="${uiLabelMap.HumanResAddValidResponsibility}" style="buttontext"/>
+ <link target="EditValidResponsibility" text="${uiLabelMap.HumanResAddValidResponsibility}" style="buttontext">
+ <parameter param-name="emplPositionTypeId"/>
+ </link>
</container>
<include-form name="AddValidResponsibility" location="component://humanres/widget/forms/EmplPositionForms.xml"/>
+ <include-form name="ListValidResponsibilities" location="component://humanres/widget/forms/EmplPositionForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
</widgets>
</section>
</screen>
@@ -252,17 +255,27 @@
default-menu-item-name="EditEmplPositionType" selected-menuitem-context-field-name="tabButtonItem2">
<menu-item name="EditEmplPositionType" title="${uiLabelMap.HumanResEmplPositionType}">
<link target="EditEmplPositionTypes">
<parameter param-name="emplPositionTypeId"/>
</link>
@@ -265,12 +265,17 @@
</menu-item>
+ <menu-item name="EditValidResponsibilities" title="${uiLabelMap.HumanResEmplPositionResponsibilities}">
+ <link target="findValidResponsibilities">
+ <parameter param-name="emplPositionTypeId"/>
+ </link>
+ </menu-item>
<menu-item name="EditEmplPositionTypeRate" title="${uiLabelMap.HumanResEmplPositionTypeRate}">
<link target="EditEmplPositionTypeRates">
<parameter param-name="emplPositionTypeId"/>
......
@@ -235,13 +235,13 @@
<field name="fromDate"><date-time default-value="${nowTimestamp}" /></field>
<field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>
</form>
<form name="ListValidResponsibilities" type="list" target="updateValidResponsibility" title="" paginate-target="findValidResponsibilities"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
- <entity-condition entity-name="EmplPositionResponsibility"/>
+ <entity-condition entity-name="ValidResponsibility"/>
</actions>
<auto-fields-service service-name="updateValidResponsibility"/>
<field name="emplPositionTypeId" title="${uiLabelMap.HumanResEmployeePositionTypeId}"><display /></field>
<field name="responsibilityTypeId" title="${uiLabelMap.HumanResResponsibilityTypeId}"><display /></field>
<field name="fromDate"><display /></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/> </field>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<ivy-module version="2.0">
<info module="tmpWaitingJira" organisation="org.ofbizextra" revision="0.1.0"/>
<info module="tmpWaitingJira" organisation="org.ofbizextra" revision="0.2.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