enter product on invoice item does not copy price #44 popcommerce

.classpath

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="bin/test" path="src/test/groovy">
+		<attributes>
+			<attribute name="gradle_scope" value="test"/>
+			<attribute name="gradle_used_by_scope" value="test"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
+	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
+	<classpathentry kind="output" path="bin/default"/>
+</classpath>

.project

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>SimpleScreens</name>
+	<comment>Project SimpleScreens created by Buildship.</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+	</natures>
+</projectDescription>

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
+
+===========================================================================

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
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<entity-facade-xml type="install">
+<entity-facade-xml type="seed-initial">
     <moqui.security.user.NotificationTopic topic="MantleTask" description="Task Updates"
             typeString="info" showAlert="Y" persistOnSend="Y" receiveNotifications="Y" emailTemplateId="NOTIFICATION"
             titleTemplate="Task Updated ${workEffortId} - ${name} - ${status}${priority ? ' - P ' + priority : ''} - ${purpose?:''}"
-            linkTemplate="/apps/my/User/Task/TaskDetail?workEffortId=${workEffortId}"/>
+            linkTemplate="/vapps/my/User/Task/TaskDetail?workEffortId=${workEffortId}"/>
     <moqui.security.user.NotificationTopic topic="MantleEvent" description="Event Updates"
             typeString="info" showAlert="Y" persistOnSend="Y" receiveNotifications="Y" emailTemplateId="NOTIFICATION"
             titleTemplate="Event Updated ${workEffortId} - ${name} - ${status} - ${purpose?:''}"
-            linkTemplate="/apps/my/User/Calendar/EventDetail?workEffortId=${workEffortId}"/>
+            linkTemplate="/vapps/my/User/Calendar/EventDetail?workEffortId=${workEffortId}"/>
 
     <moqui.security.user.NotificationTopic topic="MantleCommunicationEvent" description="Message Updates"
             typeString="info" showAlert="Y" persistOnSend="Y" receiveNotifications="Y" emailTemplateId="NOTIFICATION"
             titleTemplate="Message Updated ${communicationEventId} - ${subject} - ${status}"
-            linkTemplate="/apps/my/User/Messages/MessageThread?communicationEventId=${communicationEventId}"/>
+            linkTemplate="/vapps/my/User/Messages/MessageThread?communicationEventId=${communicationEventId}"/>
 
     <moqui.security.user.NotificationTopic topic="MantleRequest" description="Request Updates"
             typeString="info" showAlert="Y" persistOnSend="Y" receiveNotifications="Y" emailTemplateId="NOTIFICATION"
             titleTemplate="Request Updated ${requestId} - ${name} - ${status}${priority ? ' - P ' + priority : ''} - ${type?:''}"
-            linkTemplate="/apps/my/User/Request/EditRequest?requestId=${requestId}"/>
+            linkTemplate="/vapps/my/User/Request/EditRequest?requestId=${requestId}"/>
+
+    <moqui.security.user.NotificationTopic topic="MantleWikiPage" description="Wiki Page Updates"
+            typeString="info" showAlert="Y" persistOnSend="Y" receiveNotifications="Y" emailTemplateId="NOTIFICATION"
+            titleTemplate="Wiki Page Updated ${wikiSpaceId} / ${pagePath?:''} ${publishedVersionName?:''}"
+            linkTemplate="/vapps/hm/wiki/${wikiSpaceId}/${pagePath?:''}"/>
 
     <moqui.entity.feed.DataFeed dataFeedId="MyAccountNotifications" dataFeedTypeEnumId="DTFDTP_RT_PUSH"
-            feedName="MyAccount Notifications" feedReceiveServiceName="mantle.party.PartyServices.send#DataDocumentNotifications">
+            feedName="MyAccount Notifications" feedReceiveServiceName="mantle.party.PartyServices.send#DataDocumentNotifications"
+            feedDeleteServiceName="org.moqui.impl.BasicServices.noop">
         <documents dataDocumentId="MantleTask"/>
         <documents dataDocumentId="MantleEvent"/>
         <documents dataDocumentId="MantleCommunicationEvent"/>
         <documents dataDocumentId="MantleRequest"/>
