diff --git a/service/mantle/account/InvoiceServices.xml b/service/mantle/account/InvoiceServices.xml
index 1481a434..75d1b65c 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">
@@ -781,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>
diff --git a/service/mantle/order/OrderInfoServices.xml b/service/mantle/order/OrderInfoServices.xml
index d393a12f..b36db166 100644
--- a/service/mantle/order/OrderInfoServices.xml
+++ b/service/mantle/order/OrderInfoServices.xml
@@ -133,8 +133,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">
@@ -147,6 +149,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>
@@ -368,7 +371,18 @@ along with this software (see the LICENSE.md file). If not, see
                 }
 
                 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")
@@ -381,13 +395,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
@@ -487,6 +494,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,
@@ -516,6 +524,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">
diff --git a/service/mantle/party/ContactServices.xml b/service/mantle/party/ContactServices.xml
index 4e22fcf2..7fb7ee97 100644
--- a/service/mantle/party/ContactServices.xml
+++ b/service/mantle/party/ContactServices.xml
@@ -687,7 +687,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"/>
diff --git a/service/mantle/shipment/ShipmentInfoServices.xml b/service/mantle/shipment/ShipmentInfoServices.xml
index 2f3bad6c..5464201b 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">
@@ -762,6 +766,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>