From 1d06a4c2827a49e92284e3b10be0844816f5cd54 Mon Sep 17 00:00:00 2001
From: Hans Bakker <h.bakker@antwebsystems.com>
Date: Wed, 11 Mar 2020 10:26:41 +0700
Subject: [PATCH 01/37] generate logo location for use in order PDF

---
 service/mantle/order/OrderInfoServices.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/service/mantle/order/OrderInfoServices.xml b/service/mantle/order/OrderInfoServices.xml
index 9d75f3f6..e5c36893 100644
--- a/service/mantle/order/OrderInfoServices.xml
+++ b/service/mantle/order/OrderInfoServices.xml
@@ -140,6 +140,7 @@ along with this software (see the LICENSE.md file). If not, see
                     <auto-parameters entity-name="mantle.shipment.ShipmentItemSource"/></parameter></parameter>
                 <parameter name="partShipmentIdSet" type="Set"><parameter name="partShipmentId"/></parameter>
             </parameter></parameter>
+            <parameter name="logoImageLocation"/>
 
             <parameter name="templateLocation"><description>Looked up from ProductStoreSetting and if no setting found for store or
                 no store is associated with the Order then from PartySetting (for vendorPartyId).</description></parameter>
@@ -438,6 +439,10 @@ along with this software (see the LICENSE.md file). If not, see
                         in-map="[partyId:firstPart.vendorPartyId, partySettingTypeId:('Org' + templateSettingSuffix)]"/>
                 <set field="templateLocation" from="ptySettingOut?.settingValue"/>
             </if>
+            <!-- get logo of vendor for PDF -->
+            <service-call name="mantle.party.PartyServices.get#PartyContentLocation" out-map="logoImageOut"
+                    in-map="[partyId:firstPart.vendorPartyId, partyContentTypeEnumIdList:['PcntLogoImage', 'PcntPrimaryImage']]"/>
+            <set field="logoImageLocation" from="logoImageOut.contentLocation"/>
         </actions>
     </service>
     <service verb="get" noun="OrderItemsTotalCount">

From 841d516b884bd642b37907f5828fc6a80f744b0c Mon Sep 17 00:00:00 2001
From: Hans Bakker <h.bakker@antwebsystems.com>
Date: Mon, 23 Mar 2020 13:55:27 +0700
Subject: [PATCH 02/37] get vendor/customer contactInfo for PDF

---
 service/mantle/order/OrderInfoServices.xml | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/service/mantle/order/OrderInfoServices.xml b/service/mantle/order/OrderInfoServices.xml
index e5c36893..8a6ec41a 100644
--- a/service/mantle/order/OrderInfoServices.xml
+++ b/service/mantle/order/OrderInfoServices.xml
@@ -126,8 +126,10 @@ along with this software (see the LICENSE.md file). If not, see
                         <auto-parameters entity-name="mantle.party.contact.TelecomNumber"/></parameter>
                 </parameter>
                 <parameter name="customerDetail" type="Map"><auto-parameters entity-name="mantle.party.PartyDetail"/></parameter>
+                <parameter name="customerContactInfo"/>
                 <parameter name="customerEmail"/>
                 <parameter name="vendorDetail" type="Map"><auto-parameters entity-name="mantle.party.PartyDetail"/></parameter>
+                <parameter name="vendorContactInfo"/>
                 <parameter name="isCustomerInternalOrg" type="Boolean"/>
                 <parameter name="isVendorInternalOrg" type="Boolean"/>
                 <parameter name="orderPartPartyList" type="List"><parameter name="orderPartParty">
@@ -292,7 +294,18 @@ along with this software (see the LICENSE.md file). If not, see
                 EntityList partNoParentOrderItemList = partOrderItemList.findAll({ it.parentItemSeqId == null })
 
                 EntityValue customerDetail = ec.entity.find("mantle.party.PartyDetail").condition("partyId", orderPart.customerPartyId).one()
+                Map customerContactInfo = null;
+                if (customerDetail) {
+                    customerContactInfo = ec.service.sync().name("mantle.party.ContactServices.get#PartyContactInfo")
+                        .parameter("partyId", orderPart.customerPartyId).parameter("postalContactMechPurposeId","PostalOrder")
+                        .parameter("emailContactMechPurposeId", 'EmailOrder').parameter("defaultToPrimaryPurpose", true).call()
+                    String customerEmail = customerContactInfo?.emailAddress}
                 EntityValue vendorDetail = ec.entity.find("mantle.party.PartyDetail").condition("partyId", orderPart.vendorPartyId).one()
+                Map vendorContactInfo = null;
+                if (vendorDetail) {
+                    vendorContactInfo = ec.service.sync().name("mantle.party.ContactServices.get#PartyContactInfo")
+                        .parameter("partyId", orderPart.vendorPartyId).parameter("postalContactMechPurposeId","PostalOrder")
+                        .parameter("defaultToPrimaryPurpose", true).call()}
                 boolean isCustomerInternalOrg = ec.entity.find("mantle.party.PartyRole")
                         .condition("partyId", orderPart.customerPartyId).condition("roleTypeId", "OrgInternal").one() as boolean
                 boolean isVendorInternalOrg = ec.entity.find("mantle.party.PartyRole")
@@ -305,13 +318,6 @@ along with this software (see the LICENSE.md file). If not, see
                 String shipToPartyId = customerShipToDetail?.partyId ?: orderPart.customerPartyId
                 String billToPartyId = customerBillToDetail?.partyId ?: orderPart.customerPartyId
 
-                String customerEmail = null
-                if (orderPart.customerPartyId) {
-                    customerEmail = ec.service.sync().name("mantle.party.ContactServices.get#PartyContactInfo")
-                            .parameter("partyId", orderPart.customerPartyId).parameter("emailContactMechPurposeId", "EmailOrder")
-                            .parameter("defaultToPrimaryPurpose", true).call()?.emailAddress
-                }
-
                 boolean hasShippableItems = orderItemList.find({ it.product?.productTypeEnumId in ['PtAsset', 'PtDigitalAsset', 'PtAssetUse'] }) != null
                 boolean singleLot = false
                 boolean newerInventory = false
@@ -410,6 +416,7 @@ along with this software (see the LICENSE.md file). If not, see
                         postalAddress:postalAddress, postalAddressStateGeo:postalAddressStateGeo,
                         telecomNumber:telecomNumber, facility:facility,
                         facilityContactInfo:facilityContactInfo, customerDetail:customerDetail, customerEmail:customerEmail,
+                        vendorContactInfo: vendorContactInfo, customerContactInfo: customerContactInfo,
                         vendorDetail:vendorDetail, isCustomerInternalOrg:isCustomerInternalOrg, isVendorInternalOrg:isVendorInternalOrg,
                         orderPartPartyList:orderPartPartyList, customerShipToDetail:customerShipToDetail,
                         customerBillToDetail:customerBillToDetail, partShipmentItemSourceList:partShipmentItemSourceList,

From 698bfe8348c325de0b3b42a7810008736f35c557 Mon Sep 17 00:00:00 2001
From: Swapnil M Mane <swapnil.mane@hotwaxsystems.com>
Date: Wed, 4 Mar 2020 18:52:46 +0530
Subject: [PATCH 03/37] Fixed: The UserAccount should be created if
 emailAddress is available

As mentioned in the IN parameter definition of create#PersonCustomer service, if newPassword field is empty, the UserAccount will be created and after this user will have to change or reset.

But with the exiting newPassword check, it was blocking the creation of UserAccount, thus removed the additional check of newPassword.
---
 service/mantle/party/PartyServices.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/service/mantle/party/PartyServices.xml b/service/mantle/party/PartyServices.xml
index ee4b480d..9b4d0470 100644
--- a/service/mantle/party/PartyServices.xml
+++ b/service/mantle/party/PartyServices.xml
@@ -656,7 +656,7 @@ along with this software (see the LICENSE.md file). If not, see
                         relationshipTypeEnumId:'PrtContact', fromPartyId:partyId, toPartyId:accountPartyId,
                         fromRoleTypeId:'Contact', toRoleTypeId:'Account']"/>
             </if>
-            <if condition="emailAddress &amp;&amp; newPassword">
+            <if condition="emailAddress">
                 <service-call name="mantle.party.PartyServices.create#PartyUserAccount" in-map="context" out-map="context"/>
             </if>
         </actions>

From ba04aa3a153d6595f5b081b5f14eb11f6f2b9434 Mon Sep 17 00:00:00 2001
From: David E Jones <dej@dejc.com>
Date: Tue, 17 Mar 2020 15:49:55 -0700
Subject: [PATCH 04/37] In add#OrderProductQuantity service log when using
 calculated vs manual/modified price

---
 service/mantle/order/OrderServices.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/service/mantle/order/OrderServices.xml b/service/mantle/order/OrderServices.xml
index 23479a9b..41292d9b 100644
--- a/service/mantle/order/OrderServices.xml
+++ b/service/mantle/order/OrderServices.xml
@@ -616,7 +616,9 @@ General Order Placement and eCommerce Usage
                 <set field="unitAmount" from="priceMap.price"/>
                 <set field="unitListPrice" from="priceMap.listPrice"/>
                 <set field="isModifiedPrice" value="N"/>
+                <log message="OrderProductQuantity Calculated Order ${orderId}:${orderPartSeqId} Product ${productId} calculated unitAmount ${unitAmount} unitListPrice ${unitListPrice} productStoreId ${productStoreId} customerPartyId ${customerPartyId} vendorPartyId ${vendorPartyId}"/>
             </then><else>
+                <log message="OrderProductQuantity Modified Order ${orderId}:${orderPartSeqId} Product ${productId} manual unitAmount ${unitAmount}"/>
                 <set field="isModifiedPrice" value="Y"/>
             </else></if>
 

From b95cff2bd2821519e9dcd2a6e67ae2f0fff00716 Mon Sep 17 00:00:00 2001
From: David E Jones <dej@dejc.com>
Date: Sat, 21 Mar 2020 02:25:37 -0700
Subject: [PATCH 05/37] In cancel#AssetIssuance handle reservations that still
 exist because was only partly issued, and always do separate AssetDetail
 records for the issuance reversal and the new reservation making it much
 easier to see history and avoid weird data combinations, also pass through
 shipmentId and other IDs relevant to AssetDetail records

---
 service/mantle/product/AssetServices.xml | 53 +++++++++++++++---------
 1 file changed, 34 insertions(+), 19 deletions(-)

diff --git a/service/mantle/product/AssetServices.xml b/service/mantle/product/AssetServices.xml
index bd0ec96c..810f9f86 100644
--- a/service/mantle/product/AssetServices.xml
+++ b/service/mantle/product/AssetServices.xml
@@ -1037,6 +1037,7 @@ along with this software (see the LICENSE.md file). If not, see
         </actions>
     </service>
 
+    <!-- TODO: more useful would be reReserve more generally, by: Product, Facility, and/or Order/Item -->
     <!-- TODO: implement this (and populate priority on order/item and on reservation)
     <service verb="reReserve" noun="ProductAssets">
         <description>Clear out all reservations for a Product and re-reserve</description>
@@ -1524,6 +1525,7 @@ along with this software (see the LICENSE.md file). If not, see
             </if>
         </actions>
     </service>
+    <!-- WARNING: don't use this service. The general concept is flawed, needs to be more constrained and/or better handle more complex data scenarios
     <service verb="checkReserve" noun="ProductAssets">
         <description>
             WARNING: don't use this service. The general concept is flawed, needs to be more constrained and/or better handle more complex data scenarios
@@ -1539,17 +1541,18 @@ along with this software (see the LICENSE.md file). If not, see
                 <entity-find entity-name="mantle.product.asset.Asset" list="availAssetList" limit="1">
                     <econdition field-name="productId"/>
                     <econdition field-name="availableToPromiseTotal" operator="greater" from="0.0"/>
-                    <order-by field-name="receivedDate"/><!-- get oldest first for filling quantityNotAvailable -->
+                    <order-by field-name="receivedDate"/><!- - get oldest first for filling quantityNotAvailable - ->
                 </entity-find>
                 <if condition="availAssetList.size() == 0"><break/></if>
-                <!-- move reservation(s) to this asset -->
+                <!- - move reservation(s) to this asset - ->
                 <service-call name="mantle.product.AssetServices.reserve#IncreasedAsset" in-map="[assetId:availAssetList[0].assetId]"/>
-                <!-- see if we have any more not available reservations -->
+                <!- - see if we have any more not available reservations - ->
                 <entity-find-count entity-name="mantle.product.issuance.AssetReservation" count-field="notAvailResCount">
                     <econdition field-name="productId"/><econdition field-name="quantityNotAvailable" operator="greater" from="0.0"/></entity-find-count>
             </while>
         </actions>
     </service>
+    -->
 
     <!-- ======================================= -->
     <!-- ========== Issuance Services ========== -->
@@ -2112,6 +2115,10 @@ along with this software (see the LICENSE.md file). If not, see
         <out-parameters><parameter name="assetReservationId"/></out-parameters>
         <actions>
             <entity-find-one entity-name="mantle.product.issuance.AssetIssuance" value-field="assetIssuance" for-update="true"/>
+            <!-- lock the Asset record to prevent concurrent reservations, etc -->
+            <entity-find-one entity-name="mantle.product.asset.Asset" value-field="asset" for-update="true">
+                <field-map field-name="assetId" from="assetIssuance.assetId"/></entity-find-one>
+
             <set field="originalQuantity" from="assetIssuance.quantity"/>
             <if condition="!originalQuantity"><return message="No quantity to cancel for issuance ${assetIssuanceId} of asset ${assetIssuance.assetId}"/></if>
             <if condition="assetIssuance.invoiceId">
@@ -2121,23 +2128,31 @@ along with this software (see the LICENSE.md file). If not, see
             <service-call name="update#mantle.product.issuance.AssetIssuance" in-map="[assetIssuanceId:assetIssuanceId,
                     quantity:0.0, quantityCancelled:quantityCancelled]"/>
 
-            <set field="cancelDate" from="assetIssuance.issuedDate ?: ec.user.nowTimestamp"/>
-            <if condition="reserveAsset &amp;&amp; assetIssuance.orderId"><then>
-                <!-- create AssetDetail to increment QOH only, keep ATP -->
-                <!-- NOTE: no availableToPromiseDiff because we are going to reserve again right now -->
-                <service-call name="create#mantle.product.asset.AssetDetail" in-map="[assetId:assetIssuance.assetId,
-                    effectiveDate:cancelDate, quantityOnHandDiff:originalQuantity,
-                    productId:assetIssuance.productId, assetIssuanceId:assetIssuanceId]"/>
-                <service-call name="create#mantle.product.issuance.AssetReservation" out-map="context" in-map="[
-                    orderId:assetIssuance.orderId, orderItemSeqId:assetIssuance.orderItemSeqId, productId:assetIssuance.productId,
-                    assetId:assetIssuance.assetId, reservedDate:cancelDate, quantity:originalQuantity,
-                    quantityNotAvailable:0, quantityNotIssued:originalQuantity, priority:null,
-                    sequenceNum:1, reservationOrderEnumId:null]"/>
-            </then><else>
-                <!-- create AssetDetail to increment QOH and ATP -->
-                <service-call name="create#mantle.product.asset.AssetDetail" in-map="[assetId:assetIssuance.assetId,
+            <!-- NOTE: used to look at "assetIssuance.issuedDate ?:" but better to stick with actual time for easier tracking and figuring out time lines -->
+            <set field="cancelDate" from="ec.user.nowTimestamp"/>
+
+            <!-- create AssetDetail to increment QOH and ATP -->
+            <service-call name="create#mantle.product.asset.AssetDetail" in-map="[assetId:assetIssuance.assetId,
                     effectiveDate:cancelDate, quantityOnHandDiff:originalQuantity, availableToPromiseDiff:originalQuantity,
-                    productId:assetIssuance.productId, assetIssuanceId:assetIssuanceId]"/>
+                    productId:assetIssuance.productId, assetIssuanceId:assetIssuanceId,
+                    shipmentId:assetIssuance.shipmentId, workEffortId:assetIssuance.workEffortId,
+                    assetMaintenanceId:assetIssuance.assetMaintenanceId]"/>
+
+            <if condition="assetIssuance.assetReservationId">
+                <entity-find-one entity-name="mantle.product.issuance.AssetReservation" value-field="oldReservation">
+                    <field-map field-name="assetReservationId" from="assetIssuance.assetReservationId"/></entity-find-one>
+            </if>
+            <if condition="oldReservation != null"><then>
+                <!-- if issuance was from a reservation increase not issued quantity -->
+                <set field="oldReservation.quantityNotIssued" from="(oldReservation.quantityNotIssued ?: 0.0) + originalQuantity"/>
+                <entity-update value-field="oldReservation"/>
+            </then><else>
+                <if condition="reserveAsset &amp;&amp; assetIssuance.orderId">
+                    <!-- no reservation, try reserve for order item using this asset with freshly available inventory -->
+                    <service-call name="mantle.product.AssetServices.reserve#AssetForOrderItem"
+                            in-map="[orderId:assetIssuance.orderId, orderItemSeqId:assetIssuance.orderItemSeqId,
+                                assetId:assetIssuance.assetId]"/>
+                </if>
             </else></if>
         </actions>
     </service>

From 3c9dec592535bfdbad727aba7cf35fef845ac3b9 Mon Sep 17 00:00:00 2001
From: David E Jones <dej@dejc.com>
Date: Sat, 21 Mar 2020 02:26:50 -0700
Subject: [PATCH 06/37] Add tests for inventory reservation and issuance
 scenarios where shipments are partly or fully packed and shipped and then
 hard cancelled, still some to do

---
 src/test/groovy/OrderToCashBasicFlow.groovy | 196 ++++++++++++++++----
 1 file changed, 162 insertions(+), 34 deletions(-)

