This is an automated email from the ASF dual-hosted git repository.
nmalin pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new 354e86a241 Fixed: Error rendering included form "MandatoryWorkEfforts"
when approving parent production run (OFBIZ-13223)
354e86a241 is described below
commit 354e86a241039382d10b2efc282c521e504caa43
Author: Nicolas Malin <nicolas.ma...@nereide.fr>
AuthorDate: Thu Apr 17 15:17:38 2025 +0200
Fixed: Error rendering included form "MandatoryWorkEfforts" when approving
parent production run (OFBIZ-13223)
Fix previous commit
Thanks to Yashwant Dhakad for the fix
---
.../manufacturing/widget/manufacturing/JobshopScreens.xml | 4 ++--
.../manufacturing/widget/manufacturing/ProductionRunForms.xml | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/applications/manufacturing/widget/manufacturing/JobshopScreens.xml
b/applications/manufacturing/widget/manufacturing/JobshopScreens.xml
index 941247f3d6..004e8cadc8 100644
--- a/applications/manufacturing/widget/manufacturing/JobshopScreens.xml
+++ b/applications/manufacturing/widget/manufacturing/JobshopScreens.xml
@@ -346,10 +346,10 @@ under the License.
<decorator-screen name="CommonJobshopDecorator"
location="${parameters.commonJobshopDecorator}">
<decorator-section name="body">
<screenlet
title="${uiLabelMap.ManufacturingPrecedingProductionRun}">
- <include-form name="MandatoryWorkEfforts"
location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
+ <include-grid name="MandatoryWorkEfforts"
location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
</screenlet>
<screenlet
title="${uiLabelMap.ManufacturingSucceedingProductionRun}">
- <include-form name="DependentWorkEfforts"
location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
+ <include-grid name="DependentWorkEfforts"
location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
diff --git
a/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml
b/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml
index bfd478c0e3..57573320f3 100644
--- a/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml
+++ b/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml
@@ -788,7 +788,7 @@ under the License.
</field>
<field name="submitButton"
title="${uiLabelMap.CommonSubmit}"><submit/></field>
</form>
- <form name="MandatoryWorkEfforts" list-name="mandatoryWorkEfforts"
+ <grid name="MandatoryWorkEfforts" list-name="mandatoryWorkEfforts"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
<field name="workEffortIdFrom" title=" " widget-style="buttontext">
<hyperlink description="${workEffortIdFrom}"
target="ShowProductionRun" also-hidden="false" link-type="anchor">
@@ -825,8 +825,8 @@ under the License.
<parameter param-name="productionRunId"/>
</hyperlink>
</field>
- </form>
- <form name="DependentWorkEfforts" list-name="dependentWorkEfforts"
+ </grid>
+ <grid name="DependentWorkEfforts" list-name="dependentWorkEfforts"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
<field name="workEffortIdTo" title=" " widget-style="buttontext">
<hyperlink description="${workEffortIdTo}"
target="ShowProductionRun" also-hidden="false" link-type="anchor">
@@ -863,7 +863,7 @@ under the License.
<parameter param-name="productionRunId"/>
</hyperlink>
</field>
- </form>
+ </grid>
<grid name="ProductionRunTaskCosts" list-name="taskCosts"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
<auto-fields-entity entity-name="CostComponent"
default-field-type="display"/>
