This is an automated email from the ASF dual-hosted git repository.
jleroux 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 45089936c0 Fixed: Change position of the Receive Against PO menu item
and remove redundant link (OFBIZ-13353) (#951)
45089936c0 is described below
commit 45089936c08388b08b373c983631862e49aa02ef
Author: Anahita Goljahani <[email protected]>
AuthorDate: Fri Jan 30 12:10:07 2026 +0100
Fixed: Change position of the Receive Against PO menu item and remove
redundant link (OFBIZ-13353) (#951)
In shipment screens the Receive Against PO menu item should be placed in
the main shipment menu, instead of the "Action" bar.
Moreover, currently, the menu item is duplicated and doesn't retain
focus when the screen is selected.
---
.../product/widget/facility/FacilityMenus.xml | 24 ++++++++--------------
.../product/widget/facility/ShipmentScreens.xml | 20 +-----------------
2 files changed, 10 insertions(+), 34 deletions(-)
diff --git a/applications/product/widget/facility/FacilityMenus.xml
b/applications/product/widget/facility/FacilityMenus.xml
index b97e881d06..05c5858c92 100644
--- a/applications/product/widget/facility/FacilityMenus.xml
+++ b/applications/product/widget/facility/FacilityMenus.xml
@@ -399,41 +399,35 @@ under the License.
<parameter param-name="shipmentId"/>
</link>
</menu-item>
- </menu>
- <menu name="ShipmentActionBar" menu-container-style="button-bar
button-style-2" default-selected-style="selected">
- <menu-item name="ReceiveInventory"
title="${uiLabelMap.ProductReceiveInventory}">
+ <menu-item name="ReceiveInventoryAgainstPurchaseOrder"
title="${uiLabelMap.ProductReceiveInventoryAgainstPO}">
<condition>
<and>
<not><if-empty field="facility"/></not>
<not><if-empty field="shipment"/></not>
+ <not><if-empty field="shipment.primaryOrderId"/></not>
<if-compare field="shipment.shipmentTypeId"
operator="equals" value="PURCHASE_SHIPMENT" />
</and>
</condition>
- <link target="ReceiveInventory">
+ <link target="ReceiveInventoryAgainstPurchaseOrder">
<parameter param-name="shipmentId"/>
- <parameter param-name="facilityId"
from-field="facility.facilityId"/>
<parameter param-name="purchaseOrderId"
from-field="shipment.primaryOrderId"/>
- <parameter param-name="initialSelected" value="Y"/>
</link>
</menu-item>
- <menu-item name="ReceiveInventoryAgainstPurchaseOrder"
title="${uiLabelMap.ProductReceiveInventoryAgainstPO}">
+ </menu>
+ <menu name="ShipmentActionBar" menu-container-style="button-bar
button-style-2" default-selected-style="selected">
+ <menu-item name="ReceiveInventory"
title="${uiLabelMap.ProductReceiveInventory}">
<condition>
<and>
<not><if-empty field="facility"/></not>
<not><if-empty field="shipment"/></not>
- <not><if-empty field="shipment.primaryOrderId"/></not>
<if-compare field="shipment.shipmentTypeId"
operator="equals" value="PURCHASE_SHIPMENT" />
</and>
</condition>
- <link target="ReceiveInventoryAgainstPurchaseOrder">
- <parameter param-name="shipmentId"/>
- <parameter param-name="purchaseOrderId"
from-field="shipment.primaryOrderId"/>
- </link>
- </menu-item>
- <menu-item name="ReceiveInventoryAgainstPurchaseOrder"
title="${uiLabelMap.ProductReceiveInventoryAgainstPO}">
- <link target="ReceiveInventoryAgainstPurchaseOrder">
+ <link target="ReceiveInventory">
<parameter param-name="shipmentId"/>
+ <parameter param-name="facilityId"
from-field="facility.facilityId"/>
<parameter param-name="purchaseOrderId"
from-field="shipment.primaryOrderId"/>
+ <parameter param-name="initialSelected" value="Y"/>
</link>
</menu-item>
<menu-item name="CreateShipmentNote" title="${uiLabelMap.CommonAdd}
${uiLabelMap.CommonNote}">
diff --git a/applications/product/widget/facility/ShipmentScreens.xml
b/applications/product/widget/facility/ShipmentScreens.xml
index 95c18e31a8..0676f519e6 100644
--- a/applications/product/widget/facility/ShipmentScreens.xml
+++ b/applications/product/widget/facility/ShipmentScreens.xml
@@ -123,24 +123,6 @@ under the License.
</container>
</widgets>
</section>
- <section>
- <condition>
- <and>
- <not><if-empty
field="shipment"/></not>
- <not><if-empty
field="facility"/></not>
- <if-compare
field="shipment.shipmentTypeId" operator="equals" value="PURCHASE_SHIPMENT"/>
- <not><if-empty
field="shipment.primaryOrderId"/></not>
- </and>
- </condition>
- <widgets>
- <container>
- <link style="buttontext"
text="${uiLabelMap.ProductReceiveInventoryAgainstPO}"
target="ReceiveInventoryAgainstPurchaseOrder">
- <parameter
param-name="shipmentId" from-field="shipment.shipmentId"/>
- <parameter
param-name="purchaseOrderId" from-field="shipment.primaryOrderId"/>
- </link>
- </container>
- </widgets>
- </section>
<decorator-section-include name="body"/>
</widgets>
@@ -564,7 +546,7 @@ under the License.
<property-map resource="ProductEntityLabels"
map-name="uiLabelMap" global="true"/>
<set field="titleProperty"
value="ProductReceiveInventoryAgainstPurchaseOrder"/>
<set field="headerItem" value="shipment"/>
- <set field="tabButtonItem"
value="ProductReceiveInventoryAgainstPO"/>
+ <set field="tabButtonItem"
value="ReceiveInventoryAgainstPurchaseOrder"/>
<property-map resource="OrderUiLabels" map-name="uiLabelMap"
global="true"/>
<script
location="component://product/src/main/groovy/org/apache/ofbiz/product/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.groovy"/>
</actions>