diff --git a/src/test/groovy/OrderToCashBasicFlow.groovy b/src/test/groovy/OrderToCashBasicFlow.groovy
index 5e38bb3b..bd1dd56b 100644
--- a/src/test/groovy/OrderToCashBasicFlow.groovy
+++ b/src/test/groovy/OrderToCashBasicFlow.groovy
@@ -31,6 +31,7 @@ class OrderToCashBasicFlow extends Specification {
     @Shared protected final static Logger logger = LoggerFactory.getLogger(OrderToCashBasicFlow.class)
     @Shared ExecutionContext ec
     @Shared String cartOrderId = null, cartOrderPartSeqId
+    @Shared String inventoryOrderId = null
     @Shared Map setInfoOut, shipResult
     @Shared String b2bPaymentId, b2bShipmentId, b2bCredMemoId
     @Shared long effectiveTime = System.currentTimeMillis()
@@ -49,7 +50,7 @@ class OrderToCashBasicFlow extends Specification {
         ec.entity.tempSetSequencedIdPrimary("mantle.shipment.Shipment", 55500, 10)
         ec.entity.tempSetSequencedIdPrimary("mantle.shipment.ShipmentItemSource", 55500, 10)
         ec.entity.tempSetSequencedIdPrimary("mantle.product.asset.Asset", 55500, 10)
-        ec.entity.tempSetSequencedIdPrimary("mantle.product.asset.AssetDetail", 55500, 10)
+        ec.entity.tempSetSequencedIdPrimary("mantle.product.asset.AssetDetail", 55500, 50)
         ec.entity.tempSetSequencedIdPrimary("mantle.product.asset.PhysicalInventory", 55500, 10)
         ec.entity.tempSetSequencedIdPrimary("mantle.product.issuance.AssetReservation", 55500, 10)
         ec.entity.tempSetSequencedIdPrimary("mantle.product.issuance.AssetIssuance", 55500, 10)
@@ -57,7 +58,7 @@ class OrderToCashBasicFlow extends Specification {
         ec.entity.tempSetSequencedIdPrimary("mantle.account.payment.Payment", 55500, 10)
         ec.entity.tempSetSequencedIdPrimary("mantle.account.payment.PaymentApplication", 55500, 10)
         ec.entity.tempSetSequencedIdPrimary("mantle.order.OrderHeader", 55500, 10)
-        ec.entity.tempSetSequencedIdPrimary("mantle.order.OrderItemBilling", 55500, 10)
+        ec.entity.tempSetSequencedIdPrimary("mantle.order.OrderItemBilling", 55500, 20)
     }
 
     def cleanupSpec() {
@@ -546,38 +547,6 @@ class OrderToCashBasicFlow extends Specification {
         dataCheckErrors.size() == 0
     }
 
-    def "reserve Asset With Displace Reservation"() {
-        when:
-        // NOTE: orders used here are from AssetReservationMultipleThreads (base id 53000)
-        // use asset DEMO_1_1A with 0 ATP at this point (90 QOH, 2 reservations for orders)
-        // use order with 60 currently reserved against asset 55400
-
-        EntityList beforeResList = ec.entity.find("mantle.product.issuance.AssetReservation")
-                .condition("assetId", "DEMO_1_1A").orderBy("assetId").list()
-        for (EntityValue res in beforeResList) logger.warn("Res before: R:${res.assetReservationId} - O:${res.orderId} - A:${res.assetId} - ${res.quantity} - QOH:${res.asset.quantityOnHandTotal}")
-
-        beforeResList = ec.entity.find("mantle.product.issuance.AssetReservation")
-                .condition("assetId", "55400").orderBy("assetId").list()
-        for (EntityValue res in beforeResList) logger.warn("Res before: R:${res.assetReservationId} - O:${res.orderId} - A:${res.assetId} - ${res.quantity}")
-
-        EntityValue beforeRes = beforeResList.find({it.quantity == 60})
-        String orderId = beforeRes.orderId
-        String orderItemSeqId = beforeRes.orderItemSeqId
-
-        ec.service.sync().name("mantle.product.AssetServices.reserve#AssetForOrderItem")
-                .parameters([orderId:orderId, orderItemSeqId:orderItemSeqId, assetId:"DEMO_1_1A", resetReservations:true]).call()
-
-        EntityList afterResList = ec.entity.find("mantle.product.issuance.AssetReservation")
-                .condition("orderId", orderId).condition("orderItemSeqId", orderItemSeqId).orderBy("assetId").list()
-        for (EntityValue res in afterResList) logger.info("Res after: R:${res.assetReservationId} - O:${res.orderId} - A:${res.assetId} - ${res.quantity}")
-        EntityValue afterRes = afterResList.find({it.assetId == "DEMO_1_1A"})
-
-        then:
-        afterRes != null
-        afterRes?.assetId == "DEMO_1_1A"
-        afterRes?.quantity == 60.0
-    }
-
     /* ========== Business Customer Order, Credit Memo, Overpay/Refund, etc ========== */
 
     def "create and Ship Business Customer Order"() {
@@ -783,4 +752,163 @@ class OrderToCashBasicFlow extends Specification {
         refundApplResult.amountApplied == overpayAmount
         dataCheckErrors.size() == 0
     }
+
+    /* ========== Inventory Reservation and Issuance Tests: pack/issue and unpack, cancel Shipment in late status ========== */
+
+    def "create Inventory Tests Sales Order"() {
+        when:
+        ec.user.loginUser("john.doe", "moqui")
+
+        Map addOut1 = ec.service.sync().name("mantle.order.OrderServices.add#OrderProductQuantity")
+                .parameters([productId:"DEMO_UNIT", quantity:10, customerPartyId:"CustJqp",
+                        currencyUomId:"USD", productStoreId:"POPC_DEFAULT"]).call()
+
+        inventoryOrderId = addOut1.orderId
+
+        ec.service.sync().name("mantle.order.OrderServices.set#OrderBillingShippingInfo")
+                .parameters([orderId:inventoryOrderId, paymentMethodId:'CustJqpCc', shippingPostalContactMechId:'CustJqpAddr',
+                        shippingTelecomContactMechId:'CustJqpTeln', carrierPartyId:'_NA_', shipmentMethodEnumId:'ShMthGround']).call()
+
+        ec.service.sync().name("mantle.order.OrderServices.place#Order").parameters([orderId:inventoryOrderId, requireInventory:false]).call()
+        ec.service.sync().name("mantle.order.OrderServices.approve#Order").parameters([orderId:inventoryOrderId]).call()
+
+        // NOTE: this has sequenced IDs so is sensitive to run order!
+        List<String> dataCheckErrors = ec.entity.makeDataLoader().xmlText("""<entity-facade-xml>
+            <mantle.order.OrderHeader orderId="${inventoryOrderId}" entryDate="${effectiveTime}" placedDate="${effectiveTime}"
+                statusId="OrderApproved" currencyUomId="USD" productStoreId="POPC_DEFAULT" grandTotal="10.00"/>
+            <mantle.order.OrderPart orderId="${inventoryOrderId}" orderPartSeqId="01" vendorPartyId="ORG_ZIZI_RETAIL"
+                customerPartyId="CustJqp" shipmentMethodEnumId="ShMthGround" postalContactMechId="CustJqpAddr"
+                telecomContactMechId="CustJqpTeln" partTotal="10.00"/>
+            <mantle.order.OrderItem orderId="${inventoryOrderId}" orderItemSeqId="01" orderPartSeqId="01" itemTypeEnumId="ItemProduct"
+                productId="DEMO_UNIT" itemDescription="Demo Product One Unit" quantity="10" unitAmount="1.00"
+                isModifiedPrice="N"/>
+
+            <mantle.product.issuance.AssetReservation assetReservationId="55505" orderId="55502" orderItemSeqId="01"
+                reservedDate="${effectiveTime}" quantity="10" quantityNotAvailable="0" quantityNotIssued="10" assetId="DEMO_UNITA"
+                productId="DEMO_UNIT" sequenceNum="0" reservationOrderEnumId="AsResOrdFifoRec"/>
+            <mantle.product.asset.AssetDetail assetDetailId="55513" assetId="DEMO_UNITA" orderId="55502" orderItemSeqId="01" 
+                productId="DEMO_UNIT" assetReservationId="55505" availableToPromiseDiff="-10" effectiveDate="${effectiveTime}"/>
+        </entity-facade-xml>""").check()
+        logger.info("create Inventory Tests Sales Order data check results: ")
+        for (String dataCheckError in dataCheckErrors) logger.info(dataCheckError)
+
+        // TODO: check QOH - ATP = Reservations
+
+        then:
+        dataCheckErrors.size() == 0
+    }
+
+    def "ship Inventory Sales Order and Cancel Shipment"() {
+        when:
+        ec.user.loginUser("john.doe", "moqui")
+
+        Map shipResult = ec.service.sync().name("mantle.shipment.ShipmentServices.create#OrderPartShipment")
+                .parameters([orderId:inventoryOrderId, orderPartSeqId:"01", createPackage:true]).call()
+
+        ec.service.sync().name("mantle.shipment.ShipmentServices.pack#ShipmentProduct")
+                .parameters([productId:'DEMO_UNIT', quantity:10, shipmentId:shipResult.shipmentId, shipmentPackageSeqId:shipResult.shipmentPackageSeqId]).call()
+
+        ec.service.sync().name("mantle.shipment.ShipmentServices.pack#Shipment").parameters([shipmentId:shipResult.shipmentId]).call()
+        ec.service.sync().name("mantle.shipment.ShipmentServices.ship#Shipment").parameters([shipmentId:shipResult.shipmentId]).call()
+        ec.service.sync().name("mantle.shipment.ShipmentServices.cancel#Shipment").parameters([shipmentId:shipResult.shipmentId]).call()
+
+        // NOTE: this has sequenced IDs so is sensitive to run order!
+        List<String> dataCheckErrors = ec.entity.makeDataLoader().xmlText("""<entity-facade-xml>
+            <mantle.product.issuance.AssetIssuance assetIssuanceId="55505" assetId="DEMO_UNITA" orderId="55502" orderItemSeqId="01" 
+                    issuedDate="${effectiveTime}" shipmentId="55502" shipmentItemSourceId="55505" 
+                    productId="DEMO_UNIT" quantity="0" quantityCancelled="10" assetReservationId="55505"
+                    acctgTransResultEnumId="AtrSuccess" issuedByUserId="EX_JOHN_DOE">
+                <mantle.product.asset.AssetDetail assetDetailId="55514" assetId="DEMO_UNITA" quantityOnHandDiff="-10" 
+                        productId="DEMO_UNIT" shipmentId="55502" assetReservationId="55505" effectiveDate="${effectiveTime}"/>
+                <mantle.product.asset.AssetDetail assetDetailId="55515" assetId="DEMO_UNITA" quantityOnHandDiff="10" availableToPromiseDiff="10"  
+                        productId="DEMO_UNIT" shipmentId="55502" effectiveDate="${effectiveTime}"/>
+                <mantle.order.OrderItemBilling orderItemBillingId="55511" orderId="55502" orderItemSeqId="01" amount="1" 
+                        quantity="0" shipmentId="55502" invoiceId="55503" invoiceItemSeqId="01"/>
+            </mantle.product.issuance.AssetIssuance>
+
+            <mantle.product.issuance.AssetReservation assetReservationId="55506" orderId="55502" orderItemSeqId="01" 
+                    reservedDate="${effectiveTime}" quantity="10" quantityNotAvailable="0" quantityNotIssued="10" assetId="DEMO_UNITA" 
+                    productId="DEMO_UNIT" sequenceNum="0" reservationOrderEnumId="AsResOrdFifoRec"/>
+            <mantle.product.asset.AssetDetail assetDetailId="55516" assetId="DEMO_UNITA" orderId="55502" orderItemSeqId="01"
+                    productId="DEMO_UNIT" assetReservationId="55506" availableToPromiseDiff="-10" effectiveDate="${effectiveTime}"/>
+        </entity-facade-xml>""").check()
+        logger.info("ship Inventory Sales Order and Cancel Shipment data check results: ")
+        for (String dataCheckError in dataCheckErrors) logger.info(dataCheckError)
+
+        // TODO: check QOH - ATP = Reservations
+
+        then:
+        dataCheckErrors.size() == 0
+    }
+
+    def "ship Partial Inventory Sales Order and Cancel Shipment"() {
+        when:
+        ec.user.loginUser("john.doe", "moqui")
+
+        Map shipResult = ec.service.sync().name("mantle.shipment.ShipmentServices.create#OrderPartShipment")
+                .parameters([orderId:inventoryOrderId, orderPartSeqId:"01", createPackage:true]).call()
+        String shipmentId = shipResult.shipmentId
+
+        // pack partial
+        ec.service.sync().name("mantle.shipment.ShipmentServices.pack#ShipmentProduct")
+                .parameters([productId:'DEMO_UNIT', quantity:5, shipmentId:shipResult.shipmentId, shipmentPackageSeqId:shipResult.shipmentPackageSeqId]).call()
+        // unpack
+        EntityList issuanceList = ec.entity.find("mantle.product.issuance.AssetIssuance").condition("shipmentId", shipmentId).list()
+        for (EntityValue issuance in issuanceList) {
+            ec.service.sync().name("mantle.shipment.ShipmentServices.unpack#ShipmentItemIssuance")
+                    .parameters([assetIssuanceId:issuance.assetIssuanceId]).call()
+        }
+
+        // pack partial again
+        ec.service.sync().name("mantle.shipment.ShipmentServices.pack#ShipmentProduct")
+                .parameters([productId:'DEMO_UNIT', quantity:5, shipmentId:shipResult.shipmentId, shipmentPackageSeqId:shipResult.shipmentPackageSeqId]).call()
+
+        ec.service.sync().name("mantle.shipment.ShipmentServices.pack#Shipment").parameters([shipmentId:shipResult.shipmentId]).call()
+        ec.service.sync().name("mantle.shipment.ShipmentServices.ship#Shipment").parameters([shipmentId:shipResult.shipmentId]).call()
+        ec.service.sync().name("mantle.shipment.ShipmentServices.cancel#Shipment").parameters([shipmentId:shipResult.shipmentId]).call()
+
+        // NOTE: this has sequenced IDs so is sensitive to run order!
+        List<String> dataCheckErrors = ec.entity.makeDataLoader().xmlText("""<entity-facade-xml>
+        </entity-facade-xml>""").check()
+        logger.info("ship Partial Inventory Sales Order and Cancel Shipment data check results: ")
+        for (String dataCheckError in dataCheckErrors) logger.info(dataCheckError)
+
+        // TODO: check QOH - ATP = Reservations
+
+        then:
+        dataCheckErrors.size() == 0
+    }
+
+    // NOTE: do this last because deals with unpredictable data (number of AssetDetail, etc records) from the thread race in asset reservations
+    def "reserve Asset With Displace Reservation"() {
+        when:
+        // NOTE: orders used here are from AssetReservationMultipleThreads (base id 53000)
+        // use asset DEMO_1_1A with 0 ATP at this point (90 QOH, 2 reservations for orders)
+        // use order with 60 currently reserved against asset 55400
+
+        EntityList beforeResList = ec.entity.find("mantle.product.issuance.AssetReservation")
+                .condition("assetId", "DEMO_1_1A").orderBy("assetId").list()
+        for (EntityValue res in beforeResList) logger.warn("Res before: R:${res.assetReservationId} - O:${res.orderId} - A:${res.assetId} - ${res.quantity} - QOH:${res.asset.quantityOnHandTotal}")
+
+        beforeResList = ec.entity.find("mantle.product.issuance.AssetReservation")
+                .condition("assetId", "55400").orderBy("assetId").list()
+        for (EntityValue res in beforeResList) logger.warn("Res before: R:${res.assetReservationId} - O:${res.orderId} - A:${res.assetId} - ${res.quantity}")
+
+        EntityValue beforeRes = beforeResList.find({it.quantity == 60})
+        String orderId = beforeRes.orderId
+        String orderItemSeqId = beforeRes.orderItemSeqId
+
+        ec.service.sync().name("mantle.product.AssetServices.reserve#AssetForOrderItem")
+                .parameters([orderId:orderId, orderItemSeqId:orderItemSeqId, assetId:"DEMO_1_1A", resetReservations:true]).call()
+
+        EntityList afterResList = ec.entity.find("mantle.product.issuance.AssetReservation")
+                .condition("orderId", orderId).condition("orderItemSeqId", orderItemSeqId).orderBy("assetId").list()
+        for (EntityValue res in afterResList) logger.info("Res after: R:${res.assetReservationId} - O:${res.orderId} - A:${res.assetId} - ${res.quantity}")
+        EntityValue afterRes = afterResList.find({it.assetId == "DEMO_1_1A"})
+
+        then:
+        afterRes != null
+        afterRes?.assetId == "DEMO_1_1A"
+        afterRes?.quantity == 60.0
+    }
 }

From 67d51b47f75f16dd178655f74765781b058099e2 Mon Sep 17 00:00:00 2001
From: David E Jones <dej@dejc.com>
Date: Sat, 21 Mar 2020 02:56:16 -0700
Subject: [PATCH 07/37] Add tests to make sure QOH - ATP = Reservations and fix
 that issue in cancel#AssetIssuance when there was an existing reservation

---
 service/mantle/product/AssetServices.xml    | 14 +++++-----
 src/test/groovy/OrderToCashBasicFlow.groovy | 30 ++++++++++++++++++---
 2 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/service/mantle/product/AssetServices.xml b/service/mantle/product/AssetServices.xml
index 810f9f86..cb5335dd 100644
--- a/service/mantle/product/AssetServices.xml
+++ b/service/mantle/product/AssetServices.xml
@@ -2131,17 +2131,17 @@ along with this software (see the LICENSE.md file). If not, see
             <!-- NOTE: used to look at "assetIssuance.issuedDate ?:" but better to stick with actual time for easier tracking and figuring out time lines -->
             <set field="cancelDate" from="ec.user.nowTimestamp"/>
 
-            <!-- create AssetDetail to increment QOH and ATP -->
-            <service-call name="create#mantle.product.asset.AssetDetail" in-map="[assetId:assetIssuance.assetId,
-                    effectiveDate:cancelDate, quantityOnHandDiff:originalQuantity, availableToPromiseDiff:originalQuantity,
-                    productId:assetIssuance.productId, assetIssuanceId:assetIssuanceId,
-                    shipmentId:assetIssuance.shipmentId, workEffortId:assetIssuance.workEffortId,
-                    assetMaintenanceId:assetIssuance.assetMaintenanceId]"/>
-
             <if condition="assetIssuance.assetReservationId">
                 <entity-find-one entity-name="mantle.product.issuance.AssetReservation" value-field="oldReservation">
                     <field-map field-name="assetReservationId" from="assetIssuance.assetReservationId"/></entity-find-one>
             </if>
+            <!-- create AssetDetail to increment QOH and if there is no reservation also ATP -->
+            <service-call name="create#mantle.product.asset.AssetDetail" in-map="[assetId:assetIssuance.assetId,
+                        effectiveDate:cancelDate, quantityOnHandDiff:originalQuantity,
+                        availableToPromiseDiff:(oldReservation != null ? 0.0 : originalQuantity),
+                        productId:assetIssuance.productId, assetIssuanceId:assetIssuanceId,
+                        shipmentId:assetIssuance.shipmentId, workEffortId:assetIssuance.workEffortId,
+                        assetMaintenanceId:assetIssuance.assetMaintenanceId]"/>
             <if condition="oldReservation != null"><then>
                 <!-- if issuance was from a reservation increase not issued quantity -->
                 <set field="oldReservation.quantityNotIssued" from="(oldReservation.quantityNotIssued ?: 0.0) + originalQuantity"/>
diff --git a/src/test/groovy/OrderToCashBasicFlow.groovy b/src/test/groovy/OrderToCashBasicFlow.groovy
index bd1dd56b..bdb2c156 100644
--- a/src/test/groovy/OrderToCashBasicFlow.groovy
+++ b/src/test/groovy/OrderToCashBasicFlow.groovy
@@ -792,10 +792,18 @@ class OrderToCashBasicFlow extends Specification {
         logger.info("create Inventory Tests Sales Order data check results: ")
         for (String dataCheckError in dataCheckErrors) logger.info(dataCheckError)
 
-        // TODO: check QOH - ATP = Reservations
+        // check QOH - ATP = Reservations
+        def assetDetailSummaryList = ec.entity.find("mantle.product.asset.AssetDetailSummary")
+                .condition("assetId", "DEMO_UNITA").selectField("availableToPromiseTotal,quantityOnHandTotal").list()
+        BigDecimal availableToPromiseTotal = (BigDecimal) assetDetailSummaryList.get(0).availableToPromiseTotal
+        BigDecimal quantityOnHandTotal = (BigDecimal) assetDetailSummaryList.get(0).quantityOnHandTotal
+        BigDecimal reservationTotal = (BigDecimal) ec.entity.find("mantle.product.issuance.AssetReservation")
+                .condition("assetId", "DEMO_UNITA").list().sum({ it.quantity })
+        logger.info("availableToPromiseTotal ${availableToPromiseTotal} quantityOnHandTotal ${quantityOnHandTotal} reservationTotal ${reservationTotal}")
 
         then:
         dataCheckErrors.size() == 0
+        quantityOnHandTotal - availableToPromiseTotal == reservationTotal
     }
 
     def "ship Inventory Sales Order and Cancel Shipment"() {
@@ -835,10 +843,18 @@ class OrderToCashBasicFlow extends Specification {
         logger.info("ship Inventory Sales Order and Cancel Shipment data check results: ")
         for (String dataCheckError in dataCheckErrors) logger.info(dataCheckError)
 
-        // TODO: check QOH - ATP = Reservations
+        // check QOH - ATP = Reservations
+        def assetDetailSummaryList = ec.entity.find("mantle.product.asset.AssetDetailSummary")
+                .condition("assetId", "DEMO_UNITA").selectField("availableToPromiseTotal,quantityOnHandTotal").list()
+        BigDecimal availableToPromiseTotal = (BigDecimal) assetDetailSummaryList.get(0).availableToPromiseTotal
+        BigDecimal quantityOnHandTotal = (BigDecimal) assetDetailSummaryList.get(0).quantityOnHandTotal
+        BigDecimal reservationTotal = (BigDecimal) ec.entity.find("mantle.product.issuance.AssetReservation")
+                .condition("assetId", "DEMO_UNITA").list().sum({ it.quantity })
+        logger.info("availableToPromiseTotal ${availableToPromiseTotal} quantityOnHandTotal ${quantityOnHandTotal} reservationTotal ${reservationTotal}")
 
         then:
         dataCheckErrors.size() == 0
+        quantityOnHandTotal - availableToPromiseTotal == reservationTotal
     }
 
     def "ship Partial Inventory Sales Order and Cancel Shipment"() {
@@ -873,10 +889,18 @@ class OrderToCashBasicFlow extends Specification {
         logger.info("ship Partial Inventory Sales Order and Cancel Shipment data check results: ")
         for (String dataCheckError in dataCheckErrors) logger.info(dataCheckError)
 
-        // TODO: check QOH - ATP = Reservations
+        // check QOH - ATP = Reservations
+        def assetDetailSummaryList = ec.entity.find("mantle.product.asset.AssetDetailSummary")
+                .condition("assetId", "DEMO_UNITA").selectField("availableToPromiseTotal,quantityOnHandTotal").list()
+        BigDecimal availableToPromiseTotal = (BigDecimal) assetDetailSummaryList.get(0).availableToPromiseTotal
+        BigDecimal quantityOnHandTotal = (BigDecimal) assetDetailSummaryList.get(0).quantityOnHandTotal
+        BigDecimal reservationTotal = (BigDecimal) ec.entity.find("mantle.product.issuance.AssetReservation")
+                .condition("assetId", "DEMO_UNITA").list().sum({ it.quantity })
+        logger.info("availableToPromiseTotal ${availableToPromiseTotal} quantityOnHandTotal ${quantityOnHandTotal} reservationTotal ${reservationTotal}")
 
         then:
         dataCheckErrors.size() == 0
+        quantityOnHandTotal - availableToPromiseTotal == reservationTotal
     }
 
     // NOTE: do this last because deals with unpredictable data (number of AssetDetail, etc records) from the thread race in asset reservations

From c558bd9e3d028b887f472c77c369d3886b765d25 Mon Sep 17 00:00:00 2001
From: David E Jones <dej@dejc.com>
Date: Sat, 21 Mar 2020 22:08:40 -0700
Subject: [PATCH 08/37] On order approve populate new OrderHeader.approvedDate
 field

---
 service/mantle/order/OrderServices.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/service/mantle/order/OrderServices.xml b/service/mantle/order/OrderServices.xml
index 41292d9b..25679a89 100644
--- a/service/mantle/order/OrderServices.xml
+++ b/service/mantle/order/OrderServices.xml
@@ -919,6 +919,7 @@ General Order Placement and eCommerce Usage
             <parameter name="orderPartSeqId"/>
             <parameter name="statusId" required="true"/>
             <parameter name="placedDate" type="Timestamp"/>
+            <parameter name="approvedDate" type="Timestamp"/>
         </in-parameters>
         <out-parameters><parameter name="oldStatusId"/><parameter name="statusChanged" type="Boolean"/></out-parameters>
         <actions>
@@ -935,6 +936,7 @@ General Order Placement and eCommerce Usage
             <!-- only update header status if no order part specified, or set status if all parts now same, etc like complete#OrderPart does -->
             <set field="updateMap" from="[orderId:orderId, statusId:statusId]"/>
             <if condition="placedDate != null &amp;&amp; orderHeader.placedDate == null"><script>updateMap.put('placedDate', placedDate)</script></if>
+            <if condition="approvedDate != null &amp;&amp; orderHeader.approvedDate == null"><script>updateMap.put('approvedDate', approvedDate)</script></if>
             <if condition="orderPartSeqId"><then>
                 <set field="allPartsSame" from="true"/>
                 <entity-find entity-name="mantle.order.OrderPart" list="allPartList"><econdition field-name="orderId"/></entity-find>
@@ -1041,6 +1043,9 @@ General Order Placement and eCommerce Usage
     <service verb="approve" noun="Order">
         <description>For manual order approval, requires ORDER_APPROVE permission.</description>
         <implements service="mantle.order.OrderServices.change#OrderStatusInterface"/>
+        <in-parameters>
+            <parameter name="approvedDate" type="Timestamp" default="ec.user.nowTimestamp"/>
+        </in-parameters>
         <actions>
             <if condition="!ec.user.hasPermission('ORDER_APPROVE')">
                 <return error="true" message="Order Approve permission required"/></if>
@@ -1119,7 +1124,8 @@ General Order Placement and eCommerce Usage
                 </entity-find>
 
                 <if condition="!checkOut.approveWarnings &amp;&amp; !statusHistoryList"><then>
-                    <service-call name="mantle.order.OrderServices.update#OrderStatus" in-map="[orderId:orderId, statusId:'OrderApproved']"/>
+                    <service-call name="mantle.order.OrderServices.update#OrderStatus"
+                            in-map="[orderId:orderId, statusId:'OrderApproved', approvedDate:ec.user.nowTimestamp]"/>
                 </then><else>
                     <log message="Not auto-approving Order ${orderId} status history: ${statusHistoryList*.auditHistorySeqId}, warnings: ${checkOut.approveWarnings}"/>
                 </else></if>

From fa70e20ef25ce50a8ef5a15723eeb8b1a7d28b3e Mon Sep 17 00:00:00 2001
From: David E Jones <dej@dejc.com>
Date: Sat, 21 Mar 2020 22:10:49 -0700
Subject: [PATCH 09/37] In reserve#AssetForOrderItem reuse placeholder/dummy
 Asset records for unavailable reservations; add reReserve#Assets service to
 bulk re-reserve existing reservations, new reservations initially always
 sorted by OrderPart.priority then OrderHeader.placedDate

---
 service/mantle/product/AssetServices.xml | 93 ++++++++++++++++++++----
 1 file changed, 79 insertions(+), 14 deletions(-)

diff --git a/service/mantle/product/AssetServices.xml b/service/mantle/product/AssetServices.xml
index cb5335dd..0eb68aa0 100644
--- a/service/mantle/product/AssetServices.xml
+++ b/service/mantle/product/AssetServices.xml
@@ -955,19 +955,39 @@ along with this software (see the LICENSE.md file). If not, see
             </iterate>
 
             <if condition="quantityRemaining &gt; 0.0">
-                <!-- TODO: look for qualifying Asset even if no available quantity and do 'not available' reservation on that instead of creating new ad-hoc -->
+                <!-- look for qualifying Asset even if no available quantity and do 'not available' reservation on that instead of creating new ad-hoc -->
+                <entity-find entity-name="mantle.product.asset.Asset" list="existingResAssetList" limit="1">
+                    <econdition field-name="productId"/>
+                    <econdition field-name="facilityId" from="inventoryFacilityId"/>
+                    <econdition field-name="ownerPartyId" from="organizationPartyId"/>
+                    <econdition field-name="assetPoolId" from="null"/>
+                    <econdition field-name="locationSeqId" from="null"/>
+                    <econdition field-name="containerId" from="null"/>
+                    <econdition field-name="lotId" from="null"/>
+                    <!-- may be populated even for negative availability placeholder records: <econdition field-name="acquireCost" from="null"/> -->
+                    <econdition field-name="statusId" value="AstAvailable"/>
+                    <econdition field-name="hasQuantity" value="Y"/>
+                    <econdition field-name="availableToPromiseTotal" operator="less-equals" from="0.0"/>
+                    <select-field field-name="assetId"/>
+                    <!-- NOTE: order by ATP ascending, expect to be negative so highest negative value first -->
+                    <order-by field-name="availableToPromiseTotal"/>
+                </entity-find>
+                <set field="newResAssetId" from="existingResAssetList ? existingResAssetList.get(0).assetId : null"/>
+                <if condition="!newResAssetId">
+                    <!-- no asset... create a shell one to record the reservation and detail against -->
+                    <service-call name="mantle.product.AssetServices.create#ProductAssetAdHoc" out-map="assetOut"
+                            in-map="[productId:productId, facilityId:inventoryFacilityId, ownerPartyId:organizationPartyId,
+                                createdDate:nowTimestamp]"/>
+                    <set field="newResAssetId" from="assetOut.assetId"/>
+                </if>
 
-                <!-- no asset... create a shell one to record the reservation and detail against -->
-                <service-call name="mantle.product.AssetServices.create#ProductAssetAdHoc" out-map="assetOut"
-                        in-map="[productId:productId, facilityId:inventoryFacilityId, ownerPartyId:organizationPartyId,
-                            createdDate:nowTimestamp]"/>
                 <service-call name="create#mantle.product.issuance.AssetReservation" out-map="resOut" in-map="baseMap +
-                        [assetId:assetOut.assetId, reservedDate:nowTimestamp, quantity:quantityRemaining,
+                        [assetId:newResAssetId, reservedDate:nowTimestamp, quantity:quantityRemaining,
                             quantityNotAvailable:quantityRemaining, quantityNotIssued:quantityRemaining,
                             priority:orderItem.priority, sequenceNum:0,
                             reservationOrderEnumId:reservationOrderEnumId]"/>
                 <service-call name="create#mantle.product.asset.AssetDetail" in-map="baseMap +
-                        [assetId:assetOut.assetId, effectiveDate:nowTimestamp,
+                        [assetId:newResAssetId, effectiveDate:nowTimestamp,
                             availableToPromiseDiff:-quantityRemaining, assetReservationId:resOut.assetReservationId]"/>
             </if>
         </actions>
@@ -1004,7 +1024,7 @@ along with this software (see the LICENSE.md file). If not, see
             <if condition="quantityToDeduct &gt;= existingRes.quantity &amp;&amp; existingRes.quantity == existingRes.quantityNotIssued"><then>
                 <service-call name="create#mantle.product.asset.AssetDetail" in-map="[assetId:existingRes.assetId,
                                 effectiveDate:ec.user.nowTimestamp, availableToPromiseDiff:existingRes.quantity,
-                                assetReservationId:existingRes.assetReservationId, productId:existingRes.productId]"/>
+                                assetReservationId:existingRes.assetReservationId, productId:existingRes.productId, orderId:existingRes.orderId]"/>
 
                 <set field="quantityDeducted" from="existingRes.quantity"/>
                 <entity-delete value-field="existingRes"/>
@@ -1037,15 +1057,60 @@ along with this software (see the LICENSE.md file). If not, see
         </actions>
     </service>
 
-    <!-- TODO: more useful would be reReserve more generally, by: Product, Facility, and/or Order/Item -->
-    <!-- TODO: implement this (and populate priority on order/item and on reservation)
-    <service verb="reReserve" noun="ProductAssets">
-        <description>Clear out all reservations for a Product and re-reserve</description>
-        <in-parameters><parameter name="productId" required="true"/><parameter name="facilityId"/></in-parameters>
+    <service verb="reReserve" noun="Assets" transaction-timeout="3600">
+        <in-parameters>
+            <parameter name="facilityId"/>
+            <parameter name="productId"/>
+            <parameter name="orderId"/>
+            <parameter name="reserveOrderStatusIds" default-value="OrderPlaced,OrderHold,OrderProcessing,OrderApproved,OrderSent"/>
+            <!-- TODO: for now re-reserve order by OrderPart.priority, OrderHeader.placedDate, make that configurable or use store/etc settings somehow? -->
+            <!-- TODO: consider OrderItem.priority for reservation order? concept not yet used elsewhere... -->
+        </in-parameters>
         <actions>
+            <set field="reserveOrderStatusIdSet" from="new HashSet(((String) reserveOrderStatusIds).split(',') as List)"/>
+
+            <entity-find entity-name="mantle.product.issuance.AssetAndReservation" list="resOrderItemList" distinct="true">
+                <econdition field-name="facilityId" ignore-if-empty="true"/>
+                <econdition field-name="productId" ignore-if-empty="true"/>
+                <econdition field-name="orderId" ignore-if-empty="true"/>
+                <select-field field-name="orderId,orderItemSeqId"/>
+            </entity-find>
+            <log message="reReserve#Assets facilityId ${facilityId} productId ${productId} orderId ${orderId} OrderItems with reservations ${resOrderItemList.size()}"/>
+
+            <set field="orderItemInfoList" from="[]"/>
+            <iterate list="resOrderItemList" entry="resOrderItem">
+                <entity-find-one entity-name="mantle.order.OrderItem" value-field="orderItem">
+                    <field-map field-name="orderId" from="resOrderItem.orderId"/>
+                    <field-map field-name="orderItemSeqId" from="resOrderItem.orderItemSeqId"/>
+                </entity-find-one>
+                <if condition="orderItem == null">
+                    <log level="warn" message="In reReserve#Assets could not find OrderItem ${orderId}:${orderItemSeqId}"/>
+                    <continue/>
+                </if>
+
+                <!-- remove item reservations -->
+                <service-call name="mantle.product.AssetServices.remove#OrderItemReservations"
+                        in-map="[orderId:resOrderItem.orderId, orderItemSeqId:resOrderItem.orderItemSeqId]"/>
+
+                <!-- look up OrderPart, OrderHeader to see if item qualifies for re-reserve, and get order by fields -->
+                <set field="orderPart" from="orderItem.part"/>
+                <if condition="orderPart.statusId in reserveOrderStatusIdSet">
+                    <set field="orderHeader" from="orderItem.header"/>
+                    <script>orderItemInfoList.add([orderId:orderItem.orderId, orderItemSeqId:orderItem.orderItemSeqId,
+                            priority:orderPart.priority, placedDate:orderHeader.placedDate])</script>
+                </if>
+            </iterate>
+
+            <order-map-list list="orderItemInfoList"><order-by field-name="priority"/><order-by field-name="placedDate"/>
+                <order-by field-name="orderId"/><order-by field-name="orderItemSeqId"/></order-map-list>
+
+            <iterate list="orderItemInfoList" entry="orderItemInfo">
+                <!-- NOTE: a reservation existed so forceReserve:true -->
+                <service-call name="mantle.product.AssetServices.reserve#AssetForOrderItem"
+                        in-map="[orderId:orderItemInfo.orderId, orderItemSeqId:orderItemInfo.orderItemSeqId, forceReserve:true]"/>
+            </iterate>
         </actions>
     </service>
-    -->
 
     <service verb="reserve" noun="IncreasedAsset" no-tx-cache="true">
         <description>For Asset with availableToPromiseTotal > 0 find AssetReservation with quantityNotAvailable and reserve against it</description>

From a34bdcb33f2fb2c325dd07c0f16fb8398f6b9b02 Mon Sep 17 00:00:00 2001
From: David E Jones <dej@dejc.com>
Date: Mon, 23 Mar 2020 16:41:45 -0700
Subject: [PATCH 10/37] In create#Order set new default disable promos, ship
 calc, and tax calc fields from ProductStore

---
 service/mantle/order/OrderServices.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/service/mantle/order/OrderServices.xml b/service/mantle/order/OrderServices.xml
index 25679a89..8ccfd5d3 100644
--- a/service/mantle/order/OrderServices.xml
+++ b/service/mantle/order/OrderServices.xml
@@ -71,6 +71,9 @@ General Order Placement and eCommerce Usage
                 <set field="salesChannelEnumId" from="salesChannelEnumId ?: productStore?.defaultSalesChannelEnumId"/>
                 <set field="facilityId" from="facilityId ?: productStore?.inventoryFacilityId"/>
                 <set field="reservationAutoEnumId" from="reservationAutoEnumId ?: productStore?.reservationAutoEnumId"/>
+                <set field="disablePromotions" from="disablePromotions ?: productStore?.defaultDisablePromotions"/>
+                <set field="disableShippingCalc" from="disableShippingCalc ?: productStore?.defaultDisableShippingCalc"/>
+                <set field="disableTaxCalc" from="disableTaxCalc ?: productStore?.defaultDisableTaxCalc"/>
 
                 <!-- Customer - Bill To: set from store if set there, special case for drop-ship channel stores -->
                 <entity-find entity-name="mantle.product.store.ProductStoreParty" list="storeBillToList">

From 3a8235c0d11b730f6ee72bbf813a53f9024ce6e0 Mon Sep 17 00:00:00 2001
From: David E Jones <dej@dejc.com>
Date: Tue, 31 Mar 2020 13:58:54 -0700
Subject: [PATCH 11/37] In issue#AssetReservation set AssetIssuance.invoiceId
 and item seq id based on ShipmentItemSource if available, fixes issue where
 invoiceId/invoiceItemSeqId not set on AssetIssuance if invoice created before
 shipment

---
 service/mantle/product/AssetServices.xml | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/service/mantle/product/AssetServices.xml b/service/mantle/product/AssetServices.xml
index 0eb68aa0..e3e811aa 100644
--- a/service/mantle/product/AssetServices.xml
+++ b/service/mantle/product/AssetServices.xml
@@ -1649,9 +1649,13 @@ along with this software (see the LICENSE.md file). If not, see
                     <return error="true" message="For reservation ${assetReservation.assetReservationId} tried to issue quantity ${quantity} which is greater than quantity on hand ${asset.quantityOnHandTotal} for asset ${asset.assetId}"/></if>
             </if>
 
+            <if condition="shipmentItemSourceId">
+                <entity-find-one entity-name="mantle.shipment.ShipmentItemSource" value-field="shipmentItemSource"/></if>
+
             <!-- see if there is another issuance we can add to -->
             <entity-find entity-name="mantle.product.issuance.AssetIssuance" list="existingIssuanceList">
                 <econdition field-name="shipmentId"/>
+                <econdition field-name="shipmentItemSourceId" ignore-if-empty="true"/>
                 <econdition field-name="assetReservationId" from="assetReservation.assetReservationId"/>
                 <!-- these 3 shouldn't be necessary when constrained by assetReservationId but just in case -->
                 <econdition field-name="assetId" from="assetReservation.assetId"/>
@@ -1663,12 +1667,15 @@ along with this software (see the LICENSE.md file). If not, see
                 <set field="existingIssuance" from="existingIssuanceList[0]"/>
                 <set field="assetIssuanceId" from="existingIssuance.assetIssuanceId"/>
                 <service-call name="update#mantle.product.issuance.AssetIssuance"
-                        in-map="[assetIssuanceId:assetIssuanceId, quantity:(existingIssuance.quantity + quantity)]"/>
+                        in-map="[assetIssuanceId:assetIssuanceId, quantity:(existingIssuance.quantity + quantity),
+                            invoiceId:(existingIssuance.invoiceId ?: shipmentItemSource?.invoiceId),
+                            invoiceItemSeqId:(existingIssuance.invoiceItemSeqId ?: shipmentItemSource?.invoiceItemSeqId)]"/>
             </then><else>
