local currency not displayed on transaction screen.

.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>

screen/SimpleScreens/Accounting/Invoice/FindInvoice.xml

@@ -207,7 +207,7 @@ along with this software (see the LICENSE.md file). If not, see
             <entity-find entity-name="mantle.account.invoice.InvoiceFindView" list="invoiceList" use-clone="true">
                 <search-form-inputs default-order-by="invoiceDate,invoiceId" skip-fields="fromRoleTypeId,toRoleTypeId">
                     <default-parameters statusId="InvoiceInProcess,InvoiceFinalized,InvoiceSent,InvoiceAcked,InvoiceIncoming,InvoiceReceived,InvoiceApproved"
-                            statusId_op="in" invoiceDate_poffset="-3" invoiceDate_period="30d"/></search-form-inputs>
+                            statusId_op="in"/></search-form-inputs>
                 <econdition field-name="fromRoleTypeId" ignore-if-empty="true"/>
                 <econdition field-name="toRoleTypeId" ignore-if-empty="true"/>
                 <select-field field-name="currencyUomId"/>

screen/SimpleScreens/Accounting/OrgSettings/GlAccounts.xml

@@ -69,6 +69,10 @@ along with this software (see the LICENSE.md file). If not, see
                         condition="parentGlAccountId" parameter-map="[glAccountId:parentGlAccountId]"
                         text="${accountCodeFormatter != null ? accountCodeFormatter.valueToString(accountCode) : accountCode}: ${accountName}"/>
             </default-field></field>
+            <field name="externalId">
+                <header-field show-order-by="case-insensitive"><text-find size="5" hide-options="true"/></header-field>
+                <default-field title="Old Accnt"><display/></default-field>
+            </field>
 
             <field name="glAccountTypeEnumId">
                 <header-field title="Account Type" show-order-by="true">

screen/SimpleScreens/Accounting/Payment/FindPayment.xml

@@ -85,7 +85,7 @@ along with this software (see the LICENSE.md file). If not, see
             <entity-find entity-name="mantle.account.payment.PaymentFindView" list="paymentList" use-clone="true">
                 <search-form-inputs default-order-by="-effectiveDate" skip-fields="fromRoleTypeId,toRoleTypeId">
                     <default-parameters statusId="PmntProposed,PmntPromised,PmntAuthorized" statusId_op="in"
-                            effectiveDate_poffset="-1" effectiveDate_period="30d" paymentType="Any"/></search-form-inputs>
+                            /></search-form-inputs>
                 <econdition field-name="fromRoleTypeId" ignore-if-empty="true"/>
                 <econdition field-name="toRoleTypeId" ignore-if-empty="true"/>
                 <econditions combine="or">

screen/SimpleScreens/Accounting/Reports/OrderIssuedInvoiced.xml

@@ -33,7 +33,7 @@ along with this software (see the LICENSE.md file). If not, see
             <entity-find entity-name="mantle.order.OrderItemShipBillSummary" list="oisbsList" use-clone="true">
                 <search-form-inputs default-order-by="placedDate">
                     <default-parameters statusId_op="in" statusId="OrderApproved,OrderCompleted,OrderHold"
-                            placedDate_poffset="-3" placedDate_period="30d"/>
+                            />
                 </search-form-inputs>
                 <econdition field-name="vendorRoleTypeId" value="OrgInternal"/>
                 <econdition field-name="itemTypeEnumId" operator="in" from="productItemTypes"/>

screen/SimpleScreens/Accounting/Transaction/EditTransaction.xml

@@ -55,9 +55,11 @@ along with this software (see the LICENSE.md file). If not, see
             <field-map field-name="enumId" from="acctgTrans.acctgTransTypeEnumId"/></entity-find-one>
         <entity-find-one entity-name="moqui.basic.Uom" value-field="amountUom">
             <field-map field-name="uomId" from="acctgTrans.amountUomId"/></entity-find-one>
+        <entity-find-one entity-name="moqui.basic.Uom" value-field="localCurrencyAmountUom">
+            <field-map field-name="uomId" from="acctgTrans.localCurrencyUomId"/></entity-find-one>
         <entity-find-one entity-name="moqui.basic.Uom" value-field="origCurrencyAmountUom">
             <field-map field-name="uomId" from="acctgTrans.originalCurrencyUomId"/></entity-find-one>
-
+            
         <set field="glJournal" from="acctgTrans.'mantle.ledger.transaction.GlJournal'"/>
 
         <entity-find entity-name="mantle.ledger.transaction.AcctgTransEntry" list="entryList">
