From 6c25e58911d70ba0c7c3082f82e3efcadbcdcc4e Mon Sep 17 00:00:00 2001
From: Hans Bakker <h.bakker@antwebsystems.com>
Date: Mon, 5 Jun 2023 11:41:19 +0700
Subject: [PATCH] merge development

---
 CONTRIBUTING.md                               |   9 +
 Dockerfile                                    |  61 ++++
 data/GrowerpAaSeedData.xml                    |  12 +-
 data/GrowerpAaSetupData.xml                   |   3 +
 entity/GrowerpViewEntities.xml                |   6 +
 ...lity-location-to-assets-relationship.patch |  25 ++
 ...-gl-accounts-and-payroll-simplified-.patch |  54 +++
 service/growerp.rest.xml                      |   9 +-
 service/growerp/100/AccountingServices100.xml | 333 ++++++++++++++----
 service/growerp/100/FinDocServices100.xml     | 166 +++++----
 service/growerp/100/PartyServices100.xml      |  62 +++-
 service/growerp/100/WarehouseServices100.xml  |   3 +
 12 files changed, 570 insertions(+), 173 deletions(-)
 create mode 100644 CONTRIBUTING.md
 create mode 100644 Dockerfile
 create mode 100644 patches/mantle-udm/0001-add-facility-location-to-assets-relationship.patch
 create mode 100644 patches/mantle-udm/0001-disable-itemType-gl-accounts-and-payroll-simplified-.patch

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000..e961067
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,9 @@
+# How to contribute.
+
+In general you can make a pull request to the https://github.com/growerp/growerp repository:
+
+1. Fork it!
+2. Create your feature branch from master/main branch: git checkout -b my-new-feature
+3. Commit your changes: git commit -am 'Add some feature'
+4. Push to the branch: git push --set-upstream origin my-new-feature
+5. Submit a pull request.
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..b47ac95
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,61 @@
+#stage 1 -get files and build
+FROM openjdk:11-jdk as build-env
+MAINTAINER Growerp <support@growerp.com>
+
+ARG BRANCH=development # currently either master or development we need to add existing
+
+RUN apt-get update && \
+    apt-get install -y curl git wget zip unzip apt-transport-https && \
+    apt-get clean
+#install dart
+RUN wget -qO- https://dl-ssl.google.com/linux/linux_signing_key.pub | gpg --dearmor -o /usr/share/keyrings/dart.gpg
+RUN echo 'deb [signed-by=/usr/share/keyrings/dart.gpg arch=amd64] https://storage.googleapis.com/download.dartlang.org/linux/debian stable main' | tee /etc/apt/sources.list.d/dart_stable.list
+RUN apt-get update && apt-get install dart
+RUN export PATH="/usr/lib/dart/bin:$PATH"
+#install growerp backend
+RUN dart pub global activate growerp
+ENV PATH="/root/.pub-cache/bin:$PATH"
+# will install in /root/growerp/flutterDevelopment
+RUN growerp install backend -dev -noBuild
+# antwebsystems website
+WORKDIR /root/growerp/moquiDevelopment/
+RUN git clone --depth 1 https://github.com/AntWebsystems-Co-Ltd/vueWebsite.git /root/vueWebsite
+RUN cp /root/vueWebsite/AWSSetupAaaWebSiteData.xml runtime/component/growerp/service/growerp
+RUN cp /root/vueWebsite/WebSiteRestServices.xml runtime/component/growerp/data
+# local db for development but need search
+RUN echo $BRANCH
+RUN if [ "$BRANCH" = "development" ]; then ./gradlew downloadElasticsearch ; fi
+# production uses postgresql
+RUN if [ "$BRANCH" = "master" ]; then curl -L https://jdbc.postgresql.org/download/postgresql-42.2.9.jar -o /runtime/lib ; fi 
+RUN ./gradlew addRunTime
+# unzip war file
+WORKDIR /opt/moqui
+RUN unzip -q /root/growerp/moquiDevelopment/moqui-plus-runtime.war
+
+# stage 2 create image
+FROM openjdk:11-jdk
+RUN apt-get update && apt-get install -y apt-transport-https nano && apt-get clean
+WORKDIR /opt
+COPY --from=build-env /opt/moqui .
+# exposed as volumes for configuration purposes
+VOLUME ["/opt/moqui/runtime/conf", "/opt/moqui/runtime/lib", "/opt/moqui/runtime/classes", "/opt/moqui/runtime/ecomponent"]
+# exposed as volumes to persist data outside the container, recommended
+VOLUME ["/opt/moqui/runtime/log", "/opt/moqui/runtime/txlog", "/opt/moqui/runtime/sessions", "/opt/moqui/runtime/db", "/opt/moqui/runtime/elasticsearch"]
+
+# Main Servlet Container Port
+EXPOSE 80
+# ElasticSearch HTTP Port
+EXPOSE 9200
+# ElasticSearch Cluster (TCP Transport) Port
+EXPOSE 9300
+# Hazelcast Cluster Port
+EXPOSE 5701
+
+# this is to run from the war file directly, preferred approach unzips war file in advance
+# ENTRYPOINT ["java", "-jar", "moqui.war"]
+ENTRYPOINT ["java", "-cp", ".", "MoquiStart", "port=80"]
+
+HEALTHCHECK --interval=30s --timeout=600ms --start-period=120s CMD curl -f -H "X-Forwarded-Proto: https" -H "X-Forwarded-Ssl: on" http://localhost/status || exit 1
+# specify this as a default parameter if none are specified with docker exec/run, ie run production by default
+CMD ["conf=conf/MoquiProductionConf.xml"]
+
diff --git a/data/GrowerpAaSeedData.xml b/data/GrowerpAaSeedData.xml
index b92a22f..1c529c7 100644
--- a/data/GrowerpAaSeedData.xml
+++ b/data/GrowerpAaSeedData.xml
@@ -151,12 +151,12 @@ along with this software (see the LICENSE.md file). If not, see
 
     <mantle.facility.Facility facilityId="DEFAULT_WH" facilityTypeEnumId="FcTpWarehouse" assetAllowIssueOverQoh="Y"
         ownerPartyId="_NA_" facilityName="Default Warehouse">
-        <locations locationTypeEnumId="FltPick" locationSeqId="0001" sequenceNum="1" areaId="01" aisleId="01" sectionId="01" levelId="01" positionId=""/>
-        <locations locationTypeEnumId="FltPick" locationSeqId="0002" sequenceNum="2" areaId="01" aisleId="01" sectionId="01" levelId="01" positionId=""/>
-        <locations locationTypeEnumId="FltPick" locationSeqId="0003" sequenceNum="3" areaId="01" aisleId="01" sectionId="01" levelId="01" positionId=""/>
-        <locations locationTypeEnumId="FltPick" locationSeqId="0004" sequenceNum="4" areaId="01" aisleId="01" sectionId="01" levelId="01" positionId=""/>
-        <locations locationTypeEnumId="FltPick" locationSeqId="0005" sequenceNum="5" areaId="01" aisleId="01" sectionId="01" levelId="01" positionId=""/>
-        <locations locationTypeEnumId="FltPick" locationSeqId="0006" sequenceNum="6" areaId="01" aisleId="01" sectionId="01" levelId="01" positionId=""/>
+        <locations locationTypeEnumId="FltPick" description="loc 1" locationSeqId="0001" sequenceNum="1" areaId="01" aisleId="01" sectionId="01" levelId="01" positionId="A"/>
+        <locations locationTypeEnumId="FltPick" description="loc 2" locationSeqId="0002" sequenceNum="2" areaId="02" aisleId="01" sectionId="01" levelId="01" positionId="B"/>
+        <locations locationTypeEnumId="FltPick" description="loc 3" locationSeqId="0003" sequenceNum="3" areaId="03" aisleId="01" sectionId="01" levelId="01" positionId="C"/>
+        <locations locationTypeEnumId="FltPick" description="loc 4" locationSeqId="0004" sequenceNum="4" areaId="04" aisleId="01" sectionId="01" levelId="01" positionId="D"/>
+        <locations locationTypeEnumId="FltPick" description="loc 5" locationSeqId="0005" sequenceNum="5" areaId="05" aisleId="01" sectionId="01" levelId="01" positionId="E"/>
+        <locations locationTypeEnumId="FltPick" description="loc 6" locationSeqId="0006" sequenceNum="6" areaId="06" aisleId="01" sectionId="01" levelId="01" positionId="F"/>
     </mantle.facility.Facility>
 
     <!-- Product for eCommerce Search -->