-                <!-- create an issuance -->
+                <!-- create an issuance, get back assetIssuanceId -->
                 <service-call name="create#mantle.product.issuance.AssetIssuance" out-map="context"
                         in-map="[assetId:assetReservation.assetId, assetReservationId:assetReservation.assetReservationId,
                             orderId:assetReservation.orderId, orderItemSeqId:assetReservation.orderItemSeqId,
+                            invoiceId:shipmentItemSource?.invoiceId, invoiceItemSeqId:shipmentItemSource?.invoiceItemSeqId,
                             shipmentId:shipmentId, shipmentItemSourceId:shipmentItemSourceId, productId:assetReservation.productId,
                             issuedDate:issuedDate, issuedByUserId:ec.user.userId, quantity:quantity]"/>
             </else></if>

From 96dc51bea9a9dc3690a0b2877af4e4cbbee576c7 Mon Sep 17 00:00:00 2001
From: David E Jones <dej@dejc.com>
Date: Tue, 31 Mar 2020 13:59:52 -0700
Subject: [PATCH 12/37] Improve apply#InvoiceItemToShipment to fill in
 invoiceId and invoiceItemSeqId on AssetIssuance related to ShipmentItemSource
 for records where was missing

---
 service/mantle/account/InvoiceServices.xml | 45 +++++++++++++++-------
 1 file changed, 32 insertions(+), 13 deletions(-)

diff --git a/service/mantle/account/InvoiceServices.xml b/service/mantle/account/InvoiceServices.xml
index 94ae8595..5bd933ba 100644
--- a/service/mantle/account/InvoiceServices.xml
+++ b/service/mantle/account/InvoiceServices.xml
@@ -2259,7 +2259,7 @@ along with this software (see the LICENSE.md file). If not, see
             <if condition="shipment.fromPartyId != invoice.fromPartyId">
                 <return error="true" message="Shipment from party ${shipment.fromPartyId} does not match invoice from party ${invoice.fromPartyId}"/></if>
 
-
+            <!-- ShipmentItemSource -->
             <set field="invoiceQtyOrig" from="invoiceItem.quantity != null ? invoiceItem.quantity : 1.0"/>
             <set field="invoiceQtyRemaining" from="invoiceQtyOrig"/>
             <entity-find entity-name="mantle.shipment.ShipmentItemSource" list="invoiceSisList">
@@ -2269,20 +2269,39 @@ along with this software (see the LICENSE.md file). If not, see
             </entity-find>
             <set field="invoiceShippedQuantity" from="invoiceSisList*.quantity.sum() ?: 0.0"/>
             <set field="invoiceQtyRemaining" from="invoiceQtyRemaining - invoiceShippedQuantity"/>
-            <if condition="invoiceQtyRemaining &lt;= 0.0"><return message="Invoice ${invoiceId} item ${invoiceItemSeqId} already fully applied to shipments"/></if>
+            <if condition="invoiceQtyRemaining &gt; 0.0"><then>
+                <entity-find entity-name="mantle.shipment.ShipmentItemSource" list="shipmentItemSourceList">
+                    <econdition field-name="shipmentId"/>
+                    <econdition field-name="productId" from="invoiceItem.productId"/>
+                    <order-by field-name="-quantity"/>
+                </entity-find>
+                <iterate list="shipmentItemSourceList" entry="shipmentItemSource">
+                    <if condition="!shipmentItemSource.invoiceId &amp;&amp; invoiceQtyRemaining &gt;= shipmentItemSource.quantity">
+                        <set field="shipmentItemSource.invoiceId" from="invoiceId"/>
+                        <set field="shipmentItemSource.invoiceItemSeqId" from="invoiceItemSeqId"/>
+                        <entity-update value-field="shipmentItemSource"/>
+                        <set field="quantityNotShipSourced" from="invoiceQtyRemaining - shipmentItemSource.quantity"/>
+                    </if>
+                </iterate>
+            </then><else>
+                <message>Invoice ${invoiceId} item ${invoiceItemSeqId} already fully applied to shipments</message>
+            </else></if>
 
-            <entity-find entity-name="mantle.shipment.ShipmentItemSource" list="shipmentItemSourceList">
-                <econdition field-name="shipmentId"/>
-                <econdition field-name="productId" from="invoiceItem.productId"/>
-                <order-by field-name="-quantity"/>
+            <!-- AssetIssuance for SIS, do in separate pass to fill in any missing data -->
+            <entity-find entity-name="mantle.shipment.ShipmentItemSource" list="invoiceSisFullList">
+                <econdition field-name="invoiceId"/>
+                <econdition field-name="invoiceItemSeqId"/>
             </entity-find>
-            <iterate list="shipmentItemSourceList" entry="shipmentItemSource">
-                <if condition="!shipmentItemSource.invoiceId &amp;&amp; invoiceQtyRemaining &gt;= shipmentItemSource.quantity">
-                    <set field="shipmentItemSource.invoiceId" from="invoiceId"/>
-                    <set field="shipmentItemSource.invoiceItemSeqId" from="invoiceItemSeqId"/>
-                    <entity-update value-field="shipmentItemSource"/>
-                    <set field="quantityNotShipSourced" from="invoiceQtyRemaining - shipmentItemSource.quantity"/>
-                </if>
+            <iterate list="invoiceSisFullList" entry="invoiceSis">
+                <entity-find entity-name="mantle.product.issuance.AssetIssuance" list="sisIssuanceList">
+                    <econdition field-name="shipmentItemSourceId" from="invoiceSis.shipmentItemSourceId"/>
+                    <econdition field-name="invoiceId" operator="is-null"/>
+                </entity-find>
+                <iterate list="sisIssuanceList" entry="sisIssuance">
+                    <set field="sisIssuance.invoiceId" from="invoiceSis.invoiceId"/>
+                    <set field="sisIssuance.invoiceItemSeqId" from="invoiceSis.invoiceItemSeqId"/>
+                    <entity-update value-field="sisIssuance"/>
+                </iterate>
             </iterate>
         </actions>
     </service>

From 856e3d6304ec991cdf08bac0ee76c2c54b543730 Mon Sep 17 00:00:00 2001
From: David E Jones <dej@dejc.com>
Date: Tue, 31 Mar 2020 17:04:39 -0700
Subject: [PATCH 13/37] In get#ProjectParties service also include Project
 roles so all project parties are available

---
 service/mantle/work/ProjectServices.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/service/mantle/work/ProjectServices.xml b/service/mantle/work/ProjectServices.xml
index 301acfef..664e799d 100644
--- a/service/mantle/work/ProjectServices.xml
+++ b/service/mantle/work/ProjectServices.xml
@@ -510,7 +510,7 @@ along with this software (see the LICENSE.md file). If not, see
         <actions>
             <if condition="onlyAssignable &amp;&amp; !roleTypeId">
                 <entity-find entity-name="mantle.party.RoleGroupMember" list="projectRoleList" cache="true">
-                    <econdition field-name="roleGroupEnumId" value="RgpTask"/>
+                    <econdition field-name="roleGroupEnumId" operator="in" value="RgpTask,RgpProject"/>
                     <order-by field-name="roleTypeId"/>
                 </entity-find>
                 <set field="roleTypeId" from="projectRoleList*.roleTypeId.join(',')"/>

From 25d0ccf913df1d5a4ee9627c95c19b77e933f385 Mon Sep 17 00:00:00 2001
From: David E Jones <dej@dejc.com>
Date: Fri, 3 Apr 2020 15:39:36 -0700
Subject: [PATCH 14/37] In Party/ContactServices add create#WebAddress service
 and add webAddress support (like emailAddress) to get#PartyContactInfo,
 get#PartyContactInfoList, and store#PartyContactInfo