@@ -196,7 +198,7 @@ along with this software (see the LICENSE.md file). If not, see
             <row-col lg="1"><label text="Journal" type="strong"/></row-col>
             <row-col lg="3"><label text="${glJournal?.glJournalName?:''} [${acctgTrans.glJournalId?:''}]" type="p"/></row-col>
             <row-col lg="1"><label text="Currency" type="strong"/></row-col>
-            <row-col lg="3"><label text="${amountUom?.description} [${amountUom?.uomId}]" type="p"/></row-col>
+            <row-col lg="3"><label text="${localCurrencyAmountUom?.description} [${localCurrencyAmountUom?.uomId}]" type="p"/></row-col>
             <row-col lg="1"><label text="Orig. Currency" type="strong"/></row-col>
             <row-col lg="3"><label text="${origCurrencyAmountUom?.description?:''} [${origCurrencyAmountUom?.uomId?:''}]"/></row-col>
         </container-row>

screen/SimpleScreens/Accounting/Transaction/FindTransaction.xml

@@ -74,15 +74,15 @@ along with this software (see the LICENSE.md file). If not, see
                    saved-finds="true" show-csv-button="true" show-xlsx-button="true">
             <entity-find entity-name="mantle.ledger.transaction.AcctgTrans" list="acctgTransList">
                 <search-form-inputs default-order-by="-transactionDate">
-                    <default-parameters transactionDate_poffset="-1" transactionDate_period="30d"/></search-form-inputs>
+                    <default-parameters/></search-form-inputs>
             </entity-find>
             <row-actions>
                 <service-call name="mantle.ledger.LedgerServices.calculate#AcctgTransTrialBalance"
                         in-map="[acctgTransId:acctgTransId]" out-map="context"/>
             </row-actions>
 
-            <field name="transactionDate"><header-field show-order-by="true"><date-period/></header-field>
-                <default-field><display/></default-field></field>
+            <field name="transactionDate"><header-field show-order-by="true"><date-period /></header-field>
+                <default-field><display /></default-field></field>
             <field name="acctgTransId"><header-field show-order-by="true" title="TX ID"><text-find hide-options="true" default-operator="begins"/></header-field>
                 <default-field><link url="editTransaction" text="${acctgTransId}" link-type="anchor"/></default-field></field>
 

screen/SimpleScreens/Accounting/Transaction/FindTransactionEntry.xml

@@ -42,7 +42,7 @@ along with this software (see the LICENSE.md file). If not, see
                    select-columns="true" saved-finds="true" show-csv-button="true" show-xlsx-button="true" show-all-button="true">
             <entity-find entity-name="mantle.ledger.transaction.AcctgTransAndEntrySummary" list="acctgTransEntryList">
                 <search-form-inputs default-order-by="-transactionDate,-acctgTransId,acctgTransEntrySeqId">
-                    <default-parameters transactionDate_poffset="-1" transactionDate_period="30d"/></search-form-inputs>
+                    <default-parameters/></search-form-inputs>
                 <econdition field-name="reconcileStatusId" value="AterNot" or-null="true" ignore="onlyNotRec != 'Y'"/>
                 <select-field field-name="amount,debitCreditFlag"/><!-- always select amount and debit/credit flag in case are not displayed but debit/credit are -->
             </entity-find>

screen/SimpleScreens/Order/FindOrder.xml

@@ -188,7 +188,7 @@ along with this software (see the LICENSE.md file). If not, see
                         skip-fields="vendorRoleTypeId,customerRoleTypeId,customerClassificationId,itemTypeEnumId">
                     <!-- NOTE: OrderOpen no longer included by default to exclude shopping cart orders (salesChannelEnumId == 'ScWeb') -->
                     <default-parameters partStatusId="OrderProposed,OrderRequested,OrderPlaced,OrderApproved,OrderHold" partStatusId_op="in"
-                            entryDate_poffset="-3" entryDate_period="30d"/></search-form-inputs>
+                            /></search-form-inputs>
                 <date-filter from-field-name="customerClassFromDate" thru-field-name="customerClassThruDate" ignore="!customerClassificationId"/>
                 <econdition field-name="vendorRoleTypeId" value="OrgInternal" ignore="!'sales'.equalsIgnoreCase(orderType)"/>
                 <econdition field-name="customerRoleTypeId" value="OrgInternal" ignore="!'purchase'.equalsIgnoreCase(orderType)"/>

screen/SimpleScreens/Order/OrderDetail.xml

@@ -152,6 +152,18 @@ along with this software (see the LICENSE.md file). If not, see
             <parameter name="orderId"/><parameter name="filename" value="Order-${orderId}.pdf"/>
         </default-response>
     </transition>