diff --git a/data/GrowerpAaSetupData.xml b/data/GrowerpAaSetupData.xml
index f9063d7..5273f94 100644
--- a/data/GrowerpAaSetupData.xml
+++ b/data/GrowerpAaSetupData.xml
@@ -19,4 +19,7 @@ along with this software (see the LICENSE.md file). If not, see
             serviceName="growerp.100.GeneralServices100.get#Statistics" cronExpression="0 0 * * * ?" paused="N"
             transactionTimeout="1800"/>
 
+    <!-- format time period name -->
+    <moqui.basic.LocalizedMessage locale="default" original="TimePeriodBaseNameTemplate"
+        localized="Y${fromLocalDate.getYear()}${timePeriodType?.lengthUomId!='TF_yr'?(timePeriodType.description.split('(?=[A-Z])')[1][0].toLowerCase())+(periodNum as String).padLeft(2,'0'):''}"/>
 </entity-facade-xml>
diff --git a/entity/GrowerpViewEntities.xml b/entity/GrowerpViewEntities.xml
index 8cd22b4..7ab1016 100644
--- a/entity/GrowerpViewEntities.xml
+++ b/entity/GrowerpViewEntities.xml
@@ -259,6 +259,7 @@ along with this software (see the LICENSE.md file). If not, see
         <alias name="assetClassId" field="classEnumId" entity-alias="AST"/>
         <alias name="statusId" entity-alias="AST"/>
         <alias name="receivedDate" entity-alias="AST"/>
+        <alias name="acquireCost" entity-alias="AST"/>
         <alias name="originalQuantity" entity-alias="AST"/>
         <alias name="quantityOnHand" field="quantityOnHandTotal" entity-alias="AST"/>
         <alias name="availableToPromise" field="availableToPromiseTotal" entity-alias="AST"/>
@@ -471,6 +472,8 @@ along with this software (see the LICENSE.md file). If not, see
         <member-entity entity-alias="CORG" entity-name="mantle.party.Organization"
             join-from-alias="ATX" join-optional="true">
             <key-map field-name="otherPartyId" related="partyId"/></member-entity>
+        <member-entity entity-alias="GLAC" entity-name="mantle.ledger.account.GlAccount"
+            join-from-alias="ATE"><key-map field-name="glAccountId"/></member-entity>
         <alias name="transactionId" field="acctgTransId" entity-alias="ATX"/>
         <alias name="invoiceId" entity-alias="ATX"/>
         <alias name="paymentId" entity-alias="ATX"/>
@@ -483,7 +486,10 @@ along with this software (see the LICENSE.md file). If not, see
         <alias name="entryId" field="acctgTransEntrySeqId" entity-alias="ATE"/>
         <alias name="debitCreditFlag" entity-alias="ATE"/>
         <alias name="productId" entity-alias="ATE"/>
+        <alias name="description" entity-alias="ATE"/>
         <alias name="glAccountId" entity-alias="ATE"/>
+        <alias name="accountCode" entity-alias="GLAC"/>
+        <alias name="accountName" entity-alias="GLAC"/>
         <alias name="amount" entity-alias="ATE"/>
         <alias name="otherCompanyPartyId" field="partyId" entity-alias="CORG"/>
         <alias name="otherCompanyName" field="organizationName" entity-alias="CORG"/>
diff --git a/patches/mantle-udm/0001-add-facility-location-to-assets-relationship.patch b/patches/mantle-udm/0001-add-facility-location-to-assets-relationship.patch
new file mode 100644
index 0000000..8e4e61a
--- /dev/null
+++ b/patches/mantle-udm/0001-add-facility-location-to-assets-relationship.patch
@@ -0,0 +1,25 @@
+From ba051c56ea3b7ad9de9dd64de7e3eadff5029d8c Mon Sep 17 00:00:00 2001
+From: Hans Bakker <h.bakker@antwebsystems.com>
+Date: Tue, 14 Dec 2021 09:49:34 +0700
+Subject: [PATCH] add facility location to assets relationship
+
+---
+ entity/FacilityEntities.xml | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/entity/FacilityEntities.xml b/entity/FacilityEntities.xml
+index d86a207..b3fb1d8 100644
+--- a/entity/FacilityEntities.xml
++++ b/entity/FacilityEntities.xml
+@@ -259,6 +259,8 @@ along with this software (see the LICENSE.md file). If not, see
+         <relationship type="one" related="moqui.basic.GeoPoint" short-alias="geoPoint"/>
+         <relationship type="one" title="Capacity" related="moqui.basic.Uom" short-alias="capacityUom">
+             <key-map field-name="capacityUomId"/></relationship>
++            <relationship type="many" related="mantle.product.asset.Asset" short-alias="AssetLocation">
++        <key-map field-name="facilityId"/><key-map field-name="locationSeqId"/></relationship>
+         <seed-data>
+             <!-- Facility Location Type -->
+             <moqui.basic.EnumerationType description="Facility Location Type" enumTypeId="FacilityLocationType"/>
+-- 
+2.34.1
+
diff --git a/patches/mantle-udm/0001-disable-itemType-gl-accounts-and-payroll-simplified-.patch b/patches/mantle-udm/0001-disable-itemType-gl-accounts-and-payroll-simplified-.patch
new file mode 100644
index 0000000..534f710
--- /dev/null
+++ b/patches/mantle-udm/0001-disable-itemType-gl-accounts-and-payroll-simplified-.patch
@@ -0,0 +1,54 @@
+From 7ce84bbb043d22d0d2174058e2c4b5b9fad3dfd7 Mon Sep 17 00:00:00 2001
+From: Hans Bakker <h.bakker@antwebsystems.com>
+Date: Tue, 8 Jun 2021 05:28:42 +0700
+Subject: [PATCH] disable itemType, gl accounts and payroll: simplified version
+ provided in growerp-moqui component
+
+---
+ data/ItemTypeData.xml             | 2 +-
+ data/ZaaGlAccountsInstallData.xml | 2 +-
+ data/ZapPayrollTaxInstallData.xml | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/data/ItemTypeData.xml b/data/ItemTypeData.xml
+index 83289e9..35634ee 100644
+--- a/data/ItemTypeData.xml
++++ b/data/ItemTypeData.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/>.
+ -->
+-<entity-facade-xml type="seed">
++<entity-facade-xml type="seedMoqui">
+ 
+     <!-- General Item Types (Order, Return, Invoice) -->
+     <moqui.basic.EnumerationType description="Item Type (Order, Return, Invoice)" enumTypeId="ItemType"/>
+diff --git a/data/ZaaGlAccountsInstallData.xml b/data/ZaaGlAccountsInstallData.xml
+index bca1f54..4ed054a 100644
+--- a/data/ZaaGlAccountsInstallData.xml
++++ b/data/ZaaGlAccountsInstallData.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/>.
+ -->
+-<entity-facade-xml type="install">
++<entity-facade-xml type="installMoqui">
+     <!-- Uses syntax in https://docs.oracle.com/javase/8/docs/api/javax/swing/text/MaskFormatter.html -->
+     <!-- Only used if PartyAcctgPreference.glAccountCodeMask is empty or the context only supports this global or user setting -->
+     <moqui.security.UserGroupPreference userGroupId="ALL_USERS" preferenceKey="GlAccountCodeMask" preferenceValue="###-###-###"/>
+diff --git a/data/ZapPayrollTaxInstallData.xml b/data/ZapPayrollTaxInstallData.xml
+index 49cba9a..677a948 100644
+--- a/data/ZapPayrollTaxInstallData.xml
++++ b/data/ZapPayrollTaxInstallData.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/>.
+ -->
+-<entity-facade-xml type="install">
++<entity-facade-xml type="installMoqui">
+ 
+     <!-- =============================================================================================================
+          NOTE: While based on real data this data is for demo/testing purposes only. AS STATED IN THE LICENSE THERE IS
+-- 
+2.34.1
+
diff --git a/service/growerp.rest.xml b/service/growerp.rest.xml
index 5ebae9d..011dd8c 100644
--- a/service/growerp.rest.xml
+++ b/service/growerp.rest.xml
@@ -18,7 +18,8 @@ along with this software (see the LICENSE.md file). If not, see
     <!-- flutter versioned REST interface -->
     <resource name="100">
         <!-- general -->