+        <documents dataDocumentId="MantleWikiPage"/>
     </moqui.entity.feed.DataFeed>
 </entity-facade-xml>

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)>
     <a href="${webRoot!""}/apps/my/User/Notifications" data-toggle="tooltip" data-container="body" data-original-title="${ec.l10n.localize("Notifications")}" data-placement="bottom" class="btn btn-default btn-sm navbar-btn">
-        <i class="glyphicon glyphicon-info-sign"></i>
+        <i class="fa fa-info-circle"></i>
         <span id="navbar_notification_count" class="label label-info">${noticeCounts.notificationCount!"0"}</span>
     </a>
     <a href="${webRoot!""}/apps/my/User/Messages/FindMessage?statusId=CeReceived&toPartyId=${ec.user.userAccount.partyId!}" data-toggle="tooltip" data-container="body" data-original-title="${ec.l10n.localize("Messages")}" data-placement="bottom" class="btn btn-default btn-sm navbar-btn">
-        <i class="glyphicon glyphicon-envelope"></i>
+        <i class="fa fa-envelope"></i>
         <span class="label label-warning">${noticeCounts.messageCount!"0"}</span>
     </a>
     <a href="${webRoot!""}/apps/my/User/Calendar/MyCalendar" data-toggle="tooltip" data-container="body" data-original-title="${ec.l10n.localize("Events This Week")}" data-placement="bottom" class="btn btn-default btn-sm navbar-btn">
-        <i class="glyphicon glyphicon-calendar"></i>
+        <i class="fa fa-calendar"></i>
         <span class="label label-primary">${noticeCounts.eventCount!"0"}</span>
     </a>
     <a href="${webRoot!""}/apps/my/User/Task/MyTasks" data-toggle="tooltip" data-container="body" data-original-title="${ec.l10n.localize("Open Tasks")}" data-placement="bottom" class="btn btn-default btn-sm navbar-btn">
-        <i class="glyphicon glyphicon-check"></i>
+        <i class="fa fa-check"></i>
         <span class="label label-success">${noticeCounts.taskCount!"0"}</span>
     </a>
 </div>
@@ -73,11 +73,18 @@ along with this software (see the LICENSE.md file). If not, see
 </#if>
         ]]></resourceValue>
     </moqui.screen.ScreenThemeResource>
+
+    <!-- /vapps (vuet) header plugins -->
     <moqui.screen.ScreenThemeResource screenThemeId="DEFAULT" sequenceNum="130" resourceTypeEnumId="STRT_HEADER_NAVBAR_COMP"
-                                      resourceValue="/ssstatic/MyAccountNav.js"/>
-    <!-- When needed use something like this for the Active Organization selector in the nav bar:
+            resourceValue="/ssstatic/lib/MyAccountNav.js"/>
     <moqui.screen.ScreenThemeResource screenThemeId="DEFAULT" sequenceNum="135" resourceTypeEnumId="STRT_HEADER_NAVBAR_COMP"
-                                      resourceValue="/ssstatic/ActiveOrgNav.js"/> -->
+            resourceValue="/ssstatic/lib/ActiveOrgNav.js"/>
+    <!-- /qapps (qvt/qvue) header plugins -->
+    <moqui.screen.ScreenThemeResource screenThemeId="DEFAULT_QUASAR" sequenceNum="130" resourceTypeEnumId="STRT_HEADER_NAVBAR_COMP"
+            resourceValue="/ssstatic/lib/ActiveOrgNav.qvue"/>
+    <moqui.screen.ScreenThemeResource screenThemeId="DEFAULT_QUASAR" sequenceNum="135" resourceTypeEnumId="STRT_HEADER_NAVBAR_COMP"
+            resourceValue="/ssstatic/lib/MyAccountNav.qvue"/>
+
 
     <!-- ====================================================== -->
     <!-- ========== User/Group Preferences Supported ========== -->

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.

screen/BasicHandheld/Warehouse.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"
-        default-menu-title="HH Warehouse" default-menu-index="50" menu-image="glyphicon glyphicon-tags" menu-image-type="icon">
+        default-menu-title="HH Warehouse" default-menu-index="50" menu-image="fa fa-tags" menu-image-type="icon">
 
     <always-actions>
         <set field="appRoot" value="hhwh"/>

