From 9895784dd9cbe6c7b915f4c4a652638feb261d05 Mon Sep 17 00:00:00 2001 From: Hans Bakker Date: Wed, 11 Mar 2020 10:28:47 +0700 Subject: [PATCH 001/150] show logo of vendor when avaiable on order PDF --- template/order/Order.xsl-fo.ftl | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/template/order/Order.xsl-fo.ftl b/template/order/Order.xsl-fo.ftl index 47fe325d..1f5aba57 100644 --- a/template/order/Order.xsl-fo.ftl +++ b/template/order/Order.xsl-fo.ftl @@ -33,7 +33,14 @@ along with this software (see the LICENSE.md file). If not, see - <#if firstPartInfo.isCustomerInternalOrg>Purchase<#else>Sales Order #${orderId} + <#if logoImageLocation?has_content> + + + + + + + <#if firstPartInfo.isCustomerInternalOrg>Purchase<#else>Sales Order #${orderId} From b183ca7153b267c2d2ea0a8d40d338da136c6f32 Mon Sep 17 00:00:00 2001 From: Hans Bakker Date: Tue, 17 Mar 2020 13:25:04 +0700 Subject: [PATCH 002/150] add buttons for order panels --- screen/SimpleScreens/Order/OrderDetail.xml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/screen/SimpleScreens/Order/OrderDetail.xml b/screen/SimpleScreens/Order/OrderDetail.xml index 7f7109fc..a9926623 100644 --- a/screen/SimpleScreens/Order/OrderDetail.xml +++ b/screen/SimpleScreens/Order/OrderDetail.xml @@ -152,6 +152,18 @@ along with this software (see the LICENSE.md file). If not, see + + + + + + + + + + + + @@ -169,6 +181,11 @@ along with this software (see the LICENSE.md file). If not, see + + + + +
@@ -237,6 +254,10 @@ along with this software (see the LICENSE.md file). If not, see condition="ec.user.hasPermission('ORDER_APPROVE') && orderHeader.statusId == 'OrderCompleted'"/> + + + From e39d1398e1efee365888d680ce4eb37e37f4857b Mon Sep 17 00:00:00 2001 From: Hans Bakker Date: Mon, 23 Mar 2020 13:59:14 +0700 Subject: [PATCH 003/150] add customer/vendor postal addresses to orderPDF, also show 'Quote' in the header when status is 'OrderProposal' --- template/order/Order.xsl-fo.ftl | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/template/order/Order.xsl-fo.ftl b/template/order/Order.xsl-fo.ftl index 1f5aba57..99b76350 100644 --- a/template/order/Order.xsl-fo.ftl +++ b/template/order/Order.xsl-fo.ftl @@ -25,8 +25,8 @@ along with this software (see the LICENSE.md file). If not, see - - + + @@ -40,14 +40,32 @@ along with this software (see the LICENSE.md file). If not, see - <#if firstPartInfo.isCustomerInternalOrg>Purchase<#else>Sales Order #${orderId} + + <#if firstPartInfo.isCustomerInternalOrg>Purchase<#else>Sales + <#if orderHeader.statusId == 'OrderProposed'> Quote, Order #${orderId} Vendor <@encodeText (firstPartInfo.vendorDetail.organizationName)!""/><@encodeText (firstPartInfo.vendorDetail.firstName)!""/> <@encodeText (firstPartInfo.vendorDetail.lastName)!""/> + + <#if firstPartInfo.vendorContactInfo?has_content> + <@encodeText (firstPartInfo.vendorContactInfo.postalAddress.address1)!""/><#if firstPartInfo.vendorContactInfo.postalAddress.unitNumber?has_content> #<@encodeText firstPartInfo.vendorContactInfo.postalAddress.unitNumber/> + <#if firstPartInfo.vendorContactInfo.postalAddress.address2?has_content><@encodeText firstPartInfo.vendorContactInfo.postalAddress.address2/> + <@encodeText (firstPartInfo.vendorContactInfo.postalAddress.city!"")/>, ${(firstPartInfo.vendorContactInfo.postalAddressStateGeo.geoCodeAlpha2)!""} ${firstPartInfo.vendorContactInfo.postalAddress.postalCode!""}<#if firstPartInfo.vendorContactInfo.postalAddress.postalCodeExt?has_content>-${firstPartInfo.vendorContactInfo.postalAddress.postalCodeExt} + <#if firstPartInfo.vendorContactInfo.postalAddress.countryGeoId?has_content>${firstPartInfo.vendorContactInfo.postalAddress.countryGeoId} + + Customer <@encodeText (firstPartInfo.customerDetail.organizationName)!""/><@encodeText (firstPartInfo.customerDetail.firstName)!""/> <@encodeText (firstPartInfo.customerDetail.lastName)!""/> + + <#if firstPartInfo.customerContactInfo?has_content> + <@encodeText (firstPartInfo.customerContactInfo.postalAddress.address1)!""/><#if firstPartInfo.customerContactInfo.postalAddress.unitNumber?has_content> #<@encodeText firstPartInfo.customerContactInfo.postalAddress.unitNumber/> + <#if firstPartInfo.customerContactInfo.postalAddress.address2?has_content><@encodeText firstPartInfo.customerContactInfo.postalAddress.address2/> + <@encodeText (firstPartInfo.customerContactInfo.postalAddress.city!"")/>, ${(firstPartInfo.customerContactInfo.postalAddressStateGeo.geoCodeAlpha2)!""} ${firstPartInfo.customerContactInfo.postalAddress.postalCode!""}<#if firstPartInfo.customerContactInfo.postalAddress.postalCodeExt?has_content>-${firstPartInfo.customerContactInfo.postalAddress.postalCodeExt} + <#if firstPartInfo.customerContactInfo.postalAddress.countryGeoId?has_content>${firstPartInfo.customerContactInfo.postalAddress.countryGeoId} + + Date From df3f0862ec4f0d6999212f426ce8612f558cfdc4 Mon Sep 17 00:00:00 2001 From: Hans Bakker Date: Wed, 25 Mar 2020 12:26:55 +0700 Subject: [PATCH 004/150] modified added buttons for panels --- screen/SimpleScreens/Order/OrderDetail.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/screen/SimpleScreens/Order/OrderDetail.xml b/screen/SimpleScreens/Order/OrderDetail.xml index a9926623..293d782f 100644 --- a/screen/SimpleScreens/Order/OrderDetail.xml +++ b/screen/SimpleScreens/Order/OrderDetail.xml @@ -183,7 +183,8 @@ along with this software (see the LICENSE.md file). If not, see - + + @@ -254,10 +255,9 @@ along with this software (see the LICENSE.md file). If not, see condition="ec.user.hasPermission('ORDER_APPROVE') && orderHeader.statusId == 'OrderCompleted'"/> - - - + + + From c8688c5544a9993d1058ff716a24a0b4361928e6 Mon Sep 17 00:00:00 2001 From: Hans Bakker Date: Tue, 5 May 2020 07:43:35 +0700 Subject: [PATCH 005/150] Only show orderpanels buttons when it is a sales order --- .classpath | 13 ++++++++++++ .project | 23 ++++++++++++++++++++++ screen/SimpleScreens/Order/OrderDetail.xml | 6 +++--- 3 files changed, 39 insertions(+), 3 deletions(-) create mode 100644 .classpath create mode 100644 .project diff --git a/.classpath b/.classpath new file mode 100644 index 00000000..a611913b --- /dev/null +++ b/.classpath @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/.project b/.project new file mode 100644 index 00000000..17d1591c --- /dev/null +++ b/.project @@ -0,0 +1,23 @@ + + + SimpleScreens + Project SimpleScreens created by Buildship. + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.buildship.core.gradleprojectbuilder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.buildship.core.gradleprojectnature + + diff --git a/screen/SimpleScreens/Order/OrderDetail.xml b/screen/SimpleScreens/Order/OrderDetail.xml index 293d782f..3f98b4ef 100644 --- a/screen/SimpleScreens/Order/OrderDetail.xml +++ b/screen/SimpleScreens/Order/OrderDetail.xml @@ -255,9 +255,9 @@ along with this software (see the LICENSE.md file). If not, see condition="ec.user.hasPermission('ORDER_APPROVE') && orderHeader.statusId == 'OrderCompleted'"/> - - - + + + From fae73dd090a7a34341d69c23908df8ee68dd33f3 Mon Sep 17 00:00:00 2001 From: Hans Bakker Date: Fri, 29 May 2020 08:29:00 +0700 Subject: [PATCH 006/150] Add vendor logo at shipment packsheet --- template/shipment/ShipmentPack.xsl-fo.ftl | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/template/shipment/ShipmentPack.xsl-fo.ftl b/template/shipment/ShipmentPack.xsl-fo.ftl index 7723699a..2f4dcdc5 100644 --- a/template/shipment/ShipmentPack.xsl-fo.ftl +++ b/template/shipment/ShipmentPack.xsl-fo.ftl @@ -44,6 +44,13 @@ along with this software (see the LICENSE.md file). If not, see + <#if logoImageLocation?has_content> + + + + + + <#if fromPartyDetail?has_content><@encodeText fromPartyDetail.organizationName!""/><@encodeText fromPartyDetail.firstName!""/> <@encodeText fromPartyDetail.lastName!""/> Shipment Pack Sheet <#if logoImageLocation?has_content> From d1cf46960634c433114947d6d1f79ef7cd053410 Mon Sep 17 00:00:00 2001 From: Hans Bakker Date: Fri, 29 May 2020 08:44:43 +0700 Subject: [PATCH 007/150] Add logo to shipment by package --- template/shipment/ShipmentByPackage.xsl-fo.ftl | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/template/shipment/ShipmentByPackage.xsl-fo.ftl b/template/shipment/ShipmentByPackage.xsl-fo.ftl index da3afc71..11cee6c0 100644 --- a/template/shipment/ShipmentByPackage.xsl-fo.ftl +++ b/template/shipment/ShipmentByPackage.xsl-fo.ftl @@ -31,6 +31,13 @@ along with this software (see the LICENSE.md file). If not, see + <#if logoImageLocation?has_content> + + + + + + <#if fromPartyDetail?has_content><@encodeText fromPartyDetail.organizationName!""/><@encodeText fromPartyDetail.firstName!""/> <@encodeText fromPartyDetail.lastName!""/> Shipment by Package From 578c0967b2600f7141b97e862893a5f8a48cdbc2 Mon Sep 17 00:00:00 2001 From: Hans Bakker Date: Sat, 6 Jun 2020 10:25:14 +0700 Subject: [PATCH 008/150] add orderpanels and quantity uom to invoice --- template/account/Invoice.xsl-fo.ftl | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/template/account/Invoice.xsl-fo.ftl b/template/account/Invoice.xsl-fo.ftl index 5cc45635..ee69d6c7 100644 --- a/template/account/Invoice.xsl-fo.ftl +++ b/template/account/Invoice.xsl-fo.ftl @@ -25,6 +25,7 @@ along with this software (see the LICENSE.md file). If not, see <#assign product = invoiceItem.product!> <#assign asset = invoiceItem.asset!> <#assign lot = asset.lot!> + <#assign quantityUom = ec.entity.find("moqui.basic.Uom").condition("uomId", invoiceItem.quantityUomId).useCache(true).one().description> <#if (itemIndex > 0)>${itemIndex}<#else> ${(product.pseudoId)!(invoiceItem.productId)!""} @@ -34,6 +35,7 @@ along with this software (see the LICENSE.md file). If not, see <#if invoiceItem.otherPartyProductId?has_content>Your Product: ${invoiceItem.otherPartyProductId} ${invoiceItem.quantity!"1"} + ${quantityUom} ${ec.l10n.formatCurrency(invoiceItem.amount!0, invoice.currencyUomId, 3)} ${ec.l10n.formatCurrency(((invoiceItem.quantity!1) * (invoiceItem.amount!0)), invoice.currencyUomId, 3)} @@ -232,9 +234,10 @@ along with this software (see the LICENSE.md file). If not, see Item Product Lot - Description + Description Qty - Amount + Uom + Amount Total @@ -247,6 +250,7 @@ along with this software (see the LICENSE.md file). If not, see + Total ${ec.l10n.formatCurrency(noAdjustmentTotal, invoice.currencyUomId)} From 7fbb19e7f2293b64725487d7efd93c573752ec64 Mon Sep 17 00:00:00 2001 From: Hans Bakker Date: Thu, 30 Jul 2020 10:43:43 +0700 Subject: [PATCH 009/150] add externalId t leger account list --- screen/SimpleScreens/Accounting/OrgSettings/GlAccounts.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/screen/SimpleScreens/Accounting/OrgSettings/GlAccounts.xml b/screen/SimpleScreens/Accounting/OrgSettings/GlAccounts.xml index 31743219..f5579442 100644 --- a/screen/SimpleScreens/Accounting/OrgSettings/GlAccounts.xml +++ b/screen/SimpleScreens/Accounting/OrgSettings/GlAccounts.xml @@ -69,6 +69,10 @@ along with this software (see the LICENSE.md file). If not, see condition="parentGlAccountId" parameter-map="[glAccountId:parentGlAccountId]" text="${accountCodeFormatter != null ? accountCodeFormatter.valueToString(accountCode) : accountCode}: ${accountName}"/> + + + + From 2acf771b450baeaa0e71f85de0bd859da8183a7f Mon Sep 17 00:00:00 2001 From: Hans Bakker Date: Fri, 28 Aug 2020 12:01:14 +0700 Subject: [PATCH 010/150] remove lists limiting days --- screen/SimpleScreens/Accounting/Invoice/FindInvoice.xml | 2 +- screen/SimpleScreens/Accounting/Payment/FindPayment.xml | 2 +- .../Accounting/Reports/OrderIssuedInvoiced.xml | 2 +- .../Accounting/Transaction/FindTransaction.xml | 6 +++--- .../Accounting/Transaction/FindTransactionEntry.xml | 2 +- screen/SimpleScreens/Order/FindOrder.xml | 2 +- screen/SimpleScreens/Return/FindReturn.xml | 2 +- screen/SimpleScreens/Shipment/FindShipment.xml | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/screen/SimpleScreens/Accounting/Invoice/FindInvoice.xml b/screen/SimpleScreens/Accounting/Invoice/FindInvoice.xml index 7bf5100e..1ce4a3bb 100644 --- a/screen/SimpleScreens/Accounting/Invoice/FindInvoice.xml +++ b/screen/SimpleScreens/Accounting/Invoice/FindInvoice.xml @@ -207,7 +207,7 @@ along with this software (see the LICENSE.md file). If not, see + statusId_op="in"/> diff --git a/screen/SimpleScreens/Accounting/Payment/FindPayment.xml b/screen/SimpleScreens/Accounting/Payment/FindPayment.xml index 75eae092..99f72edf 100644 --- a/screen/SimpleScreens/Accounting/Payment/FindPayment.xml +++ b/screen/SimpleScreens/Accounting/Payment/FindPayment.xml @@ -85,7 +85,7 @@ along with this software (see the LICENSE.md file). If not, see + /> diff --git a/screen/SimpleScreens/Accounting/Reports/OrderIssuedInvoiced.xml b/screen/SimpleScreens/Accounting/Reports/OrderIssuedInvoiced.xml index 6f3c82ca..b13d718a 100644 --- a/screen/SimpleScreens/Accounting/Reports/OrderIssuedInvoiced.xml +++ b/screen/SimpleScreens/Accounting/Reports/OrderIssuedInvoiced.xml @@ -33,7 +33,7 @@ along with this software (see the LICENSE.md file). If not, see + /> diff --git a/screen/SimpleScreens/Accounting/Transaction/FindTransaction.xml b/screen/SimpleScreens/Accounting/Transaction/FindTransaction.xml index c372a2df..e952f9a0 100644 --- a/screen/SimpleScreens/Accounting/Transaction/FindTransaction.xml +++ b/screen/SimpleScreens/Accounting/Transaction/FindTransaction.xml @@ -74,15 +74,15 @@ along with this software (see the LICENSE.md file). If not, see saved-finds="true" show-csv-button="true" show-xlsx-button="true"> - + - - + + diff --git a/screen/SimpleScreens/Accounting/Transaction/FindTransactionEntry.xml b/screen/SimpleScreens/Accounting/Transaction/FindTransactionEntry.xml index e63ff61a..0f73ea66 100644 --- a/screen/SimpleScreens/Accounting/Transaction/FindTransactionEntry.xml +++ b/screen/SimpleScreens/Accounting/Transaction/FindTransactionEntry.xml @@ -42,7 +42,7 @@ along with this software (see the LICENSE.md file). If not, see select-columns="true" saved-finds="true" show-csv-button="true" show-xlsx-button="true" show-all-button="true"> - + diff --git a/screen/SimpleScreens/Order/FindOrder.xml b/screen/SimpleScreens/Order/FindOrder.xml index 6265c4a8..3603fa6c 100644 --- a/screen/SimpleScreens/Order/FindOrder.xml +++ b/screen/SimpleScreens/Order/FindOrder.xml @@ -188,7 +188,7 @@ along with this software (see the LICENSE.md file). If not, see skip-fields="vendorRoleTypeId,customerRoleTypeId,customerClassificationId,itemTypeEnumId"> + /> diff --git a/screen/SimpleScreens/Return/FindReturn.xml b/screen/SimpleScreens/Return/FindReturn.xml index 2d7176b0..06d125cb 100644 --- a/screen/SimpleScreens/Return/FindReturn.xml +++ b/screen/SimpleScreens/Return/FindReturn.xml @@ -89,7 +89,7 @@ along with this software (see the LICENSE.md file). If not, see + /> diff --git a/screen/SimpleScreens/Shipment/FindShipment.xml b/screen/SimpleScreens/Shipment/FindShipment.xml index 083436bd..f21d7ca4 100644 --- a/screen/SimpleScreens/Shipment/FindShipment.xml +++ b/screen/SimpleScreens/Shipment/FindShipment.xml @@ -96,7 +96,7 @@ along with this software (see the LICENSE.md file). If not, see + /> From 9d980f7c3e5dfb3e2b91f77df0ec8d3555e31eef Mon Sep 17 00:00:00 2001 From: Hans Bakker Date: Mon, 31 Aug 2020 09:30:57 +0700 Subject: [PATCH 011/150] missing original currency on transaction screen --- .../Accounting/Transaction/EditTransaction.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/screen/SimpleScreens/Accounting/Transaction/EditTransaction.xml b/screen/SimpleScreens/Accounting/Transaction/EditTransaction.xml index 617aba08..f82b9907 100644 --- a/screen/SimpleScreens/Accounting/Transaction/EditTransaction.xml +++ b/screen/SimpleScreens/Accounting/Transaction/EditTransaction.xml @@ -55,9 +55,11 @@ along with this software (see the LICENSE.md file). If not, see + + - + @@ -196,7 +198,7 @@ along with this software (see the LICENSE.md file). If not, see - + From 932789b4c8089776bd6bee6b2810b34f401cfc2b Mon Sep 17 00:00:00 2001 From: Hans Bakker Date: Mon, 2 Nov 2020 12:14:44 +0700 Subject: [PATCH 012/150] allow quotes in pseudoId's in picl/packlist --- template/shipment/ShipmentPack.xsl-fo.ftl | 2 +- template/shipment/ShipmentPick.xsl-fo.ftl | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/template/shipment/ShipmentPack.xsl-fo.ftl b/template/shipment/ShipmentPack.xsl-fo.ftl index 2f4dcdc5..3b560bee 100644 --- a/template/shipment/ShipmentPack.xsl-fo.ftl +++ b/template/shipment/ShipmentPack.xsl-fo.ftl @@ -179,7 +179,7 @@ along with this software (see the LICENSE.md file). If not, see - + 0.4in 0.25mm diff --git a/template/shipment/ShipmentPick.xsl-fo.ftl b/template/shipment/ShipmentPick.xsl-fo.ftl index ad78bef6..9029dd82 100644 --- a/template/shipment/ShipmentPick.xsl-fo.ftl +++ b/template/shipment/ShipmentPick.xsl-fo.ftl @@ -144,7 +144,7 @@ along with this software (see the LICENSE.md file). If not, see - + 0.4in 0.25mm @@ -249,7 +249,7 @@ along with this software (see the LICENSE.md file). If not, see - + 0.4in 0.25mm From 668b1222678ec0f47d446be9e6352df19f03d0c8 Mon Sep 17 00:00:00 2001 From: Hans Bakker Date: Tue, 1 Dec 2020 10:07:31 +0700 Subject: [PATCH 013/150] show originId field on orderfind screen --- screen/SimpleScreens/Order/FindOrder.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/screen/SimpleScreens/Order/FindOrder.xml b/screen/SimpleScreens/Order/FindOrder.xml index 3603fa6c..cc8d2993 100644 --- a/screen/SimpleScreens/Order/FindOrder.xml +++ b/screen/SimpleScreens/Order/FindOrder.xml @@ -413,6 +413,8 @@ along with this software (see the LICENSE.md file). If not, see + + From 1a758f72ab0ae8c92c2902273671585db580c3a8 Mon Sep 17 00:00:00 2001 From: David E Jones Date: Tue, 17 Mar 2020 15:12:04 -0700 Subject: [PATCH 014/150] On Order/QuickItems screen log all parameters to setItemQuantities transition for support purposes, clean up hidden parameters so not so excessive and fix order by issues --- screen/SimpleScreens/Order/QuickItems.xml | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/screen/SimpleScreens/Order/QuickItems.xml b/screen/SimpleScreens/Order/QuickItems.xml index 4ceb1701..44b3e330 100644 --- a/screen/SimpleScreens/Order/QuickItems.xml +++ b/screen/SimpleScreens/Order/QuickItems.xml @@ -18,13 +18,13 @@ along with this software (see the LICENSE.md file). If not, see - + @@ -86,7 +86,8 @@ along with this software (see the LICENSE.md file). If not, see - + + @@ -120,18 +121,22 @@ along with this software (see the LICENSE.md file). If not, see productStoreId:productStoreId, customerPartyId:orderPart.customerPartyId]"/> - - - + + + + + + - + + - + @@ -140,9 +145,9 @@ along with this software (see the LICENSE.md file). If not, see - + - + From f843e853a1fd7c16135c68b03faddb693c534fce Mon Sep 17 00:00:00 2001 From: David E Jones Date: Fri, 20 Mar 2020 19:27:22 -0700 Subject: [PATCH 015/150] On AssetDetail show reservation totals; on DetailHistory show page size widget --- screen/SimpleScreens/Asset/Asset/AssetDetail.xml | 8 ++++---- screen/SimpleScreens/Asset/Asset/DetailHistory.xml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/screen/SimpleScreens/Asset/Asset/AssetDetail.xml b/screen/SimpleScreens/Asset/Asset/AssetDetail.xml index 14625e32..c6af23bb 100644 --- a/screen/SimpleScreens/Asset/Asset/AssetDetail.xml +++ b/screen/SimpleScreens/Asset/Asset/AssetDetail.xml @@ -167,11 +167,11 @@ along with this software (see the LICENSE.md file). If not, see - - - + + + - + diff --git a/screen/SimpleScreens/Asset/Asset/DetailHistory.xml b/screen/SimpleScreens/Asset/Asset/DetailHistory.xml index ee8e6729..d7d6b23a 100644 --- a/screen/SimpleScreens/Asset/Asset/DetailHistory.xml +++ b/screen/SimpleScreens/Asset/Asset/DetailHistory.xml @@ -27,7 +27,7 @@ along with this software (see the LICENSE.md file). If not, see - + From deba6b37ddfc1a0ffcc23ccb6826ff3e9e565865 Mon Sep 17 00:00:00 2001 From: David E Jones Date: Sat, 21 Mar 2020 02:21:43 -0700 Subject: [PATCH 016/150] On AssetDetail and DetailHistory screens show new orderId from AssetDetail records if there, for when reservations are deleted so we still know the order --- screen/SimpleScreens/Asset/Asset/AssetDetail.xml | 6 +++--- screen/SimpleScreens/Asset/Asset/DetailHistory.xml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/screen/SimpleScreens/Asset/Asset/AssetDetail.xml b/screen/SimpleScreens/Asset/Asset/AssetDetail.xml index c6af23bb..7ffab314 100644 --- a/screen/SimpleScreens/Asset/Asset/AssetDetail.xml +++ b/screen/SimpleScreens/Asset/Asset/AssetDetail.xml @@ -211,9 +211,9 @@ along with this software (see the LICENSE.md file). If not, see diff --git a/screen/SimpleScreens/Asset/Asset/DetailHistory.xml b/screen/SimpleScreens/Asset/Asset/DetailHistory.xml index d7d6b23a..a406cfad 100644 --- a/screen/SimpleScreens/Asset/Asset/DetailHistory.xml +++ b/screen/SimpleScreens/Asset/Asset/DetailHistory.xml @@ -63,9 +63,9 @@ along with this software (see the LICENSE.md file). If not, see From 0bcda5d2c41d8023d63500c02cfa67b1eb1a04a0 Mon Sep 17 00:00:00 2001 From: David E Jones Date: Sat, 21 Mar 2020 02:58:07 -0700 Subject: [PATCH 017/150] On Asset/DetailHistory screen show totals and right align QOH and ATP diffs --- screen/SimpleScreens/Asset/Asset/DetailHistory.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/screen/SimpleScreens/Asset/Asset/DetailHistory.xml b/screen/SimpleScreens/Asset/Asset/DetailHistory.xml index a406cfad..b0abf9bd 100644 --- a/screen/SimpleScreens/Asset/Asset/DetailHistory.xml +++ b/screen/SimpleScreens/Asset/Asset/DetailHistory.xml @@ -38,9 +38,9 @@ along with this software (see the LICENSE.md file). If not, see - + - + From 27e35b9c78fdd01a3d76dc0866b153f18d3e8d12 Mon Sep 17 00:00:00 2001 From: David E Jones Date: Mon, 23 Mar 2020 16:42:33 -0700 Subject: [PATCH 018/150] On EditProductStore change Require Inventory to radio and add fields for ProductStore settings for default disable promos, ship calc, tax calc --- screen/SimpleScreens/ProductStore/EditProductStore.xml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/screen/SimpleScreens/ProductStore/EditProductStore.xml b/screen/SimpleScreens/ProductStore/EditProductStore.xml index 847450f0..6b7425fa 100644 --- a/screen/SimpleScreens/ProductStore/EditProductStore.xml +++ b/screen/SimpleScreens/ProductStore/EditProductStore.xml @@ -89,8 +89,13 @@ along with this software (see the LICENSE.md file). If not, see - - + + + + + + + From 4526b8873e092cb7d83cf43e1171ec06a00b8ae1 Mon Sep 17 00:00:00 2001 From: David E Jones Date: Mon, 30 Mar 2020 23:39:32 -0700 Subject: [PATCH 019/150] Change data/MyAccountDocumentData.xml from install to seed-initial, making all document data files seed-initial for consistency --- data/MyAccountDocumentData.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/MyAccountDocumentData.xml b/data/MyAccountDocumentData.xml index e9f61534..65d214be 100644 --- a/data/MyAccountDocumentData.xml +++ b/data/MyAccountDocumentData.xml @@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication along with this software (see the LICENSE.md file). If not, see . --> - + Date: Tue, 31 Mar 2020 12:42:02 -0700 Subject: [PATCH 020/150] Change notification topic link templates to use vapps --- data/MyAccountDocumentData.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/MyAccountDocumentData.xml b/data/MyAccountDocumentData.xml index 65d214be..a8646600 100644 --- a/data/MyAccountDocumentData.xml +++ b/data/MyAccountDocumentData.xml @@ -16,21 +16,21 @@ along with this software (see the LICENSE.md file). If not, see + linkTemplate="/vapps/my/User/Task/TaskDetail?workEffortId=${workEffortId}"/> + linkTemplate="/vapps/my/User/Calendar/EventDetail?workEffortId=${workEffortId}"/> + linkTemplate="/vapps/my/User/Messages/MessageThread?communicationEventId=${communicationEventId}"/> + linkTemplate="/vapps/my/User/Request/EditRequest?requestId=${requestId}"/> From f3a1911089de2116917bda016ecfa4525b66096f Mon Sep 17 00:00:00 2001 From: David E Jones Date: Tue, 31 Mar 2020 13:56:13 -0700 Subject: [PATCH 021/150] On ShipmentDetail show Invoice Item for Issuances, combine order/item columns into one --- .../SimpleScreens/Shipment/ShipmentDetail.xml | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/screen/SimpleScreens/Shipment/ShipmentDetail.xml b/screen/SimpleScreens/Shipment/ShipmentDetail.xml index 9a6a8216..a5938413 100644 --- a/screen/SimpleScreens/Shipment/ShipmentDetail.xml +++ b/screen/SimpleScreens/Shipment/ShipmentDetail.xml @@ -961,16 +961,16 @@ along with this software (see the LICENSE.md file). If not, see - - - + + + - + @@ -1032,8 +1032,13 @@ along with this software (see the LICENSE.md file). If not, see - - + + + + + + + Date: Tue, 31 Mar 2020 16:23:22 -0700 Subject: [PATCH 022/150] On OrderDetail screen add confirmation for Quote Requested and Propose Quote buttons --- screen/SimpleScreens/Order/OrderDetail.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/screen/SimpleScreens/Order/OrderDetail.xml b/screen/SimpleScreens/Order/OrderDetail.xml index 3f98b4ef..f6afe81f 100644 --- a/screen/SimpleScreens/Order/OrderDetail.xml +++ b/screen/SimpleScreens/Order/OrderDetail.xml @@ -223,11 +223,11 @@ along with this software (see the LICENSE.md file). If not, see - - - Date: Wed, 1 Apr 2020 22:32:42 -0700 Subject: [PATCH 023/150] On MyAccount TimeEntries and PartyTimeEntries screens use new minute-stepping attribute to not round to 5 minutes, in Clock In dialog remove server populate fromDate default, use the now timestamp on form submit which is more accurate if none specified --- screen/MyAccount/User/TimeEntries.xml | 9 +++++---- screen/SimpleScreens/Party/PartyTimeEntries.xml | 8 ++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/screen/MyAccount/User/TimeEntries.xml b/screen/MyAccount/User/TimeEntries.xml index c7432893..1b5fe36f 100644 --- a/screen/MyAccount/User/TimeEntries.xml +++ b/screen/MyAccount/User/TimeEntries.xml @@ -66,8 +66,8 @@ along with this software (see the LICENSE.md file). If not, see - - + + @@ -97,7 +97,7 @@ along with this software (see the LICENSE.md file). If not, see - + @@ -118,7 +118,8 @@ along with this software (see the LICENSE.md file). If not, see - + + diff --git a/screen/SimpleScreens/Party/PartyTimeEntries.xml b/screen/SimpleScreens/Party/PartyTimeEntries.xml index 212d4a52..573e6f3b 100644 --- a/screen/SimpleScreens/Party/PartyTimeEntries.xml +++ b/screen/SimpleScreens/Party/PartyTimeEntries.xml @@ -70,12 +70,12 @@ along with this software (see the LICENSE.md file). If not, see - - + + - - + + From e5d8b4dc3af32d142ea720605d9c4018813d670e Mon Sep 17 00:00:00 2001 From: David E Jones Date: Wed, 1 Apr 2020 23:33:24 -0700 Subject: [PATCH 024/150] On FindParty (and reused on FindCustomer, FindSupplier) filter classifications by from/thru dates to only show active classifications --- screen/SimpleScreens/Party/FindParty.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/screen/SimpleScreens/Party/FindParty.xml b/screen/SimpleScreens/Party/FindParty.xml index 881a2f51..791c81a5 100644 --- a/screen/SimpleScreens/Party/FindParty.xml +++ b/screen/SimpleScreens/Party/FindParty.xml @@ -257,7 +257,7 @@ along with this software (see the LICENSE.md file). If not, see value-field="partyClassificationId" label-field="description"> - + From 098e2446bc38d668264c20c077086c99ea133c41 Mon Sep 17 00:00:00 2001 From: David E Jones Date: Thu, 2 Apr 2020 01:42:01 -0700 Subject: [PATCH 025/150] In LedgerCharts used on Accounting/ReportList screen add support for specifying the number of periods and add Chart.js tooltip formatting, would be nice to do that more globally but these are handled all in the individual screen sections for the carts, including adding chart.js lib --- template/account/LedgerCharts.xml | 53 ++++++++++++++++++++++++------- 1 file changed, 42 insertions(+), 11 deletions(-) diff --git a/template/account/LedgerCharts.xml b/template/account/LedgerCharts.xml index bfbe7959..7cd740a6 100644 --- a/template/account/LedgerCharts.xml +++ b/template/account/LedgerCharts.xml @@ -30,10 +30,11 @@ along with this software (see the LICENSE.md file). If not, see + - +
@@ -53,7 +54,7 @@ along with this software (see the LICENSE.md file). If not, see ] + in-map="[partyId:organizationPartyId, timePeriodTypeId:timePeriodTypeId, thruDate:thruDate, groups:(periods?:13)]"/> @@ -76,7 +77,13 @@ along with this software (see the LICENSE.md file). If not, see type: 'bar', data: { labels:${Static["groovy.json.JsonOutput"].toJson(periodLabels!"")}, datasets:${Static["groovy.json.JsonOutput"].toJson(datasets!"")} }, - options: { scales:{ yAxes: [{ ticks: { beginAtZero:true } }] }, maintainAspectRatio:false } + options: { + scales:{ yAxes:[{ ticks:{ beginAtZero:true } }] }, maintainAspectRatio:false, + tooltips:{ callbacks:{ label: function(tooltipItem, data) { + var dataset = data.datasets[tooltipItem.datasetIndex]; var datasetLabel = dataset.label || ''; + return datasetLabel + ": " + moqui.format(dataset.data[tooltipItem.index], null, "currency"); + }}} + } }); ]]> @@ -94,7 +101,7 @@ along with this software (see the LICENSE.md file). If not, see ] + in-map="[partyId:organizationPartyId, timePeriodTypeId:timePeriodTypeId, thruDate:thruDate, groups:(periods?:13)]"/> @@ -117,7 +124,13 @@ along with this software (see the LICENSE.md file). If not, see type: 'bar', data: { labels:${Static["groovy.json.JsonOutput"].toJson(periodLabels!"")}, datasets:${Static["groovy.json.JsonOutput"].toJson(datasets!"")} }, - options: { scales:{ yAxes: [{ ticks: { beginAtZero:true } }] }, maintainAspectRatio:false } + options: { + scales:{ yAxes:[{ ticks:{ beginAtZero:true } }] }, maintainAspectRatio:false, + tooltips:{ callbacks:{ label: function(tooltipItem, data) { + var dataset = data.datasets[tooltipItem.datasetIndex]; var datasetLabel = dataset.label || ''; + return datasetLabel + ": " + moqui.format(dataset.data[tooltipItem.index], null, "currency"); + }}} + } }); ]]> @@ -133,7 +146,7 @@ along with this software (see the LICENSE.md file). If not, see backgroundColor:'rgba(217, 83, 79, 0.5)', borderColor:'rgba(217, 83, 79, 1.0)', pointStyle:'triangle', fill:false] ] + in-map="[partyId:organizationPartyId, timePeriodTypeId:timePeriodTypeId, thruDate:thruDate, groups:(periods?:13)]"/> @@ -170,7 +183,13 @@ along with this software (see the LICENSE.md file). If not, see type: 'line', data: { labels:${Static["groovy.json.JsonOutput"].toJson(periodLabels!"")}, datasets:${Static["groovy.json.JsonOutput"].toJson(datasets!"")} }, - options: { scales:{ yAxes: [{ ticks: { beginAtZero:true } }] }, maintainAspectRatio:false } + options: { + scales:{ yAxes:[{ ticks:{ beginAtZero:true } }] }, maintainAspectRatio:false, + tooltips:{ callbacks:{ label: function(tooltipItem, data) { + var dataset = data.datasets[tooltipItem.datasetIndex]; var datasetLabel = dataset.label || ''; + return datasetLabel + ": " + moqui.format(dataset.data[tooltipItem.index], null, "currency"); + }}} + } }); ]]> @@ -194,7 +213,7 @@ along with this software (see the LICENSE.md file). If not, see ] + in-map="[partyId:organizationPartyId, timePeriodTypeId:timePeriodTypeId, thruDate:thruDate, groups:(periods?:13)]"/> @@ -217,7 +236,13 @@ along with this software (see the LICENSE.md file). If not, see type: 'bar', data: { labels:${Static["groovy.json.JsonOutput"].toJson(periodLabels!"")}, datasets:${Static["groovy.json.JsonOutput"].toJson(datasets!"")} }, - options: { scales:{ yAxes: [{ ticks: { beginAtZero:true } }] }, maintainAspectRatio:false } + options: { + scales:{ yAxes:[{ ticks:{ beginAtZero:true } }] }, maintainAspectRatio:false, + tooltips:{ callbacks:{ label: function(tooltipItem, data) { + var dataset = data.datasets[tooltipItem.datasetIndex]; var datasetLabel = dataset.label || ''; + return datasetLabel + ": " + moqui.format(dataset.data[tooltipItem.index], null, "currency"); + }}} + } }); ]]> @@ -234,7 +259,7 @@ along with this software (see the LICENSE.md file). If not, see ] + in-map="[partyId:organizationPartyId, timePeriodTypeId:timePeriodTypeId, thruDate:thruDate, groups:(periods?:13)]"/> @@ -257,7 +282,13 @@ along with this software (see the LICENSE.md file). If not, see type: 'bar', data: { labels:${Static["groovy.json.JsonOutput"].toJson(periodLabels!"")}, datasets:${Static["groovy.json.JsonOutput"].toJson(datasets!"")} }, - options: { scales:{ yAxes: [{ ticks: { beginAtZero:true } }] }, maintainAspectRatio:false } + options: { + scales:{ yAxes:[{ ticks:{ beginAtZero:true } }] }, maintainAspectRatio:false, + tooltips:{ callbacks:{ label: function(tooltipItem, data) { + var dataset = data.datasets[tooltipItem.datasetIndex]; var datasetLabel = dataset.label || ''; + return datasetLabel + ": " + moqui.format(dataset.data[tooltipItem.index], null, "currency"); + }}} + } }); ]]> From 1472b49441b20bbe433c2a8f03adbbbd8ab1cf15 Mon Sep 17 00:00:00 2001 From: David E Jones Date: Thu, 2 Apr 2020 15:36:54 -0700 Subject: [PATCH 026/150] On LedgerCharts (used on ReportList) add percent of net to tooltip label --- template/account/LedgerCharts.xml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/template/account/LedgerCharts.xml b/template/account/LedgerCharts.xml index 7cd740a6..1e587b3e 100644 --- a/template/account/LedgerCharts.xml +++ b/template/account/LedgerCharts.xml @@ -80,8 +80,15 @@ along with this software (see the LICENSE.md file). If not, see options: { scales:{ yAxes:[{ ticks:{ beginAtZero:true } }] }, maintainAspectRatio:false, tooltips:{ callbacks:{ label: function(tooltipItem, data) { - var dataset = data.datasets[tooltipItem.datasetIndex]; var datasetLabel = dataset.label || ''; - return datasetLabel + ": " + moqui.format(dataset.data[tooltipItem.index], null, "currency"); + var dataset = data.datasets[tooltipItem.datasetIndex]; + var datasetLabel = dataset.label || ''; + var curValue = dataset.data[tooltipItem.index]; + // NOTE: datasetIndex 0 is net revenue, the first dataset in the list + if (tooltipItem.datasetIndex == 0) { return datasetLabel + ": " + moqui.format(curValue, null, "currency"); } + // calculate and show percent of net revenue for expenses + var netRevenue = data.datasets[0].data[tooltipItem.index]; + var percentOfNet = netRevenue ? (curValue / netRevenue) * 100.0 : 0.0; + return datasetLabel + ": " + moqui.format(dataset.data[tooltipItem.index], null, "currency") + " (" + percentOfNet.toFixed(1) + "% net)"; }}} } }); From a6015714c8906e3f53d25e4382562970cd40ad1e Mon Sep 17 00:00:00 2001 From: David E Jones Date: Thu, 2 Apr 2020 22:27:49 -0700 Subject: [PATCH 027/150] Improve User/TimeEntries screen to allow inline update of comments, recordTimeEntry transition now makes sure the time entry is for the current user's party --- screen/MyAccount/User/TimeEntries.xml | 39 ++++++++++++++++----------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/screen/MyAccount/User/TimeEntries.xml b/screen/MyAccount/User/TimeEntries.xml index 1b5fe36f..64706f2d 100644 --- a/screen/MyAccount/User/TimeEntries.xml +++ b/screen/MyAccount/User/TimeEntries.xml @@ -18,9 +18,17 @@ along with this software (see the LICENSE.md file). If not, see - - - + + + + + + + + + + + @@ -125,12 +133,12 @@ along with this software (see the LICENSE.md file). If not, see - - + + - + - + @@ -151,31 +159,32 @@ along with this software (see the LICENSE.md file). If not, see - + - + - + - + - - + + - + - + + From 771bd64ebd13ef670a8a0b844cd3a2739f322110 Mon Sep 17 00:00:00 2001 From: David E Jones Date: Fri, 3 Apr 2020 00:27:33 -0700 Subject: [PATCH 028/150] Fix issue from last commit on User/TimeEntries screen where it shouldn't check the current user's party when creating a TimeEntry --- screen/MyAccount/User/TimeEntries.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/screen/MyAccount/User/TimeEntries.xml b/screen/MyAccount/User/TimeEntries.xml index 64706f2d..5f76f748 100644 --- a/screen/MyAccount/User/TimeEntries.xml +++ b/screen/MyAccount/User/TimeEntries.xml @@ -22,7 +22,7 @@ along with this software (see the LICENSE.md file). If not, see - + From 594a7b9554e79c9f71ce39f014d80db70f4279ff Mon Sep 17 00:00:00 2001 From: David E Jones Date: Fri, 3 Apr 2020 11:19:18 -0700 Subject: [PATCH 029/150] Add csv and xlsx buttons on FindParty --- screen/SimpleScreens/Party/FindParty.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/screen/SimpleScreens/Party/FindParty.xml b/screen/SimpleScreens/Party/FindParty.xml index 791c81a5..f0bea656 100644 --- a/screen/SimpleScreens/Party/FindParty.xml +++ b/screen/SimpleScreens/Party/FindParty.xml @@ -213,7 +213,7 @@ along with this software (see the LICENSE.md file). If not, see - + From f9ed0a869482c9d85f732a361427bc25e0ddf60d Mon Sep 17 00:00:00 2001 From: David E Jones Date: Fri, 3 Apr 2020 15:42:35 -0700 Subject: [PATCH 030/150] Add Web URL (address) support on general contact info forms and template for input and display, add create form to EditParty (reused on EditCustomer and EditSupplier) --- screen/SimpleScreens/Party/EditParty.xml | 46 +++++++++++++++++-- .../Party/EditParty/UpdateContactInfo.xml | 10 ++-- template/party/ContactInfo.html.gstring | 3 +- template/party/PartyForms.xml | 31 +++++++++++-- 4 files changed, 78 insertions(+), 12 deletions(-) diff --git a/screen/SimpleScreens/Party/EditParty.xml b/screen/SimpleScreens/Party/EditParty.xml index 9e3d211d..eb132eb5 100644 --- a/screen/SimpleScreens/Party/EditParty.xml +++ b/screen/SimpleScreens/Party/EditParty.xml @@ -809,12 +809,14 @@ along with this software (see the LICENSE.md file). If not, see - - + + @@ -848,7 +850,41 @@ along with this software (see the LICENSE.md file). If not, see parameter-map="[partyId:partyId, contactMechId:contactInfo.emailContactMechId, contactMechPurposeId:contactInfo.emailContactMechPurposeId]"/> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -884,7 +920,7 @@ along with this software (see the LICENSE.md file). If not, see parameter-map="[partyId:partyId, contactMechId:contactInfo.telecomContactMechId, contactMechPurposeId:contactInfo.telecomContactMechPurposeId]"/> - @@ -941,7 +977,7 @@ along with this software (see the LICENSE.md file). If not, see + + + + + + + + + + + + + + + + + + + + + + + + From 387c5b2f4adbe691887e07d98af7579c0c9d6e93 Mon Sep 17 00:00:00 2001 From: David E Jones Date: Fri, 3 Apr 2020 18:27:07 -0700 Subject: [PATCH 031/150] On ShipmentDetail and PackShipment add warnings to Set Shipped dialog and change button color if not all packages have labels (warning) or tracking codes (danger) --- screen/SimpleScreens/Shipment/ShipmentDetail.xml | 8 +++++--- screen/SimpleScreens/Shipping/PackShipment.xml | 14 +++++++++++++- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/screen/SimpleScreens/Shipment/ShipmentDetail.xml b/screen/SimpleScreens/Shipment/ShipmentDetail.xml index a5938413..e2e6ab24 100644 --- a/screen/SimpleScreens/Shipment/ShipmentDetail.xml +++ b/screen/SimpleScreens/Shipment/ShipmentDetail.xml @@ -270,8 +270,10 @@ along with this software (see the LICENSE.md file). If not, see
- -
- +
- +
+ + +
From eb7d5e56821422087d2e69e2846ef9ad69cc5849 Mon Sep 17 00:00:00 2001 From: David E Jones Date: Mon, 6 Apr 2020 19:55:55 -0700 Subject: [PATCH 032/150] Add RequestTransitions file and in it getRequestList transition for dynamic options drop downs --- template/request/RequestTransitions.xml | 57 +++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 template/request/RequestTransitions.xml diff --git a/template/request/RequestTransitions.xml b/template/request/RequestTransitions.xml new file mode 100644 index 00000000..c6590435 --- /dev/null +++ b/template/request/RequestTransitions.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From bb54d105225eae558c73ebddfee278e57f04a7c0 Mon Sep 17 00:00:00 2001 From: David E Jones Date: Mon, 6 Apr 2020 21:45:39 -0700 Subject: [PATCH 033/150] Add Tasks section to EditRequest screen, link transitions for HiveMind PM --- screen/SimpleScreens/Request/EditRequest.xml | 30 +++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/screen/SimpleScreens/Request/EditRequest.xml b/screen/SimpleScreens/Request/EditRequest.xml index 380ec6e6..5055f348 100644 --- a/screen/SimpleScreens/Request/EditRequest.xml +++ b/screen/SimpleScreens/Request/EditRequest.xml @@ -17,12 +17,15 @@ along with this software (see the LICENSE.md file). If not, see + + + + - @@ -266,6 +269,7 @@ along with this software (see the LICENSE.md file). If not, see +
@@ -314,6 +318,30 @@ along with this software (see the LICENSE.md file). If not, see
+ +
+ + + + + + + + + + + + + + + + + + + + + +
From fa3810095a47b29bb6d7148b9732da5a6cb0caa7 Mon Sep 17 00:00:00 2001 From: David E Jones Date: Tue, 7 Apr 2020 01:37:54 -0700 Subject: [PATCH 034/150] On FindParty small change to show page size dropdown --- screen/SimpleScreens/Party/FindParty.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/screen/SimpleScreens/Party/FindParty.xml b/screen/SimpleScreens/Party/FindParty.xml index f0bea656..aa58a847 100644 --- a/screen/SimpleScreens/Party/FindParty.xml +++ b/screen/SimpleScreens/Party/FindParty.xml @@ -213,7 +213,8 @@ along with this software (see the LICENSE.md file). If not, see - + From 6f6108a7255a7d7b7732de7f60aaf54426d4d4dc Mon Sep 17 00:00:00 2001 From: David E Jones Date: Wed, 8 Apr 2020 13:10:31 -0700 Subject: [PATCH 035/150] On ViewPeriodGlAccounts highlight account names and beginning/ending balance for income statement accounts --- .../TimePeriod/ViewPeriodGlAccounts.xml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/screen/SimpleScreens/Accounting/TimePeriod/ViewPeriodGlAccounts.xml b/screen/SimpleScreens/Accounting/TimePeriod/ViewPeriodGlAccounts.xml index 86ff73da..a916e4ae 100644 --- a/screen/SimpleScreens/Accounting/TimePeriod/ViewPeriodGlAccounts.xml +++ b/screen/SimpleScreens/Accounting/TimePeriod/ViewPeriodGlAccounts.xml @@ -43,6 +43,14 @@ along with this software (see the LICENSE.md file). If not, see + + + + + + + From 18bc68809d5f88386742b5b7a289f2531cabdbb8 Mon Sep 17 00:00:00 2001 From: David E Jones Date: Tue, 14 Apr 2020 00:34:20 -0700 Subject: [PATCH 036/150] In various screens and search transitions use new StringUtilities.elasticQueryAutoWildcard() method to handle query string processing instead of inconsistent inline --- screen/SimpleScreens/Catalog/Search.xml | 2 ++ screen/SimpleScreens/Search.xml | 2 +- template/party/PartyForms.xml | 4 +--- template/product/ProductTransitions.xml | 6 ++---- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/screen/SimpleScreens/Catalog/Search.xml b/screen/SimpleScreens/Catalog/Search.xml index 7cc50140..465bc8c5 100644 --- a/screen/SimpleScreens/Catalog/Search.xml +++ b/screen/SimpleScreens/Catalog/Search.xml @@ -39,6 +39,8 @@ along with this software (see the LICENSE.md file). If not, see + + diff --git a/screen/SimpleScreens/Search.xml b/screen/SimpleScreens/Search.xml index 4adfac56..55cd6b47 100644 --- a/screen/SimpleScreens/Search.xml +++ b/screen/SimpleScreens/Search.xml @@ -19,7 +19,7 @@ along with this software (see the LICENSE.md file). If not, see - + diff --git a/template/party/PartyForms.xml b/template/party/PartyForms.xml index ead8df4e..2abfce5f 100644 --- a/template/party/PartyForms.xml +++ b/template/party/PartyForms.xml @@ -92,9 +92,7 @@ along with this software (see the LICENSE.md file). If not, see + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -61,6 +130,7 @@ along with this software (see the LICENSE.md file). If not, see + @@ -88,6 +158,7 @@ along with this software (see the LICENSE.md file). If not, see + From db45ad45e56919b8b297ee8d90e358f1cb6890f5 Mon Sep 17 00:00:00 2001 From: David E Jones Date: Thu, 16 Apr 2020 19:37:12 -0700 Subject: [PATCH 039/150] On Asset/FindSummary screen add option to show zero QOH and ATP results --- screen/SimpleScreens/Asset/Asset/FindSummary.xml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/screen/SimpleScreens/Asset/Asset/FindSummary.xml b/screen/SimpleScreens/Asset/Asset/FindSummary.xml index f3229bd8..680c1540 100644 --- a/screen/SimpleScreens/Asset/Asset/FindSummary.xml +++ b/screen/SimpleScreens/Asset/Asset/FindSummary.xml @@ -169,8 +169,8 @@ along with this software (see the LICENSE.md file). If not, see - - + + @@ -178,6 +178,10 @@ along with this software (see the LICENSE.md file). If not, see + + + + From c89fe0a71a57c2d1a112ad65d4875176cacf94e0 Mon Sep 17 00:00:00 2001 From: David E Jones Date: Sat, 18 Apr 2020 01:49:57 -0700 Subject: [PATCH 040/150] Add support for new WikiPage.sequenceNum field and use new get#WikiPageChildren service to get sorted child page info --- screen/SimpleScreens/Wiki/EditWikiPage.xml | 3 ++- screen/SimpleScreens/Wiki/wiki.xml | 25 +++++++++++----------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/screen/SimpleScreens/Wiki/EditWikiPage.xml b/screen/SimpleScreens/Wiki/EditWikiPage.xml index 5ab535c8..bd8345b0 100644 --- a/screen/SimpleScreens/Wiki/EditWikiPage.xml +++ b/screen/SimpleScreens/Wiki/EditWikiPage.xml @@ -52,6 +52,7 @@ along with this software (see the LICENSE.md file). If not, see + @@ -66,7 +67,7 @@ along with this software (see the LICENSE.md file). If not, see --> - + diff --git a/screen/SimpleScreens/Wiki/wiki.xml b/screen/SimpleScreens/Wiki/wiki.xml index c8e71fa0..44f02a3e 100644 --- a/screen/SimpleScreens/Wiki/wiki.xml +++ b/screen/SimpleScreens/Wiki/wiki.xml @@ -159,14 +159,13 @@ along with this software (see the LICENSE.md file). If not, see - + + @@ -175,15 +174,15 @@ along with this software (see the LICENSE.md file). If not, see - - + - - + @@ -202,7 +201,7 @@ along with this software (see the LICENSE.md file). If not, see - - - + + + + - - - + @@ -55,7 +58,7 @@ along with this software (see the LICENSE.md file). If not, see - + diff --git a/screen/SimpleScreens/Customer/EditCustomer.xml b/screen/SimpleScreens/Customer/EditCustomer.xml index c428410d..579f7479 100644 --- a/screen/SimpleScreens/Customer/EditCustomer.xml +++ b/screen/SimpleScreens/Customer/EditCustomer.xml @@ -108,8 +108,20 @@ along with this software (see the LICENSE.md file). If not, see - - + + + + + + + + + + + + + + diff --git a/screen/SimpleScreens/Party/EditParty.xml b/screen/SimpleScreens/Party/EditParty.xml index fc1d61ee..743133db 100644 --- a/screen/SimpleScreens/Party/EditParty.xml +++ b/screen/SimpleScreens/Party/EditParty.xml @@ -122,8 +122,20 @@ along with this software (see the LICENSE.md file). If not, see - - + + + + + + + + + + + + + + From 60b4519f389f438d0fa3088c111c244dd4777ec8 Mon Sep 17 00:00:00 2001 From: Deepak Nigam Date: Tue, 28 Apr 2020 10:30:46 +0530 Subject: [PATCH 061/150] Added document related to Order Place button. --- data/SimpleScreensSetupData.xml | 3 +++ document/order/Order Place.md | 20 ++++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 document/order/Order Place.md diff --git a/data/SimpleScreensSetupData.xml b/data/SimpleScreensSetupData.xml index bedca7b5..eaa14675 100644 --- a/data/SimpleScreensSetupData.xml +++ b/data/SimpleScreensSetupData.xml @@ -122,10 +122,13 @@ along with this software (see the LICENSE.md file). If not, see docIndex="100" docLocation="component://SimpleScreens/document/order/Order Roles and Parts.md"/> + + Date: Sun, 3 May 2020 21:33:57 +0530 Subject: [PATCH 062/150] Added document for the Create Purchase Order Button. --- data/SimpleScreensSetupData.xml | 3 ++ .../order/Create Purchase Order Button.md | 36 +++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 document/order/Create Purchase Order Button.md diff --git a/data/SimpleScreensSetupData.xml b/data/SimpleScreensSetupData.xml index eaa14675..d1a797c7 100644 --- a/data/SimpleScreensSetupData.xml +++ b/data/SimpleScreensSetupData.xml @@ -122,6 +122,8 @@ along with this software (see the LICENSE.md file). If not, see docIndex="100" docLocation="component://SimpleScreens/document/order/Order Roles and Parts.md"/> + @@ -130,6 +132,7 @@ along with this software (see the LICENSE.md file). If not, see + diff --git a/document/order/Create Purchase Order Button.md b/document/order/Create Purchase Order Button.md new file mode 100644 index 00000000..5227d85f --- /dev/null +++ b/document/order/Create Purchase Order Button.md @@ -0,0 +1,36 @@ +## Create Purchase Order Button + +### Fields Description + +#### Supplier + +The supplier represents vendor or vendor organization from which order is associated. + +#### Customer Org + +Customer Org represents the organization or the party through which the customer is associated. + +#### Facility + +The facility represents a facility that is associated with the customer organization. + +#### Ship Before Date + +Date before which shipment should be happening. + +#### Delivery Date + +The delivery date represents an estimated delivery date. + + +### Actions when Create button pressed + +#### Transitions + +When we click on the 'Create' button, the following transition will be called. +- SimpleScreens/screen/SimpleScreens/Order/FindOrder.xml: 'createOrder' + +#### Services + +In the 'createOrder' transition, the following service will be called. +- mantle.order.OrderServices.create#Order From e92c74e05dd982214bd3e0f707a74a2ca4ada8bd Mon Sep 17 00:00:00 2001 From: Deepak Nigam Date: Mon, 4 May 2020 10:04:03 +0530 Subject: [PATCH 063/150] Updated name of the document and the respective data. --- data/SimpleScreensSetupData.xml | 4 ++-- document/order/{Order Place.md => Order Button Bar.md} | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename document/order/{Order Place.md => Order Button Bar.md} (100%) diff --git a/data/SimpleScreensSetupData.xml b/data/SimpleScreensSetupData.xml index d1a797c7..e46eec4d 100644 --- a/data/SimpleScreensSetupData.xml +++ b/data/SimpleScreensSetupData.xml @@ -1,6 +1,6 @@ diff --git a/document/order/Order Place.md b/document/order/Order Button Bar.md similarity index 100% rename from document/order/Order Place.md rename to document/order/Order Button Bar.md From b92b8a6c6932ba10b7c9355902d7333f0d01c1ba Mon Sep 17 00:00:00 2001 From: Shahbaz Khan Date: Thu, 28 May 2020 13:42:36 +0530 Subject: [PATCH 064/150] Added document related to Create Sales Order button. --- data/SimpleScreensSetupData.xml | 3 ++- document/order/Create Sales Order.md | 32 ++++++++++++++++++++++++++++ document/order/Order Button Bar.md | 2 +- 3 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 document/order/Create Sales Order.md diff --git a/data/SimpleScreensSetupData.xml b/data/SimpleScreensSetupData.xml index e46eec4d..b64f59b9 100644 --- a/data/SimpleScreensSetupData.xml +++ b/data/SimpleScreensSetupData.xml @@ -124,7 +124,8 @@ along with this software (see the LICENSE.md file). If not, see docIndex="110" docLocation="component://SimpleScreens/document/order/Order Status Reference.md"/> - + Date: Fri, 5 Jun 2020 13:26:18 -0700 Subject: [PATCH 065/150] First pass on new OrderItems screen and EditItem dialog/standalone screen, Order screens now have tabs for Order Detail, Items, and Quick Items --- screen/SimpleScreens/Order.xml | 2 +- screen/SimpleScreens/Order/OrderDetail.xml | 2 +- .../Order/OrderDetail/EditItem.xml | 190 ++++++++++ screen/SimpleScreens/Order/OrderItems.xml | 344 ++++++++++++++++++ screen/SimpleScreens/Order/QuickItems.xml | 114 +++--- 5 files changed, 595 insertions(+), 57 deletions(-) create mode 100644 screen/SimpleScreens/Order/OrderDetail/EditItem.xml create mode 100644 screen/SimpleScreens/Order/OrderItems.xml diff --git a/screen/SimpleScreens/Order.xml b/screen/SimpleScreens/Order.xml index c641966d..d99417f3 100644 --- a/screen/SimpleScreens/Order.xml +++ b/screen/SimpleScreens/Order.xml @@ -23,5 +23,5 @@ along with this software (see the LICENSE.md file). If not, see - + diff --git a/screen/SimpleScreens/Order/OrderDetail.xml b/screen/SimpleScreens/Order/OrderDetail.xml index 9af4c51a..c98ff31f 100644 --- a/screen/SimpleScreens/Order/OrderDetail.xml +++ b/screen/SimpleScreens/Order/OrderDetail.xml @@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see . --> + default-menu-title="Order Detail" default-menu-index="1"> diff --git a/screen/SimpleScreens/Order/OrderDetail/EditItem.xml b/screen/SimpleScreens/Order/OrderDetail/EditItem.xml new file mode 100644 index 00000000..c8ddb6a1 --- /dev/null +++ b/screen/SimpleScreens/Order/OrderDetail/EditItem.xml @@ -0,0 +1,190 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <#list itemUnitAmountAuditList as auditInfo> + + + + +
${ec.l10n.formatCurrency(auditInfo.auditLog.newValueText, orderHeader.currencyUomId, 3)}${ec.resource.expand('UsernameTemplate', '', auditInfo.userAccount)}${ec.l10n.format(auditInfo.auditLog.changedDate, 'yyyy-MM-dd HH:mm')}${(auditInfo.changeReasonEnum.description)!(auditInfo.auditLog.changeReason)!''}
+ + ${ec.l10n.localize('Price History')} + ]]> + + + + + + + + + + + + + + + + + + + + + + <#list itemQuantityAuditList as auditInfo> + + + + +
${auditInfo.auditLog.newValueText}${ec.resource.expand('UsernameTemplate', '', auditInfo.userAccount)}${ec.l10n.format(auditInfo.auditLog.changedDate, 'yyyy-MM-dd HH:mm')}${(auditInfo.changeReasonEnum.description)!(auditInfo.auditLog.changeReason)!''}
+ + ${ec.l10n.localize('Quantity History')} + ]]> + + + + + + + + + + + + + + + + + + + + + + + $(function () { $('[data-toggle="popover"]').popover({ sanitize:false, html:true, trigger:"hover click" }); })]]> + + diff --git a/screen/SimpleScreens/Order/OrderItems.xml b/screen/SimpleScreens/Order/OrderItems.xml new file mode 100644 index 00000000..990d353b --- /dev/null +++ b/screen/SimpleScreens/Order/OrderItems.xml @@ -0,0 +1,344 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/screen/SimpleScreens/Order/QuickItems.xml b/screen/SimpleScreens/Order/QuickItems.xml index 44b3e330..596b4364 100644 --- a/screen/SimpleScreens/Order/QuickItems.xml +++ b/screen/SimpleScreens/Order/QuickItems.xml @@ -13,10 +13,10 @@ along with this software (see the LICENSE.md file). If not, see . --> + default-menu-title="Quick Items" default-menu-index="3"> - + @@ -30,68 +30,72 @@ along with this software (see the LICENSE.md file). If not, see - - - - - - - - - - + + + + + + + - + + + + + + + + + + + + + + - - - - - + + + + + - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - + @@ -101,7 +105,7 @@ along with this software (see the LICENSE.md file). If not, see - + From b73c20efa30195858b38a93782becc0a67414484 Mon Sep 17 00:00:00 2001 From: David E Jones Date: Fri, 5 Jun 2020 17:15:52 -0700 Subject: [PATCH 066/150] On OrderDetail add default itemLimit of 10 for no parent items per OrderPart along with form to set to different values and button above per-part item list for all items if not all shown that goes to OrderItems screen; on OrderItems add more Find Options; on QuickItems filter out Virtual type Products --- screen/SimpleScreens/Order/OrderDetail.xml | 19 +++++++- .../Order/OrderDetail/ItemReserve.xml | 1 + screen/SimpleScreens/Order/OrderItems.xml | 45 ++++++++++++++----- screen/SimpleScreens/Order/QuickItems.xml | 5 ++- 4 files changed, 58 insertions(+), 12 deletions(-) diff --git a/screen/SimpleScreens/Order/OrderDetail.xml b/screen/SimpleScreens/Order/OrderDetail.xml index c98ff31f..196f4dab 100644 --- a/screen/SimpleScreens/Order/OrderDetail.xml +++ b/screen/SimpleScreens/Order/OrderDetail.xml @@ -175,7 +175,9 @@ along with this software (see the LICENSE.md file). If not, see - + + + @@ -400,6 +402,17 @@ along with this software (see the LICENSE.md file). If not, see +
+ + + + + + + +
+
@@ -1123,6 +1136,10 @@ along with this software (see the LICENSE.md file). If not, see parameter-map="[orderId:orderId, orderPartSeqId:orderPart.orderPartSeqId, disablePromotions:'Y']"/>
+ + + diff --git a/screen/SimpleScreens/Order/OrderItems.xml b/screen/SimpleScreens/Order/OrderItems.xml index 990d353b..42aecaa7 100644 --- a/screen/SimpleScreens/Order/OrderItems.xml +++ b/screen/SimpleScreens/Order/OrderItems.xml @@ -198,35 +198,56 @@ along with this software (see the LICENSE.md file). If not, see + - + + + + - + - + + + + + + + + + - - - + + + + + + + - + + + + + @@ -235,19 +256,25 @@ along with this software (see the LICENSE.md file). If not, see - + + + + + + + @@ -264,8 +291,6 @@ along with this software (see the LICENSE.md file). If not, see - - diff --git a/screen/SimpleScreens/Order/QuickItems.xml b/screen/SimpleScreens/Order/QuickItems.xml index 596b4364..676aad1f 100644 --- a/screen/SimpleScreens/Order/QuickItems.xml +++ b/screen/SimpleScreens/Order/QuickItems.xml @@ -59,7 +59,10 @@ along with this software (see the LICENSE.md file). If not, see - + + + + From 24f385181bdf89b348a5cf33073d706391d767c4 Mon Sep 17 00:00:00 2001 From: Daniel Taylor Date: Wed, 10 Jun 2020 11:33:02 -0500 Subject: [PATCH 067/150] Revert "End User Documentation" --- data/SimpleScreensSetupData.xml | 9 +---- .../order/Create Purchase Order Button.md | 36 ------------------- document/order/Create Sales Order.md | 32 ----------------- document/order/Order Button Bar.md | 20 ----------- 4 files changed, 1 insertion(+), 96 deletions(-) delete mode 100644 document/order/Create Purchase Order Button.md delete mode 100644 document/order/Create Sales Order.md delete mode 100644 document/order/Order Button Bar.md diff --git a/data/SimpleScreensSetupData.xml b/data/SimpleScreensSetupData.xml index b64f59b9..bedca7b5 100644 --- a/data/SimpleScreensSetupData.xml +++ b/data/SimpleScreensSetupData.xml @@ -1,6 +1,6 @@ Date: Thu, 11 Jun 2020 15:10:22 -0700 Subject: [PATCH 068/150] On FindRequest add showNot to requestTypeEnumId to search for requests not matching the selected type(s) --- screen/SimpleScreens/Request/FindRequest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/screen/SimpleScreens/Request/FindRequest.xml b/screen/SimpleScreens/Request/FindRequest.xml index ff963d54..4fc6c988 100644 --- a/screen/SimpleScreens/Request/FindRequest.xml +++ b/screen/SimpleScreens/Request/FindRequest.xml @@ -165,8 +165,8 @@ along with this software (see the LICENSE.md file). If not, see - - + + From f9993ada9490554dce4697a0d3fead8fc33615c1 Mon Sep 17 00:00:00 2001 From: David E Jones Date: Fri, 12 Jun 2020 19:26:14 -0700 Subject: [PATCH 069/150] Add first pass on ShipmentItems and ShipmentPackages screens, paginated; ShipmentDetail now uses section-iterate for items and packages from the new screens but currently doesn't show pagination as section-include doesn't do that for now, but limits the results to the pageSize and shows a message and button to see all if more than displayed --- screen/SimpleScreens/Shipment.xml | 2 +- .../SimpleScreens/Shipment/ShipmentDetail.xml | 540 ++---------------- .../SimpleScreens/Shipment/ShipmentItems.xml | 345 +++++++++++ .../Shipment/ShipmentPackages.xml | 279 +++++++++ 4 files changed, 663 insertions(+), 503 deletions(-) create mode 100644 screen/SimpleScreens/Shipment/ShipmentItems.xml create mode 100644 screen/SimpleScreens/Shipment/ShipmentPackages.xml diff --git a/screen/SimpleScreens/Shipment.xml b/screen/SimpleScreens/Shipment.xml index d8b624c6..70d80511 100644 --- a/screen/SimpleScreens/Shipment.xml +++ b/screen/SimpleScreens/Shipment.xml @@ -18,6 +18,6 @@ along with this software (see the LICENSE.md file). If not, see - + diff --git a/screen/SimpleScreens/Shipment/ShipmentDetail.xml b/screen/SimpleScreens/Shipment/ShipmentDetail.xml index f54b4d7f..fe36cbab 100644 --- a/screen/SimpleScreens/Shipment/ShipmentDetail.xml +++ b/screen/SimpleScreens/Shipment/ShipmentDetail.xml @@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see . --> + default-menu-title="Shipment" default-menu-index="1"> @@ -56,18 +56,6 @@ along with this software (see the LICENSE.md file). If not, see - - - - - - - - - - - - @@ -94,6 +82,8 @@ along with this software (see the LICENSE.md file). If not, see + + @@ -103,16 +93,28 @@ along with this software (see the LICENSE.md file). If not, see - - + + + + + + + + + + + + + + @@ -142,6 +144,8 @@ along with this software (see the LICENSE.md file). If not, see + + @@ -676,6 +680,17 @@ along with this software (see the LICENSE.md file). If not, see --> +
+ + + + + + + +
+
@@ -861,279 +876,10 @@ along with this software (see the LICENSE.md file). If not, see
- - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - -
-
- - - -
- - - - - -
- - - - - - - -
- - -
- - - - - - - - - - - -
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - + @@ -1143,220 +889,10 @@ along with this software (see the LICENSE.md file). If not, see parameter-map="[resetExisting:true]" confirmation="Remove existing packages and create new based on auto-package data?"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Label]]>
- - -
- Com. Invoice]]>
- - - -
- Ret Lbl]]>
- - -
- Ret Com Invc]]>
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - -
-
- - - - - - - - - - - - - - -
- - - - - - - - - - - - + diff --git a/screen/SimpleScreens/Shipment/ShipmentItems.xml b/screen/SimpleScreens/Shipment/ShipmentItems.xml new file mode 100644 index 00000000..da1bdf4b --- /dev/null +++ b/screen/SimpleScreens/Shipment/ShipmentItems.xml @@ -0,0 +1,345 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + +
+
+ + + +
+ + + + + +
+ + + + + + + +
+ + +
+ + + + + + + + + + + +
+ + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + diff --git a/screen/SimpleScreens/Shipment/ShipmentPackages.xml b/screen/SimpleScreens/Shipment/ShipmentPackages.xml new file mode 100644 index 00000000..e9b64b44 --- /dev/null +++ b/screen/SimpleScreens/Shipment/ShipmentPackages.xml @@ -0,0 +1,279 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Label]]>
+ + +
+ Com. Invoice]]>
+ + + +
+ Ret Lbl]]>
+ + +
+ Ret Com Invc]]>
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + +
+
+ + + + + + + + + + + + + + +
+ + + + + + + + + + + + + +
+ + From e430fb850482b30f49ce40c9564aa6908b0b4208 Mon Sep 17 00:00:00 2001 From: David E Jones Date: Fri, 12 Jun 2020 20:04:39 -0700 Subject: [PATCH 070/150] On ShipmentDetail make warning message about now showing all items red --- screen/SimpleScreens/Order/OrderDetail.xml | 16 ++++++++-------- screen/SimpleScreens/Shipment/ShipmentDetail.xml | 6 ++++-- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/screen/SimpleScreens/Order/OrderDetail.xml b/screen/SimpleScreens/Order/OrderDetail.xml index 196f4dab..e60e9f7d 100644 --- a/screen/SimpleScreens/Order/OrderDetail.xml +++ b/screen/SimpleScreens/Order/OrderDetail.xml @@ -853,7 +853,7 @@ along with this software (see the LICENSE.md file). If not, see - + @@ -957,7 +957,7 @@ along with this software (see the LICENSE.md file). If not, see condition="partPaymentInfo.partPayment.paymentMethodId != null"/> - + - checked="checked"> ]]> - + - $("#SetOrderInfoForm_shippingPostalContactMechId_${orderPartInfo_index}").val($("input[name=shippingPostalContactMechId_${orderPartInfo_index}]:checked").val()); $("input[name=shippingPostalContactMechId_${orderPartInfo_index}]:radio").change( function() { $("#SetOrderInfoForm_shippingPostalContactMechId_${orderPartInfo_index}").val($("input[name=shippingPostalContactMechId_${orderPartInfo_index}]:checked").val()); }) @@ -1282,7 +1282,7 @@ along with this software (see the LICENSE.md file). If not, see - <#list itemUnitAmountAuditList as auditInfo> @@ -1306,7 +1306,7 @@ along with this software (see the LICENSE.md file). If not, see -
${ec.l10n.formatCurrency(auditInfo.auditLog.newValueText, orderHeader.currencyUomId, 3)}
<#list itemQuantityAuditList as auditInfo> @@ -1404,6 +1404,6 @@ along with this software (see the LICENSE.md file). If not, see - $(function () { $('[data-toggle="popover"]').popover({ sanitize:false, html:true, trigger:"hover click" }); })]]> + $(function () { $('[data-toggle="popover"]').popover({ sanitize:false, html:true, trigger:"hover click" }); })]]> diff --git a/screen/SimpleScreens/Shipment/ShipmentDetail.xml b/screen/SimpleScreens/Shipment/ShipmentDetail.xml index fe36cbab..4f900c0c 100644 --- a/screen/SimpleScreens/Shipment/ShipmentDetail.xml +++ b/screen/SimpleScreens/Shipment/ShipmentDetail.xml @@ -876,7 +876,8 @@ along with this software (see the LICENSE.md file). If not, see -
${auditInfo.auditLog.newValueText}
<#list itemUnitAmountAuditList as auditInfo> @@ -1328,7 +1329,8 @@ along with this software (see the LICENSE.md file). If not, see - +
${ec.l10n.formatCurrency(auditInfo.auditLog.newValueText, orderHeader.currencyUomId, 3)}
<#list itemQuantityAuditList as auditInfo> @@ -1426,6 +1428,7 @@ along with this software (see the LICENSE.md file). If not, see - $(function () { $('[data-toggle="popover"]').popover({ sanitize:false, html:true, trigger:"hover click" }); })]]> + + $(function () { $('[data-toggle="popover"]').popover({ sanitize:false, html:true, trigger:"hover click" }); })]]> From 5dfd0e7ad3ab291198b18c802d2854c242d47490 Mon Sep 17 00:00:00 2001 From: David E Jones Date: Sat, 20 Jun 2020 12:32:49 -0700 Subject: [PATCH 074/150] On FindProduct show more text-find options for ID and Name fields --- screen/SimpleScreens/Catalog/Product/FindProduct.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/screen/SimpleScreens/Catalog/Product/FindProduct.xml b/screen/SimpleScreens/Catalog/Product/FindProduct.xml index 4ac524e7..4bd8b291 100644 --- a/screen/SimpleScreens/Catalog/Product/FindProduct.xml +++ b/screen/SimpleScreens/Catalog/Product/FindProduct.xml @@ -63,11 +63,11 @@ along with this software (see the LICENSE.md file). If not, see - + - + From 07a882822a1f5ff7f9732edd0c2be1e3a32e1449 Mon Sep 17 00:00:00 2001 From: David E Jones Date: Sat, 20 Jun 2020 12:34:12 -0700 Subject: [PATCH 075/150] On ShipmentDetail/ReceiveItem screen use new ProductServices.find#ProductByIdValue to support more flexible ID values, especially for scan receive form on upper right of ShipmentDetail; on ShipmentDetail show the warning in the Add Item dialog instead of as a submit confirmation --- .../SimpleScreens/Shipment/ShipmentDetail.xml | 4 +-- .../Shipment/ShipmentDetail/ReceiveItem.xml | 26 +++++++------------ 2 files changed, 11 insertions(+), 19 deletions(-) diff --git a/screen/SimpleScreens/Shipment/ShipmentDetail.xml b/screen/SimpleScreens/Shipment/ShipmentDetail.xml index baf0bab0..40e94a12 100644 --- a/screen/SimpleScreens/Shipment/ShipmentDetail.xml +++ b/screen/SimpleScreens/Shipment/ShipmentDetail.xml @@ -792,14 +792,14 @@ along with this software (see the LICENSE.md file). If not, see to returns, knowing that order items were returned, etc -->
+
diff --git a/screen/SimpleScreens/Shipment/ShipmentDetail/ReceiveItem.xml b/screen/SimpleScreens/Shipment/ShipmentDetail/ReceiveItem.xml index 9c43d215..e7350517 100644 --- a/screen/SimpleScreens/Shipment/ShipmentDetail/ReceiveItem.xml +++ b/screen/SimpleScreens/Shipment/ShipmentDetail/ReceiveItem.xml @@ -32,24 +32,16 @@ along with this software (see the LICENSE.md file). If not, see - - - - - - - - - - - - Found multiple products with ID ${scanId}: ${prodIdentList*.productId.join(', ')} - + + + + + + - - - - + + From e18e6f88af51af3c92c07b17690de63a3521a920 Mon Sep 17 00:00:00 2001 From: David E Jones Date: Wed, 24 Jun 2020 12:56:13 -0700 Subject: [PATCH 076/150] On ShipmentDetail add Parties section with add and view/delete forms; on ReceiveItem screen pass shipmentId to find#ProductByIdValue service call, look up ShipmentParty with new AssetOwner role as the default ownerPartyId, overriding other options if there is one --- .../SimpleScreens/Shipment/ShipmentDetail.xml | 38 +++++++++++++++++++ .../Shipment/ShipmentDetail/ReceiveItem.xml | 17 ++++++--- 2 files changed, 50 insertions(+), 5 deletions(-) diff --git a/screen/SimpleScreens/Shipment/ShipmentDetail.xml b/screen/SimpleScreens/Shipment/ShipmentDetail.xml index 40e94a12..467e63c1 100644 --- a/screen/SimpleScreens/Shipment/ShipmentDetail.xml +++ b/screen/SimpleScreens/Shipment/ShipmentDetail.xml @@ -62,6 +62,11 @@ along with this software (see the LICENSE.md file). If not, see + + + + + @@ -710,6 +715,39 @@ along with this software (see the LICENSE.md file). If not, see + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/screen/SimpleScreens/Shipment/ShipmentDetail/ReceiveItem.xml b/screen/SimpleScreens/Shipment/ShipmentDetail/ReceiveItem.xml index e7350517..b1f645a6 100644 --- a/screen/SimpleScreens/Shipment/ShipmentDetail/ReceiveItem.xml +++ b/screen/SimpleScreens/Shipment/ShipmentDetail/ReceiveItem.xml @@ -32,13 +32,12 @@ along with this software (see the LICENSE.md file). If not, see - - + - + in-map="[idValue:productId, shipmentId:shipmentId]"/> + - + @@ -74,6 +73,14 @@ along with this software (see the LICENSE.md file). If not, see + + + + + + + + From 0d3ea219b49a0155541e00ac9332c8958f6c1f1e Mon Sep 17 00:00:00 2001 From: David E Jones Date: Wed, 24 Jun 2020 14:30:53 -0700 Subject: [PATCH 077/150] On OrderItems and ShipmentItems screens pass through pageIndex in more places to preserve page after submitting forms/etc; on OrderItems query and paginate on top level (no parent) order items only, and then do separate query to get all child items to add to displayed list so child items always visible --- .../Order/OrderDetail/EditItem.xml | 2 + .../Order/OrderDetail/ItemReserve.xml | 3 ++ .../Order/OrderDetail/ReturnItem.xml | 4 ++ screen/SimpleScreens/Order/OrderItems.xml | 49 ++++++++++++++----- .../Shipment/ShipmentDetail/ItemReserve.xml | 2 + .../Shipment/ShipmentDetail/ReceiveItem.xml | 2 + .../ShipmentDetail/UpdateItemAsset.xml | 1 + .../SimpleScreens/Shipment/ShipmentItems.xml | 20 ++++++++ 8 files changed, 72 insertions(+), 11 deletions(-) diff --git a/screen/SimpleScreens/Order/OrderDetail/EditItem.xml b/screen/SimpleScreens/Order/OrderDetail/EditItem.xml index c8ddb6a1..95930974 100644 --- a/screen/SimpleScreens/Order/OrderDetail/EditItem.xml +++ b/screen/SimpleScreens/Order/OrderDetail/EditItem.xml @@ -17,6 +17,7 @@ along with this software (see the LICENSE.md file). If not, see + @@ -44,6 +45,7 @@ along with this software (see the LICENSE.md file). If not, see + diff --git a/screen/SimpleScreens/Order/OrderDetail/ItemReserve.xml b/screen/SimpleScreens/Order/OrderDetail/ItemReserve.xml index 518e61b9..9dae17b0 100644 --- a/screen/SimpleScreens/Order/OrderDetail/ItemReserve.xml +++ b/screen/SimpleScreens/Order/OrderDetail/ItemReserve.xml @@ -17,6 +17,7 @@ along with this software (see the LICENSE.md file). If not, see + @@ -30,6 +31,8 @@ along with this software (see the LICENSE.md file). If not, see + + diff --git a/screen/SimpleScreens/Order/OrderDetail/ReturnItem.xml b/screen/SimpleScreens/Order/OrderDetail/ReturnItem.xml index 684dbae8..6f9d4551 100644 --- a/screen/SimpleScreens/Order/OrderDetail/ReturnItem.xml +++ b/screen/SimpleScreens/Order/OrderDetail/ReturnItem.xml @@ -17,6 +17,8 @@ along with this software (see the LICENSE.md file). If not, see + + @@ -30,6 +32,8 @@ along with this software (see the LICENSE.md file). If not, see + + diff --git a/screen/SimpleScreens/Order/OrderItems.xml b/screen/SimpleScreens/Order/OrderItems.xml index 42aecaa7..40f10f36 100644 --- a/screen/SimpleScreens/Order/OrderItems.xml +++ b/screen/SimpleScreens/Order/OrderItems.xml @@ -17,6 +17,7 @@ along with this software (see the LICENSE.md file). If not, see + @@ -70,6 +71,40 @@ along with this software (see the LICENSE.md file). If not, see 'OrderProposed', 'OrderPlaced', 'OrderHold', 'OrderProcessing', 'OrderWishList', 'OrderGiftRegistry', 'OrderAutoReorder'])"/> + + + + + + + + + + + + + + + + + + + @@ -181,13 +216,6 @@ along with this software (see the LICENSE.md file). If not, see - - - - - - - @@ -198,13 +226,12 @@ along with this software (see the LICENSE.md file). If not, see - - + @@ -224,7 +251,7 @@ along with this software (see the LICENSE.md file). If not, see - + @@ -240,7 +267,7 @@ along with this software (see the LICENSE.md file). If not, see - + diff --git a/screen/SimpleScreens/Shipment/ShipmentDetail/ItemReserve.xml b/screen/SimpleScreens/Shipment/ShipmentDetail/ItemReserve.xml index 98db40b6..0420485e 100644 --- a/screen/SimpleScreens/Shipment/ShipmentDetail/ItemReserve.xml +++ b/screen/SimpleScreens/Shipment/ShipmentDetail/ItemReserve.xml @@ -20,6 +20,7 @@ along with this software (see the LICENSE.md file). If not, see + @@ -36,6 +37,7 @@ along with this software (see the LICENSE.md file). If not, see + diff --git a/screen/SimpleScreens/Shipment/ShipmentDetail/ReceiveItem.xml b/screen/SimpleScreens/Shipment/ShipmentDetail/ReceiveItem.xml index b1f645a6..959ec445 100644 --- a/screen/SimpleScreens/Shipment/ShipmentDetail/ReceiveItem.xml +++ b/screen/SimpleScreens/Shipment/ShipmentDetail/ReceiveItem.xml @@ -20,6 +20,7 @@ along with this software (see the LICENSE.md file). If not, see + @@ -128,6 +129,7 @@ along with this software (see the LICENSE.md file). If not, see + diff --git a/screen/SimpleScreens/Shipment/ShipmentDetail/UpdateItemAsset.xml b/screen/SimpleScreens/Shipment/ShipmentDetail/UpdateItemAsset.xml index 5b9d30e5..bfab49f6 100644 --- a/screen/SimpleScreens/Shipment/ShipmentDetail/UpdateItemAsset.xml +++ b/screen/SimpleScreens/Shipment/ShipmentDetail/UpdateItemAsset.xml @@ -21,6 +21,7 @@ along with this software (see the LICENSE.md file). If not, see + diff --git a/screen/SimpleScreens/Shipment/ShipmentItems.xml b/screen/SimpleScreens/Shipment/ShipmentItems.xml index 3475393c..0ff1ad48 100644 --- a/screen/SimpleScreens/Shipment/ShipmentItems.xml +++ b/screen/SimpleScreens/Shipment/ShipmentItems.xml @@ -18,6 +18,7 @@ along with this software (see the LICENSE.md file). If not, see + @@ -173,6 +174,12 @@ along with this software (see the LICENSE.md file). If not, see + + + + + + @@ -208,6 +215,12 @@ along with this software (see the LICENSE.md file). If not, see + + + + + + @@ -219,6 +232,12 @@ along with this software (see the LICENSE.md file). If not, see + + + + + + - + - + Date: Tue, 30 Jun 2020 12:32:30 -0700 Subject: [PATCH 079/150] On order SalesAnalysis add Customer find option and optional Customer display field, not displayed by default; on FindOrder pass through Customer if one is selected in Find Options or parameter from EditParty/etc link --- .../SimpleScreens/Accounting/Reports/SalesAnalysis.xml | 10 ++++++++-- screen/SimpleScreens/Order/FindOrder.xml | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/screen/SimpleScreens/Accounting/Reports/SalesAnalysis.xml b/screen/SimpleScreens/Accounting/Reports/SalesAnalysis.xml index b7ef050a..e3b02f92 100644 --- a/screen/SimpleScreens/Accounting/Reports/SalesAnalysis.xml +++ b/screen/SimpleScreens/Accounting/Reports/SalesAnalysis.xml @@ -32,8 +32,8 @@ along with this software (see the LICENSE.md file). If not, see - + @@ -53,6 +53,12 @@ along with this software (see the LICENSE.md file). If not, see + + + + + diff --git a/screen/SimpleScreens/Order/FindOrder.xml b/screen/SimpleScreens/Order/FindOrder.xml index 59bc872b..7fa524c7 100644 --- a/screen/SimpleScreens/Order/FindOrder.xml +++ b/screen/SimpleScreens/Order/FindOrder.xml @@ -177,7 +177,7 @@ along with this software (see the LICENSE.md file). If not, see - + From 371ca5bbfc3af4ff4d9f23a0011e864571051b4d Mon Sep 17 00:00:00 2001 From: David E Jones Date: Tue, 7 Jul 2020 13:06:41 -0700 Subject: [PATCH 080/150] On EditProductStore add new shipmentAnyCarrierMethod config field --- screen/SimpleScreens/ProductStore/EditProductStore.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/screen/SimpleScreens/ProductStore/EditProductStore.xml b/screen/SimpleScreens/ProductStore/EditProductStore.xml index ac914ae7..34d0875f 100644 --- a/screen/SimpleScreens/ProductStore/EditProductStore.xml +++ b/screen/SimpleScreens/ProductStore/EditProductStore.xml @@ -101,6 +101,8 @@ along with this software (see the LICENSE.md file). If not, see + + From f2a2831324943f3a9a4fbd118082c35a4d6e1a84 Mon Sep 17 00:00:00 2001 From: David E Jones Date: Wed, 8 Jul 2020 22:07:13 -0700 Subject: [PATCH 081/150] On ShipmentItems Set Packed dialog (also used on ShipmentDetail) change warning message about not all items packed to danger, and show message for each item not fully packed with quantities; basically the single simple message was not sufficient in real world use --- screen/SimpleScreens/Shipment/ShipmentItems.xml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/screen/SimpleScreens/Shipment/ShipmentItems.xml b/screen/SimpleScreens/Shipment/ShipmentItems.xml index 0ff1ad48..f20b4545 100644 --- a/screen/SimpleScreens/Shipment/ShipmentItems.xml +++ b/screen/SimpleScreens/Shipment/ShipmentItems.xml @@ -87,7 +87,13 @@ along with this software (see the LICENSE.md file). If not, see -
${auditInfo.auditLog.newValueText}
+ class="q-table__container q-table__card q-table--horizontal-separator q-table--dense q-table--flat"> +
@@ -212,3 +213,4 @@ along with this software (see the LICENSE.md file). If not, see
${ec.l10n.localize("Cash Flow Statement")}
+ diff --git a/template/ledger/FinancialRatios.html.ftl b/template/ledger/FinancialRatios.html.ftl index b18b2188..a849137e 100644 --- a/template/ledger/FinancialRatios.html.ftl +++ b/template/ledger/FinancialRatios.html.ftl @@ -31,7 +31,8 @@ along with this software (see the LICENSE.md file). If not, see - + class="q-table__container q-table__card q-table--horizontal-separator q-table--dense q-table--flat"> +
@@ -91,3 +92,4 @@ along with this software (see the LICENSE.md file). If not, see <@showOther "Interest Expense" interestExpenseMap/>
${ec.l10n.localize("Financial Ratios")}
+ diff --git a/template/ledger/IncomeStatement.html.ftl b/template/ledger/IncomeStatement.html.ftl index 47aa4102..77da33a2 100644 --- a/template/ledger/IncomeStatement.html.ftl +++ b/template/ledger/IncomeStatement.html.ftl @@ -108,10 +108,11 @@ along with this software (see the LICENSE.md file). If not, see - + class="q-table__container q-table__card q-table--horizontal-separator q-table--dense q-table--flat"> +
- + <#if (timePeriodIdList?size > 1)> <#list timePeriodIdList as timePeriodId> @@ -121,7 +122,6 @@ along with this software (see the LICENSE.md file). If not, see - <@showClass classInfoById.REVENUE 1/> <@showClass classInfoById.COST_OF_SALES 1 true/> @@ -208,15 +208,16 @@ along with this software (see the LICENSE.md file). If not, see
${organizationName!""} - ${ec.l10n.localize("Income Statement")} (${ec.l10n.format(ec.user.nowTimestamp, 'dd MMM yyyy HH:mm')})${organizationName!""} - ${ec.l10n.localize("Income Statement")} (${ec.l10n.format(ec.user.nowTimestamp, 'dd MMM yyyy HH:mm')})${ec.l10n.localize("All Periods")}${timePeriodIdMap[timePeriodId].periodName}
+ <#if showCharts> -
    +
    <#if (timePeriodIdList?size > 1) && topExpenseByTimePeriod['ALL']?has_content> <#assign topExpenseList = topExpenseByTimePeriod['ALL']> -
  • +
    Expenses All Periods
    - + -
    • +
    <#list timePeriodIdList as timePeriodId><#if topExpenseByTimePeriod[timePeriodId]?has_content> <#assign topExpenseList = topExpenseByTimePeriod[timePeriodId]> -
  • +
    Expenses ${timePeriodIdMap[timePeriodId].periodName}
    - + -
    • + -