---
 service/mantle/party/ContactServices.xml | 125 +++++++++++++++++++++++
 1 file changed, 125 insertions(+)

diff --git a/service/mantle/party/ContactServices.xml b/service/mantle/party/ContactServices.xml
index 3a74de99..612ce949 100644
--- a/service/mantle/party/ContactServices.xml
+++ b/service/mantle/party/ContactServices.xml
@@ -25,6 +25,8 @@ along with this software (see the LICENSE.md file). If not, see
             <parameter name="faxContactMechPurposeId"/>
             <parameter name="emailContactMechId"/>
             <parameter name="emailContactMechPurposeId"/>
+            <parameter name="webContactMechId"/>
+            <parameter name="webContactMechPurposeId"/>
             <parameter name="otherContactMechId"/>
             <parameter name="otherContactMechPurposeId"/>
             <parameter name="defaultToPrimaryPurpose" type="Boolean" default="true"/>
@@ -38,6 +40,7 @@ along with this software (see the LICENSE.md file). If not, see
             <parameter name="postalAddressCountryGeo" type="EntityValue"/>
             <parameter name="postalAddressGeoPoint" type="EntityValue"/>
             <parameter name="postalTrustLevelEnum" type="EntityValue"/>
+
             <parameter name="telecomContactMechId"/>
             <parameter name="telecomContactMech" type="EntityValue"/>
             <parameter name="telecomPartyContactMech" type="EntityValue"/>
@@ -48,11 +51,18 @@ along with this software (see the LICENSE.md file). If not, see
             <parameter name="faxPartyContactMech" type="EntityValue"/>
             <parameter name="faxContactMechPurposeId"/>
             <parameter name="faxTelecomNumber" type="EntityValue"/>
+
             <parameter name="emailContactMechId"/>
             <parameter name="emailContactMech" type="EntityValue"/>
             <parameter name="emailPartyContactMech" type="EntityValue"/>
             <parameter name="emailContactMechPurposeId"/>
             <parameter name="emailAddress"/>
+            <parameter name="webContactMechId"/>
+            <parameter name="webContactMech" type="EntityValue"/>
+            <parameter name="webPartyContactMech" type="EntityValue"/>
+            <parameter name="webContactMechPurposeId"/>
+            <parameter name="webAddress"/>
+
             <parameter name="otherContactMechId"/>
             <parameter name="otherContactMech" type="EntityValue"/>
             <parameter name="otherContactMechPurposeId"/>
@@ -190,6 +200,36 @@ along with this software (see the LICENSE.md file). If not, see
                 <set field="emailPartyContactMech" from="emailPcmList ? emailPcmList[0] : null"/>
             </if>
 
+            <!-- web address -->
+            <if condition="webContactMechPurposeId &amp;&amp; !webContactMechId">
+                <entity-find entity-name="mantle.party.contact.PartyContactMech" list="webPcmList">
+                    <date-filter/><econdition field-name="partyId"/>
+                    <econdition field-name="contactMechPurposeId" from="webContactMechPurposeId"/>
+                    <order-by field-name="-fromDate"/>
+                </entity-find>
+                <if condition="defaultToPrimaryPurpose &amp;&amp; !webPcmList">
+                    <entity-find entity-name="mantle.party.contact.PartyContactMech" list="webPcmList">
+                        <date-filter/><econdition field-name="partyId"/>
+                        <econdition field-name="contactMechPurposeId" value="WebUrlPrimary"/>
+                        <order-by field-name="-fromDate"/>
+                    </entity-find>
+                    <if condition="webPcmList"><set field="webContactMechPurposeId" value="WebUrlPrimary"/></if>
+                </if>
+                <set field="webPartyContactMech" from="webPcmList ? webPcmList[0] : null"/>
+                <set field="webContactMechId" from="webPartyContactMech?.contactMechId"/>
+            </if>
+            <entity-find-one entity-name="mantle.party.contact.ContactMech" value-field="webContactMech">
+                <field-map field-name="contactMechId" from="webContactMechId"/></entity-find-one>
+            <set field="webAddress" from="webContactMech?.infoString"/>
+            <if condition="webPartyContactMech == null &amp;&amp; webContactMech != null">
+                <entity-find entity-name="mantle.party.contact.PartyContactMech" list="webPcmList">
+                    <date-filter/><econdition field-name="partyId"/>
+                    <econdition field-name="contactMechId" from="webContactMechId"/>
+                    <econdition field-name="contactMechPurposeId" from="webContactMechPurposeId" ignore-if-empty="true"/>
+                </entity-find>
+                <set field="webPartyContactMech" from="webPcmList ? webPcmList[0] : null"/>
+            </if>
+
             <!-- other contact info -->
             <if condition="otherContactMechPurposeId &amp;&amp; !otherContactMechId">
                 <entity-find entity-name="mantle.party.contact.PartyContactMech" list="otherPcmList">
@@ -213,6 +253,7 @@ along with this software (see the LICENSE.md file). If not, see
             <parameter name="postalContactMechPurposeId"/>
             <parameter name="telecomContactMechPurposeId"/>
             <parameter name="emailContactMechPurposeId"/>
+            <parameter name="webContactMechPurposeId"/>
             <parameter name="getAll" type="Boolean" default="false"/>
             <parameter name="alsoIncludePrimaryPurpose" type="Boolean" default="true"/>
         </in-parameters>
@@ -250,6 +291,14 @@ along with this software (see the LICENSE.md file). If not, see
                 <parameter name="emailContactMechPurpose" type="EntityValue"/>
                 <parameter name="emailAddress"/>
             </parameter></parameter>
+            <parameter name="webAddressList" type="List"><parameter name="infoMap" type="Map">
+                <parameter name="otherContactMechId"/>
+                <parameter name="otherContactMech" type="EntityValue"/>
+                <parameter name="otherPartyContactMech" type="EntityValue"/>
+                <parameter name="otherContactMechPurposeId"/>
+                <parameter name="otherContactMechPurpose" type="EntityValue"/>
+                <parameter name="webAddress"/>
+            </parameter></parameter>
         </out-parameters>
         <actions>
             <if condition="postalContactMechPurposeId"><then>
@@ -372,6 +421,37 @@ along with this software (see the LICENSE.md file). If not, see
                     <script>emailAddressList.add(emailAddressInfo)</script>
                 </iterate>
             </if>
+
+            <if condition="webContactMechPurposeId"><then>
+                <set field="webPurposeList" from="[webContactMechPurposeId]"/>
+                <if condition="alsoIncludePrimaryPurpose &amp;&amp; webContactMechPurposeId != 'WebUrlPrimary'">
+                    <script>webPurposeList.add('WebUrlPrimary')</script></if>
+                <entity-find entity-name="mantle.party.contact.PartyContactMech" list="webPcmList">
+                    <date-filter/><econdition field-name="partyId"/>
+                    <econdition field-name="contactMechPurposeId" operator="in" from="webPurposeList"/>
+                    <order-by field-name="-fromDate"/>
+                </entity-find>
+            </then><else-if condition="getAll">
+                <entity-find entity-name="mantle.party.contact.PartyContactMechInfo" list="webPcmList">
+                    <date-filter/><econdition field-name="partyId"/>
+                    <econdition field-name="contactMechTypeEnumId" value="CmtWebAddress"/>
+                    <order-by field-name="-fromDate"/>
+                </entity-find>
+            </else-if></if>
+            <if condition="webPcmList">
+                <set field="webAddressList" from="[]"/>
+                <iterate list="webPcmList" entry="webPcm">
+                    <set field="webContactMechId" from="webPcm.contactMechId"/>
+                    <entity-find-one entity-name="mantle.party.contact.ContactMech" value-field="webContactMech">
+                        <field-map field-name="contactMechId" from="webContactMechId"/></entity-find-one>
+                    <entity-find-one entity-name="mantle.party.contact.ContactMechPurpose" value-field="webContactMechPurpose">
+                        <field-map field-name="contactMechPurposeId" from="webPcm.contactMechPurposeId"/></entity-find-one>
+                    <set field="webInfo" from="[webContactMechId:webContactMechId, webContactMech:webContactMech,
+                            webContactMechPurposeId:webPcm.contactMechPurposeId, webContactMechPurpose:webContactMechPurpose,
+                            webPartyContactMech:webPcm, webAddress:webContactMech.infoString]"/>
+                    <script>webAddressList.add(webInfo)</script>
+                </iterate>
+            </if>
             <!-- <log level="warn" message="get#PartyContactInfoList finish context=${context.context}"/> -->
         </actions>
     </service>
@@ -458,6 +538,11 @@ along with this software (see the LICENSE.md file). If not, see
             <parameter name="emailAddress"><text-email/></parameter>
             <parameter name="emailAllowSolicitation"/>
 
+            <parameter name="webContactMechId"/>
+            <parameter name="webContactMechPurposeId"/>
+            <parameter name="webAddress"><text-url/></parameter>
+            <parameter name="webAllowSolicitation"/>
+
             <parameter name="otherContactMechId"/>
             <parameter name="otherContactMechTypeEnumId"/>
             <parameter name="otherContactMechPurposeId"/>
@@ -467,6 +552,7 @@ along with this software (see the LICENSE.md file). If not, see
             <parameter name="postalContactMechId"/>
             <parameter name="telecomContactMechId"/>
             <parameter name="emailContactMechId"/>
+            <parameter name="webContactMechId"/>
             <parameter name="otherContactMechId"/>
         </out-parameters>
         <actions>
@@ -509,6 +595,25 @@ along with this software (see the LICENSE.md file). If not, see
             </else-if></if>
             <set field="emailContactMechId" from="emOut?.contactMechId ?: emailContactMechId"/>
 
+            <!-- Web URL -->
+            <if condition="replaceByPurpose &amp;&amp; webAddress &amp;&amp; !webContactMechId &amp;&amp; webContactMechPurposeId">
+                <entity-find entity-name="mantle.party.contact.PartyContactMech" list="existingWebPcmList">
+                    <date-filter/><econdition field-name="partyId"/>
+                    <econdition field-name="contactMechPurposeId" from="webContactMechPurposeId"/>
+                    <order-by field-name="-fromDate"/>
+                </entity-find>
+                <if condition="existingWebPcmList"><set field="webContactMechId" from="existingWebPcmList[0].contactMechId"/></if>
+            </if>
+            <if condition="webContactMechId &amp;&amp; webAddress"><then>
+                <service-call name="mantle.party.ContactServices.update#PartyContactOther" out-map="webOut"
+                        in-map="[infoString:webAddress, partyId:partyId, contactMechId:webContactMechId,
+                            contactMechPurposeId:webContactMechPurposeId, allowSolicitation:webAllowSolicitation]"/>
+            </then><else-if condition="webAddress">
+                <service-call name="mantle.party.ContactServices.create#WebAddress" out-map="webOut"
+                        in-map="context + [contactMechPurposeId:webContactMechPurposeId, allowSolicitation:webAllowSolicitation]"/>
+            </else-if></if>
+            <set field="webContactMechId" from="webOut?.contactMechId ?: webContactMechId"/>
+
             <!-- Other -->
             <if condition="otherInfoString &amp;&amp; !otherContactMechId &amp;&amp; replaceByPurpose">
                 <entity-find entity-name="mantle.party.contact.PartyContactMech" list="existingOtherPcmList">
@@ -1030,6 +1135,26 @@ along with this software (see the LICENSE.md file). If not, see
         </actions>
     </service>
 
+    <!-- ========== Web Address Services ========== -->
+
+    <service verb="create" noun="WebAddress">
+        <in-parameters>
+            <parameter name="webAddress" required="true"><text-url/></parameter>
+            <auto-parameters entity-name="mantle.party.contact.PartyContactMech" include="nonpk"/>
+
+            <parameter name="partyId"/>
+            <parameter name="facilityId"/>
+            <parameter name="contactMechPurposeId"/>
+        </in-parameters>
+        <out-parameters>
+            <parameter name="contactMechId" required="true"/>
+        </out-parameters>
+        <actions>
+            <service-call name="mantle.party.ContactServices.create#ContactMechOther" out-map="context"
+                    in-map="context + [infoString:webAddress, contactMechTypeEnumId:'CmtWebAddress']"/>
+        </actions>
+    </service>
+
     <!-- ========== Other ContactMech Services ========== -->
 
     <service verb="create" noun="ContactMechOther">

From 22f1e177fdf53752595c0ff03bbf566f246bc52a Mon Sep 17 00:00:00 2001
From: David E Jones <dej@dejc.com>
Date: Fri, 3 Apr 2020 18:31:35 -0700
Subject: [PATCH 15/37] Add hasAllTrackingCodes out-parameter to
 get#ShipmentDisplayInfo service for use on ShipmentDetail and PackShipment
 screens

---
 service/mantle/shipment/ShipmentInfoServices.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/service/mantle/shipment/ShipmentInfoServices.xml b/service/mantle/shipment/ShipmentInfoServices.xml
index a934ae6a..a8174674 100644
--- a/service/mantle/shipment/ShipmentInfoServices.xml
+++ b/service/mantle/shipment/ShipmentInfoServices.xml
@@ -70,6 +70,7 @@ along with this software (see the LICENSE.md file). If not, see
             <parameter name="shippingGatewayConfigId"/>
             <parameter name="shippingGatewayConfig" type="Map"/>
             <parameter name="hasAllLabels" type="Boolean"/><parameter name="hasAnyLabels" type="Boolean"/>
+            <parameter name="hasAllTrackingCodes" type="Boolean"/>
             <parameter name="destContactMechValid" type="Boolean"/>
 
             <parameter name="curCarrierDetail" type="Map"/>
@@ -161,12 +162,14 @@ along with this software (see the LICENSE.md file). If not, see
             </if>
 
             <set field="hasAllLabels" from="true"/>
+            <set field="hasAllTrackingCodes" from="true"/>
             <set field="hasAnyLabels" from="false"/>
             <iterate list="packageRouteSegList" entry="packageRouteSeg">
                 <if condition="packageRouteSeg.gatewayLabelId || packageRouteSeg.labelImage != null || packageRouteSeg.labelUrl">
                     <then><set field="hasAnyLabels" from="true"/></then>
                     <else><set field="hasAllLabels" from="false"/></else>
                 </if>
+                <if condition="!packageRouteSeg.trackingCode"><set field="hasAllTrackingCodes" from="false"/></if>
             </iterate>
 
             <set field="shippingGatewayConfigId" from="firstRouteSegment.shippingGatewayConfigId"/>

From 43e0149b8f8f31059cae6d30c66999e70f999bda Mon Sep 17 00:00:00 2001
From: Hans Bakker <h.bakker@antwebsystems.com>
Date: Mon, 6 Apr 2020 12:25:15 +0700
Subject: [PATCH 16/37] mantle.party.ContactServices.create#PostalAddress
 address1 should be mandatory mantle.party.duplicateServices
 find#PostalAddresses is already mandatory if mssing the following will
 happen: Transaction rollback for [Error running service
 mantle.order.OrderInfoServices.check#OrderPreApprove (message): Field cannot
 be empty(for field Address 1 of service Mantle Party Duplicate Services Find
 Postal Addresses which make the order detail screen locked.

---
 service/mantle/party/ContactServices.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/service/mantle/party/ContactServices.xml b/service/mantle/party/ContactServices.xml
index 612ce949..a6538e04 100644
--- a/service/mantle/party/ContactServices.xml
+++ b/service/mantle/party/ContactServices.xml
@@ -667,7 +667,7 @@ along with this software (see the LICENSE.md file). If not, see
             <auto-parameters entity-name="mantle.party.contact.PostalAddress" include="nonpk"/>
             <auto-parameters entity-name="moqui.basic.GeoPoint" include="nonpk"/>
             <auto-parameters entity-name="mantle.party.contact.PartyContactMech" include="nonpk"/>
-
+            <parameter name="address1" required="true"/>
             <parameter name="partyId"/>
             <parameter name="facilityId"/>
             <parameter name="contactMechPurposeId"/>

From 3473b9241de601048309a0aa05a7fa4798e128de Mon Sep 17 00:00:00 2001
From: David E Jones <dej@dejc.com>
Date: Tue, 7 Apr 2020 01:37:12 -0700
Subject: [PATCH 17/37] In search#Party service use a nested query to filter
 partyClassificationId by from/thru dates, add pageNoLimit parameter for file
 output use

---
 service/mantle/party/PartyServices.xml | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/service/mantle/party/PartyServices.xml b/service/mantle/party/PartyServices.xml
index 9b4d0470..04e69e23 100644
--- a/service/mantle/party/PartyServices.xml
+++ b/service/mantle/party/PartyServices.xml
@@ -73,6 +73,7 @@ along with this software (see the LICENSE.md file). If not, see
             <parameter name="orderByField"/>
             <parameter name="pageIndex" type="Integer" default="0"/>
             <parameter name="pageSize" type="Integer" default="20"/>
+            <parameter name="pageNoLimit" type="Boolean" default="false"/>
         </in-parameters>
         <out-parameters>
             <parameter name="queryString"/>
@@ -88,6 +89,8 @@ along with this software (see the LICENSE.md file). If not, see
             <set field="indexName" from="searchPartyIndexName ?: 'mantle_party'"/>
             <set field="documentType" from="searchPartyDocType ?: 'MantleParty'"/>
             <!-- <set field="orderByField" from="orderByField ?: 'combinedName'"/> -->
+            <set field="nestedQueryMap" from="[:]"/>
+            <set field="nowTimeLong" from="System.currentTimeMillis()"/>
 
             <!-- auto prefix with '*:' so that highlighting works -->
             <!-- TODO: would be nice to somehow parse the query string, matching parentheses and quotes, and add *: for the field if none for each term -->
@@ -100,7 +103,16 @@ along with this software (see the LICENSE.md file). If not, see
             <if condition="roleTypeId">
                 <set field="queryString" from="(queryString ? queryString + ' AND ' : '' ) + 'roles.roleTypeId:' + roleTypeId"/></if>
             <if condition="partyClassificationId">
-                <set field="queryString" from="(queryString ? queryString + ' AND ' : '' ) + 'classifications.partyClassificationId:' + partyClassificationId"/></if>
+                <set field="nestedQueryMap.classifications" from="[bool:[filter:[
+                        [term:['classifications.partyClassificationId':partyClassificationId]],
+                        [range:['classifications.classFromDate':[lte:nowTimeLong]]]
+                    ], should:[
+                        [range:['classifications.classThruDate':[gte:nowTimeLong]]],
+                        [bool:[must_not:[exists:[field:'classifications.classThruDate']]]]
+                    ], minimum_should_match:1]]"/>
+                <if condition="!queryString"><set field="queryString" value="*:*"/></if>
+                <!-- <set field="queryString" from="(queryString ? queryString + ' AND ' : '' ) + 'classifications.partyClassificationId:' + partyClassificationId"/> -->
+            </if>
 
             <if condition="pseudoId">
                 <set field="queryString" from="(queryString ? queryString + ' AND ' : '' ) + 'pseudoId:' + pseudoId + '*'"/></if>
@@ -181,7 +193,8 @@ along with this software (see the LICENSE.md file). If not, see
             <if condition="queryString">
                 <service-call name="org.moqui.search.SearchServices.search#DataDocuments" out-map="context"
                         in-map="[indexName:indexName, documentType:documentType, queryString:queryString, flattenDocument:false,
-                             orderByFields:orderByFields, highlightFields:highlightFields, pageIndex:pageIndex, pageSize:pageSize]"/>
+                             orderByFields:orderByFields, highlightFields:highlightFields, nestedQueryMap:nestedQueryMap,
+                             pageIndex:pageIndex, pageSize:pageSize, pageNoLimit:pageNoLimit]"/>
             </if>
         </actions>
     </service>

From d62263d9af7aff566963fea6c704c0736479c881 Mon Sep 17 00:00:00 2001
From: David E Jones <dej@dejc.com>
Date: Wed, 8 Apr 2020 14:06:55 -0700
Subject: [PATCH 18/37] Fix error messages in generate#NachaFile service

---
 service/mantle/account/NachaServices.xml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/service/mantle/account/NachaServices.xml b/service/mantle/account/NachaServices.xml