-        <resource name="Ping" description="to check if the system is available, no authorization required">
+        <resource name="Ping" require-authentication="anonymous-all"
+                description="to check if the system is available, no authorization required">
             <method type="get"><service name="growerp.100.GeneralServices100.check#Ping"/></method></resource>
         <resource name="Authenticate">
             <method type="get"><service name="growerp.100.GeneralServices100.get#Authenticate"/></method></resource>
@@ -37,6 +38,8 @@ along with this software (see the LICENSE.md file). If not, see
         <!--resource name="Image just for internal use 
             <method type="post"><service name="growerp.100.ImageServices100.upload#Image"/></method></resource-->
         <!-- parties -->
+        <resource name="CheckEmail" require-authentication="anonymous-all">
+            <method type="get"><service name="growerp.100.PartyServices100.check#Email"/></method></resource>
         <resource name="CheckCompany" require-authentication="anonymous-all">
             <method type="get"><service name="growerp.100.PartyServices100.check#Company"/></method></resource>
         <resource name="UserAndCompany" require-authentication="anonymous-all">
@@ -115,8 +118,12 @@ along with this software (see the LICENSE.md file). If not, see
             <method type="patch"><service name="growerp.100.CrmServices100.update#Opportunity"/></method>
             <method type="delete"><service name="growerp.100.CrmServices100.delete#Opportunity"/></method></resource>
         <!-- Accounting -->
+        <resource name="Timeperiod">
+            <method type="get"><service name="growerp.100.AccountingServices100.get#TimePeriod"/></method></resource>
         <resource name="BalanceSheet">
             <method type="get"><service name="growerp.100.AccountingServices100.get#BalanceSheet"/></method></resource>
+        <resource name="BalanceSummary">
+            <method type="get"><service name="growerp.100.AccountingServices100.get#BalanceSummary"/></method></resource>
         <resource name="Ledger">
             <method type="get"><service name="growerp.100.AccountingServices100.get#Ledger"/></method></resource>
         <!--resource name="Payment">
diff --git a/service/growerp/100/AccountingServices100.xml b/service/growerp/100/AccountingServices100.xml
index ab4f4e1..c6baeeb 100644
--- a/service/growerp/100/AccountingServices100.xml
+++ b/service/growerp/100/AccountingServices100.xml
@@ -153,65 +153,227 @@ along with this software (see the LICENSE.md file). If not, see
 
                     <set field="prevPeriodId" from="curYearOut.timePeriodId"/>
                     <set field="curYear" from="((curYear as int) + 1) as String"/>
-                </while>
-            </then><else>
+                </while></then>
+            <else>
                 <service-call name="mantle.ledger.LedgerServices.check#NextFiscalTimePeriods"
                         in-map="[organizationPartyId:organizationPartyId]"/>
-            </else></if>
+            </else>
+            </if>
         </actions>
     </service>
 
-    <service verb="get" noun="BalanceSheet">
+    <service verb="get" noun="TimePeriod">
+        <description>Get the accounting periods valid for this company</description>
         <out-parameters>
-            <parameter name="balanceSheet" type="Map"/>
+            <parameter name="timePeriods" type="List">
+                <parameter name="timePeriod" type="Map">
+                    <parameter name="periodId"/>
+                    <parameter name="periodName"/>
+                    <parameter name="fromDate"/>
+                    <parameter name="thruDate"/>
+                    <parameter name="isClosed" type="Boolean"/>
+                </parameter>
+            </parameter>
         </out-parameters>
         <actions>
             <service-call out-map="context"
                 name="growerp.100.GeneralServices100.get#RelatedCompanyAndOwner"/>
             <entity-find entity-name="mantle.party.time.TimePeriod" list="periods">
                 <econdition field-name="partyId" from="companyPartyId"/>
-                <econdition field-name="timePeriodTypeId" value="FiscalMonth"/>
+                <econdition field-name="timePeriodTypeId" value="FiscalYear"/>
+                <order-by field-name="periodName"/>
+            </entity-find>
+            <set field="timePeriods" from="[]"/>
+            <iterate list="periods" entry="p">
+                <script>
+                    timePeriods.add([periodId: p.timePeriodId,
+                                    periodName: p.periodName,
+                                    fromDate: p.fromDate.toString(),
+                                    thruDate: p.thruDate.toString(),
+                                    isClosed: p.isClosed == 'Y' ? true : false,
+                                    ]); 
+                </script>
+            </iterate>
+        </actions>
+    </service>
+
+    <service verb="get" noun="BalanceSummary">
+        <in-parameters>
+            <parameter name="periodName" required="true"/>
+        </in-parameters>
+        <out-parameters>
+            <parameter name="ledgerReport" type="Map">
+                <parameter name="company" type="Map">
+                    <parameter name="companyId"/>
+                    <parameter name="companyName"/>
+                </parameter>
+                <parameter name="title"/>
+                <parameter name="printDate"/>
+                <parameter name="timePeriod" type="Map">
+                    <parameter name="periodId"/>
+                    <parameter name="periodName"/>
+                    <parameter name="fromDate"/>
+                    <parameter name="thruDate"/>
+                    <parameter name="isClosed" type="Boolean"/>
+                </parameter>
+                <parameter name="glAccounts" type="List">
+                    <parameter name="accountCode"/>
+                    <parameter name="accountName"/>
+                    <parameter name="level"/>
+                    <parameter name="beginningBalance"/>
+                    <parameter name="postedDebits"/>
+                    <parameter name="postedCredits"/>
+                    <parameter name="postedBalance"/>
+                </parameter>
+            </parameter>
+        </out-parameters>
+        <actions><log message="===sumary input: $periodName"/>
+            <service-call out-map="context"
+                name="growerp.100.GeneralServices100.get#RelatedCompanyAndOwner"/>
+            <entity-find entity-name="mantle.party.time.TimePeriod" list="periods">
+                <econdition field-name="partyId" from="companyPartyId"/>
+                <econdition field-name="periodName" from="periodName"/>
+            </entity-find>
+            <if condition="!periods">
+                <return error="true" message="Period $periodName not found!"/>
+            </if>
+            <entity-find entity-name="mantle.ledger.report.GlAccountOrgTimePeriodDetail" list="postedBalanceSummary" limit="150">
+                <econdition field-name="organizationPartyId" from="companyPartyId"/>
+                <econdition field-name="periodName" from="periodName"/>
+                <econditions combine="or">
+                    <econdition field-name="beginningBalance" operator="not-equals" from="BigDecimal.ZERO"/>
+                    <econdition field-name="endingBalance" operator="not-equals" from="BigDecimal.ZERO"/>
+                    <econdition field-name="postedDebits" operator="not-equals" from="BigDecimal.ZERO"/>
+                    <econdition field-name="postedCredits" operator="not-equals" from="BigDecimal.ZERO"/>
+                </econditions>
+                <select-field field-name="accountCode,accountName,beginningBalance,postedDebits,postedCredits,endingBalance"/>
+                <order-by field-name="accountCode"/>
             </entity-find>
