Cleanups to recent changes to show tab set labels on Order and Shipme…

…nt, simplify to just show ID from parameter for now
moqui · Dec 20, 2020 · 1a3972e · 1a3972e
1 parent cc9fb9e
commit 1a3972e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/screen/PopCommerceAdmin/Order.xml b/screen/PopCommerceAdmin/Order.xml
@@ -35,13 +35,8 @@ along with this software (see the LICENSE.md file). If not, see
         <subscreens-item name="SalesSummary" menu-include="false"
                 location="component://SimpleScreens/screen/SimpleScreens/Accounting/Reports/SalesSummary.xml"/>
     </subscreens>
-    <actions>
-        <if condition="orderId">
-            <entity-find-one entity-name="mantle.order.OrderPart" value-field="orderPart"/>
-        </if>
-    </actions>
     <widgets>
-        <label text="OrderNameTemplate" text-map="orderPart" type="strong" condition="orderPart"/>
+        <label text="Order ${orderId}" type="strong" condition="orderId"/>
         <subscreens-panel id="OrderPanel" type="tab"/>
     </widgets>
 </screen>
diff --git a/screen/PopCommerceAdmin/Shipment.xml b/screen/PopCommerceAdmin/Shipment.xml
@@ -37,11 +37,8 @@ along with this software (see the LICENSE.md file). If not, see
         <subscreens-item name="ShipmentByPackage" menu-include="false"
                 location="component://SimpleScreens/screen/SimpleScreens/Shipment/ShipmentByPackage.xml"/>
     </subscreens>
-    <actions>
-        <entity-find-one entity-name="mantle.shipment.Shipment" value-field="shipment"/>
-    </actions>
     <widgets>
-        <label text="${shipmentId}: ${shipment.toPartyId}" type="strong" condition="shipmentId"/>
+        <label text="Shipment ${shipmentId}" type="strong" condition="shipmentId"/>
         <subscreens-panel id="ShipmentPanel"/>
     </widgets>
 </screen>