+    <transition name="PrintOrderData.pdf">
+        <default-response url="${ec.web.getWebappRootUrl(false, null)}/fop/apps/${appRoot}/Order/PrintOrderData" url-type="plain">
+            <parameter name="renderMode" value="xsl-fo"/><parameter name="pageNoLimit" value="true"/>
+            <parameter name="orderId"/><parameter name="filename" value="OrderData-${orderId}.pdf"/>
+        </default-response>
+    </transition>
+    <transition name="PrintOrderProd.pdf">
+        <default-response url="${ec.web.getWebappRootUrl(false, null)}/fop/apps/${appRoot}/Order/PrintOrderProd" url-type="plain">
+            <parameter name="renderMode" value="xsl-fo"/><parameter name="pageNoLimit" value="true"/>
+            <parameter name="orderId"/><parameter name="filename" value="OrderProd-${orderId}.pdf"/>
+        </default-response>
+    </transition>
 
     <subscreens>
         <subscreens-item name="UpdateContactInfo" location="component://SimpleScreens/screen/SimpleScreens/Party/EditParty/UpdateContactInfo.xml"/>
@@ -169,6 +181,12 @@ along with this software (see the LICENSE.md file). If not, see
 
         <if condition="orderHeader.statusId in ['OrderPlaced', 'OrderProcessing', 'OrderHold']">
             <service-call name="mantle.order.OrderInfoServices.check#OrderPreApprove" in-map="[orderId:orderId]" out-map="context"/></if>
+
+        <entity-find entity-name="accugeo.order.OrderPanel" list="orderPanels">
+            <econdition field-name="orderId"/>
+            <econdition field-name="qcNum" operator="is-not-null" />
+        </entity-find>
+
     </actions>
     <widgets>
         <section name="OrderHeaderSection"><widgets>
@@ -237,6 +255,9 @@ along with this software (see the LICENSE.md file). If not, see
                         condition="ec.user.hasPermission('ORDER_APPROVE') &amp;&amp; orderHeader.statusId == 'OrderCompleted'"/>
 
                 <link url="PrintOrder.pdf" text="Order PDF"/>
+                <link url="/apps/accugeo/OrderPanels" condition="firstPartInfo.isVendorInternalOrg" text="Order Panels (${orderPanels.size()})" link-type="anchor-button" url-type="plain" parameter-map="[orderId: orderId]"/>
+                <link url="PrintOrderData.pdf" condition="firstPartInfo.isVendorInternalOrg" text="Order data Sheet PDF" parameter-map="[orderId: orderId]"/>
+                <link url="PrintOrderProd.pdf" condition="firstPartInfo.isVendorInternalOrg" text="Order production PDF" parameter-map="[orderId: orderId]"/>
 
                 <section-iterate name="InvoiceLinks" list="invoiceIdSet" entry="invoiceId"><widgets>
                     <link url="editInvoice" text="Invoice ${invoiceId}" link-type="anchor-button"/>

screen/SimpleScreens/Return/FindReturn.xml

@@ -89,7 +89,7 @@ along with this software (see the LICENSE.md file). If not, see
             <entity-find entity-name="mantle.order.return.ReturnHeaderDetail" list="returnHeaderList" distinct="true" use-clone="true">
                 <search-form-inputs default-order-by="-entryDate,returnId" skip-fields="orderId">
                     <default-parameters statusId="ReturnCreated,ReturnRequested,ReturnApproved,ReturnShipped,ReturnReceived" statusId_op="in"
-                            entryDate_poffset="-3" entryDate_period="30d"/>
+                            />
                 </search-form-inputs>
                 <econdition field-name="vendorRoleTypeId" value="OrgInternal" ignore="!'customer'.equalsIgnoreCase(returnType)"/>
                 <econdition field-name="customerRoleTypeId" value="OrgInternal" ignore="!'supplier'.equalsIgnoreCase(returnType)"/>

screen/SimpleScreens/Shipment/FindShipment.xml

@@ -96,7 +96,7 @@ along with this software (see the LICENSE.md file). If not, see
             <entity-find entity-name="mantle.shipment.ShipmentFindView" list="shipmentList" distinct="true" use-clone="true">
                 <search-form-inputs default-order-by="-entryDate,shipmentId">
                     <default-parameters statusId="ShipInput,ShipScheduled,ShipPicked" statusId_op="in"
-                            entryDate_poffset="-3" entryDate_period="30d"/></search-form-inputs>
+                            /></search-form-inputs>
                 <date-filter from-field-name="customerClassFromDate" thru-field-name="customerClassThruDate" ignore="!customerClassificationId"/>
                 <econdition field-name="shipmentTypeEnumId" operator="in" from="shipmentTypeSet" ignore="!shipmentTypeSet"/>
                 <econdition field-name="productId" operator="in" from="findProductId" ignore-if-empty="true"/>