-            <set field="count" from="periods.size()"/>
-            <while condition="count">
-                <script> periodList = []
-                         periodList.add(periods[--count].timePeriodId)</script>
-            </while>
+            <entity-find-one entity-name="mantle.party.Organization" value-field="company">
+                <field-map field-name="partyId" from="companyPartyId"/>
+            </entity-find-one>
+            <set field="ledgerReport" from="[
+                period: [periodId: periods[0].timePeriodId,
+                                    periodName: periods[0].periodName,
+                                    fromDate: periods[0].fromDate.toString(),
+                                    thruDate: periods[0].thruDate.toString(),
+                                    isClosed: periods[0].isClosed == 'Y' ? true : false,
+                                    ], company: [companyPartyId: companyPartyId,
+                companyName: company.organizationName],
+                title: 'Balance Summary report',
+                printDate: ec.user.nowTimestamp.toString(),glAccounts: []]"/>
+            <set field="glAccountCodeMask" from="partyAcctgPreference?.glAccountCodeMask ?: ec.user.getPreference('GlAccountCodeMask')"/>
+            <set field="accountCodeFormatter" from="masker(glAccountCodeMask, '0')"/>
+            <script>
+                //change values into strings
+                for (el in postedBalanceSummary) {
+                    def temp = [beginningBalance: el.beginningBalance?.toString(),
+                                postedBalance: el.endingBalance?.toString(),
+                                postedCredits: el.postedCredits?.toString(),
+                                postedDebits: el.postedDebits?.toString(),
+                                accountCode: accountCodeFormatter != null ? accountCodeFormatter.valueToString(el.accountCode) : el.accountCode,
+                                accountName: el.accountName,
+                                ];
+                    ledgerReport.glAccounts.add(temp);
+                }
+            </script>
+        </actions>
+    </service>
+
+    <service verb="get" noun="BalanceSheet">
+        <in-parameters>
+            <parameter name="periodName" required="true"/>
+        </in-parameters>
+        <out-parameters>
+            <parameter name="ledgerReport" type="Map">
+                <parameter name="company" type="Map">
+                    <parameter name="companyId"/>
+                    <parameter name="companyName"/>
+                </parameter>
+                <parameter name="title"/>
+                <parameter name="printDate"/>
+                <parameter name="timePeriod" type="Map">
+                    <parameter name="periodId"/>
+                    <parameter name="periodName"/>
+                    <parameter name="fromDate"/>
+                    <parameter name="thruDate"/>
+                    <parameter name="isClosed" type="Boolean"/>
+                </parameter>
+                <parameter name="glAccounts" type="List">
+                    <parameter name="glAccount" type="Map">
+                        <parameter name="accountCode"/>
+                        <parameter name="accountName"/>
+                        <parameter name="level"/>
+                        <parameter name="beginningBalance"/>
+                        <parameter name="postedDebits"/>
+                        <parameter name="postedCredits"/>
+                        <parameter name="postedBalance"/>
+                    </parameter>
+                </parameter>
+            </parameter>
+        </out-parameters>
+        <actions><log message="===sheet input: $periodName"/>
+            <service-call out-map="context"
+                name="growerp.100.GeneralServices100.get#RelatedCompanyAndOwner"/>
+            <service-call in-map="organizationPartyId: companyPartyId"
+                name="mantle.ledger.LedgerServices.recalculate#GlAccountOrgSummaries"/>
+            <entity-find entity-name="mantle.party.time.TimePeriod" list="periods">
+                <econdition field-name="partyId" from="companyPartyId"/>
+                <econdition field-name="periodName" from="periodName"/>
+            </entity-find>
+            <if condition="!periods">
+                <return error="true" message="Balance sheet, period: $periodId not found"/>
+            </if>
             <service-call
                 name="mantle.ledger.LedgerReportServices.run#BalanceSheet"
                 in-map="[organizationPartyId: companyPartyId, 
-                                    timePeriodIdList: periodList,
-                                    childOrgPeriods: false]"
+                                    timePeriodIdList: [periods[0].timePeriodId]]"
                 out-map="context"/>
-            <!--log message="$classInfoById"/-->
+            <set field="glAccountCodeMask" from="partyAcctgPreference?.glAccountCodeMask ?: ec.user.getPreference('GlAccountCodeMask')"/>
+            <set field="accountCodeFormatter" from="masker(glAccountCodeMask, '0')"/>
+            <!--log message="====run balance sheet out: ${classInfoById}"/-->
             <script>
                 def currencyFormat = currencyFormat ?: "#,##0.00";
 