screen/MyAccount.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"
-        default-menu-title="My Account" default-menu-index="99" menu-image="glyphicon glyphicon-user" menu-image-type="icon">
+        default-menu-title="My Account" default-menu-index="99" menu-image="fa fa-user" menu-image-type="icon">
 
     <subscreens default-item="User"/>
     <pre-actions><set field="partyId" from="ec.user.userAccount.partyId"/></pre-actions>

screen/MyAccount/User/Account.xml

@@ -16,22 +16,25 @@ 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">
 
-    <always-actions><set field="partyId" from="ec.user.userAccount.partyId"/></always-actions>
+    <always-actions>
+        <set field="partyId" from="ec.user.userAccount.partyId"/>
+        <set field="userId" from="ec.user.userId"/>
+    </always-actions>
 
     <transition name="updateUser"><service-call name="mantle.party.PartyServices.update#Account" in-map="context"/>
         <default-response url="."/></transition>
     <transition name="changePassword"><service-call name="org.moqui.impl.UserServices.update#Password"/>
         <default-response url="."/><error-response url="."/></transition>
 
     <actions>
-        <if condition="partyId"><then>
-            <entity-find-one entity-name="mantle.party.PersonAndUserAccount" value-field="personAndUserAccount"/>
+        <entity-find-one entity-name="mantle.party.PersonAndUserAccount" value-field="personAndUserAccount"/>
+        <if condition="personAndUserAccount == null"><set field="personAndUserAccount" from="ec.user.userAccount"/></if>
+
+        <if condition="partyId &amp;&amp; !personAndUserAccount?.emailAddress">
             <service-call name="mantle.party.ContactServices.get#PrimaryEmailAddress" out-map="primaryEmail"
                           in-map="[partyId:partyId]"/>
-        </then><else>
-            <set field="personAndUserAccount" from="ec.user.userAccount"/>
-        </else>
         </if>
+
         <set field="localeStringList" from="[]"/>
         <iterate list="Locale.getAvailableLocales()" entry="lcl">
             <script>if (lcl.toString()) localeStringList.add([locale:lcl.toString(), name:lcl.getDisplayName(ec.user.locale)])</script></iterate>
@@ -55,7 +58,7 @@ along with this software (see the LICENSE.md file). If not, see
                     <field name="firstName"><default-field><text-line size="15"/></default-field></field>
                     <field name="middleName"><default-field><text-line size="15"/></default-field></field>
                     <field name="lastName"><default-field><text-line size="15"/></default-field></field>
-                    <field name="emailAddress" from="primaryEmail?.emailAddress"><default-field><text-line/></default-field></field>
+                    <field name="emailAddress" from="emailAddress ?: primaryEmail?.emailAddress"><default-field><text-line/></default-field></field>
 
                     <field name="locale"><default-field>
                         <drop-down allow-empty="true"><list-options list="localeStringList" key="${locale}" text="${name}"/></drop-down>

screen/MyAccount/User/Calendar/MyCalendar.xml

@@ -65,7 +65,7 @@ along with this software (see the LICENSE.md file). If not, see
         <container id="calendar"/>
         <render-mode>
             <!-- NOTE: to work as Vue template link element must be closed and don't use $(document).ready() -->