template/account/Invoice.xsl-fo.ftl

@@ -25,6 +25,7 @@ along with this software (see the LICENSE.md file). If not, see
     <#assign product = invoiceItem.product!>
     <#assign asset = invoiceItem.asset!>
     <#assign lot = asset.lot!>
+    <#assign quantityUom = ec.entity.find("moqui.basic.Uom").condition("uomId", invoiceItem.quantityUomId).useCache(true).one().description>
     <fo:table-row font-size="8pt" border-bottom="thin solid black">
         <fo:table-cell padding="${cellPadding}"><fo:block text-align="center"><#if (itemIndex > 0)>${itemIndex}<#else> </#if></fo:block></fo:table-cell>
         <fo:table-cell padding="${cellPadding}"><fo:block>${(product.pseudoId)!(invoiceItem.productId)!""}</fo:block></fo:table-cell>
@@ -34,6 +35,7 @@ along with this software (see the LICENSE.md file). If not, see
             <#if invoiceItem.otherPartyProductId?has_content><fo:block>Your Product: ${invoiceItem.otherPartyProductId}</fo:block></#if>
         </fo:table-cell>
         <fo:table-cell padding="${cellPadding}"><fo:block text-align="center">${invoiceItem.quantity!"1"}</fo:block></fo:table-cell>
+        <fo:table-cell padding="${cellPadding}"><fo:block text-align="center">${quantityUom}</fo:block></fo:table-cell>
         <fo:table-cell padding="${cellPadding}"><fo:block text-align="right">${ec.l10n.formatCurrency(invoiceItem.amount!0, invoice.currencyUomId, 3)}</fo:block></fo:table-cell>
         <fo:table-cell padding="${cellPadding}"><fo:block text-align="right">${ec.l10n.formatCurrency(((invoiceItem.quantity!1) * (invoiceItem.amount!0)), invoice.currencyUomId, 3)}</fo:block></fo:table-cell>
     </fo:table-row>
@@ -232,9 +234,10 @@ along with this software (see the LICENSE.md file). If not, see
                         <fo:table-cell width="0.4in" padding="${cellPadding}"><fo:block text-align="center">Item</fo:block></fo:table-cell>
                         <fo:table-cell width="1in" padding="${cellPadding}"><fo:block>Product</fo:block></fo:table-cell>
                         <fo:table-cell width="1in" padding="${cellPadding}"><fo:block>Lot</fo:block></fo:table-cell>
-                        <fo:table-cell width="2.5in" padding="${cellPadding}"><fo:block>Description</fo:block></fo:table-cell>
+                        <fo:table-cell width="2.0in" padding="${cellPadding}"><fo:block>Description</fo:block></fo:table-cell>
                         <fo:table-cell width="0.6in" padding="${cellPadding}"><fo:block text-align="center">Qty</fo:block></fo:table-cell>
-                        <fo:table-cell width="0.9in" padding="${cellPadding}"><fo:block text-align="right">Amount</fo:block></fo:table-cell>
+                        <fo:table-cell width="0.6in" padding="${cellPadding}"><fo:block text-align="center">Uom</fo:block></fo:table-cell>
+                        <fo:table-cell width="0.5in" padding="${cellPadding}"><fo:block text-align="right">Amount</fo:block></fo:table-cell>
                         <fo:table-cell width="1in" padding="${cellPadding}"><fo:block text-align="right">Total</fo:block></fo:table-cell>
                     </fo:table-header>
                     <fo:table-body>
@@ -247,6 +250,7 @@ along with this software (see the LICENSE.md file). If not, see
                             <fo:table-cell padding="${cellPadding}"><fo:block> </fo:block></fo:table-cell>
                             <fo:table-cell padding="${cellPadding}"><fo:block> </fo:block></fo:table-cell>
                             <fo:table-cell padding="${cellPadding}"><fo:block> </fo:block></fo:table-cell>
+                            <fo:table-cell padding="${cellPadding}"><fo:block> </fo:block></fo:table-cell>
                             <fo:table-cell padding="${cellPadding}"><fo:block text-align="right" font-weight="bold">Total</fo:block></fo:table-cell>
                             <fo:table-cell padding="${cellPadding}"><fo:block text-align="right" font-weight="bold">${ec.l10n.formatCurrency(noAdjustmentTotal, invoice.currencyUomId)}</fo:block></fo:table-cell>
                         </fo:table-row>