+ diff --git a/template/ledger/RetainedEarningsStatement.html.ftl b/template/ledger/RetainedEarningsStatement.html.ftl index d2d3316a..6039bf52 100644 --- a/template/ledger/RetainedEarningsStatement.html.ftl +++ b/template/ledger/RetainedEarningsStatement.html.ftl @@ -35,7 +35,8 @@ along with this software (see the LICENSE.md file). If not, see - + class="q-table__container q-table__card q-table--horizontal-separator q-table--dense q-table--flat"> +
@@ -96,3 +97,4 @@ along with this software (see the LICENSE.md file). If not, see
${ec.l10n.localize("Retained Earnings Statement")}
+ From 9226649f8e0a64b6ea89d31df9b27ca7e7999d23 Mon Sep 17 00:00:00 2001 From: David E Jones Date: Sat, 25 Jul 2020 11:49:09 -0700 Subject: [PATCH 089/150] More qvt support, now the bulk of the simple cases --- screen/SimpleScreens/Facility/FacilityCalendar.xml | 2 +- screen/SimpleScreens/Party/EditParty.xml | 10 +++++----- screen/SimpleScreens/Shipment/ShipmentItems.xml | 2 +- screen/SimpleScreens/Shipping/PackShipment.xml | 2 +- screen/SimpleScreens/Vendor/EditVendor.xml | 4 ++-- screen/SimpleScreens/Wiki/wiki.xml | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/screen/SimpleScreens/Facility/FacilityCalendar.xml b/screen/SimpleScreens/Facility/FacilityCalendar.xml index ef0047c8..97b3c146 100644 --- a/screen/SimpleScreens/Facility/FacilityCalendar.xml +++ b/screen/SimpleScreens/Facility/FacilityCalendar.xml @@ -29,7 +29,7 @@ along with this software (see the LICENSE.md file). If not, see - diff --git a/screen/SimpleScreens/Party/EditParty.xml b/screen/SimpleScreens/Party/EditParty.xml index 743133db..c77d7282 100644 --- a/screen/SimpleScreens/Party/EditParty.xml +++ b/screen/SimpleScreens/Party/EditParty.xml @@ -885,7 +885,7 @@ along with this software (see the LICENSE.md file). If not, see contactMechPurposeId:contactInfo.emailContactMechPurposeId]"/> @@ -919,7 +919,7 @@ along with this software (see the LICENSE.md file). If not, see contactMechPurposeId:contactInfo.webContactMechPurposeId]"/> @@ -955,7 +955,7 @@ along with this software (see the LICENSE.md file). If not, see contactMechPurposeId:contactInfo.telecomContactMechPurposeId]"/> @@ -1012,7 +1012,7 @@ along with this software (see the LICENSE.md file). If not, see @@ -1034,7 +1034,7 @@ along with this software (see the LICENSE.md file). If not, see - +