You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2020/11/29 19:46:38 UTC
[ofbiz-framework] branch release17.12 updated: Fixed: Edit
button(s) are shown for shipments received or shipped (OFBIZ-11788)
This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a commit to branch release17.12
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/release17.12 by this push:
new e1cfe58 Fixed: Edit button(s) are shown for shipments received or shipped (OFBIZ-11788)
e1cfe58 is described below
commit e1cfe58828f7013ecb2121b4e477f8023bb8b311
Author: Jacques Le Roux <ja...@les7arts.com>
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="<@o...@ofbizUrl>">${uiLabelMap.CommonView}</a></li>
- <li<#if selected="EditShipment"> class="selected"</#if>><a href="<@o...@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="<@o...@ofbizUrl>">${uiLabelMap.CommonEdit}</a></li>
+ </#if>
<#if (shipment.shipmentTypeId)?? && shipment.shipmentTypeId = "PURCHASE_RETURN">
<li<#if selected="AddItemsFromInventory"> class="selected"</#if>><a href="<@o...@ofbizUrl>">${uiLabelMap.ProductOrderItems}</a></li>
</#if>