Release 2.2.0 changes (#55)

* Update XML files to use new XSD references for the 3.0.0 release series * In component.xml bump versions for upcoming release * Add more release notes from review of commits since last release, update year in AUTHORS
moqui · May 31, 2022 · a0027f6 · a0027f6
1 parent ddfb956
commit a0027f6
Show file tree

Hide file tree

Showing 39 changed files with 60 additions and 44 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -34,7 +34,7 @@ that are otherwise encumbered.
 
 Signed by git commit adding my legal name and git username:
 
-Written in 2010-2020 by David E. Jones - jonesde
+Written in 2010-2022 by David E. Jones - jonesde
 Written in 2015-2016 by Sam Hamilton - samhamilton
 Written in 2015 by Abdullah Shaikh - abdullahs
 Written in 2015 by Yao Chunlin - chunlinyao
@@ -64,7 +64,7 @@ litigation is filed.
 
 Signed by git commit adding my legal name and git username:
 
-Written in 2010-2020 by David E. Jones - jonesde
+Written in 2010-2022 by David E. Jones - jonesde
 Written in 2015-2016 by Yao Chunlin - chunlinyao
 Written in 2015-2016 by Sam Hamilton - samhamilton
 Written in 2015 by Jens Hardings - jenshp

diff --git a/MoquiConf.xml b/MoquiConf.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!-- No copyright or license for configuration file, details here are not considered a creative work. -->
-<moqui-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/moqui-conf-2.1.xsd">
+<moqui-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/moqui-conf-3.xsd">
     <screen-facade>
         <screen location="component://webroot/screen/webroot.xml">
             <subscreens-item name="popc" menu-title="POP Commerce" menu-include="false"

diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
@@ -1,6 +1,24 @@
 
 POP Commerce - Retail and Wholesale ERP and eCommerce - Release Notes
 
+===========================================================================
+Release 2.2.0 - 31 May 2022
+===========================================================================
+
+POP Commerce Retail and Wholesale ERP and eCommerce 2.2.0 is a minor
+new feature and bug fix release.
+
+There are only minor changes and fixes in this release. For a complete
+list of changes see:
+
+https://github.com/moqui/PopCommerce/compare/v2.1.2...v2.2.0
+
+Most changes come from screens reused from SimpleScreens.
+
+NOTE: the POPC ERP application may never be removed, but is being replaced
+by the more general Marble ERP application which also includes project and
+task functionality that was originally in HiveMind.
+
 ===========================================================================
 Release 2.1.2 - 07 Dec 2019
 ===========================================================================

diff --git a/component.xml b/component.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<component xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/moqui-conf-2.1.xsd"
-        name="PopCommerce" version="2.1.2">
-    <depends-on name="moqui-fop" version="1.1.2"/>
+<component xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/moqui-conf-3.xsd"
+        name="PopCommerce" version="2.2.0">
+    <depends-on name="moqui-fop" version="1.1.3"/>
     <!-- optional: <depends-on name="moqui-kie"/> -->
-    <depends-on name="mantle-udm" version="2.1.2"/>
-    <depends-on name="mantle-usl" version="2.1.2"/>
-    <depends-on name="SimpleScreens" version="2.1.2"/>
+    <depends-on name="SimpleScreens" version="2.2.0"/>
 </component>
diff --git a/screen/PopCommerceAdmin.xml b/screen/PopCommerceAdmin.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
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="POPC ERP" menu-image="fa fa-shopping-cart" menu-image-type="icon" server-static="vuet,qvt">
 
     <always-actions>

diff --git a/screen/PopCommerceAdmin/Accounting.xml b/screen/PopCommerceAdmin/Accounting.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
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Accounting" default-menu-index="27" menu-image="/ssstatic/images/Accounting.png">
 
     <subscreens default-item="dashboard">

diff --git a/screen/PopCommerceAdmin/Asset.xml b/screen/PopCommerceAdmin/Asset.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
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-index="17" default-menu-title="Assets" menu-image="/ssstatic/images/Asset.png">
 
     <subscreens default-item="dashboard">

diff --git a/screen/PopCommerceAdmin/Catalog.xml b/screen/PopCommerceAdmin/Catalog.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
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Catalog" default-menu-index="22" menu-image="/ssstatic/images/Catalog.png">
     <subscreens default-item="dashboard">
         <subscreens-item name="dashboard" location="component://SimpleScreens/screen/SimpleScreens/Catalog/dashboard.xml"/>

diff --git a/screen/PopCommerceAdmin/Customer.xml b/screen/PopCommerceAdmin/Customer.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
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Customers" default-menu-index="12" menu-image="/ssstatic/images/Customer.png">
 
     <subscreens default-item="FindCustomer">

diff --git a/screen/PopCommerceAdmin/Facility.xml b/screen/PopCommerceAdmin/Facility.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
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Facilities" default-menu-index="23" menu-image="/ssstatic/images/Facility.png">
 
     <subscreens default-item="FindFacility">

diff --git a/screen/PopCommerceAdmin/Order.xml b/screen/PopCommerceAdmin/Order.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
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Orders" default-menu-index="13" menu-image="/ssstatic/images/Sales.png">
 
     <subscreens default-item="FindOrder">

diff --git a/screen/PopCommerceAdmin/Party.xml b/screen/PopCommerceAdmin/Party.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
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Parties" default-menu-index="24" menu-image="/ssstatic/images/Parties.png">
     <subscreens default-item="FindParty">
         <subscreens-item name="FindParty" location="component://SimpleScreens/screen/SimpleScreens/Party/FindParty.xml" menu-include="false"/>

diff --git a/screen/PopCommerceAdmin/Request.xml b/screen/PopCommerceAdmin/Request.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
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Requests" default-menu-index="5" menu-image="/ssstatic/images/Request.png">
 
     <subscreens default-item="FindRequest">

diff --git a/screen/PopCommerceAdmin/Return.xml b/screen/PopCommerceAdmin/Return.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
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Returns" default-menu-index="16" menu-image="/ssstatic/images/Return.png">
 
     <subscreens default-item="FindReturn">

diff --git a/screen/PopCommerceAdmin/Shipment.xml b/screen/PopCommerceAdmin/Shipment.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
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Shipments" default-menu-index="15" menu-image="/ssstatic/images/Shipping.png">
 
     <subscreens default-item="FindShipment">

diff --git a/screen/PopCommerceAdmin/Shipping.xml b/screen/PopCommerceAdmin/Shipping.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
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Shipping" default-menu-index="14" menu-image="/ssstatic/images/Picking.png">
 
     <subscreens default-item="dashboard">

diff --git a/screen/PopCommerceAdmin/Supplier.xml b/screen/PopCommerceAdmin/Supplier.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
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Suppliers" default-menu-index="11" menu-image="/ssstatic/images/Supplier.png">
 
     <subscreens default-item="FindSupplier">

diff --git a/screen/PopCommerceAdmin/Wiki.xml b/screen/PopCommerceAdmin/Wiki.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
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Wiki/Content" default-menu-index="21" menu-image="/ssstatic/images/Wiki.png">
 
     <subscreens default-item="WikiSpaces">

diff --git a/screen/PopCommerceAdmin/dashboard.xml b/screen/PopCommerceAdmin/dashboard.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
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Dashboard" default-menu-index="1" menu-image="fa fa-dashboard" menu-image-type="icon">
 
     <transition name="search"><default-response url="../Search"/></transition>

diff --git a/screen/PopCommerceRoot.xml b/screen/PopCommerceRoot.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
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         screen-theme-type-enum-id="STT_POP_COMMERCE" standalone="true"
         require-authentication="anonymous-view" login-path="/popc/Login">
 

diff --git a/screen/PopCommerceRoot/Customer.xml b/screen/PopCommerceRoot/Customer.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd">
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd">
     <subscreens default-item="Profile"/>
     <widgets>
         <subscreens-active id="customer"/>

diff --git a/screen/PopCommerceRoot/Customer/OrderDetail.xml b/screen/PopCommerceRoot/Customer/OrderDetail.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         require-authentication="true">
 
     <parameter name="orderId" required="true"/>

diff --git a/screen/PopCommerceRoot/Customer/OrderHistory.xml b/screen/PopCommerceRoot/Customer/OrderHistory.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         require-authentication="true">
 
     <transition name="orderDetail"><default-response url="../OrderDetail"/></transition>

diff --git a/screen/PopCommerceRoot/Customer/Profile.xml b/screen/PopCommerceRoot/Customer/Profile.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
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         require-authentication="true">
 
     <transition name="updateUser"><service-call name="mantle.party.PartyServices.update#Account" in-map="context"/>

diff --git a/screen/PopCommerceRoot/Customer/Profile/UpdateContactInfo.xml b/screen/PopCommerceRoot/Customer/Profile/UpdateContactInfo.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-include="false" standalone="true">
 
     <parameter name="partyId"/>

diff --git a/screen/PopCommerceRoot/Customer/Profile/UpdatePaymentMethodInfo.xml b/screen/PopCommerceRoot/Customer/Profile/UpdatePaymentMethodInfo.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-include="false" standalone="true">
 
     <parameter name="partyId"/>

diff --git a/screen/PopCommerceRoot/Home.xml b/screen/PopCommerceRoot/Home.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         require-authentication="false">
 
     <transition name="addToCart">

diff --git a/screen/PopCommerceRoot/Login.xml b/screen/PopCommerceRoot/Login.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
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-include="false" require-authentication="anonymous-all" history="false">
 
     <transition name="login" require-session-token="false">

diff --git a/screen/PopCommerceRoot/Order.xml b/screen/PopCommerceRoot/Order.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         require-authentication="false">
     <subscreens default-item="Cart"/>
     <widgets>

diff --git a/screen/PopCommerceRoot/Order/Cart.xml b/screen/PopCommerceRoot/Order/Cart.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         require-authentication="false">
 
     <transition name="updateCartItems">

diff --git a/screen/PopCommerceRoot/Order/Checkout.xml b/screen/PopCommerceRoot/Order/Checkout.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         require-authentication="true">
 
     <transition name="setOrderBillingShippingInfo">

diff --git a/screen/PopCommerceRoot/Order/Review.xml b/screen/PopCommerceRoot/Order/Review.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         require-authentication="true">
 
     <transition name="placeOrder">

diff --git a/screen/PopCommerceRoot/Product.xml b/screen/PopCommerceRoot/Product.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
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         require-authentication="false">
     <subscreens default-item="Category"/>
     <widgets>