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 5d6e9dc Fixed: Edit button(s) are shown for shipments received or
shipped (OFBIZ-11788)
5d6e9dc is described below
commit 5d6e9dc9d1ba889cadc01acfefbcddf8c58d5b45
Author: Jacques Le Roux <[email protected]>
AuthorDate: Sun Nov 29 20:40:39 2020 +0100
Fixed: Edit button(s) are shown for shipments received or shipped
(OFBIZ-11788)
When a shipment has been received (purchase) or shipped (sales), the
shipment
process should be concluded. And thus the shipment should not be editable
anymore.
Thanks: Pierre Smits for report, Ankit Joshi for patch
---
applications/product/template/shipment/ShipmentTabBar.ftl | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/applications/product/template/shipment/ShipmentTabBar.ftl
b/applications/product/template/shipment/ShipmentTabBar.ftl
index edb0894..68921e4 100644
--- a/applications/product/template/shipment/ShipmentTabBar.ftl
+++ b/applications/product/template/shipment/ShipmentTabBar.ftl
@@ -26,7 +26,9 @@ under the License.
<li>
<ul>
<li<#if selected="ViewShipment"> class="selected"</#if>><a
href="<@ofbizUrl>ViewShipment?shipmentId=${shipmentId}</@ofbizUrl>">${uiLabelMap.CommonView}</a></li>
- <li<#if selected="EditShipment"> class="selected"</#if>><a
href="<@ofbizUrl>EditShipment?shipmentId=${shipmentId}</@ofbizUrl>">${uiLabelMap.CommonEdit}</a></li>
+ <#if (shipment.statusId)?? && (shipment.statusId !=
"PURCH_SHIP_RECEIVED" && shipment.statusId != "SHIPMENT_SHIPPED")>
+ <li<#if selected="EditShipment">
class="selected"</#if>><a
href="<@ofbizUrl>EditShipment?shipmentId=${shipmentId}</@ofbizUrl>">${uiLabelMap.CommonEdit}</a></li>
+ </#if>
<#if (shipment.shipmentTypeId)?? && shipment.shipmentTypeId =
"PURCHASE_RETURN">
<li<#if selected="AddItemsFromInventory">
class="selected"</#if>><a
href="<@ofbizUrl>AddItemsFromInventory?shipmentId=${shipmentId}</@ofbizUrl>">${uiLabelMap.ProductOrderItems}</a></li>
</#if>