index d194acd0..6c50a4c1 100644
--- a/service/mantle/account/NachaServices.xml
+++ b/service/mantle/account/NachaServices.xml
@@ -190,10 +190,13 @@ along with this software (see the LICENSE.md file). If not, see
                 BigDecimal debitAmountTotal = 0, creditAmountTotal = 0
                 paymentList = []
                 for (EntityValue payment in originalPaymentList) {
-                    boolean outgoing = payment.fromPartyId == paymentMethod.ownerPartyId
+                    // add payment to context for error messages using ec.resource.expand()
+                    ec.context.put("payment", payment)
 
                     // Get PaymentMethod and BankAccount; use toPaymentMethodId if outgoing
-                    String pmtPaymentMethodId = outgoing ? payment.toPaymentMethodId : payment.paymentMethodId
+                    boolean outgoing = payment.fromPartyId == paymentMethod.ownerPartyId
+                    // NOTE: no type on pmtPaymentMethodId to put in ec.context so available for ec.resource.expand()
+                    pmtPaymentMethodId = outgoing ? payment.toPaymentMethodId : payment.paymentMethodId
                     EntityValue pmtPaymentMethod = ec.entity.find("mantle.account.method.PaymentMethod")
                             .condition("paymentMethodId", pmtPaymentMethodId).one()
                     EntityValue pmtBankAccount = ec.entity.find("mantle.account.method.BankAccount")

From 6b940fc4c9637d5a8f0c6e11073495c68c7a8b32 Mon Sep 17 00:00:00 2001
From: David E Jones <dej@dejc.com>
Date: Sat, 11 Apr 2020 00:32:29 -0700
Subject: [PATCH 19/37] In store#PaymentMethodInfo automatically update open
 Payments with new paymentMethodId and toPaymentMethodId

---
 .../mantle/account/PaymentMethodServices.xml  | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/service/mantle/account/PaymentMethodServices.xml b/service/mantle/account/PaymentMethodServices.xml
index c756c460..6f86a5d0 100644
--- a/service/mantle/account/PaymentMethodServices.xml
+++ b/service/mantle/account/PaymentMethodServices.xml
@@ -198,6 +198,7 @@ along with this software (see the LICENSE.md file). If not, see
             <parameter name="emailContactMechId"/>
         </out-parameters>
         <actions>
+            <set field="origPaymentMethodId" from="paymentMethodId"/>
             <if condition="paymentMethodId">
                 <entity-find-one entity-name="mantle.account.method.PaymentMethod" value-field="paymentMethod"/>
                 <set field="paymentMethodTypeEnumId" from="paymentMethod.paymentMethodTypeEnumId"/>
@@ -246,6 +247,27 @@ along with this software (see the LICENSE.md file). If not, see
                 </else-if></if>
             </else></if>
             <!-- NOTE: out paymentMethodId set from service-call.@out-map=context -->
+
+            <if condition="origPaymentMethodId &amp;&amp; origPaymentMethodId != paymentMethodId">
+                <!-- update Payment.paymentMethodId and .toPaymentMethodId on open Payment records -->
+                <entity-find entity-name="mantle.account.payment.Payment" list="paymentList">
+                    <econdition field-name="paymentMethodId" from="origPaymentMethodId"/>
+                    <econdition field-name="statusId" operator="in" value="PmntProposed,PmntPromised,PmntAuthorized,PmntDeclined"/>
+                    <econdition field-name="paymentAuthCode" operator="is-null"/>
+                </entity-find>
+                <iterate list="paymentList" entry="payment">
+                    <set field="payment.paymentMethodId" from="paymentMethodId"/>
+                    <entity-update value-field="payment"/>
+                </iterate>
+                <entity-find entity-name="mantle.account.payment.Payment" list="toPaymentList">
+                    <econdition field-name="toPaymentMethodId" from="origPaymentMethodId"/>
+                    <econdition field-name="statusId" operator="in" value="PmntProposed,PmntPromised,PmntAuthorized,PmntDeclined"/>
+                </entity-find>
+                <iterate list="toPaymentList" entry="toPayment">
+                    <set field="toPayment.toPaymentMethodId" from="paymentMethodId"/>
+                    <entity-update value-field="payment"/>
+                </iterate>
+            </if>
         </actions>
     </service>
 

From f5c4c14fab7bf0c198d5a9fbe0cd0c41e04eb6a0 Mon Sep 17 00:00:00 2001
From: David E Jones <dej@dejc.com>
Date: Sat, 11 Apr 2020 00:39:24 -0700
Subject: [PATCH 20/37] In store#PaymentMethodInfo show message when
 automatically updating open Payments

---
 service/mantle/account/PaymentMethodServices.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/service/mantle/account/PaymentMethodServices.xml b/service/mantle/account/PaymentMethodServices.xml
index 6f86a5d0..37e19261 100644
--- a/service/mantle/account/PaymentMethodServices.xml
+++ b/service/mantle/account/PaymentMethodServices.xml
@@ -258,6 +258,7 @@ along with this software (see the LICENSE.md file). If not, see
                 <iterate list="paymentList" entry="payment">
                     <set field="payment.paymentMethodId" from="paymentMethodId"/>
                     <entity-update value-field="payment"/>
+                    <message>Updated Payment Method on Payment ${payment.paymentId}</message>
                 </iterate>
                 <entity-find entity-name="mantle.account.payment.Payment" list="toPaymentList">
                     <econdition field-name="toPaymentMethodId" from="origPaymentMethodId"/>
@@ -265,7 +266,8 @@ along with this software (see the LICENSE.md file). If not, see
                 </entity-find>
                 <iterate list="toPaymentList" entry="toPayment">
                     <set field="toPayment.toPaymentMethodId" from="paymentMethodId"/>
-                    <entity-update value-field="payment"/>
+                    <entity-update value-field="toPayment"/>
+                    <message>Updated To Payment Method on Payment ${toPayment.paymentId}</message>
                 </iterate>
             </if>
         </actions>
@@ -286,6 +288,7 @@ along with this software (see the LICENSE.md file). If not, see
             <parameter name="ledgerBalance" type="BigDecimal"/>
             <parameter name="availableBalance" type="BigDecimal"/>
             <parameter name="balanceDate" type="Timestamp"/>
+            <parameter name="thruDateSetAuto"/>
         </in-parameters>
         <actions>
             <service-call name="update#mantle.account.method.PaymentMethod" in-map="context"/>

From 9c0471ded585d60e7ed5b68c930b2f3f1b1b8571 Mon Sep 17 00:00:00 2001
From: David E Jones <dej@dejc.com>
Date: Tue, 14 Apr 2020 00:29:58 -0700
Subject: [PATCH 21/37] In search#Party service use new
 StringUtilities.elasticQueryAutoWildcard() method to handle query string
 processing instead of inconsistent inline

---
 service/mantle/party/PartyServices.xml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/service/mantle/party/PartyServices.xml b/service/mantle/party/PartyServices.xml
index 04e69e23..bfa0ca03 100644
--- a/service/mantle/party/PartyServices.xml
+++ b/service/mantle/party/PartyServices.xml
@@ -93,10 +93,7 @@ along with this software (see the LICENSE.md file). If not, see
             <set field="nowTimeLong" from="System.currentTimeMillis()"/>
 
             <!-- auto prefix with '*:' so that highlighting works -->
-            <!-- TODO: would be nice to somehow parse the query string, matching parentheses and quotes, and add *: for the field if none for each term -->
-            <set field="queryString" from="anyField ? anyField.trim() : ''"/>
-            <if condition="queryString &amp;&amp; isAlphaNumeric(queryString, ' *?')">
-                <set field="queryString" from="queryString.split(' ').collect({ (!it || it in ['AND', 'OR', 'NOT']) ? it : '*:' + it }).join(' ')"/></if>
+            <set field="queryString" from="anyField ? elasticQueryAutoWildcard(anyField, true) : ''"/>
 
             <if condition="queryString"><set field="queryString" from="'(' + queryString + ')'"/></if>
 

From ab9f3201db535f3209b3366a763ced775a226185 Mon Sep 17 00:00:00 2001
From: David E Jones <dej@dejc.com>
Date: Tue, 14 Apr 2020 02:53:45 -0700
Subject: [PATCH 22/37] Add create#WorkerInvoiceItems service for direct
 billing from worker to project vendor or employer, ie without a project; move
 child/descendant WorkEffort logic to create#TimeEntryInvoiceItems from
 create#ProjectInvoiceItems; changes to all of these services to better handle
 invoice type and invoice item type for employee, non-employee person, and
 organization

---
 service/mantle/account/InvoiceServices.xml | 140 ++++++++++++++++-----
 service/mantle/work/TimeServices.xml       |   4 +-
 2 files changed, 115 insertions(+), 29 deletions(-)

diff --git a/service/mantle/account/InvoiceServices.xml b/service/mantle/account/InvoiceServices.xml
index 5bd933ba..957c87cb 100644
--- a/service/mantle/account/InvoiceServices.xml
+++ b/service/mantle/account/InvoiceServices.xml
@@ -1517,7 +1517,8 @@ along with this software (see the LICENSE.md file). If not, see
                 <description>Only TimeEntry records before this date will be included. Defaults to now.</description></parameter>
             <parameter name="invoiceDate" type="Timestamp" default="ec.user.nowTimestamp"/>
             <parameter name="currencyUomId"/>
-            <parameter name="ratePurposeEnumId" default-value="RaprClient"/>
+            <parameter name="ratePurposeEnumId" default-value="RaprClient">
+                <description>Invoice Project Client/Customer (RaprClient) or Vendor/Worker (RaprVendor)</description></parameter>
             <parameter name="workerPartyId"><description>If specified only include time entries and expenses from this Party.</description></parameter>
         </in-parameters>
         <out-parameters>
@@ -1536,9 +1537,31 @@ along with this software (see the LICENSE.md file). If not, see
                 <econdition field-name="roleTypeId" operator="in" value="Vendor,VendorBillFrom"/>
             </entity-find>
             <set field="billFromWep" from="billFromList ? billFromList[0] : null"/>
+            <set field="vendorPartyId" from="billFromWep?.partyId"/>
 
-            <entity-find-one entity-name="mantle.party.PartyDetail" value-field="workerParty">
-                <field-map field-name="partyId" from="workerPartyId"/></entity-find-one>
+            <if condition="workerPartyId">
+                <entity-find-one entity-name="mantle.party.PartyDetail" value-field="workerParty">
+                    <field-map field-name="partyId" from="workerPartyId"/></entity-find-one>
+                <!-- is worker an employee? -->
+                <entity-find entity-name="mantle.party.PartyRelationship" list="employeeRelationshipList">
+                    <date-filter/>
+                    <econdition field-name="fromPartyId" from="workerPartyId"/>
+                    <econdition field-name="toPartyId" from="vendorPartyId"/>
+                    <econdition field-name="relationshipTypeEnumId" value="PrtEmployee"/>
+                    <econdition field-name="fromRoleTypeId" value="Employee"/>
+                </entity-find>
+                <set field="isEmployee" from="employeeRelationshipList.size() &gt; 0"/>
+            </if>
+
+            <if condition="ratePurposeEnumId == 'RaprClient'"><then>
+                <set field="invoiceTypeEnumId" value="InvoiceSales"/>
+                <set field="itemTypeEnumId" value="ItemTimeEntry"/>
+            </then><else>
+                <set field="invoiceTypeEnumId" from="workerParty?.partyTypeEnumId == 'PtyPerson' ?
+                            (isEmployee ? 'InvoicePayroll' : 'InvoicePayrollOther') : 'InvoiceSales'"/>
+                <!-- NEW: use ItemHourlyEarnings for Employee Person vendor/worker invoices, ItemTimeEntry for client/customer invoices and all other vendor/worker invoices -->
+                <set field="itemTypeEnumId" from="workerParty?.partyTypeEnumId == 'PtyPerson' &amp;&amp; isEmployee ? 'ItemHourlyEarnings' : 'ItemTimeEntry'"/>
+            </else></if>
 
             <!-- create Invoice associated with WorkEffort, use WorkEffortParty to find from/to parties -->
             <if condition="!invoiceId">
@@ -1551,33 +1574,20 @@ along with this software (see the LICENSE.md file). If not, see
                 <set field="description" value="Invoice for${workEffort ? ' project ' + ec.resource.expand('WorkEffortNameTemplate','') : ''}${workerParty ? ' worker ' + ec.resource.expand('PartyNameTemplate','',workerParty) : ''}"/>
                 <if condition="ratePurposeEnumId == 'RaprClient'"><then>
                     <service-call name="mantle.account.InvoiceServices.create#Invoice" out-map="context"
-                            in-map="[invoiceTypeEnumId:'InvoiceSales',
-                                fromPartyId:billFromWep?.partyId, toPartyId:billToWep?.partyId,
+                            in-map="[invoiceTypeEnumId:invoiceTypeEnumId, fromPartyId:billFromWep?.partyId, toPartyId:billToWep?.partyId,
                                 invoiceDate:invoiceDate, currencyUomId:currencyUomId, description:description]"/>
                 </then><else>
                     <service-call name="mantle.account.InvoiceServices.create#Invoice" out-map="context"
-                            in-map="[invoiceTypeEnumId:'InvoiceSales',
-                                fromPartyId:workerPartyId, toPartyId:billFromWep?.partyId,
+                            in-map="[invoiceTypeEnumId:invoiceTypeEnumId, fromPartyId:workerPartyId, toPartyId:vendorPartyId,
                                 invoiceDate:invoiceDate, currencyUomId:currencyUomId, description:description]"/>
                 </else></if>
             </if>
 
-            <!-- iterate through task WorkEffort records and add to Invoice with create#TimeEntryInvoiceItems service -->
-            <!-- TODO: consider refactoring to query TimeEntry records by project workEffortId and workerPartyId
-                instead of doing a query for each task (was original approach when before workerPartyId support and
-                making project workEffortId optional -->
-            <entity-find entity-name="mantle.work.effort.WorkEffort" list="taskWorkEffortList">
-                <econdition field-name="rootWorkEffortId" from="workEffortId" ignore-if-empty="true"/>
-                <econdition field-name="workEffortTypeEnumId" value="WetTask"/>
-                <order-by field-name="workEffortId"/>
-            </entity-find>
-            <set field="invoiceItemCreatedCount" from="0" type="Long"/>
-            <iterate list="taskWorkEffortList" entry="taskWorkEffort">
-                <service-call name="mantle.account.InvoiceServices.create#TimeEntryInvoiceItems" out-map="createResult"
-                        in-map="[invoiceId:invoiceId, workEffortId:taskWorkEffort.workEffortId, thruDate:thruDate,
-                        currencyUomId:currencyUomId, ratePurposeEnumId:ratePurposeEnumId, workerPartyId:workerPartyId]"/>
-                <set field="invoiceItemCreatedCount" from="invoiceItemCreatedCount + createResult.invoiceItemCreatedCount"/>
-            </iterate>
+            <service-call name="mantle.account.InvoiceServices.create#TimeEntryInvoiceItems" out-map="createResult"
+                    in-map="[invoiceId:invoiceId, workEffortId:workEffortId, thruDate:thruDate,
+                        currencyUomId:currencyUomId, ratePurposeEnumId:ratePurposeEnumId, itemTypeEnumId:itemTypeEnumId,
+                        workerPartyId:workerPartyId, vendorPartyId:vendorPartyId]"/>
+            <set field="invoiceItemCreatedCount" from="createResult.invoiceItemCreatedCount"/>
 
             <!-- add items for all expense invoice items for project that are not yet billed through -->
             <if condition="ratePurposeEnumId == 'RaprClient'">
@@ -1611,31 +1621,106 @@ along with this software (see the LICENSE.md file). If not, see
         </actions>
     </service>
 
+    <service verb="create" noun="WorkerInvoiceItems">
+        <in-parameters>
+            <parameter name="workerPartyId" required="true"/>
+            <parameter name="vendorPartyId" required="true"><description>Matches TimeEntry.vendorPartyId, a Project Vendor or Employer</description></parameter>
+            <parameter name="invoiceId"><description>If specified add item(s) to this Invoice. If empty an Invoice will be created.</description></parameter>
+            <parameter name="thruDate" type="Timestamp" default="ec.user.nowTimestamp">
+                <description>Only TimeEntry records before this date will be included. Defaults to now.</description></parameter>
+            <parameter name="invoiceDate" type="Timestamp" default="ec.user.nowTimestamp"/>
+            <parameter name="currencyUomId"/>
+            <parameter name="workEffortId"><description>If specified filter TimeEntry query by the specified WorkEffort and all WorkEfforts matching on rootWorkEffortId (for projects, etc) or parentWorkEffortId</description></parameter>
+            <parameter name="timesheetId"><description>If specified get TimeEntry records constrained on it.</description></parameter>
+        </in-parameters>
+        <actions>
+            <entity-find-one entity-name="mantle.party.PartyDetail" value-field="workerParty">
+                <field-map field-name="partyId" from="workerPartyId"/></entity-find-one>
+            <!-- is worker an employee? -->
+            <entity-find entity-name="mantle.party.PartyRelationship" list="employeeRelationshipList">
+                <date-filter/>
+                <econdition field-name="fromPartyId" from="workerPartyId"/>
+                <econdition field-name="toPartyId" from="vendorPartyId"/>
+                <econdition field-name="relationshipTypeEnumId" value="PrtEmployee"/>
+                <econdition field-name="fromRoleTypeId" value="Employee"/>
+            </entity-find>
+            <set field="isEmployee" from="employeeRelationshipList.size() &gt; 0"/>
+
+            <set field="invoiceTypeEnumId" from="workerParty?.partyTypeEnumId == 'PtyPerson' ?
+                    (isEmployee ? 'InvoicePayroll' : 'InvoicePayrollOther') : 'InvoiceSales'"/>
+            <!-- NEW: use ItemHourlyEarnings for Employee Person vendor/worker invoices, ItemTimeEntry for client/customer invoices and all other vendor/worker invoices -->
+            <set field="itemTypeEnumId" from="workerParty?.partyTypeEnumId == 'PtyPerson' &amp;&amp; isEmployee ? 'ItemHourlyEarnings' : 'ItemTimeEntry'"/>
+
+            <!-- create Invoice associated with WorkEffort, use WorkEffortParty to find from/to parties -->
+            <if condition="!invoiceId">
+                <if condition="!currencyUomId">
+                    <entity-find-one entity-name="mantle.ledger.config.PartyAcctgPreference" value-field="partyAcctgPreference">
+                        <field-map field-name="organizationPartyId" from="vendorPartyId"/></entity-find-one>
+                    <set field="currencyUomId" from="partyAcctgPreference?.baseCurrencyUomId ?: 'USD'"/>
+                </if>
+                <set field="description" value="Invoice for worker ${ec.resource.expand('PartyNameTemplate','',workerParty)}"/>
+                <service-call name="mantle.account.InvoiceServices.create#Invoice" out-map="context"
+                        in-map="[invoiceTypeEnumId:invoiceTypeEnumId, fromPartyId:workerPartyId, toPartyId:vendorPartyId,
+                            invoiceDate:invoiceDate, currencyUomId:currencyUomId, description:description]"/>
+            </if>
+
+            <service-call name="mantle.account.InvoiceServices.create#TimeEntryInvoiceItems" out-map="createResult"
+                    in-map="[invoiceId:invoiceId, workEffortId:workEffortId, timesheetId:timesheetId, thruDate:thruDate,
+                        currencyUomId:currencyUomId, ratePurposeEnumId:'RaprVendor', itemTypeEnumId:itemTypeEnumId,
+                        workerPartyId:workerPartyId, vendorPartyId:vendorPartyId]"/>
+
+            <if condition="!createResult.invoiceItemCreatedCount"><then>
+                <message error="true">No time entries found for worker ${ec.resource.expand('PartyNameTemplate','',workerParty)}, not creating invoice or adding items to existing invoice.</message>
+            </then><else>
+                <message>Added ${createResult.invoiceItemCreatedCount} items to Invoice ${invoiceId}</message>
+            </else></if>
+        </actions>
+    </service>
+
     <!-- InvoiceItems based on TimeEntry -->
     <service verb="create" noun="TimeEntryInvoiceItems">
         <in-parameters>
             <parameter name="invoiceId" required="true"/>
-            <parameter name="workEffortId"><description>If specified get TimeEntry records constrained on it. Generally a task ID.</description></parameter>
+            <parameter name="workEffortId"><description>If specified filter TimeEntry query by the specified WorkEffort and all WorkEfforts matching on rootWorkEffortId (for projects, etc) or parentWorkEffortId</description></parameter>
             <parameter name="timesheetId"><description>If specified get TimeEntry records constrained on it.</description></parameter>
             <parameter name="thruDate" type="Timestamp" default="ec.user.nowTimestamp">
                 <description>Only TimeEntry records before this date will be included. Defaults to now.</description></parameter>
             <parameter name="createSingleItem" type="Boolean" default="false"/>
+            <parameter name="itemTypeEnumId" default-value="ItemTimeEntry"><description>If not specified uses ItemTimeEntry for RaprClient,
+                for RaprVendor use ItemHourlyEarnings for Person Worker and ItemTimeEntry for Organization Worker</description></parameter>
             <parameter name="currencyUomId" default-value="${ec.user.getPreference('CurrencyDefault') ?: 'USD'}"/>
             <parameter name="ratePurposeEnumId" default-value="RaprClient"><description>If RaprVendor TimeEntry.vendorInvoiceId is
                 populated and time entries with it populated are excluded, otherwise with default of RaprClient TimeEntry.invoiceId is used.</description></parameter>
-            <parameter name="workerPartyId"><description>If specified only include time entries from this Party.</description></parameter>
+            <parameter name="workerPartyId"><description>If specified only include time entries from this Party (matches TimeEntry.partyId)</description></parameter>
+            <parameter name="vendorPartyId"><description>Matches TimeEntry.vendorPartyId, a Project Vendor or Employer</description></parameter>
         </in-parameters>
         <out-parameters>
             <parameter name="invoiceItemCreatedCount" type="Long"/>
         </out-parameters>
         <actions>
             <entity-find-one entity-name="mantle.work.effort.WorkEffort" value-field="workEffort"/>
+            <entity-find-one entity-name="mantle.party.PartyDetail" value-field="workerParty">
+                <field-map field-name="partyId" from="workerPartyId"/></entity-find-one>
+
+            <if condition="workEffortId">
+                <set field="workEffortIdSet" from="new HashSet()"/>
+                <script>workEffortIdSet.add(workEffortId)</script>
+                <entity-find entity-name="mantle.work.effort.WorkEffort" list="descendantWorkEffortList">
+                    <econditions combine="or">
+                        <econdition field-name="rootWorkEffortId" from="workEffortId"/>
+                        <econdition field-name="parentWorkEffortId" from="workEffortId"/>
+                    </econditions>
+                    <select-field field-name="workEffortId"/>
+                    <order-by field-name="workEffortId"/>
+                </entity-find>
+                <script>if (descendantWorkEffortList) workEffortIdSet.addAll(descendantWorkEffortList*.workEffortId)</script>
+            </if>
 
             <if condition="ratePurposeEnumId == 'RaprVendor'"><then><set field="timeEntryInvoiceCondition" from="[vendorInvoiceId:null]"/></then>
                 <else><set field="timeEntryInvoiceCondition" from="[invoiceId:null]"/></else></if>
             <entity-find entity-name="mantle.work.time.TimeEntry" list="timeEntryList">
                 <econdition-object field="timeEntryInvoiceCondition"/>
-                <econdition field-name="workEffortId" ignore-if-empty="true"/>
+                <econdition field-name="workEffortId" operator="in" from="workEffortIdSet" ignore-if-empty="true"/>
                 <econdition field-name="timesheetId" ignore-if-empty="true"/>
                 <econditions combine="or">
                     <econdition field-name="thruDate" operator="less-equals" from="thruDate"/>