-            <text type="html,vuet"><![CDATA[
+            <text type="html,vuet,qvt"><![CDATA[
                 <script src="https://cdnjs.cloudflare.com/ajax/libs/fullcalendar/3.1.0/fullcalendar.min.js" type="text/javascript"></script>
                 <script src="https://cdnjs.cloudflare.com/ajax/libs/fullcalendar/3.1.0/locale-all.js" type="text/javascript"></script>
                 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/fullcalendar/3.1.0/fullcalendar.min.css" type="text/css"/>

screen/MyAccount/User/ContactInfo.xml

@@ -43,7 +43,7 @@ along with this software (see the LICENSE.md file). If not, see
                                 <widgets>
                                     <container type="li">
                                         <label text="${contactInfo.emailContactMechPurpose.description}" type="p"/>
-                                        <render-mode><text type="html,vuet" location="component://SimpleScreens/template/party/ContactInfo.html.gstring"/></render-mode>
+                                        <render-mode><text type="html,vuet,qvt" location="component://SimpleScreens/template/party/ContactInfo.html.gstring"/></render-mode>
                                         <dynamic-dialog id="UpdateEmailInfo" button-text="Update"
                                                 transition="updateContactInfo"
                                                 parameter-map="[partyId:partyId, emailContactMechId:contactInfo.emailContactMechId,
@@ -70,7 +70,7 @@ along with this software (see the LICENSE.md file). If not, see
                                 <widgets>
                                     <container type="li">
                                         <label text="${contactInfo.telecomContactMechPurpose.description}" type="p"/>
-                                        <render-mode><text type="html,vuet" location="component://SimpleScreens/template/party/ContactInfo.html.gstring"/></render-mode>
+                                        <render-mode><text type="html,vuet,qvt" location="component://SimpleScreens/template/party/ContactInfo.html.gstring"/></render-mode>
                                         <dynamic-dialog id="UpdatePhoneInfo" button-text="Update"
                                                 transition="updateContactInfo"
                                                 parameter-map="[partyId:partyId, telecomContactMechId:contactInfo.telecomContactMechId,
@@ -97,7 +97,7 @@ along with this software (see the LICENSE.md file). If not, see
                                 <widgets>
                                     <container type="li">
                                         <label text="${contactInfo.postalContactMechPurpose.description}" type="p"/>
-                                        <render-mode><text type="html,vuet" location="component://SimpleScreens/template/party/ContactInfo.html.gstring"/></render-mode>
+                                        <render-mode><text type="html,vuet,qvt" location="component://SimpleScreens/template/party/ContactInfo.html.gstring"/></render-mode>
                                         <dynamic-dialog id="UpdatePostalInfo" button-text="Update Address"
                                                 transition="updateContactInfo" width="800"
                                                 parameter-map="[partyId:partyId, postalContactMechId:contactInfo.postalContactMechId,

screen/MyAccount/User/Messages/EditMessage.xml

@@ -120,7 +120,7 @@ along with this software (see the LICENSE.md file). If not, see
                         <field name="description"><default-field title="Note"><text-line size="20"/></default-field></field>
                         <field name="submitButton"><default-field title="Update"><submit/></default-field></field>
                         <field name="removeButton"><default-field title="">
-                            <link url="deleteCommunicationEventPurpose" text=" " icon="glyphicon glyphicon-trash" confirmation="Delete this Purpose?"/>
+                            <link url="deleteCommunicationEventPurpose" text=" " icon="fa fa-trash" confirmation="Delete this Purpose?"/>
                         </default-field></field>
                     </form-list>
                 </box-body-nopad></container-box>

screen/MyAccount/User/Notifications.xml

@@ -48,7 +48,7 @@ along with this software (see the LICENSE.md file). If not, see
                 <field name="receiveNotifications" from="notTopicUser?.receiveNotifications ?: receiveNotifications ?: 'Y'"><default-field title="Receive">
                     <radio><option key="Y"/><option key="N"/></radio>
                 </default-field></field>
-                <field name="emailNotifications" from="notTopicUser?.emailNotifications ?: 'N'">
+                <field name="emailNotifications" from="notTopicUser?.emailNotifications ?: emailNotifications ?: 'N'">
                     <conditional-field condition="emailTemplateId"><radio><option key="Y"/><option key="N"/></radio></conditional-field>
                     <default-field title="Email"><display text=""/></default-field>
                 </field>
@@ -59,7 +59,7 @@ along with this software (see the LICENSE.md file). If not, see
             <field name="_useRowSubmit"><default-field><hidden default-value="true"/></default-field></field>
             <field name="_rowSubmit"><header-field title="Select"/>
                 <conditional-field condition="viewedDate"><display text=" "/></conditional-field>
-                <default-field><check no-current-selected-key="true"><option key="true" text=" "/></check></default-field>
+                <default-field title="Select"><check no-current-selected-key="true" no-wrapper="true"><option key="true" text=" "/></check></default-field>
             </field>
 
             <field name="titleText">