-                def showClass(Map classInfo, int depth) { // 24
-                    if (!classInfo.totalBalanceByTimePeriod.ALL &amp;&amp; 
-                        !classInfo.totalPostedByTimePeriod.All) return;
-                    def classInfoData = [:]
-                    classInfoData.description = ec.l10n.localize(classInfo.className);
-                    classInfoData.id = classInfo.glAccountClassEnumId;
-                    classInfoData.periodsAmount = [];
-                    timePeriodIdList.each { timePeriodId -> // 31
-                        classInfoData.periodsAmount.add(classInfo.balanceByTimePeriod[timePeriodId] ?: 0);
-                    }
-                    classInfoData.children = [];
-                    classInfo.childClassInfoList.each { childClassInfo -> // 67
-                        def tempClass = showClass(childClassInfo, depth + 1); 
-                        if (tempClass) classInfoData.children.add(tempClass); //67
-                    }
-                    def newClassInfoData = [:]
-                    classInfo.glAccountInfoList.each { glAccountInfo ->
-                        newClassInfoData.children = [];
-                        newClassInfoData.description = accountCodeFormatter.valueToString(glAccountInfo.accountCode) + ": " + glAccountInfo.accountName;
-                        newClassInfoData.id = glAccountInfo.accountCode;
-                        newClassInfoData.periodsAmount = [];
-                        timePeriodIdList.each { timePeriodId -> // 31
-                            newClassInfoData.periodsAmount.add(glAccountInfo.postedByTimePeriod[timePeriodId] ?: 0);
+                def showClass(Map classInfo, int depth) {
+                    // if (!classInfo.totalBalanceByTimePeriod.ALL &amp;&amp; !classInfo.totalPostedByTimePeriod.ALL) return null;
+                    ec.logger.info("==$depth-1==${classInfo.glAccountClassEnumId}/${classInfo.className} =======${classInfo.totalBalanceByTimePeriod.ALL}")
+                    def classInfoData = [level: depth, children: []];
+                    classInfo.each { classInfoEl -&gt;
+                        switch(classInfoEl.key) {
+                            case 'className':
+                                classInfoData.accountName = ec.l10n.localize(classInfoEl.value);
+                                break;
+                            case 'glAccountClassEnumId':
+                                classInfoData.accountCode = classInfoEl.value
+                                break;
+                            case 'totalBalanceByTimePeriod':
+                                if (!classInfoEl.value) return;
+                                classInfoData.postedBalance = classInfoEl.value.ALL.toString();
+                                break;
+                            case 'glAccountDetailList':
+                                classInfoEl.value.each {
+                                    if (it.endingBalance.compareTo(BigDecimal.ZERO) != 0) { // not equal 0
+                                        ec.logger.info("==$depth-2==${it.accountCode}/${it.accountName} ${it.endingBalance}");
+                                        def newGl = [
+                                                level: depth+1,
+                                                accountCode: accountCodeFormatter != null ? accountCodeFormatter.valueToString(it.accountCode) : it.accountCode,
+                                                accountName: ec.l10n.localize(it.accountName),
+                                                postedBalance: it.endingBalance.toString(),
+                                        ];
+                                        classInfoData.children.add(newGl);
+                                    }
+                                }
+                                break;
+                            case 'childClassInfoList':
+                                classInfoEl.value.each {
+                                    def result = showClass(it, depth + 1);
+                                    if (result) {
+                                        classInfoData.children.add(result);
+                                    }
+                                };
+                                break;
                         }
-                        classInfoData.children.add(newClassInfoData); 
                     }
                     return classInfoData;
                 }
@@ -219,58 +381,72 @@ along with this software (see the LICENSE.md file). If not, see
                 if(classInfoById.LIABILITY) liability = showClass(classInfoById.LIABILITY, 1);
                 if(classInfoById.EQUITY) equity = showClass(classInfoById.EQUITY, 1);
                 if(classInfoById.DISTRIBUTION) distribution = showClass(classInfoById.DISTRIBUTION, 1);
-                def header = [:];
-                header.title = "$organizationName - ${ec.l10n.localize("Balance Sheet")} " +
-                    "${ec.l10n.format(ec.user.nowTimestamp, 'dd MMM yyyy HH:mm')}";
-                header.children = [];
-                timePeriodIdList.each { timePeriodId -> // 88
-                    header.children.add(timePeriodIdMap[timePeriodId].periodName); // 93
-                }
-                /*
-                BalanceSheet: [
-                    classInfoHeader[ title: string, periodsAmounts: [string,string,....],
-                    classInfoData[  id: string.
-                                    description: string,
-                                    periodsAmount: [string, string ....],
-                                    children: [classInfoData, classInfoData....]
-                ]
-                */
+                def incomeAmount = [accountCode: 'INCOME', postedBalance: netIncomeOut.totalBalance.ALL.toString()];
             </script>
-            <set field="balanceSheet" from="[:]"/>
-            <set field="balanceSheet.asset" from="asset"/>
-            <set field="balanceSheet.liability" from="liability"/>
-            <set field="balanceSheet.equity" from="equity"/>
-            <set field="balanceSheet.distribution" from="distribution"/>
-            <set field="balanceSheet.header" from="header"/>
+            <set field="ledgerReport" from="[
+                period: [periodId: periods[0].timePeriodId,
+                                    periodName: periods[0].periodName,
+                                    fromDate: periods[0].fromDate.toString(),
+                                    thruDate: periods[0].thruDate.toString(),
+                                    isClosed: periods[0].isClosed == 'Y' ? true : false,
+                                    ],
+                title: 'Balance Sheet', printDate: ec.user.nowTimestamp.toString(),
+                glAccounts: [asset?:[:], liability?:[:], equity?:[:], distribution?:[:], incomeAmount.totalBalance?.ALL?incomeAmount:[:]]]"/>
         </actions>
     </service>
 
     <service verb="get" noun="Ledger">
         <out-parameters>
-            <parameter name="glAccountList"/>
+            <parameter name="ledgerReport" type="Map">
+                <parameter name="company" type="Map">
+                    <parameter name="companyId"/>
+                    <parameter name="companyName"/>
+                </parameter>
+                <parameter name="title"/>
+                <parameter name="printDate"/>
+                <parameter name="glAccounts" type="List">
+                    <parameter name="glAccount" type="Map">
+                        <parameter name="accountCode"/>
+                        <parameter name="accountName"/>
+                        <parameter name="level"/>
+                        <parameter name="beginningBalance"/>
+                        <parameter name="postedDebits"/>
+                        <parameter name="postedCredits"/>
+                        <parameter name="postedBalance"/>
+                    </parameter>
+                </parameter>
+            </parameter>
         </out-parameters>
         <actions>
             <service-call out-map="context" 
                 name="growerp.100.GeneralServices100.get#RelatedCompanyAndOwner"/>
-            <service-call in-map="organizationPartyId: companyPartyId"
-                name="mantle.ledger.LedgerServices.recalculate#GlAccountOrgSummaries"/>
+            <!--service-call in-map="organizationPartyId: companyPartyId"
+                name="mantle.ledger.LedgerServices.recalculate#GlAccountOrgSummaries"/-->
             <entity-find list="dbGlAccounts" 
                 entity-name="mantle.ledger.account.GlAccountAndOrganization">
                 <econdition field-name="partyId" from="companyPartyId"/>
-                <order-by field-name="glAccountId"/>
+                <order-by field-name="accountCode"/>
             </entity-find>
-            <set field="glAccountList" from="[]"/>
+            <entity-find-one entity-name="mantle.party.Organization" value-field="company">
+                <field-map field-name="partyId" from="companyPartyId"/>
+            </entity-find-one>
+            <set field="ledgerReport" from="[
+                company: [companyPartyId: companyPartyId,
+                companyName: company.organizationName],
+                title: 'Current Ledger Tree report',
+                printDate: ec.user.nowTimestamp.toString(),
+                glAccounts: []]"/>
+            <set field="glAccountCodeMask" from="partyAcctgPreference?.glAccountCodeMask ?: ec.user.getPreference('GlAccountCodeMask')"/>
+            <set field="accountCodeFormatter" from="masker(glAccountCodeMask, '0')"/>
             <script>
-
-                def getGlAccountTree(dbGlAccount, dept) {
+                def getGlAccountTree(Map dbGlAccount, int dept) {
                     def glAccount = [:];
-                    glAccount.l = dept;
-                    glAccount.id = dbGlAccount.accountCode.substring(0,3) + 
-                        '-' + dbGlAccount.accountCode.substring(3,5);
-                    glAccount.isDebit = dbGlAccount.isDebit;
+                    glAccount.level = dept;
+                    // glAccount.accountCode = accountCodeFormatter != null ? accountCodeFormatter.valueToString(dbGlAccount.accountCode) : dbGlAccount.accountCode;
+                    glAccount.isDebit = dbGlAccount.isDebit == 'Y' ? true : false;
                     glAccount.accountName = ec.l10n.localize(dbGlAccount.accountName);
-                    glAccount.postedBalance = dbGlAccount.postedBalance ?: 0;
-                    glAccount.rollUp = new BigDecimal(dbGlAccount.postedBalance?:"0");
+                    glAccount.postedBalance = dbGlAccount.postedBalance ? dbGlAccount.postedBalance.toString() : '0';
+                    glAccount.rollUp = dbGlAccount.postedBalance ? dbGlAccount.postedBalance.toString() : '0';
                     glAccount.classId = dbGlAccount.glAccountClassEnumId;
                     glAccount.accountCode = dbGlAccount.accountCode;
                     def dependents = dbGlAccounts.findAll { 
@@ -279,7 +455,8 @@ along with this software (see the LICENSE.md file). If not, see
                     glAccount.children = [];
                     dependents.each {
                         def glAccountSave = getGlAccountTree(it, dept + 1)
-                        glAccount.rollUp = glAccount.rollUp.add(glAccountSave.rollUp); 
+                        def rollUp = new BigDecimal(glAccount.rollUp ?: '0').add(new BigDecimal(glAccountSave.rollUp ?: '0'))
+                        glAccount.rollUp = rollUp? rollUp.toString() : '0';
                         glAccount.children.add(glAccountSave)
                     }
                     return glAccount;
@@ -288,12 +465,13 @@ along with this software (see the LICENSE.md file). If not, see
                 def rootAccounts = dbGlAccounts.findAll {
                     it.parentGlAccountId == null }
                 rootAccounts.each {
-                    glAccountList.add(getGlAccountTree(it, 1));
+                    ledgerReport.glAccounts.add(getGlAccountTree(it, 1));
                 }
             </script>
         </actions>
     </service>
-    <service verb="get" noun="Transaction">
+    <!-- replaced by getFinDoc -->
+    <!--service verb="get" noun="Transaction">
         <description> get a accounting single or all transactions</description>
         <in-parameters>
             <parameter name="acctgTransId"/>
@@ -327,6 +505,7 @@ along with this software (see the LICENSE.md file). If not, see
             <if condition="!acctgTransId">
                 <set field="acctgTransList" from="[]"/></if>
             <set field="lastEntry" from="null"/>
+            <set field="accountCodeFormatter" from="masker(glAccountCodeMask, '0')"/>
             <iterate entry="entry" list="entries">
                 <if condition="lastEntry &amp;&amp; lastEntry.acctgTransId != entry.acctgTransId">
                     <script>acctgTransList.add(acctgTransOut)</script>
@@ -360,7 +539,7 @@ along with this software (see the LICENSE.md file). If not, see
                 </if>
             </iterate>
         </actions>
-    </service>
+    </service-->
 
     <!-- replace by update findoc payment status to 'PmntDelivered' -->
     <service verb="confirm" noun="PurchasePayment">
diff --git a/service/growerp/100/FinDocServices100.xml b/service/growerp/100/FinDocServices100.xml
index a422cf2..728d89f 100644
--- a/service/growerp/100/FinDocServices100.xml
+++ b/service/growerp/100/FinDocServices100.xml
@@ -200,11 +200,11 @@ along with this software (see the LICENSE.md file). If not, see
                         <parameter name="firstName"/>
                         <parameter name="lastName"/>
                         <parameter name="email"/>
-                        <parameter name="company" type="Map">
-                            <parameter name="partyId"/>
-                            <parameter name="name"/>
-                        </parameter>  
                     </parameter>     
+                    <parameter name="otherCompany" type="Map">
+                        <parameter name="partyId"/>
+                        <parameter name="name"/>
+                    </parameter>  
                     <parameter name="shipmentMethod"/>
                     <parameter name="address" type="Map">
                         <parameter name="addressId"/>
@@ -261,15 +261,15 @@ along with this software (see the LICENSE.md file). If not, see
                     <parameter name="firstName"/>
                     <parameter name="lastName"/>
                     <parameter name="email"/>
-                    <parameter name="company" type="Map">
-                        <parameter name="partyId"/>
-                        <parameter name="name"/>
-                        <parameter name="paymentMethod" type="Map">
-                            <parameter name="ccPaymentMethodId"/>
-                            <parameter name="ccDescription"/>
-                        </parameter>
-                    </parameter>  
                 </parameter>
+                <parameter name="otherCompany" type="Map">
+                    <parameter name="partyId"/>
+                    <parameter name="name"/>
+                    <parameter name="paymentMethod" type="Map">
+                        <parameter name="ccPaymentMethodId"/>
+                        <parameter name="ccDescription"/>
+                    </parameter>
+                </parameter>  
                 <parameter name="address" type="Map">
                     <parameter name="addressId"/>
                     <parameter name="address1"/>
@@ -307,6 +307,8 @@ along with this software (see the LICENSE.md file). If not, see
             </parameter>
         </out-parameters>
         <actions>
+            <set field="glAccountCodeMask" from="partyAcctgPreference?.glAccountCodeMask ?: ec.user.getPreference('GlAccountCodeMask')"/>
+            <set field="accountCodeFormatter" from="masker(glAccountCodeMask, '0')"/>
             <service-call out-map="context"
                 name="growerp.100.GeneralServices100.get#RelatedCompanyAndOwner"/>
             <if condition="startDate">
@@ -449,6 +451,7 @@ along with this software (see the LICENSE.md file). If not, see
                             sales: sales,
                             docType: docType,
                             otherUser: userOut,
+                            otherCompany: company,
                             grandTotal: item.grandTotal ? item.grandTotal.toString(): null,
                             ]"/>
                         <set field="finDocItems" from="[]"/>
@@ -574,6 +577,7 @@ along with this software (see the LICENSE.md file). If not, see
                             creationDate: item.invoiceDate
                                 ? item.invoiceDate.toString().substring(0,19) + 'Z' : null,
                             otherUser: userOut,
+                            otherCompany: company,
                             grandTotal: item.invoiceTotal
                                 ? item.invoiceTotal.toString() : null,
                             ]"/>
@@ -650,7 +654,7 @@ along with this software (see the LICENSE.md file). If not, see
                 <iterate entry="item" list="items">
                     <!-- new paymentId, so add last payment to the list-->
                     <if condition="lastItem &amp;&amp; lastItem.paymentId != item.paymentId">
-                        <set field="finDocOut.otherUser.company.paymentMethod" from="paymentMethod"/>
+                        <set field="finDocOut.otherCompany.paymentMethod" from="paymentMethod"/>
                         <script>finDocs.add(finDocOut)</script>
                         <set field="paymentMethod" from="[:]"/>
                     </if>
@@ -704,6 +708,7 @@ along with this software (see the LICENSE.md file). If not, see
                             sales: sales,
                             docType: docType,
                             otherUser: userOut,
+                            otherCompany: company,
                             grandTotal: item.amount ? item.amount.toString() : null,
                             items: items ? items : [],
                             ]"/>
@@ -735,7 +740,7 @@ along with this software (see the LICENSE.md file). If not, see
                     <set field="lastItem" from="item"/>
                 </iterate>
                 <if condition="lastItem">
-                    <set field="finDocOut.otherUser.company.paymentMethod" from="paymentMethod"/>
+                    <set field="finDocOut.otherCompany.paymentMethod" from="paymentMethod"/>
                     <script>finDocs.add(finDocOut)</script>
                 </if>
             </if>
@@ -806,12 +811,14 @@ along with this software (see the LICENSE.md file). If not, see
                                 <set field="company" from="[
                                             partyId: item.customerPartyId,
                                             name: item.customerCompanyName,
+                                            address: address,
                                         ]"/>
                                 <set field="userOut" from="[
                                         partyId: item.customerUserPartyId,
                                         firstName: item.customerFirstName,
                                         lastName: item.customerLastName,
                                         email: item.customerEmail,