@@ -1643,10 +1728,9 @@ along with this software (see the LICENSE.md file). If not, see
                 </econditions>
                 <!-- filter by workerPartyId if specified -->
                 <econdition field-name="partyId" from="workerPartyId" ignore-if-empty="true"/>
+                <econdition field-name="vendorPartyId" ignore-if-empty="true" or-null="true"/>
             </entity-find>
 
-            <!-- always use ItemTimeEntry, posts to sales/revenue for outgoing invoice and cost of sales for incoming invoice -->
-            <set field="itemTypeEnumId" value="ItemTimeEntry"/>
             <set field="invoiceItemCreatedCount" from="0" type="Long"/>
             <if condition="createSingleItem"><then>
                 <set field="amountTotal" from="0"/>
diff --git a/service/mantle/work/TimeServices.xml b/service/mantle/work/TimeServices.xml
index 467364ea..7ac6f771 100644
--- a/service/mantle/work/TimeServices.xml
+++ b/service/mantle/work/TimeServices.xml
@@ -597,7 +597,9 @@ along with this software (see the LICENSE.md file). If not, see
                         <set field="currencyUomId" from="rateAmount.rateCurrencyUomId"/>
                     </then><else>
                         <set field="purposeDesc" from="ec.entity.find('enums').condition('enumId', ratePurposeEnumId).one()?.description"/>
-                        <message error="true">No hourly ${purposeDesc} rate amount found for time entry ${timeEntryId}</message>
+                        <entity-find-one entity-name="mantle.party.PartyDetail" value-field="workerParty">
+                            <field-map field-name="partyId" from="timeEntry.partyId"/></entity-find-one>
+                        <message error="true">No hourly ${purposeDesc} rate amount found for time entry ${timeEntryId} for worker ${ec.resource.expand('PartyNameTemplate','',workerParty)}</message>
                     </else></if>
                 </then><else>
                     <set field="hourlyAmountTotal" from="hours * hourlyAmount"/>

From 28c3b050464a583f0acc816025c275ddb53d0ada Mon Sep 17 00:00:00 2001
From: David E Jones <dej@dejc.com>
Date: Thu, 23 Apr 2020 18:17:22 -0700
Subject: [PATCH 23/37] In AUTHORS file update my year range, add bottom line
 to help preserve format with empty line at end so adding signatures is
 hopefully more consistently a single line add in diffs

---
 AUTHORS | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index d28a8e9a..541e68a3 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -34,7 +34,7 @@ that are otherwise encumbered.
 
 Signed by git commit adding my legal name and git username:
 
-Written in 2010-2016 by David E. Jones - jonesde
+Written in 2010-2020 by David E. Jones - jonesde
 Written in 2014-2015 by Solomon Bessire - sbessire
 Written in 2012-2016 by Sam Hamilton - samhamilton
 Written in 2014-2015 by Yao Chunlin - chunlinyao
@@ -74,7 +74,7 @@ litigation is filed.
 
 Signed by git commit adding my legal name and git username:
 
-Written in 2010-2016 by David E. Jones - jonesde
+Written in 2010-2020 by David E. Jones - jonesde
 Written in 2014-2015 by Solomon Bessire - sbessire
 Written in 2014-2015 by Yao Chunlin - chunlinyao
 Written in 2015-2015 by Jens Hardings - jenshp
@@ -92,3 +92,5 @@ written in 2019 by Deepak Dixit - dixitdeepak
 written in 2019 by Arzang Kasiri - akasiri
 Written in 2019 by Lawrence Tran - lawrencetran
 written in 2019 by Irwing Herrera - iaha
+
+===========================================================================

From a483c7ab1a4983fbf1e25a007b9905ad31cea086 Mon Sep 17 00:00:00 2001
From: David E Jones <dej@dejc.com>
Date: Sun, 26 Apr 2020 19:37:47 -0700
Subject: [PATCH 24/37] In get#PartyEmployersAndPositionClasses service also
 return an employerPartyList that defaults to all internal orgs if worker
 party has no employee relationships

---
 service/mantle/humanres/PositionServices.xml | 21 ++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/service/mantle/humanres/PositionServices.xml b/service/mantle/humanres/PositionServices.xml
index e76779c1..fb06af88 100644
--- a/service/mantle/humanres/PositionServices.xml
+++ b/service/mantle/humanres/PositionServices.xml
@@ -21,7 +21,8 @@ along with this software (see the LICENSE.md file). If not, see
             <parameter name="emplPositionClassIdList" type="List"/>
             <parameter name="workTypeEnumerationList" type="List"/>
             <parameter name="workTypeEnumIdSet" type="Set"/>
-            <parameter name="employerRelList" type="List"/>
+            <parameter name="employerRelList" type="List"><parameter name="employerRel" type="Map"/></parameter>
+            <parameter name="employerPartyList" type="List"><parameter name="employerParty" type="Map"/></parameter>
         </out-parameters>
         <actions>
             <!-- Get EmplPositionClass options from EmplPositionClassParty and EmplPosition -->
@@ -34,7 +35,7 @@ along with this software (see the LICENSE.md file). If not, see
             <entity-find entity-name="mantle.party.PartyToAndRelationship" list="employerRelList">
                 <date-filter/><econdition field-name="fromPartyId" from="partyId"/>
                 <econdition field-name="relationshipTypeEnumId" value="PrtEmployee"/>
-                <order-by field-name="pseudoId,organizationName,lastName,firstName"/>
+                <order-by field-name="organizationName,lastName,firstName"/>
             </entity-find>
             <iterate list="employerRelList" entry="employerRel">
                 <entity-find-one entity-name="mantle.humanres.employment.Employment" value-field="employment">
@@ -45,6 +46,22 @@ along with this software (see the LICENSE.md file). If not, see
                         <script>emplPositionClassIdList.add(emplPosition?.emplPositionClassId)</script></if>
                 </if>
             </iterate>
+
+            <!-- If employerRelList empty use all internal orgs -->
+            <if condition="employerRelList"><then>
+                <entity-find entity-name="mantle.party.PartyDetail" list="employerPartyList">
+                    <econdition field-name="partyId" operator="in" from="employerRelList*.toPartyId"/>
+                    <econdition field-name="disabled" value="N" or-null="true"/>
+                    <order-by field-name="organizationName,lastName,firstName"/>
+                </entity-find>
+            </then><else>
+                <entity-find entity-name="mantle.party.PartyDetailAndRole" list="employerPartyList">
+                    <econdition field-name="roleTypeId" value="OrgInternal"/>
+                    <econdition field-name="disabled" value="N" or-null="true"/>
+                    <order-by field-name="organizationName"/>
+                </entity-find>
+            </else></if>
+
             <!-- Find EmplPositionClass records by the IDs we have, or if none then all classes -->
             <entity-find entity-name="mantle.humanres.position.EmplPositionClass" list="emplPositionClassList">
                 <econdition field-name="emplPositionClassId" operator="in" from="emplPositionClassIdList" ignore-if-empty="true"/>

From 2f0cc20aa6ec915da40c478c5b58f6bdcffc2643 Mon Sep 17 00:00:00 2001
From: David E Jones <dej@dejc.com>
Date: Mon, 27 Apr 2020 19:13:10 -0700
Subject: [PATCH 25/37] On RequestAndPartyDetail view-entity add Party member
 entity (for psuedoId, etc)

---
 entity/RequestViewEntities.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/entity/RequestViewEntities.xml b/entity/RequestViewEntities.xml
index e9524574..1dca1702 100644
--- a/entity/RequestViewEntities.xml
+++ b/entity/RequestViewEntities.xml
@@ -60,6 +60,8 @@ along with this software (see the LICENSE.md file). If not, see
         <member-entity entity-alias="REQ" entity-name="mantle.request.Request"/>
         <member-entity entity-alias="RQP" entity-name="mantle.request.RequestParty" join-from-alias="REQ">
             <key-map field-name="requestId"/></member-entity>
+        <member-entity entity-alias="PTY" entity-name="mantle.party.Party" join-from-alias="RQP">
+            <key-map field-name="partyId"/></member-entity>
         <member-entity entity-alias="ORG" entity-name="mantle.party.Organization" join-from-alias="RQP" join-optional="true">
             <key-map field-name="partyId"/></member-entity>
         <member-entity entity-alias="PER" entity-name="mantle.party.Person" join-from-alias="RQP" join-optional="true">
@@ -68,6 +70,7 @@ along with this software (see the LICENSE.md file). If not, see
             <key-map field-name="partyId"/></member-entity>
         <alias-all entity-alias="RQP"/>
         <alias-all entity-alias="REQ"/>
+        <alias-all entity-alias="PTY"/>
         <alias-all entity-alias="PER"/>
         <alias-all entity-alias="ORG"/>
         <alias name="username" entity-alias="USRACT"/>

From 1a7e1d1ae99256007ad4ae3577fc2f3d6f83fb1e Mon Sep 17 00:00:00 2001
From: Wei Zhang <zhangwei1979@outlook.com>
Date: Tue, 28 Apr 2020 14:15:13 +0800
Subject: [PATCH 26/37] Add CommunicationEventContent Services

---
 AUTHORS                                       |  2 +-
 .../mantle/party/CommunicationServices.xml    | 88 +++++++++++++++++++
 2 files changed, 89 insertions(+), 1 deletion(-)

diff --git a/AUTHORS b/AUTHORS
index 541e68a3..fb56798d 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -85,7 +85,7 @@ Written in 2016 by Shen Defu - shendepu
 Written in 2016 by Sean Lovinger - smlovin2
 Written in 2017 by Oleg Andrieiev - onadreyev
 Written in 2017 by Zhen Zhao Wei - WillWei1983
-Written in 2017 by Zhang Wei - zhangwei1979
+Written in 2017-2020 by Zhang Wei - zhangwei1979
 written in 2018 by Hans Bakker - hansbak
 written in 2019 by Daniel Taylor - danieltaylor-nz
 written in 2019 by Deepak Dixit - dixitdeepak
diff --git a/service/mantle/party/CommunicationServices.xml b/service/mantle/party/CommunicationServices.xml
index 25197c03..b3d8f2fe 100644
--- a/service/mantle/party/CommunicationServices.xml
+++ b/service/mantle/party/CommunicationServices.xml
@@ -101,4 +101,92 @@ along with this software (see the LICENSE.md file). If not, see
                     in-map="[wikiPageId:wikiPageId, communicationEventId:communicationEventId]"/>
         </actions>
     </service>
+
+    <!-- ================================================ -->
+    <!-- ========== CommunicationEventContent Services ========== -->
+    <!-- ================================================ -->
+
+    <service verb="get" noun="CommunicationEventContentLocation">
+        <in-parameters>
+            <parameter name="communicationEventId" required="true"/>
+            <parameter name="contentTypeEnumIdList" type="List" required="true"/>
+        </in-parameters>
+        <out-parameters>
+            <parameter name="contentLocation"/>
+            <parameter name="communicationEvenContent"/>
+        </out-parameters>
+        <actions>
+            <iterate list="contentTypeEnumIdList" entry="contentTypeEnumId">
+                <entity-find entity-name="mantle.party.communication.CommunicationEventContent" list="commEventContentList">
+                    <econdition field-name="communicationEventId"/><econdition field-name="contentTypeEnumId"/>
+                    <order-by field-name="-contentDate"/></entity-find>
+                <if condition="commEventContentList">
+                    <set field="communicationEvenContent" from="commEventContentList[0]"/>
+                    <break/>
+                </if>
+            </iterate>
+            <set field="contentLocation" from="communicationEvenContent ? communicationEvenContent.contentLocation : null"/>
+        </actions>
+    </service>
+
+    <service verb="create" noun="CommunicationEventContent">
+        <in-parameters>
+            <auto-parameters entity-name="mantle.party.communication.CommunicationEventContent" include="nonpk">
+                <exclude field-name="contentLocation"/></auto-parameters>
+            <parameter name="communicationEventId" required="true"/>
+            <parameter name="contentFile" type="org.apache.commons.fileupload.FileItem"/>
+        </in-parameters>
+        <out-parameters><parameter name="communicationEventContentId"/></out-parameters>
+        <actions>
+            <service-call name="create#mantle.party.communication.CommunicationEventContent" in-map="context" out-map="context"/>
+            <if condition="contentFile != null &amp;&amp; contentFile.size &gt; 0">
+                <service-call name="mantle.party.CommunicationServices.save#CommunicationEventContentFile" in-map="context"/></if>
+        </actions>
+    </service>
+
+    <service verb="update" noun="CommunicationEventContent">
+        <in-parameters>
+            <parameter name="communicationEventContentId" required="true"/>
+            <auto-parameters entity-name="mantle.party.communication.CommunicationEventContent" include="nonpk">
+                <exclude field-name="contentLocation"/></auto-parameters>
+            <parameter name="contentFile" type="org.apache.commons.fileupload.FileItem"/>
+        </in-parameters>
+        <actions>
+            <if condition="contentFile != null &amp;&amp; contentFile.size &gt; 0">
+                <entity-find-one entity-name="mantle.party.communication.CommunicationEventContent" value-field="communicationEvenContent"/>
+                <service-call name="mantle.party.CommunicationServices.save#CommunicationEventContentFile" out-map="context"
+                              in-map="context + [communicationEventId:communicationEvenContent.communicationEventId, saveContentLocation:false]"/>
+            </if>
+            <service-call name="update#mantle.party.communication.CommunicationEventContent" in-map="context"/>
+        </actions>
+    </service>
+
+    <service verb="save" noun="CommunicationEventContentFile">
+        <in-parameters>
+            <parameter name="communicationEventContentId" required="true"/>
+            <parameter name="communicationEventId" required="true"/>
+            <parameter name="contentFile" type="org.apache.commons.fileupload.FileItem" required="true"/>
+            <parameter name="saveContentLocation" type="Boolean" default="true"/>
+        </in-parameters>
+        <out-parameters><parameter name="contentLocation"/></out-parameters>
+        <actions>
+            <set field="filename" from="contentFile.getName()"/>
+            <if condition="org.moqui.resource.ResourceReference.isTextFilename(filename)"><then>
+                <set field="contentRoot" from="ec.user.getPreference('mantle.content.root') ?: 'dbresource://mantle/content'"/>
+            </then><else>
+                <set field="contentRoot" from="ec.user.getPreference('mantle.content.large.root') ?: 'dbresource://mantle/content'"/>
+            </else></if>
+            <set field="contentLocation" value="${contentRoot}/CommunicationEvent/${communicationEventId}/content_${communicationEventContentId}/${filename}"/>
+
+            <set field="docRr" from="ec.resource.getLocationReference(contentLocation)"/>
+            <script>
+                fileStream = contentFile.getInputStream()
+                try { docRr.putStream(fileStream) } finally { fileStream.close() }
+            </script>
+
+            <if condition="saveContentLocation"><service-call name="update#mantle.party.communication.CommunicationEventContent"
+                                                              in-map="[communicationEventContentId:communicationEventContentId, contentLocation:contentLocation]"/></if>
+        </actions>
+    </service>
+
 </services>

From cc6e8328c0f108e75d5ab0e68897bebb5996c949 Mon Sep 17 00:00:00 2001
From: David E Jones <dej@dejc.com>
Date: Thu, 30 Apr 2020 14:48:56 -0700
Subject: [PATCH 27/37] Fix issue in add#OrderProductQuantity where orderHeader
 and orderPart entity values were not looked up for existing open orders, and
 also constrain lookup of existing orders by vendorPartyId; related to PR #153

---
 service/mantle/order/OrderServices.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/service/mantle/order/OrderServices.xml b/service/mantle/order/OrderServices.xml
index 8ccfd5d3..bcbbc177 100644
--- a/service/mantle/order/OrderServices.xml
+++ b/service/mantle/order/OrderServices.xml
@@ -587,6 +587,7 @@ General Order Placement and eCommerce Usage
                     <entity-find entity-name="mantle.order.OrderHeaderAndPart" list="existingOrderList">
                         <econdition field-name="statusId" value="OrderOpen"/>
                         <econdition field-name="customerPartyId"/>
+                        <econdition field-name="vendorPartyId" ignore-if-empty="true"/>
                         <econdition field-name="productStoreId" ignore-if-empty="true"/>
                         <select-field field-name="orderId"/><select-field field-name="orderPartSeqId"/>
                         <order-by field-name="-entryDate"/><!-- get most recent open order -->
@@ -594,6 +595,9 @@ General Order Placement and eCommerce Usage
                     <if condition="existingOrderList">
                         <set field="orderId" from="existingOrderList[0].orderId"/>
                         <set field="orderPartSeqId" from="existingOrderList[0].orderPartSeqId"/>
+
+                        <entity-find-one entity-name="mantle.order.OrderHeader" value-field="orderHeader"/>
+                        <entity-find-one entity-name="mantle.order.OrderPart" value-field="orderPart"/>
                     </if>
                 </if>
                 <!-- no existing open (cart) order found? create one -->

From 3532d61ece11edcb7174882ab13e3b2be29cec14 Mon Sep 17 00:00:00 2001
From: David E Jones <dej@dejc.com>
Date: Fri, 1 May 2020 01:52:44 -0700
Subject: [PATCH 28/37] In CarrierServices and ShipmentInfoServices for order
 and shipment bulk rates and actual charges/rates add support for new
 ProductStoreShipOption markup fields that override the PsstShipLabelMarkup
 store setting if used, also honor the new ProductStore markupOrderShipLabels
 and markupShipmentShipLabels config fields

---
 service/mantle/shipment/CarrierServices.xml   | 213 +++++++++++++-----
 .../mantle/shipment/ShipmentInfoServices.xml  |  28 ++-
 2 files changed, 175 insertions(+), 66 deletions(-)

diff --git a/service/mantle/shipment/CarrierServices.xml b/service/mantle/shipment/CarrierServices.xml
index ee1b1fec..aee3365a 100644
--- a/service/mantle/shipment/CarrierServices.xml
+++ b/service/mantle/shipment/CarrierServices.xml
@@ -321,13 +321,17 @@ along with this software (see the LICENSE.md file). If not, see
             <parameter name="orderItemSeqId"/>
         </out-parameters>
         <actions>
-            <if condition="!shippingGatewayConfigId">
-                <entity-find-one entity-name="mantle.order.OrderHeader" value-field="orderHeader"/>
-                <entity-find-one entity-name="mantle.order.OrderPart" value-field="orderPart"/>
-                <set field="carrierPartyId" from="carrierPartyId ?: orderPart.carrierPartyId"/>
+            <entity-find-one entity-name="mantle.order.OrderHeader" value-field="orderHeader"/>
+            <entity-find-one entity-name="mantle.order.OrderPart" value-field="orderPart"/>
+
+            <set field="productStoreId" from="orderHeader.productStoreId"/>
+            <set field="carrierPartyId" from="carrierPartyId ?: orderPart.carrierPartyId"/>
+            <set field="shipmentMethodEnumId" from="shipmentMethodEnumId ?: orderPart.shipmentMethodEnumId"/>
+
+            <entity-find-one entity-name="mantle.product.store.ProductStore" value-field="productStore" cache="true"/>
 
+            <if condition="!shippingGatewayConfigId">
                 <if condition="!carrierPartyId"><return/></if>
-                <set field="productStoreId" from="orderHeader.productStoreId"/>
                 <if condition="!productStoreId">
                     <!-- this shouldn't generally happen as not called when there is no store, but if it does return quietly -->
                     <return/>
@@ -349,10 +353,12 @@ along with this software (see the LICENSE.md file). If not, see
                     message="Could not get order shipping rate, no order rate service on gateway ${shippingGatewayConfig.shippingGatewayConfigId}"/></if>
 
             <!-- if order part has shipping (ItemShipping) items clear them out first -->
-            <if condition="createOrderItem"><entity-delete-by-condition entity-name="mantle.order.OrderItem">
-                <econdition field-name="orderId"/><econdition field-name="orderPartSeqId"/>
-                <econdition field-name="itemTypeEnumId" value="ItemShipping"/>
-            </entity-delete-by-condition></if>
+            <if condition="createOrderItem">
+                <entity-delete-by-condition entity-name="mantle.order.OrderItem">
+                    <econdition field-name="orderId"/><econdition field-name="orderPartSeqId"/>
+                    <econdition field-name="itemTypeEnumId" value="ItemShipping"/>
+                </entity-delete-by-condition>
+            </if>
 
             <!-- get auto package info if service available -->
             <set field="getAutoPackageInfoName" from="shippingGatewayConfig.getAutoPackageInfoName"/>
@@ -367,6 +373,37 @@ along with this software (see the LICENSE.md file). If not, see
 
             <!-- call gateway (could be local) service to calculate shipping charges -->
             <service-call name="${getOrderRateServiceName}" in-map="context" out-map="context"/>
+
+            <if condition="productStore?.markupOrderShipLabels == 'Y'">
+                <service-call name="mantle.shipment.CarrierServices.get#ShipLabelMarkup" out-map="markupOut" out-map-add-to-existing="false"
+                        in-map="[productStoreId:productStore.productStoreId, carrierPartyId:carrierPartyId,
+                                        shipmentMethodEnumId:shipmentMethodEnumId]"/>
+
+                <set field="markupAmount" from="markupOut?.markupAmount ?: 0.0"/>
+                <set field="markupMultiplier" from="markupOut?.markupMultiplier ?: 0.0"/>
+
+                <if condition="(markupMultiplier != 0.0 || markupAmount != 0.0)">
+                    <if condition="shippingTotal">
+                        <set field="shippingTotal" from="shippingTotal + markupAmount +
+                            (markupMultiplier as BigDecimal).multiply(shippingTotal).setScale(2, BigDecimal.ROUND_HALF_UP)"/>
+                    </if>
+                    <!-- if an OrderItem was created update it too -->
+                    <if condition="createOrderItem">
+                        <entity-find entity-name="mantle.order.OrderItem" list="shippingItemList">
+                            <econdition field-name="orderId"/><econdition field-name="orderPartSeqId"/>
+                            <econdition field-name="itemTypeEnumId" value="ItemShipping"/>
+                        </entity-find>
+                        <iterate list="shippingItemList" entry="shippingItem">
+                            <if condition="shippingItem.unitAmount">
+                                <set field="shippingItem.standardCost" from="shippingItem.unitAmount"/>
+                                <set field="shippingItem.unitAmount" from="shippingItem.unitAmount + markupAmount +
+                                    (markupMultiplier as BigDecimal).multiply(shippingItem.unitAmount).setScale(2, BigDecimal.ROUND_HALF_UP)"/>
+                                <entity-update value-field="shippingItem"/>
+                            </if>
+                        </iterate>
+                    </if>
+                </if>
+            </if>
         </actions>
     </service>
     <service verb="get" noun="OrderShippingRatesBulk">
