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/AUTHORS b/AUTHORS index 3ad9caf7..918eb982 100644 --- a/AUTHORS +++ b/AUTHORS @@ -34,7 +34,7 @@ that are otherwise encumbered. Signed by git commit adding my legal name and git username: -Written in 2016-2016 by David E. Jones - jonesde +Written in 2016-2020 by David E. Jones - jonesde Written in 2016-2016 by Sam Hamilton - samhamilton Written in 2016-2018 by Jens Hardings - jenshp Written in 2016-2016 by Michal Rovnanik - mrovnanik @@ -66,7 +66,7 @@ litigation is filed. Signed by git commit adding my legal name and git username: -Written in 2016-2016 by David E. Jones - jonesde +Written in 2016-2020 by David E. Jones - jonesde Written in 2016-2016 by Sam Hamilton - samhamilton Written in 2016-2017 by Jens Hardings - jenshp Written in 2016-2016 by Michal Rovnanik - mrovnanik @@ -77,3 +77,5 @@ Written in 2018 by Daniel Taylor - danieltaylor-nz Written in 2018 by Hans Bakker - hansbak Written in 2018 by Nirendra Singh - nirendra10695 Written in 2019 by Jacob Barnes - Tellan + +=========================================================================== diff --git a/data/MyAccountDocumentData.xml b/data/MyAccountDocumentData.xml index e9f61534..fec77494 100644 --- a/data/MyAccountDocumentData.xml +++ b/data/MyAccountDocumentData.xml @@ -12,31 +12,38 @@ You should have received a copy of the CC0 Public Domain Dedication 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}"/> + + + feedName="MyAccount Notifications" feedReceiveServiceName="mantle.party.PartyServices.send#DataDocumentNotifications" + feedDeleteServiceName="org.moqui.impl.BasicServices.noop"> + diff --git a/data/SimpleScreensSetupData.xml b/data/SimpleScreensSetupData.xml index 9f3c80cb..c5965239 100644 --- a/data/SimpleScreensSetupData.xml +++ b/data/SimpleScreensSetupData.xml @@ -42,19 +42,19 @@ along with this software (see the LICENSE.md file). If not, see <#assign noticeCounts = ec.service.sync().name("mantle.party.PartyServices.get#UserNoticeCounts").disableAuthz().call()> <#assign webRoot = ec.web.getWebappRootUrl(false, false)> - + ${noticeCounts.notificationCount!"0"} - + ${noticeCounts.messageCount!"0"} - + ${noticeCounts.eventCount!"0"} - + ${noticeCounts.taskCount!"0"} @@ -73,11 +73,18 @@ along with this software (see the LICENSE.md file). If not, see ]]> + + - + resourceValue="/ssstatic/lib/ActiveOrgNav.js"/> + + + + diff --git a/document/account/Payment Status Reference.md b/document/account/Payment Status Reference.md index 3ce825de..b2915fd8 100644 --- a/document/account/Payment Status Reference.md +++ b/document/account/Payment Status Reference.md @@ -50,7 +50,3 @@ The payment was voided before funds were transferred. #### Declined The payment was declined (such as a credit card decline) or failed to clear. - -#### Refunded - -The payment has been refunded by the To party to the From party. diff --git a/screen/BasicHandheld/Warehouse.xml b/screen/BasicHandheld/Warehouse.xml index 4c66b793..2f684242 100644 --- a/screen/BasicHandheld/Warehouse.xml +++ b/screen/BasicHandheld/Warehouse.xml @@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see . --> + default-menu-title="HH Warehouse" default-menu-index="50" menu-image="fa fa-tags" menu-image-type="icon"> diff --git a/screen/MyAccount.xml b/screen/MyAccount.xml index f4d81166..c2446bb3 100644 --- a/screen/MyAccount.xml +++ b/screen/MyAccount.xml @@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see . --> + default-menu-title="My Account" default-menu-index="99" menu-image="fa fa-user" menu-image-type="icon"> diff --git a/screen/MyAccount/User/Account.xml b/screen/MyAccount/User/Account.xml index 0c3e1b4d..b7ebc6f8 100644 --- a/screen/MyAccount/User/Account.xml +++ b/screen/MyAccount/User/Account.xml @@ -16,7 +16,10 @@ along with this software (see the LICENSE.md file). If not, see xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd" default-menu-title="Account" default-menu-index="9"> - + + + + @@ -24,14 +27,14 @@ 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/MyAccount/User/Calendar/MyCalendar.xml b/screen/MyAccount/User/Calendar/MyCalendar.xml index 9bc1d764..bd8ee461 100644 --- a/screen/MyAccount/User/Calendar/MyCalendar.xml +++ b/screen/MyAccount/User/Calendar/MyCalendar.xml @@ -65,7 +65,7 @@ along with this software (see the LICENSE.md file). If not, see - diff --git a/screen/MyAccount/User/ContactInfo.xml b/screen/MyAccount/User/ContactInfo.xml index 5d78a115..c8d84512 100644 --- a/screen/MyAccount/User/ContactInfo.xml +++ b/screen/MyAccount/User/ContactInfo.xml @@ -43,7 +43,7 @@ along with this software (see the LICENSE.md file). If not, see - + diff --git a/screen/MyAccount/User/Notifications.xml b/screen/MyAccount/User/Notifications.xml index 5c02108e..fd680706 100644 --- a/screen/MyAccount/User/Notifications.xml +++ b/screen/MyAccount/User/Notifications.xml @@ -48,7 +48,7 @@ along with this software (see the LICENSE.md file). If not, see - + @@ -59,7 +59,7 @@ along with this software (see the LICENSE.md file). If not, see - + diff --git a/screen/MyAccount/User/TimeEntries.xml b/screen/MyAccount/User/TimeEntries.xml index c7432893..679b9537 100644 --- a/screen/MyAccount/User/TimeEntries.xml +++ b/screen/MyAccount/User/TimeEntries.xml @@ -18,12 +18,25 @@ along with this software (see the LICENSE.md file). If not, see - - - + + + + + + + + + + + + + + + + @@ -34,147 +47,78 @@ along with this software (see the LICENSE.md file). If not, see - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - + + + + + + + + + + + - + - + + + + + + + + + - - - - - - - - - + + - + + - + + + + + + - + - - - - - - - + + - + + + - - - + + + + diff --git a/screen/SimpleScreens.xml b/screen/SimpleScreens.xml index 81c816a0..e8cd81da 100644 --- a/screen/SimpleScreens.xml +++ b/screen/SimpleScreens.xml @@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see . --> + menu-image="fa fa-tasks" menu-image-type="icon"> diff --git a/screen/SimpleScreens/Accounting/Invoice/EditInvoice.xml b/screen/SimpleScreens/Accounting/Invoice/EditInvoice.xml index 5c250cb1..6765f1d2 100644 --- a/screen/SimpleScreens/Accounting/Invoice/EditInvoice.xml +++ b/screen/SimpleScreens/Accounting/Invoice/EditInvoice.xml @@ -350,9 +350,20 @@ along with this software (see the LICENSE.md file). If not, see
- - + + + + + + + + + + + + @@ -361,6 +372,10 @@ along with this software (see the LICENSE.md file). If not, see + + + @@ -372,6 +387,10 @@ along with this software (see the LICENSE.md file). If not, see + + + @@ -439,7 +458,7 @@ along with this software (see the LICENSE.md file). If not, see - + - + + - + + + + + + + diff --git a/screen/SimpleScreens/Accounting/Invoice/EditInvoiceItemDetails.xml b/screen/SimpleScreens/Accounting/Invoice/EditInvoiceItemDetails.xml index 6111bbe7..a2b200fd 100644 --- a/screen/SimpleScreens/Accounting/Invoice/EditInvoiceItemDetails.xml +++ b/screen/SimpleScreens/Accounting/Invoice/EditInvoiceItemDetails.xml @@ -172,7 +172,7 @@ along with this software (see the LICENSE.md file). If not, see - diff --git a/screen/SimpleScreens/Accounting/Invoice/EditInvoiceItemOrders.xml b/screen/SimpleScreens/Accounting/Invoice/EditInvoiceItemOrders.xml index 6b503096..2568e35b 100644 --- a/screen/SimpleScreens/Accounting/Invoice/EditInvoiceItemOrders.xml +++ b/screen/SimpleScreens/Accounting/Invoice/EditInvoiceItemOrders.xml @@ -105,7 +105,7 @@ along with this software (see the LICENSE.md file). If not, see - diff --git a/screen/SimpleScreens/Accounting/Invoice/EditInvoiceItemShipments.xml b/screen/SimpleScreens/Accounting/Invoice/EditInvoiceItemShipments.xml index 3a7f2c1a..2f29b65b 100644 --- a/screen/SimpleScreens/Accounting/Invoice/EditInvoiceItemShipments.xml +++ b/screen/SimpleScreens/Accounting/Invoice/EditInvoiceItemShipments.xml @@ -99,7 +99,7 @@ along with this software (see the LICENSE.md file). If not, see - diff --git a/screen/SimpleScreens/Accounting/Invoice/EditInvoiceItems.xml b/screen/SimpleScreens/Accounting/Invoice/EditInvoiceItems.xml index 718de477..fcb485d4 100644 --- a/screen/SimpleScreens/Accounting/Invoice/EditInvoiceItems.xml +++ b/screen/SimpleScreens/Accounting/Invoice/EditInvoiceItems.xml @@ -31,6 +31,7 @@ along with this software (see the LICENSE.md file). If not, see + @@ -62,7 +63,7 @@ along with this software (see the LICENSE.md file). If not, see - + @@ -87,6 +88,11 @@ along with this software (see the LICENSE.md file). If not, see + + + + @@ -108,7 +114,7 @@ along with this software (see the LICENSE.md file). If not, see
diff --git a/screen/SimpleScreens/Accounting/Reports/FinancialRatios.xml b/screen/SimpleScreens/Accounting/Reports/FinancialRatios.xml index 13b1444c..a012c27d 100644 --- a/screen/SimpleScreens/Accounting/Reports/FinancialRatios.xml +++ b/screen/SimpleScreens/Accounting/Reports/FinancialRatios.xml @@ -22,7 +22,7 @@ along with this software (see the LICENSE.md file). If not, see - diff --git a/screen/SimpleScreens/Accounting/Reports/IncomeStatement.xml b/screen/SimpleScreens/Accounting/Reports/IncomeStatement.xml index 41c237a4..f66141d5 100644 --- a/screen/SimpleScreens/Accounting/Reports/IncomeStatement.xml +++ b/screen/SimpleScreens/Accounting/Reports/IncomeStatement.xml @@ -27,7 +27,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/Reports/RetainedEarningsStatement.xml b/screen/SimpleScreens/Accounting/Reports/RetainedEarningsStatement.xml index 82a2b646..1068e502 100644 --- a/screen/SimpleScreens/Accounting/Reports/RetainedEarningsStatement.xml +++ b/screen/SimpleScreens/Accounting/Reports/RetainedEarningsStatement.xml @@ -22,7 +22,7 @@ along with this software (see the LICENSE.md file). If not, see - 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/Accounting/Reports/SalesSummary.xml b/screen/SimpleScreens/Accounting/Reports/SalesSummary.xml index edf611a9..d1626dc1 100644 --- a/screen/SimpleScreens/Accounting/Reports/SalesSummary.xml +++ b/screen/SimpleScreens/Accounting/Reports/SalesSummary.xml @@ -190,9 +190,9 @@ along with this software (see the LICENSE.md file). If not, see + + + + + + + + + + + + + + + + + + + + + + + $(function () { $('[data-toggle="popover"]').popover({ sanitize:false, html:true, trigger:"hover click" }); })]]> + + diff --git a/screen/SimpleScreens/Order/OrderDetail/ItemReserve.xml b/screen/SimpleScreens/Order/OrderDetail/ItemReserve.xml index 34cfbf23..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 + @@ -29,6 +30,9 @@ 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..1efa0cdb 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 + + @@ -80,7 +84,7 @@ 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 new file mode 100644 index 00000000..8f5e7a10 --- /dev/null +++ b/screen/SimpleScreens/Order/OrderItems.xml @@ -0,0 +1,392 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/screen/SimpleScreens/Order/QuickItems.xml b/screen/SimpleScreens/Order/QuickItems.xml index 4ceb1701..79a7b167 100644 --- a/screen/SimpleScreens/Order/QuickItems.xml +++ b/screen/SimpleScreens/Order/QuickItems.xml @@ -13,84 +13,92 @@ along with this software (see the LICENSE.md file). If not, see . --> + default-menu-title="Quick Items" default-menu-index="3"> - + - + in-map="context + [addToQuantity:false, requireInventory:false, quantity:0, customerPartyId:null]"/> + - - - - - - - - - - + + + + + + + - + + + + + + + + + + + + + + - - - - + + + + + + + - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - + @@ -100,7 +108,7 @@ along with this software (see the LICENSE.md file). If not, see - + @@ -120,18 +128,24 @@ along with this software (see the LICENSE.md file). If not, see productStoreId:productStoreId, customerPartyId:orderPart.customerPartyId]"/> - - - + + + + + + - + + + + - + @@ -140,9 +154,9 @@ 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 9e3d211d..e19e0c15 100644 --- a/screen/SimpleScreens/Party/EditParty.xml +++ b/screen/SimpleScreens/Party/EditParty.xml @@ -95,6 +95,12 @@ along with this software (see the LICENSE.md file). If not, see + + + + + + @@ -122,8 +128,20 @@ along with this software (see the LICENSE.md file). If not, see - - + + + + + + + + + + + + + + @@ -318,8 +336,25 @@ along with this software (see the LICENSE.md file). If not, see - - + + + + @@ -369,7 +404,7 @@ along with this software (see the LICENSE.md file). If not, see - + @@ -409,7 +444,7 @@ along with this software (see the LICENSE.md file). If not, see - + @@ -467,7 +502,7 @@ along with this software (see the LICENSE.md file). If not, see - + @@ -508,6 +543,8 @@ along with this software (see the LICENSE.md file). If not, see + + @@ -556,10 +593,10 @@ along with this software (see the LICENSE.md file). If not, see - + - + @@ -604,168 +641,173 @@ along with this software (see the LICENSE.md file). If not, see - + -
+
- - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ -
- - - - + - - - - - - - - - - - - - - - - - - - - - - - - - +
+ + + + + + + + + - - - - - - - - - - - - - - - - - - - -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -808,16 +850,87 @@ along with this software (see the LICENSE.md file). If not, see
+ + + + + + + + + - - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + - - - + + + - + - + - + - + - - - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - @@ -922,7 +1083,7 @@ along with this software (see the LICENSE.md file). If not, see - @@ -941,8 +1102,8 @@ along with this software (see the LICENSE.md file). If not, see @@ -964,13 +1125,13 @@ 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
+ +
+ + + + + + + + + + + + + + + + + + + + + +
diff --git a/screen/SimpleScreens/Request/FindRequest.xml b/screen/SimpleScreens/Request/FindRequest.xml index 80dcbd02..4a30f85f 100644 --- a/screen/SimpleScreens/Request/FindRequest.xml +++ b/screen/SimpleScreens/Request/FindRequest.xml @@ -68,7 +68,7 @@ along with this software (see the LICENSE.md file). If not, see - + @@ -94,7 +94,8 @@ along with this software (see the LICENSE.md file). If not, see - + @@ -164,8 +165,8 @@ along with this software (see the LICENSE.md file). If not, see - - + + diff --git a/screen/SimpleScreens/Return/AddOrderItems.xml b/screen/SimpleScreens/Return/AddOrderItems.xml index 549e715f..ac762e25 100644 --- a/screen/SimpleScreens/Return/AddOrderItems.xml +++ b/screen/SimpleScreens/Return/AddOrderItems.xml @@ -71,7 +71,7 @@ along with this software (see the LICENSE.md file). If not, see - + diff --git a/screen/SimpleScreens/Return/EditReturnItems.xml b/screen/SimpleScreens/Return/EditReturnItems.xml index eeac724c..02334fa7 100644 --- a/screen/SimpleScreens/Return/EditReturnItems.xml +++ b/screen/SimpleScreens/Return/EditReturnItems.xml @@ -173,7 +173,7 @@ along with this software (see the LICENSE.md file). If not, see - + @@ -239,7 +239,7 @@ along with this software (see the LICENSE.md file). If not, see - 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/Search.xml b/screen/SimpleScreens/Search.xml index 4adfac56..2576eb58 100644 --- a/screen/SimpleScreens/Search.xml +++ b/screen/SimpleScreens/Search.xml @@ -13,13 +13,13 @@ along with this software (see the LICENSE.md file). If not, see . --> + default-menu-index="2" menu-image="fa fa-search" menu-image-type="icon"> - + 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/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 + /> diff --git a/screen/SimpleScreens/Shipment/ShipmentDetail.xml b/screen/SimpleScreens/Shipment/ShipmentDetail.xml index 9a6a8216..bfdb47bf 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,24 +56,17 @@ along with this software (see the LICENSE.md file). If not, see - - - - - - - - - - - - + + + + + @@ -94,6 +87,8 @@ along with this software (see the LICENSE.md file). If not, see + + @@ -103,16 +98,28 @@ along with this software (see the LICENSE.md file). If not, see - - + + + + + + + + + + + + + + @@ -138,26 +145,35 @@ along with this software (see the LICENSE.md file). If not, see + + + + + + + + + + + + + + + + + + - - - - - - - - - + - @@ -196,7 +212,8 @@ along with this software (see the LICENSE.md file). If not, see Set replacedPostalIdSet = new HashSet() for (int i=0; i < shippingPostalAddressList.size(); i++) { String replAddressId = shippingPostalAddressList.get(i).postalContactMech?.replacesContactMechId - if (replAddressId) replacedPostalIdSet.add(replAddressId) + if (replAddressId && !(replAddressId.equals(firstRouteSegment.originPostalContactMechId) || replAddressId.equals(lastRouteSegment.destPostalContactMechId))) + replacedPostalIdSet.add(replAddressId) } Set shippingPostalIdSet = new HashSet() for (int i=0; i < shippingPostalAddressList.size(); ) { @@ -215,6 +232,17 @@ along with this software (see the LICENSE.md file). If not, see + + + + + + + + + + + @@ -254,92 +282,16 @@ along with this software (see the LICENSE.md file). If not, see
-
- - - -
-
- - -
-
- - -
-
- - - -
+ + + + + + + - - - - - - - - - - - - -
- qzPrintAllLabels = function() { - if (!moqui.webrootVue.qzVue || !moqui.printUrlLabel) { return }; - moqui.printUrlLabel([ - <#list packageRouteSegList! as packageRouteSeg> - <#if packageRouteSeg.labelUrl?has_content>'${getShipmentLabelPath}?shipmentId=${packageRouteSeg.shipmentId}&shipmentPackageSeqId=${packageRouteSeg.shipmentPackageSeqId}&shipmentRouteSegmentSeqId=${packageRouteSeg.shipmentRouteSegmentSeqId}', - <#if packageRouteSeg.returnLabelUrl?has_content>'${getShipmentLabelPath}?retLabel=true&shipmentId=${packageRouteSeg.shipmentId}&shipmentPackageSeqId=${packageRouteSeg.shipmentPackageSeqId}&shipmentRouteSegmentSeqId=${packageRouteSeg.shipmentRouteSegmentSeqId}', - - ]); - moqui.printUrlMain([ - <#list packageRouteSegList! as packageRouteSeg> - <#if packageRouteSeg.internationalInvoiceUrl?has_content>'${getShipmentLabelPath}?intlInvoiceLabel=true&shipmentId=${packageRouteSeg.shipmentId}&shipmentPackageSeqId=${packageRouteSeg.shipmentPackageSeqId}&shipmentRouteSegmentSeqId=${packageRouteSeg.shipmentRouteSegmentSeqId}', - <#if packageRouteSeg.returnIntlInvoiceUrl?has_content>'${getShipmentLabelPath}?retLabel=true&intlInvoiceLabel=true&shipmentId=${packageRouteSeg.shipmentId}&shipmentPackageSeqId=${packageRouteSeg.shipmentPackageSeqId}&shipmentRouteSegmentSeqId=${packageRouteSeg.shipmentRouteSegmentSeqId}', - - ]); - } - <#if localPrintAllLabels! == true>qzPrintAllLabels(); - - - ]]>
@@ -372,30 +324,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 c061b3b8..0420485e 100644 --- a/screen/SimpleScreens/Shipment/ShipmentDetail/ItemReserve.xml +++ b/screen/SimpleScreens/Shipment/ShipmentDetail/ItemReserve.xml @@ -18,6 +18,9 @@ along with this software (see the LICENSE.md file). If not, see + + + @@ -30,6 +33,12 @@ 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 b020c1b4..959ec445 100644 --- a/screen/SimpleScreens/Shipment/ShipmentDetail/ReceiveItem.xml +++ b/screen/SimpleScreens/Shipment/ShipmentDetail/ReceiveItem.xml @@ -18,6 +18,9 @@ along with this software (see the LICENSE.md file). If not, see + + + @@ -30,24 +33,15 @@ along with this software (see the LICENSE.md file). If not, see - - - - - - - - - - - - Found multiple products with ID ${scanId}: ${prodIdentList*.productId.join(', ')} - + + + + + - - - - + + @@ -80,6 +74,14 @@ along with this software (see the LICENSE.md file). If not, see + + + + + + + + @@ -123,6 +125,12 @@ 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 28b19dba..bfab49f6 100644 --- a/screen/SimpleScreens/Shipment/ShipmentDetail/UpdateItemAsset.xml +++ b/screen/SimpleScreens/Shipment/ShipmentDetail/UpdateItemAsset.xml @@ -19,6 +19,9 @@ 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 new file mode 100644 index 00000000..5340baaa --- /dev/null +++ b/screen/SimpleScreens/Shipment/ShipmentItems.xml @@ -0,0 +1,461 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+
+ + +
+ + +
+ + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + +
+ + + + + +
+ + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + + + + + + + +
+ + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + diff --git a/screen/SimpleScreens/Shipment/ShipmentPackages.xml b/screen/SimpleScreens/Shipment/ShipmentPackages.xml new file mode 100644 index 00000000..87d6a0e4 --- /dev/null +++ b/screen/SimpleScreens/Shipment/ShipmentPackages.xml @@ -0,0 +1,411 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + +
+ +
+ + + +
+ + +
+ + + + + + + + + + + + +
+ +
+ qzPrintAllLabels = function() { + if (!moqui.webrootVue.qzVue || !moqui.printUrlLabel) { return }; + moqui.printUrlLabel([ + <#list packageRouteSegList! as packageRouteSeg> + <#if packageRouteSeg.labelUrl?has_content>'${getShipmentLabelPath}?shipmentId=${packageRouteSeg.shipmentId}&shipmentPackageSeqId=${packageRouteSeg.shipmentPackageSeqId}&shipmentRouteSegmentSeqId=${packageRouteSeg.shipmentRouteSegmentSeqId}', + <#if packageRouteSeg.returnLabelUrl?has_content>'${getShipmentLabelPath}?retLabel=true&shipmentId=${packageRouteSeg.shipmentId}&shipmentPackageSeqId=${packageRouteSeg.shipmentPackageSeqId}&shipmentRouteSegmentSeqId=${packageRouteSeg.shipmentRouteSegmentSeqId}', + + ]); + moqui.printUrlMain([ + <#list packageRouteSegList! as packageRouteSeg> + <#if packageRouteSeg.internationalInvoiceUrl?has_content>'${getShipmentLabelPath}?intlInvoiceLabel=true&shipmentId=${packageRouteSeg.shipmentId}&shipmentPackageSeqId=${packageRouteSeg.shipmentPackageSeqId}&shipmentRouteSegmentSeqId=${packageRouteSeg.shipmentRouteSegmentSeqId}', + <#if packageRouteSeg.returnIntlInvoiceUrl?has_content>'${getShipmentLabelPath}?retLabel=true&intlInvoiceLabel=true&shipmentId=${packageRouteSeg.shipmentId}&shipmentPackageSeqId=${packageRouteSeg.shipmentPackageSeqId}&shipmentRouteSegmentSeqId=${packageRouteSeg.shipmentRouteSegmentSeqId}', + + ]); + } + <#if localPrintAllLabels! == true>qzPrintAllLabels(); + + + ]]>
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Label]]>
+ + + +
+ Com. Invoice]]>
+ + + + +
+ Ret Lbl]]>
+ + + +
+ Ret Com Invc]]>
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + +
+
+ + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + +
+ + diff --git a/screen/SimpleScreens/Shipping/PackShipment.xml b/screen/SimpleScreens/Shipping/PackShipment.xml index b872c516..0cce63db 100644 --- a/screen/SimpleScreens/Shipping/PackShipment.xml +++ b/screen/SimpleScreens/Shipping/PackShipment.xml @@ -1,6 +1,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Insert]]> - - - - - - - - - - - - - - - - - - - - - -
- qzPrintAllLabels = function() { - if (!moqui.webrootVue.qzVue || !moqui.printUrlLabel) { return }; - moqui.printUrlLabel([ - <#list packageRouteSegList! as packageRouteSeg> - <#if packageRouteSeg.labelUrl?has_content>'${getShipmentLabelPath}?shipmentId=${packageRouteSeg.shipmentId}&shipmentPackageSeqId=${packageRouteSeg.shipmentPackageSeqId}&shipmentRouteSegmentSeqId=${packageRouteSeg.shipmentRouteSegmentSeqId}', - <#if packageRouteSeg.returnLabelUrl?has_content>'${getShipmentLabelPath}?retLabel=true&shipmentId=${packageRouteSeg.shipmentId}&shipmentPackageSeqId=${packageRouteSeg.shipmentPackageSeqId}&shipmentRouteSegmentSeqId=${packageRouteSeg.shipmentRouteSegmentSeqId}', - - ]); - moqui.printUrlMain([ - <#list packageRouteSegList! as packageRouteSeg> - <#if packageRouteSeg.internationalInvoiceUrl?has_content>'${getShipmentLabelPath}?intlInvoiceLabel=true&shipmentId=${packageRouteSeg.shipmentId}&shipmentPackageSeqId=${packageRouteSeg.shipmentPackageSeqId}&shipmentRouteSegmentSeqId=${packageRouteSeg.shipmentRouteSegmentSeqId}', - <#if packageRouteSeg.returnIntlInvoiceUrl?has_content>'${getShipmentLabelPath}?retLabel=true&intlInvoiceLabel=true&shipmentId=${packageRouteSeg.shipmentId}&shipmentPackageSeqId=${packageRouteSeg.shipmentPackageSeqId}&shipmentRouteSegmentSeqId=${packageRouteSeg.shipmentRouteSegmentSeqId}', - - ]); - } - <#if localPrintAllLabels! == true>qzPrintAllLabels(); - - - ]]>
- - - - - - - -
- - - - - - - - - - -
- - - - -
- - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Label]]>
- - - -
- Ret Lbl]]>
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - -
-
- - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - - - - - - - - - -
- - -
- - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - -
- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - + diff --git a/screen/SimpleScreens/Shipping/PackShipment/PackItems.xml b/screen/SimpleScreens/Shipping/PackShipment/PackItems.xml new file mode 100644 index 00000000..64776df7 --- /dev/null +++ b/screen/SimpleScreens/Shipping/PackShipment/PackItems.xml @@ -0,0 +1,273 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + +
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + diff --git a/screen/SimpleScreens/Shipping/PackShipment/PackPackages.xml b/screen/SimpleScreens/Shipping/PackShipment/PackPackages.xml new file mode 100644 index 00000000..9030b07b --- /dev/null +++ b/screen/SimpleScreens/Shipping/PackShipment/PackPackages.xml @@ -0,0 +1,291 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Label]]>
+ + + + +
+ Ret Lbl]]>
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + +
+
+ + + + + + +
+ + + + + + + + + + + + + + diff --git a/screen/SimpleScreens/Shipping/PackShipment/PackSummary.xml b/screen/SimpleScreens/Shipping/PackShipment/PackSummary.xml new file mode 100644 index 00000000..ba83c331 --- /dev/null +++ b/screen/SimpleScreens/Shipping/PackShipment/PackSummary.xml @@ -0,0 +1,376 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Insert]]> + + + + + + + + + + + + + + + + + + + + + + +
+ qzPrintAllLabels = function() { + if (!moqui.webrootVue.qzVue || !moqui.printUrlLabel) { return }; + moqui.printUrlLabel([ + <#list packageRouteSegList! as packageRouteSeg> + <#if packageRouteSeg.labelUrl?has_content>'${getShipmentLabelPath}?shipmentId=${packageRouteSeg.shipmentId}&shipmentPackageSeqId=${packageRouteSeg.shipmentPackageSeqId}&shipmentRouteSegmentSeqId=${packageRouteSeg.shipmentRouteSegmentSeqId}', + <#if packageRouteSeg.returnLabelUrl?has_content>'${getShipmentLabelPath}?retLabel=true&shipmentId=${packageRouteSeg.shipmentId}&shipmentPackageSeqId=${packageRouteSeg.shipmentPackageSeqId}&shipmentRouteSegmentSeqId=${packageRouteSeg.shipmentRouteSegmentSeqId}', + + ]); + moqui.printUrlMain([ + <#list packageRouteSegList! as packageRouteSeg> + <#if packageRouteSeg.internationalInvoiceUrl?has_content>'${getShipmentLabelPath}?intlInvoiceLabel=true&shipmentId=${packageRouteSeg.shipmentId}&shipmentPackageSeqId=${packageRouteSeg.shipmentPackageSeqId}&shipmentRouteSegmentSeqId=${packageRouteSeg.shipmentRouteSegmentSeqId}', + <#if packageRouteSeg.returnIntlInvoiceUrl?has_content>'${getShipmentLabelPath}?retLabel=true&intlInvoiceLabel=true&shipmentId=${packageRouteSeg.shipmentId}&shipmentPackageSeqId=${packageRouteSeg.shipmentPackageSeqId}&shipmentRouteSegmentSeqId=${packageRouteSeg.shipmentRouteSegmentSeqId}', + + ]); + } + <#if localPrintAllLabels! == true>qzPrintAllLabels(); + + + ]]>
+ +
+ + +
+ + + + +
+ + + + + + + + + + +
+ +
+ + + + + + +
+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + +
+ + + + +
+ + + + + + + + + + + + +
+ + +
+ + + + diff --git a/screen/SimpleScreens/Shipping/PackShipment/PackCompleted.xml b/screen/SimpleScreens/Shipping/PackShipment/PackSummary/PackCompleted.xml similarity index 100% rename from screen/SimpleScreens/Shipping/PackShipment/PackCompleted.xml rename to screen/SimpleScreens/Shipping/PackShipment/PackSummary/PackCompleted.xml diff --git a/screen/SimpleScreens/Shipping/Picklist/AddOrder.xml b/screen/SimpleScreens/Shipping/Picklist/AddOrder.xml index 9403066f..a1ac2412 100644 --- a/screen/SimpleScreens/Shipping/Picklist/AddOrder.xml +++ b/screen/SimpleScreens/Shipping/Picklist/AddOrder.xml @@ -75,9 +75,6 @@ along with this software (see the LICENSE.md file). If not, see - - - diff --git a/screen/SimpleScreens/Shipping/Picklist/FindPicklist.xml b/screen/SimpleScreens/Shipping/Picklist/FindPicklist.xml index 598c6bd2..65e9c860 100644 --- a/screen/SimpleScreens/Shipping/Picklist/FindPicklist.xml +++ b/screen/SimpleScreens/Shipping/Picklist/FindPicklist.xml @@ -19,11 +19,13 @@ along with this software (see the LICENSE.md file). If not, see + + @@ -73,6 +75,8 @@ along with this software (see the LICENSE.md file). If not, see + + @@ -125,30 +129,42 @@ along with this software (see the LICENSE.md file). If not, see + + + + + + + + + - - - - + + + - - - + + + - + + diff --git a/screen/SimpleScreens/Shipping/Picklist/PicklistDetail.xml b/screen/SimpleScreens/Shipping/Picklist/PicklistDetail.xml index e01c541e..26d884bf 100644 --- a/screen/SimpleScreens/Shipping/Picklist/PicklistDetail.xml +++ b/screen/SimpleScreens/Shipping/Picklist/PicklistDetail.xml @@ -242,7 +242,7 @@ along with this software (see the LICENSE.md file). If not, see - + diff --git a/screen/SimpleScreens/SimpleReport/ViewReport.xml b/screen/SimpleScreens/SimpleReport/ViewReport.xml index 98af2123..84ca0ece 100644 --- a/screen/SimpleScreens/SimpleReport/ViewReport.xml +++ b/screen/SimpleScreens/SimpleReport/ViewReport.xml @@ -20,6 +20,7 @@ along with this software (see the LICENSE.md file). If not, see +
@@ -44,7 +45,7 @@ along with this software (see the LICENSE.md file). If not, see
+ show-csv-button="true" show-xlsx-button="true" show-page-size="true" saved-finds="true"> diff --git a/screen/SimpleScreens/Supplier/EditSupplier.xml b/screen/SimpleScreens/Supplier/EditSupplier.xml index e4028b91..17044d69 100644 --- a/screen/SimpleScreens/Supplier/EditSupplier.xml +++ b/screen/SimpleScreens/Supplier/EditSupplier.xml @@ -48,6 +48,12 @@ along with this software (see the LICENSE.md file). If not, see + + + + + + diff --git a/screen/SimpleScreens/Survey/EditSurvey.xml b/screen/SimpleScreens/Survey/EditSurvey.xml index c335b4f0..d576e1d6 100644 --- a/screen/SimpleScreens/Survey/EditSurvey.xml +++ b/screen/SimpleScreens/Survey/EditSurvey.xml @@ -77,7 +77,7 @@ along with this software (see the LICENSE.md file). If not, see - diff --git a/screen/SimpleScreens/Survey/Fields.xml b/screen/SimpleScreens/Survey/Fields.xml index 9da041a6..a2c663de 100644 --- a/screen/SimpleScreens/Survey/Fields.xml +++ b/screen/SimpleScreens/Survey/Fields.xml @@ -19,8 +19,8 @@ along with this software (see the LICENSE.md file). If not, see - - + + @@ -52,99 +52,90 @@ along with this software (see the LICENSE.md file). If not, see - - - - - - + + + + - + - - + + + - - + + -
- - dbFormFieldList - - - - - - - - - - - - - - - - - -
+
+ + + + + + + + + + + + + + + + +
- - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ diff --git a/screen/SimpleScreens/Vendor/EditUsers.xml b/screen/SimpleScreens/Vendor/EditUsers.xml index deecfbd4..22acc5fa 100644 --- a/screen/SimpleScreens/Vendor/EditUsers.xml +++ b/screen/SimpleScreens/Vendor/EditUsers.xml @@ -61,7 +61,7 @@ along with this software (see the LICENSE.md file). If not, see - + diff --git a/screen/SimpleScreens/Vendor/EditVendor.xml b/screen/SimpleScreens/Vendor/EditVendor.xml index 1ba3b1ee..3edae6b4 100644 --- a/screen/SimpleScreens/Vendor/EditVendor.xml +++ b/screen/SimpleScreens/Vendor/EditVendor.xml @@ -108,7 +108,7 @@ along with this software (see the LICENSE.md file). If not, see
- +
@@ -118,7 +118,7 @@ along with this software (see the LICENSE.md file). If not, see parameter-map="[partyId:repPerson?.partyId]" link-type="anchor"/> - + @@ -131,7 +131,7 @@ along with this software (see the LICENSE.md file). If not, see
- +
diff --git a/screen/SimpleScreens/Wiki/EditWikiBlog.xml b/screen/SimpleScreens/Wiki/EditWikiBlog.xml index 85e2a259..34e176d2 100644 --- a/screen/SimpleScreens/Wiki/EditWikiBlog.xml +++ b/screen/SimpleScreens/Wiki/EditWikiBlog.xml @@ -101,7 +101,7 @@ along with this software (see the LICENSE.md file). If not, see - +
diff --git a/screen/SimpleScreens/Wiki/EditWikiPage.xml b/screen/SimpleScreens/Wiki/EditWikiPage.xml index 5ab535c8..6a78ae6b 100644 --- a/screen/SimpleScreens/Wiki/EditWikiPage.xml +++ b/screen/SimpleScreens/Wiki/EditWikiPage.xml @@ -52,8 +52,9 @@ along with this software (see the LICENSE.md file). If not, see - - + + + @@ -66,27 +67,10 @@ along with this software (see the LICENSE.md file). If not, see --> - - + + -
- - - - ]]> -
-
- - - - ]]> -
diff --git a/screen/SimpleScreens/Wiki/WikiBlogs.xml b/screen/SimpleScreens/Wiki/WikiBlogs.xml index e7ea6f4c..b8778ecd 100644 --- a/screen/SimpleScreens/Wiki/WikiBlogs.xml +++ b/screen/SimpleScreens/Wiki/WikiBlogs.xml @@ -44,17 +44,9 @@ along with this software (see the LICENSE.md file). If not, see - + diff --git a/screen/SimpleScreens/Wiki/WikiCompare.xml b/screen/SimpleScreens/Wiki/WikiCompare.xml index 2e266b62..c710bd42 100644 --- a/screen/SimpleScreens/Wiki/WikiCompare.xml +++ b/screen/SimpleScreens/Wiki/WikiCompare.xml @@ -31,8 +31,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..0ef3a4fa 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 - diff --git a/screen/ssstatic/lib/ActiveOrgNav.js b/screen/ssstatic/lib/ActiveOrgNav.js index 95581766..d6882dc1 100644 --- a/screen/ssstatic/lib/ActiveOrgNav.js +++ b/screen/ssstatic/lib/ActiveOrgNav.js @@ -4,7 +4,7 @@ define({ template: '
@@ -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)]"/> @@ -64,19 +65,32 @@ along with this software (see the LICENSE.md file). If not, see - Get CSV ]]> - - + ]]> @@ -94,7 +108,7 @@ along with this software (see the LICENSE.md file). If not, see ] + in-map="[partyId:organizationPartyId, timePeriodTypeId:timePeriodTypeId, thruDate:thruDate, groups:(periods?:13)]"/> @@ -105,19 +119,25 @@ along with this software (see the LICENSE.md file). If not, see - Get CSV ]]> - - + ]]> @@ -133,7 +153,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)]"/> @@ -158,19 +178,25 @@ along with this software (see the LICENSE.md file). If not, see - Get CSV ]]> - - + ]]> @@ -194,7 +220,7 @@ along with this software (see the LICENSE.md file). If not, see ] + in-map="[partyId:organizationPartyId, timePeriodTypeId:timePeriodTypeId, thruDate:thruDate, groups:(periods?:13)]"/> @@ -205,19 +231,25 @@ along with this software (see the LICENSE.md file). If not, see - Get CSV ]]> - - + ]]> @@ -234,7 +266,7 @@ along with this software (see the LICENSE.md file). If not, see ] + in-map="[partyId:organizationPartyId, timePeriodTypeId:timePeriodTypeId, thruDate:thruDate, groups:(periods?:13)]"/> @@ -245,19 +277,25 @@ along with this software (see the LICENSE.md file). If not, see - Get CSV ]]> - - + ]]> diff --git a/template/ledger/BalanceSheet.html.ftl b/template/ledger/BalanceSheet.html.ftl index 592fb4b0..18ed10ea 100644 --- a/template/ledger/BalanceSheet.html.ftl +++ b/template/ledger/BalanceSheet.html.ftl @@ -119,7 +119,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"> +
@@ -234,3 +235,4 @@ along with this software (see the LICENSE.md file). If not, see
${organizationName!""} - ${ec.l10n.localize("Balance Sheet")} (${ec.l10n.format(ec.user.nowTimestamp, 'dd MMM yyyy HH:mm')})
+ diff --git a/template/ledger/CashFlowStatement.html.ftl b/template/ledger/CashFlowStatement.html.ftl index 71a4043b..d2252a98 100644 --- a/template/ledger/CashFlowStatement.html.ftl +++ b/template/ledger/CashFlowStatement.html.ftl @@ -50,7 +50,7 @@ along with this software (see the LICENSE.md file). If not, see <#if findEntryUrl??> <#assign findEntryInstance = findEntryUrl.getInstance(sri, true).addParameter("glAccountId", glAccountInfo.glAccountId).addParameter("isPosted", "Y").addParameter("timePeriodId", timePeriodId)> - <#if sri.getRenderMode()! == "vuet"> + <#if sri.getRenderMode()! == "vuet,qvt"> ${ec.l10n.format(glAccountInfo.postedByTimePeriod[timePeriodId]!0, currencyFormat)} <#else> ${ec.l10n.format(glAccountInfo.postedByTimePeriod[timePeriodId]!0, currencyFormat)} @@ -106,7 +106,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"> +
@@ -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 af406b3a..4e8d0ba7 100644 --- a/template/ledger/IncomeStatement.html.ftl +++ b/template/ledger/IncomeStatement.html.ftl @@ -60,7 +60,7 @@ along with this software (see the LICENSE.md file). If not, see <#assign currentAmt = (glAccountInfo.postedNoClosingByTimePeriod[timePeriodId]!0)*negMult> <#if findEntryUrl??> <#assign findEntryInstance = findEntryUrl.getInstance(sri, true).addParameter("glAccountId", glAccountInfo.glAccountId).addParameter("isPosted", "Y").addParameter("timePeriodId", timePeriodId)> - <#if sri.getRenderMode()! == "vuet"> + <#if sri.getRenderMode()! == "vuet,qvt"> ${ec.l10n.format(currentAmt, currencyFormat)}<#if (currentAmt >= 0)>  <#else> ${ec.l10n.format(currentAmt, currencyFormat)}<#if (currentAmt >= 0)>  @@ -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")}
+ diff --git a/template/order/Order.xsl-fo.ftl b/template/order/Order.xsl-fo.ftl index 47fe325d..99b76350 100644 --- a/template/order/Order.xsl-fo.ftl +++ b/template/order/Order.xsl-fo.ftl @@ -25,22 +25,47 @@ 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 + <#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 diff --git a/template/party/ContactInfo.html.gstring b/template/party/ContactInfo.html.gstring index 8348463a..54068fcc 100644 --- a/template/party/ContactInfo.html.gstring +++ b/template/party/ContactInfo.html.gstring @@ -6,4 +6,5 @@ <%if (contactInfo?.postalAddress) {%>${contactInfo.postalAddress.city ?: ''}<%if (contactInfo.postalAddressStateGeo?.geoCodeAlpha2) {%>, ${contactInfo.postalAddressStateGeo.geoCodeAlpha2} <%} else if (contactInfo.postalAddressStateGeo?.geoName) {%> ${contactInfo.postalAddressStateGeo.geoName} <%}%>${contactInfo.postalAddress.postalCode ?: ''}<%if (contactInfo.postalAddress.postalCodeExt) {%>-${contactInfo.postalAddress.postalCodeExt}<%}%><%if (contactInfo.postalAddressCountryGeo?.geoCodeAlpha3) {%> ${contactInfo.postalAddressCountryGeo.geoCodeAlpha3}<%}%>
<%}%> <%if (contactInfo?.telecomNumber) {%>T: <%if (contactInfo.telecomNumber.countryCode) {%>${contactInfo.telecomNumber.countryCode}-<%}%><%if (contactInfo.telecomNumber.areaCode) {%>${contactInfo.telecomNumber.areaCode}-<%}%>${contactInfo.telecomNumber.contactNumber ?: ''}<%if (contactInfo.telecomPartyContactMech?.extension) {%> x${contactInfo.telecomPartyContactMech.extension}<%}%>
<%}%> <%if (contactInfo?.emailAddress) {%>${contactInfo.emailAddress}<%}%> - \ No newline at end of file +<%if (contactInfo?.webAddress) {%>${contactInfo.webAddress}<%}%> + diff --git a/template/party/PartyForms.xml b/template/party/PartyForms.xml index a27e58cd..bc173f1c 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 + + + + + in-map="[geoId:countryGeoId,term:term]" web-send-json-response="resultList"/> @@ -141,12 +155,13 @@ along with this software (see the LICENSE.md file). If not, see - + - + + telecomContactMechPurposeId:telecomContactMechPurposeId, emailContactMechPurposeId:emailContactMechPurposeId, + otherContactMechPurposeId:otherContactMechPurposeId]"/> @@ -362,6 +377,30 @@ along with this software (see the LICENSE.md file). If not, see + + + + + + + + + + + + + + + + + + + + + + + + @@ -535,13 +574,16 @@ along with this software (see the LICENSE.md file). If not, see + + + diff --git a/template/product/ProductTransitions.xml b/template/product/ProductTransitions.xml index 005befb2..fa4a01e1 100644 --- a/template/product/ProductTransitions.xml +++ b/template/product/ProductTransitions.xml @@ -50,10 +50,8 @@ along with this software (see the LICENSE.md file). If not, see + + + + + + + + + + + + + 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 diff --git a/template/shipment/ShipmentPack.xsl-fo.ftl b/template/shipment/ShipmentPack.xsl-fo.ftl index 7723699a..3b560bee 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> @@ -172,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 diff --git a/template/work/WorkTransitions.xml b/template/work/WorkTransitions.xml index 69e926e1..1a44e6c8 100644 --- a/template/work/WorkTransitions.xml +++ b/template/work/WorkTransitions.xml @@ -14,18 +14,88 @@ along with this software (see the LICENSE.md file). If not, see --> - + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -46,6 +116,7 @@ along with this software (see the LICENSE.md file). If not, see StringBuilder termSb = new StringBuilder() termSb.append(term).append('*') if (rootWorkEffortId) termSb.append(' AND project:').append(rootWorkEffortId) + if (assignedPartyId) termSb.append(' AND parties.partyId:').append(assignedPartyId) ]]> @@ -61,6 +132,7 @@ along with this software (see the LICENSE.md file). If not, see + @@ -88,6 +160,7 @@ along with this software (see the LICENSE.md file). If not, see +