+                                        telephoneNr: item.telephoneNr,
                                         company: company,
                                         ]"/>
                             </else>
@@ -835,8 +842,7 @@ along with this software (see the LICENSE.md file). If not, see
                             creationDate: item.entryDate 
                                 ? item.entryDate.toString().substring(0,19) + 'Z' : null,
                             otherUser: userOut,
-                            telephoneNr: item.telephoneNr,
-                            address: address,
+                            otherCompany: company,
                             ]"/>
                         <set field="finDocItems" from="[]"/>
                     </if>
@@ -923,6 +929,8 @@ along with this software (see the LICENSE.md file). If not, see
                             creationDate: item.transactionDate 
                                 ? item.transactionDate.toString().substring(0,19) + 'Z' : null,
                             otherUser: userOut,
+                            otherCompany: company,
+                            grandTotal: item.amount ? item.amount.toString(): null,
                         ]"/>
                         <set field="finDocItems" from="[]"/>
                     </if>
@@ -931,8 +939,14 @@ along with this software (see the LICENSE.md file). If not, see
                             price: item.debitCreditFlag == 'D'
                                 ? item.amount.toString() : (item.amount * -1).toString(),
                             itemType: [itemTypeId: item.typeId],
-                            glAccountId: item.glAccountId,
+                            glAccount: [
+                                glAccountId: item.glAccountId,
+                                accountCode: accountCodeFormatter
+                                    ? accountCodeFormatter.valueToString(item.accountCode)
+                                    : item.accountCode,
+                                accountName: item.accountName],
                             productId: item.productId,
+                            description: item.description,
                         ]"/>
                     <script>finDocItems.add(finDocItem)</script>
                     <set field="lastItem" from="item"/>
@@ -960,11 +974,11 @@ along with this software (see the LICENSE.md file). If not, see
                 <parameter name="description"/>
                 <parameter name="otherUser" type="Map">
                     <parameter name="partyId"/>
-                    <parameter name="company" type="Map">
-                        <parameter name="partyId"/>
-                        <parameter name="paymentMethod" type="Map">
-                            <parameter name="ccPaymentMethodId"/>
-                        </parameter>
+                </parameter>
+                <parameter name="otherCompany" type="Map">
+                    <parameter name="partyId"/>
+                    <parameter name="paymentMethod" type="Map">
+                        <parameter name="ccPaymentMethodId"/>
                     </parameter>
                 </parameter>
                 <parameter name="grandTotal"/>
@@ -1019,24 +1033,24 @@ along with this software (see the LICENSE.md file). If not, see
                     <parameter name="userId"/>
                     <parameter name="locale"/>
                     <parameter name="telephoneNr"/>
-                    <parameter name="company" type="Map">
-                        <parameter name="partyId"/>
-                        <parameter name="name"/>
-                        <parameter name="role"/>
-                        <parameter name="address" type="Map">
-                            <parameter name="addressId"/>
-                            <parameter name="address1"/>
-                            <parameter name="address2"/>
-                            <parameter name="city"/>
-                            <parameter name="postalCode"/>
-                            <parameter name="province"/>
-                            <parameter name="country"/>
-                        </parameter>
-                        <parameter name="paymentMethod" type="Map">
-                            <parameter name="ccPaymentMethodId"/>
-                            <parameter name="ccDescription"/>
-                        </parameter>
-                    </parameter>  
+                </parameter>  
+                <parameter name="otherCompany" type="Map">
+                    <parameter name="partyId"/>
+                    <parameter name="name"/>
+                    <parameter name="role"/>
+                    <parameter name="address" type="Map">
+                        <parameter name="addressId"/>
+                        <parameter name="address1"/>
+                        <parameter name="address2"/>
+                        <parameter name="city"/>
+                        <parameter name="postalCode"/>
+                        <parameter name="province"/>
+                        <parameter name="country"/>
+                    </parameter>
+                    <parameter name="paymentMethod" type="Map">
+                        <parameter name="ccPaymentMethodId"/>
+                        <parameter name="ccDescription"/>
+                    </parameter>
                 </parameter>  
                 <parameter name="grandTotal"/>
                 <parameter name="classificationId"/>
@@ -1067,8 +1081,8 @@ along with this software (see the LICENSE.md file). If not, see
         <actions>
             <service-call out-map="context"
                 name="growerp.100.GeneralServices100.get#RelatedCompanyAndOwner"/>
-            <if condition="!finDoc.otherUser || !finDoc.otherUser.company.partyId">
-                <return error="true" message="Other user required with valid companyPartyId"/>
+            <if condition="!finDoc.otherCompany || !finDoc.otherCompany.partyId">
+                <return error="true" message="Other company required with valid companyPartyId"/>
             </if>
             <service-call name="growerp.100.FinDocServices100.convert#StatusId"  out-map="context"
                 in-map="[sales: finDoc?.sales, docType: finDoc.docType, statusId: finDoc.statusId]"/>
@@ -1107,11 +1121,11 @@ along with this software (see the LICENSE.md file). If not, see
                 name="growerp.100.GeneralServices100.get#RelatedCompanyAndOwner"/>
             <if condition="order.sales == true"><!-- inside this order object this field is NOT a string -->
                 <set field="vendorPartyId" from="companyPartyId"/>
-                <set field="customerPartyId" from="order.otherUser.company.partyId"/>
+                <set field="customerPartyId" from="order.otherCompany.partyId"/>
                 <set field="contactRole" value="CustomerContactPerson"/>
                 <else>
                     <set field="customerPartyId" from="companyPartyId"/>