@@ -398,6 +435,7 @@ along with this software (see the LICENSE.md file). If not, see
             <if condition="!productStoreId"><return/></if>
 
             <entity-find-one entity-name="mantle.order.OrderPart" value-field="orderPart"/>
+            <entity-find-one entity-name="mantle.product.store.ProductStore" value-field="productStore" cache="true"/>
 
             <!-- if no options requested get all on store -->
             <if condition="!carrierShipmentMethodList">
@@ -421,7 +459,7 @@ along with this software (see the LICENSE.md file). If not, see
                 <if condition="shippingGatewayConfig == null"><continue/></if>
                 <!-- <log level="warn" message="shippingGatewayConfigId ${shippingGatewayConfigId} carrierPartyIdSet ${carrierPartyIdSet}"/> -->
 
-                <!-- if both single and bulk services configured send _NA_ to single only (bulk typically through carrier integration, _NA_ is independent of carrier -->
+                <!-- if both single and bulk services configured send _NA_ to single only (bulk typically through carrier integration, _NA_ is independent of carrier) -->
                 <set field="otherCarrierMethodList" from="carrierShipmentMethodList.findAll({ it.carrierPartyId != '_NA_' &amp;&amp; it.carrierPartyId in carrierPartyIdSet })"/>
                 <set field="naCarrierMethodList" from="carrierShipmentMethodList.findAll({ it.carrierPartyId == '_NA_' &amp;&amp; it.carrierPartyId in carrierPartyIdSet })"/>
                 <if condition="shippingGatewayConfig.getShippingRatesBulkName &amp;&amp; shippingGatewayConfig.getOrderRateServiceName"><then>
@@ -472,7 +510,25 @@ along with this software (see the LICENSE.md file). If not, see
                                     fromPartyId:fromPartyId, toPartyId:toPartyId, originFacilityId:originFacilityId,
                                     originPostalContactMechId:facOriginOut.postalContactMechId,
                                     destPostalContactMechId:destPostalContactMechId, packageInfoList:packageInfoList]"/>
-                    <script>if (bulkOut.shippingRateInfoList) shippingRateInfoList.addAll(bulkOut.shippingRateInfoList)</script>
+                    <iterate list="bulkOut.shippingRateInfoList" entry="shippingRateInfo">
+                        <if condition="productStore?.markupOrderShipLabels == 'Y'">
+                            <service-call name="mantle.shipment.CarrierServices.get#ShipLabelMarkup" out-map="markupOut" out-map-add-to-existing="false"
+                                    in-map="[productStoreId:productStore.productStoreId, carrierPartyId:shippingRateInfo.carrierPartyId,
+                                        shipmentMethodEnumId:shippingRateInfo.shipmentMethodEnumId]"/>
+
+                            <set field="markupAmount" from="markupOut?.markupAmount ?: 0.0"/>
+                            <set field="markupMultiplier" from="markupOut?.markupMultiplier ?: 0.0"/>
+
+                            <if condition="(markupMultiplier != 0.0 || markupAmount != 0.0) &amp;&amp; shippingRateInfo.shippingTotal">
+                                <set field="shippingRateInfo.shippingTotal" from="shippingRateInfo.shippingTotal + markupAmount +
+                                    (markupMultiplier as BigDecimal).multiply(shippingRateInfo.shippingTotal).setScale(2, BigDecimal.ROUND_HALF_UP)"/>
+                            </if>
+                        </if>
+
+                        <script>shippingRateInfoList.add(shippingRateInfo)</script>
+                    </iterate>
+
+
                     <if condition="!postalContactMechId &amp;&amp; bulkOut.destPostalContactMechId &amp;&amp; bulkOut.destPostalContactMechId != orderPart.postalContactMechId">
                         <set field="orderPart.postalContactMechId" from="bulkOut.destPostalContactMechId"/>
                         <!-- use entity auto service to update postalContactMechId (and ONLY postalContactMechId) -->
@@ -498,6 +554,7 @@ along with this software (see the LICENSE.md file). If not, see
         </actions>
     </service>
 
+    <!-- not implemented and likely not needed, bulk rates better:
     <service verb="get" noun="ShipmentRates">
         <description>Get a rate quote for each package in a shipment</description>
         <in-parameters>
@@ -505,9 +562,9 @@ along with this software (see the LICENSE.md file). If not, see
             <parameter name="shipmentRouteSegmentSeqId"><description>Defaults to the first route segment</description></parameter>
         </in-parameters>
         <actions>
-            <!-- TODO (FUTURE) -->
         </actions>
     </service>
+    -->
 
     <!-- ========================================= -->
     <!-- Shipping Label Services (called directly) -->
@@ -536,49 +593,103 @@ along with this software (see the LICENSE.md file). If not, see
             <!-- if Shipment has productStoreId and store has a label markup setting apply it now -->
             <entity-find-one entity-name="mantle.shipment.Shipment" value-field="shipment"/>
             <if condition="shipment.productStoreId">
-                <entity-find entity-name="mantle.product.store.ProductStoreSetting" list="labelMarkupSettingList" cache="true">
-                    <date-filter/>
-                    <econdition field-name="productStoreId" from="shipment.productStoreId"/>
-                    <econdition field-name="settingTypeEnumId" value="PsstShipLabelMarkup"/>
-                    <order-by field-name="-fromDate"/>
+                <entity-find-one entity-name="mantle.product.store.ProductStore" value-field="productStore" cache="true">
+                    <field-map field-name="productStoreId" from="shipment.productStoreId"/></entity-find-one>
+            </if>
+            <if condition="productStore?.markupShipmentShipLabels == 'Y'">
+                <entity-find entity-name="mantle.shipment.ShipmentRouteSegment" list="srsList">
+                    <econdition field-name="shipmentId"/>
+                    <econdition field-name="shipmentRouteSegmentSeqId" ignore-if-empty="true"/>
                 </entity-find>
-                <set field="labelMarkupValue" from="labelMarkupSettingList ? labelMarkupSettingList[0]?.settingValue : null"/>
-                <if condition="labelMarkupValue &amp;&amp; !labelMarkupValue.isBigDecimal()">
-                    <log level="error" message="Shipping Label Markup not a valid number ${labelMarkupValue} for store ${shipment.productStoreId}"/></if>
-                <set field="labelMarkupBd" from="labelMarkupValue &amp;&amp; labelMarkupValue.isBigDecimal() ?
-                        new BigDecimal(labelMarkupValue).divide(100.0, 4, BigDecimal.ROUND_HALF_UP) : 0.0"/>
-                <if condition="labelMarkupBd">
-                    <entity-find entity-name="mantle.shipment.ShipmentPackageRouteSeg" list="packageRouteSegList">
-                        <econdition field-name="shipmentId"/>
-                        <econdition field-name="shipmentPackageSeqId" ignore-if-empty="true"/>
-                        <econdition field-name="shipmentRouteSegmentSeqId" ignore-if-empty="true"/>
-                    </entity-find>
-                    <iterate list="packageRouteSegList" entry="packageRouteSeg">
-                        <!-- normalize and calc MAIN label amounts -->
-                        <if condition="packageRouteSeg.estimatedAmount == null &amp;&amp; packageRouteSeg.baseAmount != null">
-                            <set field="packageRouteSeg.estimatedAmount" from="packageRouteSeg.baseAmount"/></if>
-                        <if condition="packageRouteSeg.estimatedAmount != null">
-                            <if condition="packageRouteSeg.baseAmount == null">
-                                <set field="packageRouteSeg.baseAmount" from="packageRouteSeg.estimatedAmount"/></if>
-                            <set field="packageRouteSeg.estimatedAmount"
-                                    from="packageRouteSeg.baseAmount + (labelMarkupBd as BigDecimal).multiply(packageRouteSeg.baseAmount).setScale(2, BigDecimal.ROUND_HALF_UP)"/>
-                        </if>
-                        <!-- normalize and calc RETURN label amounts -->
-                        <if condition="packageRouteSeg.returnEstimatedAmount == null &amp;&amp; packageRouteSeg.returnBaseAmount != null">
-                            <set field="packageRouteSeg.returnEstimatedAmount" from="packageRouteSeg.returnBaseAmount"/></if>
-                        <if condition="packageRouteSeg.returnEstimatedAmount != null">
-                            <if condition="packageRouteSeg.returnBaseAmount == null">
-                                <set field="packageRouteSeg.returnBaseAmount" from="packageRouteSeg.returnEstimatedAmount"/></if>
-                            <set field="packageRouteSeg.returnEstimatedAmount"
-                                    from="packageRouteSeg.returnBaseAmount + (labelMarkupBd as BigDecimal).multiply(packageRouteSeg.returnBaseAmount).setScale(2, BigDecimal.ROUND_HALF_UP)"/>
-                        </if>
-                        <!-- save it -->
-                        <entity-update value-field="packageRouteSeg"/>
-                    </iterate>
-                </if>
+                <entity-find entity-name="mantle.shipment.ShipmentPackageRouteSeg" list="allPackageRouteSegList">
+                    <econdition field-name="shipmentId"/>
+                    <econdition field-name="shipmentPackageSeqId" ignore-if-empty="true"/>
+                </entity-find>
+
+                <iterate list="srsList" entry="routeSegment">
+                    <service-call name="mantle.shipment.CarrierServices.get#ShipLabelMarkup" out-map="markupOut" out-map-add-to-existing="false"
+                            in-map="[productStoreId:productStore.productStoreId, carrierPartyId:routeSegment.carrierPartyId, shipmentMethodEnumId:routeSegment.shipmentMethodEnumId]"/>
+                    <set field="markupAmount" from="markupOut?.markupAmount ?: 0.0"/>
+                    <set field="markupMultiplier" from="markupOut?.markupMultiplier ?: 0.0"/>
+
+                    <if condition="markupMultiplier != 0.0 || markupAmount != 0.0">
+                        <filter-map-list list="allPackageRouteSegList" to-list="packageRouteSegList">
+                            <field-map field-name="shipmentRouteSegmentSeqId" from="routeSegment.shipmentRouteSegmentSeqId"/></filter-map-list>
+                        <iterate list="packageRouteSegList" entry="packageRouteSeg">
+                            <!-- normalize and calc MAIN label amounts -->
+                            <if condition="packageRouteSeg.estimatedAmount != null || packageRouteSeg.baseAmount != null">
+                                <if condition="packageRouteSeg.estimatedAmount == null">
+                                    <set field="packageRouteSeg.estimatedAmount" from="packageRouteSeg.baseAmount"/></if>
+                                <if condition="packageRouteSeg.baseAmount == null">
+                                    <set field="packageRouteSeg.baseAmount" from="packageRouteSeg.estimatedAmount"/></if>
+                                <set field="packageRouteSeg.estimatedAmount" from="packageRouteSeg.baseAmount + markupAmount +
+                                        (markupMultiplier as BigDecimal).multiply(packageRouteSeg.baseAmount).setScale(2, BigDecimal.ROUND_HALF_UP)"/>
+                            </if>
+                            <!-- normalize and calc RETURN label amounts -->
+                            <if condition="packageRouteSeg.returnEstimatedAmount != null || packageRouteSeg.returnBaseAmount != null">
+                                <if condition="packageRouteSeg.returnEstimatedAmount == null">
+                                    <set field="packageRouteSeg.returnEstimatedAmount" from="packageRouteSeg.returnBaseAmount"/></if>
+                                <if condition="packageRouteSeg.returnBaseAmount == null">
+                                    <set field="packageRouteSeg.returnBaseAmount" from="packageRouteSeg.returnEstimatedAmount"/></if>
+                                <set field="packageRouteSeg.returnEstimatedAmount" from="packageRouteSeg.returnBaseAmount + markupAmount +
+                                        (markupMultiplier as BigDecimal).multiply(packageRouteSeg.returnBaseAmount).setScale(2, BigDecimal.ROUND_HALF_UP)"/>
+                            </if>
+                            <!-- save it -->
+                            <entity-update value-field="packageRouteSeg"/>
+                        </iterate>
+                    </if>
+                </iterate>
             </if>
         </actions>
     </service>
+    <service verb="get" noun="ShipLabelMarkup">
+        <in-parameters>
+            <parameter name="productStoreId" required="true"/>
+            <parameter name="carrierPartyId" required="true"/>
+            <parameter name="shipmentMethodEnumId" required="true"/>
+            <parameter name="baseAmount" type="BigDecimal"><description>If specified will use to calculate markedUpAmount</description></parameter>
+        </in-parameters>
+        <out-parameters>
+            <parameter name="markupAmount" type="BigDecimal"/>
+            <parameter name="markupPercent" type="BigDecimal"/>
+            <parameter name="markupMultiplier" type="BigDecimal"/>
+            <parameter name="markedUpAmount" type="BigDecimal"/>
+        </out-parameters>
+        <actions>
+            <entity-find entity-name="mantle.product.store.ProductStoreSetting" list="labelMarkupSettingList" cache="true">
+                <econdition field-name="productStoreId"/>
+                <econdition field-name="settingTypeEnumId" value="PsstShipLabelMarkup"/>
+                <date-filter/>
+                <order-by field-name="-fromDate"/>
+            </entity-find>
+            <set field="labelMarkupValue" from="labelMarkupSettingList ? labelMarkupSettingList[0]?.settingValue : null"/>
+            <if condition="labelMarkupValue &amp;&amp; !labelMarkupValue.isBigDecimal()">
+                <log level="error" message="Shipping Label Markup not a valid number ${labelMarkupValue} for store ${shipment.productStoreId}"/></if>
+            <set field="labelMarkupPercent" from="labelMarkupValue &amp;&amp; labelMarkupValue.isBigDecimal() ?
+                        new BigDecimal(labelMarkupValue) : null"/>
+
+            <entity-find-one entity-name="mantle.product.store.ProductStoreShipOption" value-field="productStoreShipOption" cache="true">
+                <field-map field-name="productStoreId"/>
+                <field-map field-name="carrierPartyId"/>
+                <field-map field-name="shipmentMethodEnumId"/>
+            </entity-find-one>
+            <if condition="productStoreShipOption?.markupPercent != null || productStoreShipOption?.markupAmount != null"><then>
+                <set field="markupPercent" from="productStoreShipOption.markupPercent ?: 0.0"/>
+                <set field="markupAmount" from="productStoreShipOption.markupAmount ?: 0.0"/>
+            </then><else>
+                <set field="markupPercent" from="labelMarkupPercent ?: 0.0"/>
+                <set field="markupAmount" from="0.0"/>
+            </else></if>
+
+            <set field="markupMultiplier" from="markupPercent ? markupPercent.divide(100.0, 4, BigDecimal.ROUND_HALF_UP) : 0.0"/>
+
+            <if condition="baseAmount != null">
+                <set field="markedUpAmount" from="baseAmount + markupAmount +
+                    (markupMultiplier as BigDecimal).multiply(baseAmount).setScale(2, BigDecimal.ROUND_HALF_UP)"/>
+            </if>
+        </actions>
+    </service>
+
     <service verb="refund" noun="ShipmentLabels">
         <in-parameters>
             <parameter name="shipmentId" required="true"/>
diff --git a/service/mantle/shipment/ShipmentInfoServices.xml b/service/mantle/shipment/ShipmentInfoServices.xml
index a8174674..49a046d8 100644
--- a/service/mantle/shipment/ShipmentInfoServices.xml
+++ b/service/mantle/shipment/ShipmentInfoServices.xml
@@ -447,19 +447,9 @@ along with this software (see the LICENSE.md file). If not, see
                 <!-- <log message="getting rates origin ${originPostalContactMechId} dest ${routeSegment.destPostalContactMechId} packageList ${packageList} carriersByGateway ${carriersByGateway}"/> -->
                 <if condition="packageList &amp;&amp; originPostalContactMechId &amp;&amp; routeSegment.destPostalContactMechId">
                     <!-- if Shipment.productStoreId and store has a label markup setting prep it here -->
-                    <set field="labelMarkupBd" from="0.0"/>
                     <if condition="shipment.productStoreId">
-                        <entity-find entity-name="mantle.product.store.ProductStoreSetting" list="labelMarkupSettingList" cache="true">
-                            <date-filter/>
-                            <econdition field-name="productStoreId" from="shipment.productStoreId"/>
-                            <econdition field-name="settingTypeEnumId" value="PsstShipLabelMarkup"/>
-                            <order-by field-name="-fromDate"/>
-                        </entity-find>
-                        <set field="labelMarkupValue" from="labelMarkupSettingList ? labelMarkupSettingList[0]?.settingValue : null"/>
-                        <if condition="labelMarkupValue &amp;&amp; !labelMarkupValue.isBigDecimal()">
-                            <log level="error" message="Shipping Label Markup not a valid number ${labelMarkupValue} for store ${shipment.productStoreId}"/></if>
-                        <set field="labelMarkupBd" from="labelMarkupValue &amp;&amp; labelMarkupValue.isBigDecimal() ?
-                                new BigDecimal(labelMarkupValue).divide(100.0, 4, BigDecimal.ROUND_HALF_UP) : 0.0"/>
+                        <entity-find-one entity-name="mantle.product.store.ProductStore" value-field="productStore" cache="true">
+                            <field-map field-name="productStoreId" from="shipment.productStoreId"/></entity-find-one>
                     </if>
 
                     <!-- iterate over shipping gateways and get rates from each -->
@@ -488,9 +478,17 @@ along with this software (see the LICENSE.md file). If not, see
                             <iterate list="shipOptionList" entry="shipOption">
                                 <set field="shippingRateInfo" from="shippingRateInfoList.find({ it.carrierPartyId == shipOption.carrierPartyId &amp;&amp; it.shipmentMethodEnumId == shipOption.shipmentMethodEnumId })"/>
                                 <if condition="shippingRateInfo != null"><then>
-                                    <if condition="labelMarkupBd &amp;&amp; shippingRateInfo.shippingTotal">
-                                        <set field="shippingRateInfo.shippingTotal"
-                                                from="shippingRateInfo.shippingTotal + (labelMarkupBd as BigDecimal).multiply(shippingRateInfo.shippingTotal).setScale(2, BigDecimal.ROUND_HALF_UP)"/>
+                                    <if condition="productStore?.markupShipmentShipLabels == 'Y'">
+                                        <service-call name="mantle.shipment.CarrierServices.get#ShipLabelMarkup" out-map="markupOut" out-map-add-to-existing="false"
+                                                in-map="[productStoreId:productStore.productStoreId, carrierPartyId:shippingRateInfo.carrierPartyId,
+                                                    shipmentMethodEnumId:shippingRateInfo.shipmentMethodEnumId]"/>
+                                    </if>
+                                    <set field="markupAmount" from="markupOut?.markupAmount ?: 0.0"/>
+                                    <set field="markupMultiplier" from="markupOut?.markupMultiplier ?: 0.0"/>
+
+                                    <if condition="(markupMultiplier != 0.0 || markupAmount != 0.0) &amp;&amp; shippingRateInfo.shippingTotal">
+                                        <set field="shippingRateInfo.shippingTotal" from="shippingRateInfo.shippingTotal + markupAmount +
+                                                (markupMultiplier as BigDecimal).multiply(shippingRateInfo.shippingTotal).setScale(2, BigDecimal.ROUND_HALF_UP)"/>
                                     </if>
 
                                     <script>newShipOptionList.add(shippingRateInfo)</script>

From ee79cdcc521a343aae02d1c3ca8a9486e2e344ee Mon Sep 17 00:00:00 2001
From: David E Jones <dej@dejc.com>
Date: Fri, 1 May 2020 02:34:36 -0700
Subject: [PATCH 29/37] Add UserPreferenceKey data for options to markup label
 price for shipments and orders, support in services

---
 data/MantleSetupData.xml                         | 3 +++
 service/mantle/shipment/CarrierServices.xml      | 6 +++---
 service/mantle/shipment/ShipmentInfoServices.xml | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/data/MantleSetupData.xml b/data/MantleSetupData.xml
index f0b16853..65feb7f7 100644
--- a/data/MantleSetupData.xml
+++ b/data/MantleSetupData.xml
@@ -42,6 +42,9 @@ along with this software (see the LICENSE.md file). If not, see
     <userPermissions userPermissionId="TIME_ENTRY_RATE" description="Time Entry Rate Override"/>
     <userGroupPermissions userGroupId="ADMIN" userPermissionId="TIME_ENTRY_RATE" fromDate="0"/>
 
+    <moqui.basic.Enumeration enumId="AllStoresMarkupLabelShipment" description="All Product Stores Markup Shipment Labels (set to 'true')" enumTypeId="UserPreferenceKey"/>
+    <moqui.basic.Enumeration enumId="AllStoresMarkupLabelOrder" description="All Product Stores Markup Order Shipping (set to 'true')" enumTypeId="UserPreferenceKey"/>
+
     <!-- Configuration for Internal Financial Account Payment Processing -->
     <moqui.basic.Enumeration description="Financial Account" enumId="PgtFinancialAccount" enumTypeId="PaymentGatewayType"/>
     <mantle.account.method.PaymentGatewayConfig paymentGatewayConfigId="FinancialAccountLocal"
diff --git a/service/mantle/shipment/CarrierServices.xml b/service/mantle/shipment/CarrierServices.xml
index aee3365a..0151b9bd 100644
--- a/service/mantle/shipment/CarrierServices.xml
+++ b/service/mantle/shipment/CarrierServices.xml
@@ -374,7 +374,7 @@ along with this software (see the LICENSE.md file). If not, see
             <!-- call gateway (could be local) service to calculate shipping charges -->
             <service-call name="${getOrderRateServiceName}" in-map="context" out-map="context"/>
 
