From 9895784dd9cbe6c7b915f4c4a652638feb261d05 Mon Sep 17 00:00:00 2001 From: Hans Bakker Date: Wed, 11 Mar 2020 10:28:47 +0700 Subject: [PATCH 01/11] show logo of vendor when avaiable on order PDF --- template/order/Order.xsl-fo.ftl | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/template/order/Order.xsl-fo.ftl b/template/order/Order.xsl-fo.ftl index 47fe325d..1f5aba57 100644 --- a/template/order/Order.xsl-fo.ftl +++ b/template/order/Order.xsl-fo.ftl @@ -33,7 +33,14 @@ along with this software (see the LICENSE.md file). If not, see - <#if firstPartInfo.isCustomerInternalOrg>Purchase<#else>Sales Order #${orderId} + <#if logoImageLocation?has_content> + + + + + + + <#if firstPartInfo.isCustomerInternalOrg>Purchase<#else>Sales Order #${orderId} From b183ca7153b267c2d2ea0a8d40d338da136c6f32 Mon Sep 17 00:00:00 2001 From: Hans Bakker Date: Tue, 17 Mar 2020 13:25:04 +0700 Subject: [PATCH 02/11] add buttons for order panels --- screen/SimpleScreens/Order/OrderDetail.xml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/screen/SimpleScreens/Order/OrderDetail.xml b/screen/SimpleScreens/Order/OrderDetail.xml index 7f7109fc..a9926623 100644 --- a/screen/SimpleScreens/Order/OrderDetail.xml +++ b/screen/SimpleScreens/Order/OrderDetail.xml @@ -152,6 +152,18 @@ along with this software (see the LICENSE.md file). If not, see + + + + + + + + + + + + @@ -169,6 +181,11 @@ along with this software (see the LICENSE.md file). If not, see + + + + +
@@ -237,6 +254,10 @@ along with this software (see the LICENSE.md file). If not, see condition="ec.user.hasPermission('ORDER_APPROVE') && orderHeader.statusId == 'OrderCompleted'"/> + + + From e39d1398e1efee365888d680ce4eb37e37f4857b Mon Sep 17 00:00:00 2001 From: Hans Bakker Date: Mon, 23 Mar 2020 13:59:14 +0700 Subject: [PATCH 03/11] add customer/vendor postal addresses to orderPDF, also show 'Quote' in the header when status is 'OrderProposal' --- template/order/Order.xsl-fo.ftl | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/template/order/Order.xsl-fo.ftl b/template/order/Order.xsl-fo.ftl index 1f5aba57..99b76350 100644 --- a/template/order/Order.xsl-fo.ftl +++ b/template/order/Order.xsl-fo.ftl @@ -25,8 +25,8 @@ along with this software (see the LICENSE.md file). If not, see - - + + @@ -40,14 +40,32 @@ along with this software (see the LICENSE.md file). If not, see - <#if firstPartInfo.isCustomerInternalOrg>Purchase<#else>Sales Order #${orderId} + + <#if firstPartInfo.isCustomerInternalOrg>Purchase<#else>Sales + <#if orderHeader.statusId == 'OrderProposed'> Quote, Order #${orderId} Vendor <@encodeText (firstPartInfo.vendorDetail.organizationName)!""/><@encodeText (firstPartInfo.vendorDetail.firstName)!""/> <@encodeText (firstPartInfo.vendorDetail.lastName)!""/> + + <#if firstPartInfo.vendorContactInfo?has_content> + <@encodeText (firstPartInfo.vendorContactInfo.postalAddress.address1)!""/><#if firstPartInfo.vendorContactInfo.postalAddress.unitNumber?has_content> #<@encodeText firstPartInfo.vendorContactInfo.postalAddress.unitNumber/> + <#if firstPartInfo.vendorContactInfo.postalAddress.address2?has_content><@encodeText firstPartInfo.vendorContactInfo.postalAddress.address2/> + <@encodeText (firstPartInfo.vendorContactInfo.postalAddress.city!"")/>, ${(firstPartInfo.vendorContactInfo.postalAddressStateGeo.geoCodeAlpha2)!""} ${firstPartInfo.vendorContactInfo.postalAddress.postalCode!""}<#if firstPartInfo.vendorContactInfo.postalAddress.postalCodeExt?has_content>-${firstPartInfo.vendorContactInfo.postalAddress.postalCodeExt} + <#if firstPartInfo.vendorContactInfo.postalAddress.countryGeoId?has_content>${firstPartInfo.vendorContactInfo.postalAddress.countryGeoId} + + Customer <@encodeText (firstPartInfo.customerDetail.organizationName)!""/><@encodeText (firstPartInfo.customerDetail.firstName)!""/> <@encodeText (firstPartInfo.customerDetail.lastName)!""/> + + <#if firstPartInfo.customerContactInfo?has_content> + <@encodeText (firstPartInfo.customerContactInfo.postalAddress.address1)!""/><#if firstPartInfo.customerContactInfo.postalAddress.unitNumber?has_content> #<@encodeText firstPartInfo.customerContactInfo.postalAddress.unitNumber/> + <#if firstPartInfo.customerContactInfo.postalAddress.address2?has_content><@encodeText firstPartInfo.customerContactInfo.postalAddress.address2/> + <@encodeText (firstPartInfo.customerContactInfo.postalAddress.city!"")/>, ${(firstPartInfo.customerContactInfo.postalAddressStateGeo.geoCodeAlpha2)!""} ${firstPartInfo.customerContactInfo.postalAddress.postalCode!""}<#if firstPartInfo.customerContactInfo.postalAddress.postalCodeExt?has_content>-${firstPartInfo.customerContactInfo.postalAddress.postalCodeExt} + <#if firstPartInfo.customerContactInfo.postalAddress.countryGeoId?has_content>${firstPartInfo.customerContactInfo.postalAddress.countryGeoId} + + Date From df3f0862ec4f0d6999212f426ce8612f558cfdc4 Mon Sep 17 00:00:00 2001 From: Hans Bakker Date: Wed, 25 Mar 2020 12:26:55 +0700 Subject: [PATCH 04/11] modified added buttons for panels --- screen/SimpleScreens/Order/OrderDetail.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/screen/SimpleScreens/Order/OrderDetail.xml b/screen/SimpleScreens/Order/OrderDetail.xml index a9926623..293d782f 100644 --- a/screen/SimpleScreens/Order/OrderDetail.xml +++ b/screen/SimpleScreens/Order/OrderDetail.xml @@ -183,7 +183,8 @@ along with this software (see the LICENSE.md file). If not, see - + + @@ -254,10 +255,9 @@ along with this software (see the LICENSE.md file). If not, see condition="ec.user.hasPermission('ORDER_APPROVE') && orderHeader.statusId == 'OrderCompleted'"/> - - - + + + From c8688c5544a9993d1058ff716a24a0b4361928e6 Mon Sep 17 00:00:00 2001 From: Hans Bakker Date: Tue, 5 May 2020 07:43:35 +0700 Subject: [PATCH 05/11] Only show orderpanels buttons when it is a sales order --- .classpath | 13 ++++++++++++ .project | 23 ++++++++++++++++++++++ screen/SimpleScreens/Order/OrderDetail.xml | 6 +++--- 3 files changed, 39 insertions(+), 3 deletions(-) create mode 100644 .classpath create mode 100644 .project diff --git a/.classpath b/.classpath new file mode 100644 index 00000000..a611913b --- /dev/null +++ b/.classpath @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/.project b/.project new file mode 100644 index 00000000..17d1591c --- /dev/null +++ b/.project @@ -0,0 +1,23 @@ + + + SimpleScreens + Project SimpleScreens created by Buildship. + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.buildship.core.gradleprojectbuilder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.buildship.core.gradleprojectnature + + diff --git a/screen/SimpleScreens/Order/OrderDetail.xml b/screen/SimpleScreens/Order/OrderDetail.xml index 293d782f..3f98b4ef 100644 --- a/screen/SimpleScreens/Order/OrderDetail.xml +++ b/screen/SimpleScreens/Order/OrderDetail.xml @@ -255,9 +255,9 @@ along with this software (see the LICENSE.md file). If not, see condition="ec.user.hasPermission('ORDER_APPROVE') && orderHeader.statusId == 'OrderCompleted'"/> - - - + + + From fae73dd090a7a34341d69c23908df8ee68dd33f3 Mon Sep 17 00:00:00 2001 From: Hans Bakker Date: Fri, 29 May 2020 08:29:00 +0700 Subject: [PATCH 06/11] Add vendor logo at shipment packsheet --- template/shipment/ShipmentPack.xsl-fo.ftl | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/template/shipment/ShipmentPack.xsl-fo.ftl b/template/shipment/ShipmentPack.xsl-fo.ftl index 7723699a..2f4dcdc5 100644 --- a/template/shipment/ShipmentPack.xsl-fo.ftl +++ b/template/shipment/ShipmentPack.xsl-fo.ftl @@ -44,6 +44,13 @@ along with this software (see the LICENSE.md file). If not, see + <#if logoImageLocation?has_content> + + + + + + <#if fromPartyDetail?has_content><@encodeText fromPartyDetail.organizationName!""/><@encodeText fromPartyDetail.firstName!""/> <@encodeText fromPartyDetail.lastName!""/> Shipment Pack Sheet <#if logoImageLocation?has_content> From d1cf46960634c433114947d6d1f79ef7cd053410 Mon Sep 17 00:00:00 2001 From: Hans Bakker Date: Fri, 29 May 2020 08:44:43 +0700 Subject: [PATCH 07/11] Add logo to shipment by package --- template/shipment/ShipmentByPackage.xsl-fo.ftl | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/template/shipment/ShipmentByPackage.xsl-fo.ftl b/template/shipment/ShipmentByPackage.xsl-fo.ftl index da3afc71..11cee6c0 100644 --- a/template/shipment/ShipmentByPackage.xsl-fo.ftl +++ b/template/shipment/ShipmentByPackage.xsl-fo.ftl @@ -31,6 +31,13 @@ along with this software (see the LICENSE.md file). If not, see + <#if logoImageLocation?has_content> + + + + + + <#if fromPartyDetail?has_content><@encodeText fromPartyDetail.organizationName!""/><@encodeText fromPartyDetail.firstName!""/> <@encodeText fromPartyDetail.lastName!""/> Shipment by Package From 578c0967b2600f7141b97e862893a5f8a48cdbc2 Mon Sep 17 00:00:00 2001 From: Hans Bakker Date: Sat, 6 Jun 2020 10:25:14 +0700 Subject: [PATCH 08/11] add orderpanels and quantity uom to invoice --- template/account/Invoice.xsl-fo.ftl | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/template/account/Invoice.xsl-fo.ftl b/template/account/Invoice.xsl-fo.ftl index 5cc45635..ee69d6c7 100644 --- a/template/account/Invoice.xsl-fo.ftl +++ b/template/account/Invoice.xsl-fo.ftl @@ -25,6 +25,7 @@ along with this software (see the LICENSE.md file). If not, see <#assign product = invoiceItem.product!> <#assign asset = invoiceItem.asset!> <#assign lot = asset.lot!> + <#assign quantityUom = ec.entity.find("moqui.basic.Uom").condition("uomId", invoiceItem.quantityUomId).useCache(true).one().description> <#if (itemIndex > 0)>${itemIndex}<#else> ${(product.pseudoId)!(invoiceItem.productId)!""} @@ -34,6 +35,7 @@ along with this software (see the LICENSE.md file). If not, see <#if invoiceItem.otherPartyProductId?has_content>Your Product: ${invoiceItem.otherPartyProductId} ${invoiceItem.quantity!"1"} + ${quantityUom} ${ec.l10n.formatCurrency(invoiceItem.amount!0, invoice.currencyUomId, 3)} ${ec.l10n.formatCurrency(((invoiceItem.quantity!1) * (invoiceItem.amount!0)), invoice.currencyUomId, 3)} @@ -232,9 +234,10 @@ along with this software (see the LICENSE.md file). If not, see Item Product Lot - Description + Description Qty - Amount + Uom + Amount Total @@ -247,6 +250,7 @@ along with this software (see the LICENSE.md file). If not, see + Total ${ec.l10n.formatCurrency(noAdjustmentTotal, invoice.currencyUomId)} From 7fbb19e7f2293b64725487d7efd93c573752ec64 Mon Sep 17 00:00:00 2001 From: Hans Bakker Date: Thu, 30 Jul 2020 10:43:43 +0700 Subject: [PATCH 09/11] add externalId t leger account list --- screen/SimpleScreens/Accounting/OrgSettings/GlAccounts.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/screen/SimpleScreens/Accounting/OrgSettings/GlAccounts.xml b/screen/SimpleScreens/Accounting/OrgSettings/GlAccounts.xml index 31743219..f5579442 100644 --- a/screen/SimpleScreens/Accounting/OrgSettings/GlAccounts.xml +++ b/screen/SimpleScreens/Accounting/OrgSettings/GlAccounts.xml @@ -69,6 +69,10 @@ along with this software (see the LICENSE.md file). If not, see condition="parentGlAccountId" parameter-map="[glAccountId:parentGlAccountId]" text="${accountCodeFormatter != null ? accountCodeFormatter.valueToString(accountCode) : accountCode}: ${accountName}"/> + + + + From 2acf771b450baeaa0e71f85de0bd859da8183a7f Mon Sep 17 00:00:00 2001 From: Hans Bakker Date: Fri, 28 Aug 2020 12:01:14 +0700 Subject: [PATCH 10/11] remove lists limiting days --- screen/SimpleScreens/Accounting/Invoice/FindInvoice.xml | 2 +- screen/SimpleScreens/Accounting/Payment/FindPayment.xml | 2 +- .../Accounting/Reports/OrderIssuedInvoiced.xml | 2 +- .../Accounting/Transaction/FindTransaction.xml | 6 +++--- .../Accounting/Transaction/FindTransactionEntry.xml | 2 +- screen/SimpleScreens/Order/FindOrder.xml | 2 +- screen/SimpleScreens/Return/FindReturn.xml | 2 +- screen/SimpleScreens/Shipment/FindShipment.xml | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/screen/SimpleScreens/Accounting/Invoice/FindInvoice.xml b/screen/SimpleScreens/Accounting/Invoice/FindInvoice.xml index 7bf5100e..1ce4a3bb 100644 --- a/screen/SimpleScreens/Accounting/Invoice/FindInvoice.xml +++ b/screen/SimpleScreens/Accounting/Invoice/FindInvoice.xml @@ -207,7 +207,7 @@ along with this software (see the LICENSE.md file). If not, see + statusId_op="in"/> diff --git a/screen/SimpleScreens/Accounting/Payment/FindPayment.xml b/screen/SimpleScreens/Accounting/Payment/FindPayment.xml index 75eae092..99f72edf 100644 --- a/screen/SimpleScreens/Accounting/Payment/FindPayment.xml +++ b/screen/SimpleScreens/Accounting/Payment/FindPayment.xml @@ -85,7 +85,7 @@ along with this software (see the LICENSE.md file). If not, see + /> diff --git a/screen/SimpleScreens/Accounting/Reports/OrderIssuedInvoiced.xml b/screen/SimpleScreens/Accounting/Reports/OrderIssuedInvoiced.xml index 6f3c82ca..b13d718a 100644 --- a/screen/SimpleScreens/Accounting/Reports/OrderIssuedInvoiced.xml +++ b/screen/SimpleScreens/Accounting/Reports/OrderIssuedInvoiced.xml @@ -33,7 +33,7 @@ along with this software (see the LICENSE.md file). If not, see + /> diff --git a/screen/SimpleScreens/Accounting/Transaction/FindTransaction.xml b/screen/SimpleScreens/Accounting/Transaction/FindTransaction.xml index c372a2df..e952f9a0 100644 --- a/screen/SimpleScreens/Accounting/Transaction/FindTransaction.xml +++ b/screen/SimpleScreens/Accounting/Transaction/FindTransaction.xml @@ -74,15 +74,15 @@ along with this software (see the LICENSE.md file). If not, see saved-finds="true" show-csv-button="true" show-xlsx-button="true"> - + - - + + diff --git a/screen/SimpleScreens/Accounting/Transaction/FindTransactionEntry.xml b/screen/SimpleScreens/Accounting/Transaction/FindTransactionEntry.xml index e63ff61a..0f73ea66 100644 --- a/screen/SimpleScreens/Accounting/Transaction/FindTransactionEntry.xml +++ b/screen/SimpleScreens/Accounting/Transaction/FindTransactionEntry.xml @@ -42,7 +42,7 @@ along with this software (see the LICENSE.md file). If not, see select-columns="true" saved-finds="true" show-csv-button="true" show-xlsx-button="true" show-all-button="true"> - + diff --git a/screen/SimpleScreens/Order/FindOrder.xml b/screen/SimpleScreens/Order/FindOrder.xml index 6265c4a8..3603fa6c 100644 --- a/screen/SimpleScreens/Order/FindOrder.xml +++ b/screen/SimpleScreens/Order/FindOrder.xml @@ -188,7 +188,7 @@ along with this software (see the LICENSE.md file). If not, see skip-fields="vendorRoleTypeId,customerRoleTypeId,customerClassificationId,itemTypeEnumId"> + /> diff --git a/screen/SimpleScreens/Return/FindReturn.xml b/screen/SimpleScreens/Return/FindReturn.xml index 2d7176b0..06d125cb 100644 --- a/screen/SimpleScreens/Return/FindReturn.xml +++ b/screen/SimpleScreens/Return/FindReturn.xml @@ -89,7 +89,7 @@ along with this software (see the LICENSE.md file). If not, see + /> diff --git a/screen/SimpleScreens/Shipment/FindShipment.xml b/screen/SimpleScreens/Shipment/FindShipment.xml index 083436bd..f21d7ca4 100644 --- a/screen/SimpleScreens/Shipment/FindShipment.xml +++ b/screen/SimpleScreens/Shipment/FindShipment.xml @@ -96,7 +96,7 @@ along with this software (see the LICENSE.md file). If not, see + /> From 9d980f7c3e5dfb3e2b91f77df0ec8d3555e31eef Mon Sep 17 00:00:00 2001 From: Hans Bakker Date: Mon, 31 Aug 2020 09:30:57 +0700 Subject: [PATCH 11/11] missing original currency on transaction screen --- .../Accounting/Transaction/EditTransaction.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/screen/SimpleScreens/Accounting/Transaction/EditTransaction.xml b/screen/SimpleScreens/Accounting/Transaction/EditTransaction.xml index 617aba08..f82b9907 100644 --- a/screen/SimpleScreens/Accounting/Transaction/EditTransaction.xml +++ b/screen/SimpleScreens/Accounting/Transaction/EditTransaction.xml @@ -55,9 +55,11 @@ along with this software (see the LICENSE.md file). If not, see + + - + @@ -196,7 +198,7 @@ along with this software (see the LICENSE.md file). If not, see - +