-                    <set field="vendorPartyId" from="order.otherUser.company.partyId"/>
+                    <set field="vendorPartyId" from="order.otherCompany.partyId"/>
                     <set field="contactRole" value="VendorContactPerson"/>
                 </else>
             </if>
@@ -1174,12 +1188,12 @@ along with this software (see the LICENSE.md file). If not, see
                name="growerp.100.GeneralServices100.get#RelatedCompanyAndOwner"/>
                <if condition="invoice.sales == false"><!-- inside this payment object this field is NOT a string -->
                 <set field="toPartyId" from="companyPartyId"/>
-                <set field="fromPartyId" from="invoice.otherUser.company.partyId"/>
-                <set field="contactRole" value="VendorContactPerson"/>
+                <set field="fromPartyId" from="invoice.otherCompany.partyId"/>
+                <set field="contactRole" value="Vendor"/>
                 <else>
                     <set field="fromPartyId" from="companyPartyId"/>
-                    <set field="toPartyId" from="invoice.otherUser.company.partyId"/>
-                    <set field="contactRole" value="CustomerContactPerson"/>
+                    <set field="toPartyId" from="invoice.otherCompany.partyId"/>
+                    <set field="contactRole" value="Customer"/>
                 </else>
             </if>
             <!-- get currency -->
@@ -1230,18 +1244,18 @@ along with this software (see the LICENSE.md file). If not, see
                name="growerp.100.GeneralServices100.get#RelatedCompanyAndOwner"/>
             <if condition="payment.sales == true">
                 <then><!-- incoming sales payment -->
-                    <set field="fromPartyId" from="payment.otherUser.company.partyId"/>
+                    <set field="fromPartyId" from="payment.otherCompany.partyId"/>
                     <set field="toPartyId" from="companyPartyId"/>
                     <set field="contactRole" value="CustomerContactPerson"/>
                     <if condition="payment.paymentInstrument == 'CreditCard' &amp;&amp; 
-                                    payment.otherUser.company.paymentMethod?.ccPaymentMethodId">
-                        <set field="paymentMethodId" from="payment.otherUser.company.paymentMethod.ccPaymentMethodId"/>
+                                    payment.otherCompany.paymentMethod?.ccPaymentMethodId">
+                        <set field="paymentMethodId" from="payment.otherCompany.paymentMethod.ccPaymentMethodId"/>
                         <set field="paymentGatewayConfigId" from="System.getProperty('paymentGatewayConfigId')"/>
                     </if>
                 </then>
                 <else><!-- outgoing purchase payment -->
                     <set field="fromPartyId" from="companyPartyId"/>
-                    <set field="toPartyId" from="payment.otherUser.company.partyId"/>
+                    <set field="toPartyId" from="payment.otherCompany.partyId"/>
                     <set field="contactRole" value="VendorContactPerson"/>
                     <if condition="payment.paymentInstrument == 'CreditCard'">
                         <entity-find entity-name="mantle.account.method.PaymentMethod" limit="1" list="pms">
@@ -1375,12 +1389,12 @@ along with this software (see the LICENSE.md file). If not, see
                 <parameter name="description"/>
                 <parameter name="otherUser" type="Map">
                     <parameter name="partyId"/>
-                    <parameter name="company" type="Map">
-                        <parameter name="partyId"/>
-                        <parameter name="name"/>
-                        <parameter name="paymentMethod" type="Map">
-                            <parameter name="ccPaymentMethodId"/>
-                        </parameter>
+                </parameter>
+                <parameter name="otherCompany" type="Map">
+                    <parameter name="partyId"/>
+                    <parameter name="name"/>
+                    <parameter name="paymentMethod" type="Map">
+                        <parameter name="ccPaymentMethodId"/>
                     </parameter>
                 </parameter>
                 <parameter name="grandTotal"/>
@@ -1419,7 +1433,7 @@ along with this software (see the LICENSE.md file). If not, see
                 <parameter name="creationDate"/>
                 <parameter name="placedDate"/>
                 <parameter name="description"/>
-                <parameter name="user" type="Map">
+                <parameter name="otherUser" type="Map">
                     <parameter name="partyId"/>
                     <parameter name="email"/>
                     <parameter name="firstName"/>
@@ -1433,13 +1447,13 @@ along with this software (see the LICENSE.md file). If not, see
                     <parameter name="userId"/>
                     <parameter name="locale"/>
                     <parameter name="telephoneNr"/>
-                    <parameter name="company" type="Map">
-                        <parameter name="partyId"/>
-                        <parameter name="name"/>
-                        <parameter name="email"/>
-                        <parameter name="role"/>
-                    </parameter>
                 </parameter>  
+                <parameter name="otherCompany" type="Map">
+                    <parameter name="partyId"/>
+                    <parameter name="name"/>
+                    <parameter name="email"/>
+                    <parameter name="role"/>
+                </parameter>
                 <parameter name="grandTotal"/>
                 <parameter name="classificationId"/>
                 <parameter name="items" type="List">
@@ -1698,12 +1712,12 @@ along with this software (see the LICENSE.md file). If not, see
                 <set field="orderHeader.orderName" from="order.description"/>
                 <entity-update value-field="orderHeader"/>
             </if>
-            <if condition="order.otherUser">
+            <if condition="order.otherUser || order.otherCompany">
                 <if condition="order.sales == true"><!-- quotes on true NOT required -->
-                    <set field="customerPartyId" from="order.otherUser.company.partyId"/>
+                    <set field="customerPartyId" from="order.otherCompany.partyId"/>
                     <set field="contactRole" value="CustomerContactPerson"/>
                     <else>
-                        <set field="vendorPartyId" from="order.otherUser.company.partyId"/>
+                        <set field="vendorPartyId" from="order.otherCompany.partyId"/>
                         <set field="contactRole" value="VendorContactPerson"/>
                     </else>
                 </if>
@@ -1775,7 +1789,7 @@ along with this software (see the LICENSE.md file). If not, see
                     <if  condition="order.sales == true">
                         <service-call name="mantle.party.ContactServices.get#PartyContactInfoList"
                                 out-map="customerShippingInfo"
-                            in-map="[partyId: order.otherUser.company.partyId,
+                            in-map="[partyId: order.otherCompany.partyId,
                                     postalContactMechPurposeId:'PostalShippingDest']"/>
                         <if condition="customerShippingInfo.postalAddressList == null">
                             <return error="true" message="Customer does not have a shipping address!"/>
@@ -1886,12 +1900,12 @@ along with this software (see the LICENSE.md file). If not, see
         </if>
         <!-- party changes -->
         <if condition="invoice.sales &amp;&amp;
-                invoice.otherUser.company.partyId != items[0].toPartyId">
-            <set field="invoiceHeader.toPartyId" from="invoice.otherUser.company.partyId"/>
+                invoice.otherCompany.partyId != items[0].toPartyId">
+            <set field="invoiceHeader.toPartyId" from="invoice.otherCompany.partyId"/>
         </if>
         <if condition="!invoice.sales &amp;&amp;
-                invoice.otherUser.company.partyId != items[0].fromPartyId">
-            <set field="invoiceHeader.fromPartyId" from="invoice.otherUser.company.partyId"/>
+                invoice.otherCompany.partyId != items[0].fromPartyId">
+            <set field="invoiceHeader.fromPartyId" from="invoice.otherCompany.partyId"/>
         </if>
         <entity-update value-field="invoiceHeader"/>
         <!-- handle status changes -->
@@ -1936,10 +1950,10 @@ along with this software (see the LICENSE.md file). If not, see
         </entity-find-one>
         <if condition="payment.sales">
             <then>
-                <set field="paymentOld.fromPartyId" from="payment.otherUser.company.partyId"/>
+                <set field="paymentOld.fromPartyId" from="payment.otherCompany.partyId"/>
             </then>
             <else>
-                <set field="paymentOld.toPartyId" from="payment.otherUser.company.partyId"/>
+                <set field="paymentOld.toPartyId" from="payment.otherCompany.partyId"/>
             </else>
         </if>
         <set field="paymentOld.amount" from="payment.grandTotal"/>
@@ -1970,7 +1984,7 @@ along with this software (see the LICENSE.md file). If not, see
                 <if condition="payment.sales">
                     <then>
                         <set field="paymentOld.paymentMethodId"