-            <if condition="productStore?.markupOrderShipLabels == 'Y'">
+            <if condition="productStore?.markupOrderShipLabels == 'Y' || ec.user.getPreference('AllStoresMarkupLabelOrder') == 'true'">
                 <service-call name="mantle.shipment.CarrierServices.get#ShipLabelMarkup" out-map="markupOut" out-map-add-to-existing="false"
                         in-map="[productStoreId:productStore.productStoreId, carrierPartyId:carrierPartyId,
                                         shipmentMethodEnumId:shipmentMethodEnumId]"/>
@@ -511,7 +511,7 @@ along with this software (see the LICENSE.md file). If not, see
                                     originPostalContactMechId:facOriginOut.postalContactMechId,
                                     destPostalContactMechId:destPostalContactMechId, packageInfoList:packageInfoList]"/>
                     <iterate list="bulkOut.shippingRateInfoList" entry="shippingRateInfo">
-                        <if condition="productStore?.markupOrderShipLabels == 'Y'">
+                        <if condition="productStore?.markupOrderShipLabels == 'Y' || ec.user.getPreference('AllStoresMarkupLabelOrder') == 'true'">
                             <service-call name="mantle.shipment.CarrierServices.get#ShipLabelMarkup" out-map="markupOut" out-map-add-to-existing="false"
                                     in-map="[productStoreId:productStore.productStoreId, carrierPartyId:shippingRateInfo.carrierPartyId,
                                         shipmentMethodEnumId:shippingRateInfo.shipmentMethodEnumId]"/>
@@ -596,7 +596,7 @@ along with this software (see the LICENSE.md file). If not, see
                 <entity-find-one entity-name="mantle.product.store.ProductStore" value-field="productStore" cache="true">
                     <field-map field-name="productStoreId" from="shipment.productStoreId"/></entity-find-one>
             </if>
-            <if condition="productStore?.markupShipmentShipLabels == 'Y'">
+            <if condition="productStore?.markupShipmentShipLabels == 'Y' || ec.user.getPreference('AllStoresMarkupLabelShipment') == 'true'">
                 <entity-find entity-name="mantle.shipment.ShipmentRouteSegment" list="srsList">
                     <econdition field-name="shipmentId"/>
                     <econdition field-name="shipmentRouteSegmentSeqId" ignore-if-empty="true"/>
diff --git a/service/mantle/shipment/ShipmentInfoServices.xml b/service/mantle/shipment/ShipmentInfoServices.xml
index 49a046d8..78339fd1 100644
--- a/service/mantle/shipment/ShipmentInfoServices.xml
+++ b/service/mantle/shipment/ShipmentInfoServices.xml
@@ -478,7 +478,7 @@ along with this software (see the LICENSE.md file). If not, see
                             <iterate list="shipOptionList" entry="shipOption">
                                 <set field="shippingRateInfo" from="shippingRateInfoList.find({ it.carrierPartyId == shipOption.carrierPartyId &amp;&amp; it.shipmentMethodEnumId == shipOption.shipmentMethodEnumId })"/>
                                 <if condition="shippingRateInfo != null"><then>
-                                    <if condition="productStore?.markupShipmentShipLabels == 'Y'">
+                                    <if condition="productStore?.markupShipmentShipLabels == 'Y' || ec.user.getPreference('AllStoresMarkupLabelShipment') == 'true'">
                                         <service-call name="mantle.shipment.CarrierServices.get#ShipLabelMarkup" out-map="markupOut" out-map-add-to-existing="false"
                                                 in-map="[productStoreId:productStore.productStoreId, carrierPartyId:shippingRateInfo.carrierPartyId,
                                                     shipmentMethodEnumId:shippingRateInfo.shipmentMethodEnumId]"/>

From d27590e0117cada43a277e0584ce9b9b7fb158f2 Mon Sep 17 00:00:00 2001
From: David E Jones <dej@dejc.com>
Date: Tue, 5 May 2020 16:21:23 -0700
Subject: [PATCH 30/37] Use smaller bank size of 10 for IDs for tasks within a
 project

---
 service/mantle/work/TaskServices.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/service/mantle/work/TaskServices.xml b/service/mantle/work/TaskServices.xml
index 404f4e6a..008b31ba 100644
--- a/service/mantle/work/TaskServices.xml
+++ b/service/mantle/work/TaskServices.xml
@@ -121,7 +121,7 @@ along with this software (see the LICENSE.md file). If not, see
         <actions>
             <if condition="!workEffortId &amp;&amp; rootWorkEffortId">
                 <set field="seqName" value="Project_${rootWorkEffortId}"/>
-                <set field="workEffortId" value="${rootWorkEffortId}-${ec.entity.sequencedIdPrimary(seqName, null, null)}"/>
+                <set field="workEffortId" value="${rootWorkEffortId}-${ec.entity.sequencedIdPrimary(seqName, null, 10)}"/>
             </if>
             <service-call name="create#mantle.work.effort.WorkEffort" out-map="context" in-map="context + [workEffortTypeEnumId:'WetTask']"/>
             <if condition="assignToPartyId">

From 8d2ab263eea58dee8521249ff5a78ff5ac87399c Mon Sep 17 00:00:00 2001
From: David E Jones <dej@dejc.com>
Date: Wed, 6 May 2020 18:01:13 -0700
Subject: [PATCH 31/37] In store#TimeEntry service add constraint that if
 fromDate and thruDate are specified fromDate must be before thruDate, cleanup
 up some weird old logic for hours to only calc if null

---
 service/mantle/work/TimeServices.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/service/mantle/work/TimeServices.xml b/service/mantle/work/TimeServices.xml
index 7ac6f771..53cc32a1 100644
--- a/service/mantle/work/TimeServices.xml
+++ b/service/mantle/work/TimeServices.xml
@@ -69,8 +69,12 @@ along with this software (see the LICENSE.md file). If not, see
             <if condition="hours &amp;&amp; !fromDate &amp;&amp; thruDate">
                 <set field="fromDate" from="new Timestamp((Long) (thruDate.time - (hours*60*60*1000) - (breakHours ? (breakHours*60*60*1000) : 0)))"/>
             </if>
+
+            <if condition="fromDate &amp;&amp; thruDate &amp;&amp; fromDate &gt; thruDate">
+                <return error="true" message="From date ${fromDate} is after thru date ${thruDate}"/></if>
+
             <!-- calculate hours using fromDate/thruDate/breakHours -->
-            <if condition="!hours &amp;&amp; hours != 0 &amp;&amp; fromDate &amp;&amp; thruDate">
+            <if condition="hours == null &amp;&amp; fromDate &amp;&amp; thruDate">
                 <set field="hours" from="((thruDate.time - fromDate.time)/(60*60*1000)) - (breakHours ?: 0)"/>
             </if>
 

From 26ccced2f19e764cf7e0108c304385a699fd89c2 Mon Sep 17 00:00:00 2001
From: David E Jones <dej@dejc.com>
Date: Fri, 8 May 2020 12:19:10 -0700
Subject: [PATCH 32/37] In check#OrderPreApprove service before looking for
 grey- and black-listed addresses make sure current address has a value for
 address1 which is required by the DuplicateServices.find#PostalAddresses
 service, and if no value add a different warning and don't call the service
 as it will result in an error

---
 service/mantle/order/OrderInfoServices.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/service/mantle/order/OrderInfoServices.xml b/service/mantle/order/OrderInfoServices.xml
index 8a6ec41a..f151b085 100644
--- a/service/mantle/order/OrderInfoServices.xml
+++ b/service/mantle/order/OrderInfoServices.xml
@@ -779,6 +779,11 @@ along with this software (see the LICENSE.md file). If not, see
                         <if condition="'CmtlGreylisted' == addr.trustLevelEnumId">
                             <script>approveWarnings.add(ec.resource.expand('Shipping address ${addr.address1}, ${addr.postalCode} is greylisted', null))</script><continue/></if>
                         -->
+                        <if condition="!addr?.address1">
+                            <script>approveWarnings.add(ec.resource.expand('Shipping address ${addr?.contactMechId} has no Address 1 line', null))</script>
+                            <continue/>
+                        </if>
+
                         <!-- if current address not black/greylisted then look for others in system (generally more likely/useful) -->
                         <service-call name="mantle.party.DuplicateServices.find#PostalAddresses" out-map="blacklistAddrOut" out-map-add-to-existing="false"
                                 in-map="[partyId:customerPartyId, address1:addr.address1, unitNumber:addr.unitNumber, postalCode:addr.postalCode,

From ae4543229ba80c477ef394a879de2f54b03ec5d4 Mon Sep 17 00:00:00 2001
From: Daniel Taylor <daniel@danieltaylor.co.nz>
Date: Sat, 9 May 2020 11:27:57 -0500
Subject: [PATCH 33/37] Fixing typo that I saw after merging PR#152

---
 service/mantle/party/CommunicationServices.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/service/mantle/party/CommunicationServices.xml b/service/mantle/party/CommunicationServices.xml
index b3d8f2fe..a6c79f23 100644
--- a/service/mantle/party/CommunicationServices.xml
+++ b/service/mantle/party/CommunicationServices.xml
@@ -113,7 +113,7 @@ along with this software (see the LICENSE.md file). If not, see
         </in-parameters>
         <out-parameters>
             <parameter name="contentLocation"/>
-            <parameter name="communicationEvenContent"/>
+            <parameter name="communicationEventContent"/>
         </out-parameters>
         <actions>
             <iterate list="contentTypeEnumIdList" entry="contentTypeEnumId">
@@ -121,11 +121,11 @@ along with this software (see the LICENSE.md file). If not, see
                     <econdition field-name="communicationEventId"/><econdition field-name="contentTypeEnumId"/>
                     <order-by field-name="-contentDate"/></entity-find>
                 <if condition="commEventContentList">
-                    <set field="communicationEvenContent" from="commEventContentList[0]"/>
+                    <set field="communicationEventContent" from="commEventContentList[0]"/>
                     <break/>
                 </if>
             </iterate>
-            <set field="contentLocation" from="communicationEvenContent ? communicationEvenContent.contentLocation : null"/>
+            <set field="contentLocation" from="communicationEventContent ? communicationEventContent.contentLocation : null"/>
         </actions>
     </service>
 
@@ -153,9 +153,9 @@ along with this software (see the LICENSE.md file). If not, see
         </in-parameters>
         <actions>
             <if condition="contentFile != null &amp;&amp; contentFile.size &gt; 0">
-                <entity-find-one entity-name="mantle.party.communication.CommunicationEventContent" value-field="communicationEvenContent"/>
+                <entity-find-one entity-name="mantle.party.communication.CommunicationEventContent" value-field="communicationEventContent"/>
                 <service-call name="mantle.party.CommunicationServices.save#CommunicationEventContentFile" out-map="context"
-                              in-map="context + [communicationEventId:communicationEvenContent.communicationEventId, saveContentLocation:false]"/>
+                              in-map="context + [communicationEventId:communicationEventContent.communicationEventId, saveContentLocation:false]"/>
             </if>
             <service-call name="update#mantle.party.communication.CommunicationEventContent" in-map="context"/>
         </actions>

From 35917fb37abf4b7d8b276b620df722d12394db9c Mon Sep 17 00:00:00 2001
From: Daniel Taylor <daniel@danieltaylor.co.nz>
Date: Fri, 8 May 2020 15:53:54 -0500
Subject: [PATCH 34/37] Fixed missing customerPartyId and ownerPartyId in
 OrderItemSalesSummary and OrderItemShipBillSummary

---
 entity/OrderViewEntities.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/entity/OrderViewEntities.xml b/entity/OrderViewEntities.xml
index 9df3d129..9f345d1e 100644
--- a/entity/OrderViewEntities.xml
+++ b/entity/OrderViewEntities.xml
@@ -312,6 +312,7 @@ along with this software (see the LICENSE.md file). If not, see
         <alias entity-alias="PROD" name="amountUomId"/>
         <alias entity-alias="PROD" name="amountFixed"/>
         <alias entity-alias="PROD" name="productTypeEnumId"/>
+        <alias entity-alias="PROD" name="ownerPartyId"/>
         <alias entity-alias="OITM" name="orderId"/><!-- for a summary report this shouldn't be selected -->
         <alias entity-alias="OITM" name="productId"/>
         <alias entity-alias="OITM" name="itemTypeEnumId"/>
@@ -329,6 +330,7 @@ along with this software (see the LICENSE.md file). If not, see
         <alias name="vendorRoleTypeId" entity-alias="VNDRL" field="roleTypeId"/>
         <alias name="partStatusId" entity-alias="OPRT" field="statusId"/>
         <alias name="vendorPartyId" entity-alias="OPRT"/>
+        <alias name="customerPartyId" entity-alias="OPRT"/>
         <alias name="orderStatusId" entity-alias="OHDR" field="statusId"/>
         <alias name="placedDate" entity-alias="OHDR"/>
         <alias name="productStoreId" entity-alias="OHDR"/>
@@ -397,7 +399,7 @@ along with this software (see the LICENSE.md file). If not, see
         <alias name="vendorRoleTypeId" entity-alias="VNDRL" field="roleTypeId"/>
         <alias name="pseudoId" entity-alias="PROD"/>
         <alias name="productName" entity-alias="PROD"/>
-
+        <alias name="ownerPartyId" entity-alias="PROD"/>
         <alias name="issuedQuantity" entity-alias="ASI" field="quantity" function="sum"/>
         <alias name="billedQuantity" entity-alias="OIB" field="quantity" function="sum"/>
     </view-entity>

From aebdf54286b71db49429cfcfb113c86ba26695d2 Mon Sep 17 00:00:00 2001
From: Hans Bakker <h.bakker@antwebsystems.com>
Date: Fri, 29 May 2020 08:27:14 +0700
Subject: [PATCH 35/37] add retrieval of vendor logo at packsheet

---
 service/mantle/shipment/ShipmentInfoServices.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/service/mantle/shipment/ShipmentInfoServices.xml b/service/mantle/shipment/ShipmentInfoServices.xml
index 78339fd1..8101101d 100644
--- a/service/mantle/shipment/ShipmentInfoServices.xml
+++ b/service/mantle/shipment/ShipmentInfoServices.xml
@@ -355,6 +355,10 @@ along with this software (see the LICENSE.md file). If not, see
                         in-map="[partyId:toPartyId, postalContactMechPurposeId:'PostalShippingDest',
                             telecomContactMechPurposeId:'PhoneShippingDest', emailContactMechPurposeId:'EmailShippingDest']"/>
             </if>
+            <!-- get logo of vendor for PDF -->
+            <service-call name="mantle.party.PartyServices.get#PartyContentLocation" out-map="logoImageOut"
+                    in-map="[partyId:fromPartyId, partyContentTypeEnumIdList:['PcntLogoImage', 'PcntPrimaryImage']]"/>
+            <set field="logoImageLocation" from="logoImageOut.contentLocation"/>
         </actions>
     </service>
     <service verb="get" noun="ShipmentShippingOptions">
@@ -758,6 +762,7 @@ along with this software (see the LICENSE.md file). If not, see
             <parameter name="otherLocationInfoMap" type="Map"/>
             <parameter name="productInfoMap" type="Map"/>
 
+            <parameter name="logoImageLocation"/>
             <parameter name="templateLocation"><description>If templateSettingSuffix specified this is looked up from
                 ProductStoreSetting and if no setting found for store then from PartySetting.</description></parameter>
         </out-parameters>

From c589caa3d5c06eeff8b66bc05d1008e720c4526d Mon Sep 17 00:00:00 2001
From: Hans Bakker <h.bakker@antwebsystems.com>
Date: Sat, 6 Jun 2020 10:26:24 +0700
Subject: [PATCH 36/37] change invoice print service to add panels

---
 service/mantle/account/InvoiceServices.xml | 54 ++++++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/service/mantle/account/InvoiceServices.xml b/service/mantle/account/InvoiceServices.xml
index 957c87cb..e1a0abe1 100644
--- a/service/mantle/account/InvoiceServices.xml
+++ b/service/mantle/account/InvoiceServices.xml
@@ -381,6 +381,57 @@ along with this software (see the LICENSE.md file). If not, see
                 <econdition field-name="isAdjustment" value="N" or-null="true"/>
                 <order-by field-name="invoiceItemSeqId"/>
             </entity-find>
+            <entity-find entity-name="accugeo.order.InvoiceItemAndOrderPanel" list="orderPanels">
+                <econdition field-name="invoiceId"/>
+            </entity-find>
+            <if condition="orderPanels">
+                <log message="=====1=====orderpanels: ${orderPanels.size()}"/>
+                <log message="=====1=====invoiceitemList: ${invoiceItemList.size()}"/>
+                <log message="=====1=====invoiceitemList: ${invoiceItemList}"/>
+                <set field="index" value="0" type="Integer"/>
+                <set field="moveItem" value="false"/>
+                <iterate list="invoiceItemList" entry="invoiceItem">
+                    <log message="=================orderitem seqId: ${orderPanels[0].invoiceItemSeqId}"/>
+                    <log message="=================invoiceitem seqId: ${invoiceItem.invoiceItemSeqId}"/>
+                    <if condition="invoiceItem.invoiceItemSeqId == orderPanels[0].invoiceItemSeqId">
+                        <set field="moveItem" value="true"/>
+                        <set field="description" from="invoiceItem.description"/>
+                        <set field="quantityUomId" from="invoiceItem.quantityUomId"/>
+                        <set field="amount" from="invoiceItem.amount"/>
+                        <set field="productId" from="invoiceItem.productId"/>
+                        <set field="itemTypeEnumId" from="invoiceItem.itemTypeEnumId"/>
+                        <set field="lastUpdatedStamp" from="invoiceItem.lastUpdatedStamp"/>
+                    </if>
+                    <if condition="moveItem == 'true' &amp;&amp; (index+1) &lt; invoiceItemList.size()">
+                        <log message="==========move item ${invoiceItemList[index].productId}"/>
+                        <set field="invoiceItemList[index]" from="invoiceItemList[index+1]"/>
+                        <set field="invoiceItemList[index].invoiceItemSeqId" from="Integer.toString(index)"/>
+                    </if>
+                    <set field="index" from="index + 1"/>
+                </iterate>
+                <script>invoiceItemList.remove(--index);</script>
+                <log message="=====2=====invoiceitemList: ${invoiceItemList.size()}"/>
+                <iterate list="orderPanels" entry="orderPanel">
+                    <if condition="orderPanel.width &amp;&amp; orderPanel.length">
+                        <entity-make-value entity-name="mantle.account.invoice.InvoiceItem"
+                        value-field="invoiceItem" map="[
+                            'invoiceId': invoiceId,
+                            'invoiceItemSeqId': index.toString(),
+                            'productId': productId,
+                            'description': description + '  ' + orderPanel.width + '² X ' + orderPanel.length + '² feet',
+                            'quantity': orderPanel.width * orderPanel.length,
+                            'quantityUomId': quantityUomId,
+                            'amount': amount,
+                            'itemTypeEnumId': itemTypeEnumId,
+                            'lastUpdatedStamp': lastUpdatedStamp,
+                            ]"/> 
+                        <script>invoiceItemList.add(invoiceItem)</script>
+                        <set field="index" from="index + 1"/>
+                    </if>
+                </iterate>
+                <log message="=====3=====invoiceitemList: ${invoiceItemList.size()}"/>
+                <log message="=====3=====invoiceitemList: ${invoiceItemList}"/>
+            </if>
             <set field="topItemList" from="invoiceItemList.findAll({ it.parentItemSeqId == null })"/>
 
             <entity-find entity-name="mantle.account.invoice.InvoiceItem" list="adjustmentItemList">
@@ -475,6 +526,9 @@ along with this software (see the LICENSE.md file). If not, see
                         in-map="[partyId:invoice.fromPartyId, partySettingTypeId:('Org' + templateSettingSuffix)]"/>
                 <set field="templateLocation" from="ptySettingOut?.settingValue"/>
             </if>
+            <entity-find entity-name="accugeo.order.InvoiceItemAndOrderPanel" list="orderPanels">
+                <econdition field-name="invoiceId"/>
+            </entity-find>
         </actions>
     </service>
     <service verb="get" noun="ReceivableStatementInfo">

From a4fc61c74b731c62fcc97d982f097bee726cc85f Mon Sep 17 00:00:00 2001
From: Hans Bakker <h.bakker@antwebsystems.com>
Date: Mon, 4 Jan 2021 10:30:07 +0700
Subject: [PATCH 37/37] Optionally use product calc price with invoiceItem
 input

---
 service/mantle/account/InvoiceServices.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/service/mantle/account/InvoiceServices.xml b/service/mantle/account/InvoiceServices.xml
index 426d9bf4..75d1b65c 100644
--- a/service/mantle/account/InvoiceServices.xml
+++ b/service/mantle/account/InvoiceServices.xml
@@ -835,11 +835,14 @@ along with this software (see the LICENSE.md file). If not, see
     <service verb="create" noun="InvoiceItem">
         <in-parameters>
             <parameter name="invoiceId" required="true"/>
+            <parameter name="calcAmount"/>
             <auto-parameters entity-name="mantle.account.invoice.InvoiceItem" include="nonpk">
                 <exclude field-name="invoiceItemSeqId"/><exclude field-name="isAdjustment"/></auto-parameters>
         </in-parameters>
         <out-parameters><parameter name="invoiceItemSeqId"/></out-parameters>
         <actions>
+            <if condition="!amount">
+                <set field="amount" from="calcAmount"/></if>
             <entity-find-one entity-name="mantle.account.invoice.Invoice" value-field="invoice"/>
             <if condition="!(invoice.statusId in ['InvoiceInProcess', 'InvoiceIncoming', 'InvoiceReceived'])">
                 <return error="true" message="Invoice ${invoiceId} is not in a status that allows change (In Process for receivables, Incoming or Received for payables)"/></if>