-                            from="payment.otherUser.company.paymentMethod.ccPaymentMethodId"/>
+                            from="payment.otherCompany.paymentMethod.ccPaymentMethodId"/>
                         <set field="paymentOld.paymentGatewayConfigId"
                             from="System.getProperty('paymentGatewayConfigId')"/>
                     </then>
diff --git a/service/growerp/100/PartyServices100.xml b/service/growerp/100/PartyServices100.xml
index ce3c1af..e5653d1 100644
--- a/service/growerp/100/PartyServices100.xml
+++ b/service/growerp/100/PartyServices100.xml
@@ -14,6 +14,38 @@ along with this software (see the LICENSE.md file). If not, see
 -->
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/service-definition-2.1.xsd">
 
+    <service verb="check" noun="Email">
+        <description>Check if a particular emaill address exists of a party</description>
+        <in-parameters>
+            <parameter name="email" required="true"/>
+        </in-parameters>
+        <out-parameters><parameter name="ok"/></out-parameters>
+        <actions>
+            <entity-find entity-name="mantle.party.contact.PartyContactMechInfo" list="partyInfoList" distinct="true">
+                <econdition field-name="infoString" from="email" ignore-case="true"/>
+                <econdition field-name="contactMechTypeEnumId" value="CmtEmailAddress"/>
+                <date-filter/>
+                <select-field field-name="partyId"/>
+                <select-field field-name="infoString"/>
+                <order-by field-name="fromDate DESC"/>
+            </entity-find>
+            <set field="partyIds" from="[] as Set"/>
+            <!-- check if active -->
+            <iterate list="partyInfoList" entry="partyInfo">
+                <entity-find-count entity-name="mantle.party.Party" count-field="isDisabled">
+                    <econdition field-name="partyId" from="partyInfo.partyId"/>
+                    <econdition field-name="disabled" value="Y" ignore-case="true"/>
+                </entity-find-count>
+                <if condition="isDisabled==0">
+                    <set field="partyIds" from="partyIds + [partyInfo.partyId]"/></if>
+            </iterate>
+            <if condition="partyIds.size() &gt; 0">
+                <log message="email address $email found for partyId: ${partyIds}"/>
+                <set field="ok" value="ok"/>
+            </if>
+        </actions>
+    </service>
+
     <service verb="check" noun="Company">
         <description>Check if a particular company (irrespective of owner) exists</description>
         <in-parameters>
@@ -1289,6 +1321,8 @@ along with this software (see the LICENSE.md file). If not, see
                         <!-- user security access -->
                         <service-call name="create#moqui.security.UserGroupMember"
                             in-map="[userGroupId: user.userGroupId, userId: userAccount.userId]"/>
+                        <service-call name="create#moqui.security.UserGroupMember"
+                            in-map="[userGroupId: 'ALL_USERS', userId: userAccount.userId]"/>
                         <set field="userPartyId" from="userAccount.partyId"/>
                 </then>
                 <else>
@@ -1829,7 +1863,8 @@ along with this software (see the LICENSE.md file). If not, see
             <!-- load demo data -->
             <if condition="demoData == 'true'">
                 <service-call name="growerp.100.PartyServices100.load#DefaultData"
-                    in-map="[companyPartyId: user.company.partyId,
+                    in-map="[ownerPartyId: owner.partyId,
+                            companyPartyId: user.company.partyId,
                             currencyId: currencyId,
                             classificationId: classificationId,
                             userPartyId: user.partyId]"/></if>
@@ -1922,15 +1957,6 @@ along with this software (see the LICENSE.md file). If not, see
                         ownerPartyId: companyPartyId,
                         facilityName: company.organizationName + ' Inventory']"
                     out-map="context"/>
-
-                <!-- facility default locations -->
-                <entity-find entity-name="mantle.facility.FacilityLocation" list="locs">
-                    <econdition field-name="facilityId" value="DEFAULT_WH"/>
-                </entity-find>
-                <iterate list="locs" entry="loc">
-                    <service-call name="create#mantle.facility.FacilityLocation"
-                        in-map="loc + [facilityId: facilityId]"/>
-                </iterate>
                 <else>
                     <set field="facilityId" from="facExists[0].facilityId"/>
                 </else>
@@ -2206,6 +2232,7 @@ along with this software (see the LICENSE.md file). If not, see
     <service verb="load" noun="DefaultData" transaction-timeout="3600">
         <!-- not reachable outside -->
         <in-parameters>
+            <parameter name="ownerPartyId" required="true"/>
             <parameter name="companyPartyId" required="true"/>
             <parameter name="userPartyId" required="true"/>
             <parameter name="currencyId"/>
@@ -2221,6 +2248,15 @@ along with this software (see the LICENSE.md file). If not, see
             <set field="productStoreId" from="stores[0].productStoreId"/>
             <set field="facilityId" from="stores[0].inventoryFacilityId"/>
 
+            <!-- facility default locations -->
+            <entity-find entity-name="mantle.facility.FacilityLocation" list="locs">
+                <econdition field-name="facilityId" value="DEFAULT_WH"/>
+            </entity-find>
+            <iterate list="locs" entry="loc">
+                <service-call name="create#mantle.facility.FacilityLocation"
+                    in-map="loc + [facilityId: facilityId]"/>
+            </iterate>
+
             <!-- get root (browse) category -->
             <entity-find entity-name="mantle.product.store.ProductStoreCategory" list="browseRootList">
                 <econdition field-name="storeCategoryTypeEnumId" value="PsctBrowseRoot"/>
@@ -2657,11 +2693,11 @@ along with this software (see the LICENSE.md file). If not, see
                 <!--if condition="classificationId == 'AppAdmin'"><set field="ordersIn" from="ordersAdmin"/></if-->
                 <if condition="classificationId == 'AppHotel'"><set field="ordersIn" from="ordersHotel"/>
                 <entity-find entity-name="growerp.party.OwnerCompanyDetailAndEmployee" list="customers">
-                    <econdition field-name="ownerPartyId" from="companyPartyId"/>
+                    <econdition field-name="ownerPartyId" from="ownerPartyId"/>
                     <econdition field-name="companyRole" value="Customer"/>
                 </entity-find>
                 <entity-find entity-name="growerp.party.OwnerCompanyDetailAndEmployee" list="suppliers">
-                    <econdition field-name="ownerPartyId" from="companyPartyId"/>
+                    <econdition field-name="ownerPartyId" from="ownerPartyId"/>
                     <econdition field-name="companyRole" value="Supplier"/>
                 </entity-find>
                 <set field="index" type="Integer" value="0"/>
@@ -2683,7 +2719,7 @@ along with this software (see the LICENSE.md file). If not, see
                                 ]" out-map="context"/>
                             <service-call name="create#mantle.order.OrderPartParty"
                                 in-map="[orderId: orderId, orderPartSeqId: orderPartSeqId,
-                                    partyId: customers[index%2].userPartyId,
+                                    partyId: customers[index%2].personPartyId,
                                     roleTypeId: 'CustomerContactPerson']"/>
                         </else>
                     </if>
diff --git a/service/growerp/100/WarehouseServices100.xml b/service/growerp/100/WarehouseServices100.xml
index 87c7224..eadc1cf 100644
--- a/service/growerp/100/WarehouseServices100.xml
+++ b/service/growerp/100/WarehouseServices100.xml
@@ -87,6 +87,8 @@ along with this software (see the LICENSE.md file). If not, see
                         operator="like" from="search" ignore-if-empty="true"/>
                     <econdition field-name="locationName" ignore-case="true"
                         operator="like" from="search" ignore-if-empty="true"/>
+                    <econdition field-name="locationId" ignore-case="true"
+                        operator="like" from="search" ignore-if-empty="true"/>
                     <econdition field-name="acquireShipmentId" ignore-case="true"
                         operator="like" from="search" ignore-if-empty="true"/>
                 </econditions>
@@ -114,6 +116,7 @@ along with this software (see the LICENSE.md file). If not, see
                             pseudoId: loc.pseudoId, productName: loc.productName]"/>
                 <set field="asset" from="[assetId: loc.assetId, statusId: loc.statusId,
                             assetName: loc.assetName, product: product,
+                            acquireCost: acquireCost,
                             quantityOnHand: loc.quantityOnHand?.toString(),
                             availableToPromise: loc.availableToPromise?.toString(),
                             acquireShipmentId: loc.acquireShipmentId]"/>