From 16e60b627e11157457bb7cd8062c7cededa612c0 Mon Sep 17 00:00:00 2001
From: Viswas <viswas.h@fyle.in>
Date: Wed, 27 Nov 2024 20:45:58 +0530
Subject: [PATCH 1/3] fix: export settings content changes

---
 .../business-central-export-settings.component.html         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/integrations/business-central/business-central-shared/business-central-export-settings/business-central-export-settings.component.html b/src/app/integrations/business-central/business-central-shared/business-central-export-settings/business-central-export-settings.component.html
index 3c0b1cebf8..edd23ddc10 100644
--- a/src/app/integrations/business-central/business-central-shared/business-central-export-settings/business-central-export-settings.component.html
+++ b/src/app/integrations/business-central/business-central-shared/business-central-export-settings/business-central-export-settings.component.html
@@ -73,7 +73,7 @@
                             <app-configuration-select-field
                             [form]="exportSettingForm"
                             [isFieldMandatory]="false"
-                            [label]="'How should Employees in  ' + brandingConfig.brandName + ' be mapped to Employees in Dynamics 365 Business Central ?'"
+                            [label]="'How should Employees in  ' + brandingConfig.brandName + ' be mapped to Vendors in Dynamics 365 Business Central ?'"
                             [subLabel]="'Automatically map the employees in  ' + brandingConfig.brandName + ' to their corresponding records in Dynamics 365 Business Central based on a unique parameter'"
                             [placeholder]="'Select representation'"
                             [options]="employeeMapOptions"
@@ -122,7 +122,7 @@
                             [isFieldMandatory]="true"
                             [mandatoryErrorListName]="'expense state'"
                             [label]="'At which state should the expenses be ready to export from ' + brandingConfig.brandName + '?'"
-                            [subLabel]="'You can export expenses either when they\'re awaiting payment after approval (Payment processing) or when the payment has been settled (Paid).'"
+                            [subLabel]="'You can export expenses either when they\'re awaiting payment after approval (Payment processing) or when the payment has been settled (Closed).'"
                             [options]="reimbursableExpenseState"
                             [iconPath]="'list'"
                             [placeholder]="'Select export state'"
@@ -252,7 +252,7 @@
                             [isFieldMandatory]="true"
                             [mandatoryErrorListName]="'expense state'"
                             [label]="'At which state should the expenses be ready to export from ' + brandingConfig.brandName + '?'"
-                            [subLabel]="'You can export expenses either when they\'re awaiting payment after approval (Payment processing) or when the payment has been settled (Paid).'"
+                            [subLabel]="'You can export expenses either when they\'re awaiting payment after approval (Approved) or when the payment has been settled (Closed).'"
                             [options]="cccExpenseState"
                             [iconPath]="'list'"
                             [placeholder]="'Select export state'"

From ec3f4202ffb3c0020ac0c7466bb280a98d2cb4d5 Mon Sep 17 00:00:00 2001
From: Viswas <viswas.h@fyle.in>
Date: Wed, 27 Nov 2024 20:46:27 +0530
Subject: [PATCH 2/3] fix: hide spend date help message for group by expenses

---
 .../configuration-select-field.component.html                   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/shared/components/configuration/configuration-select-field/configuration-select-field.component.html b/src/app/shared/components/configuration/configuration-select-field/configuration-select-field.component.html
index f7bc504c4d..71e84548a4 100644
--- a/src/app/shared/components/configuration/configuration-select-field/configuration-select-field.component.html
+++ b/src/app/shared/components/configuration/configuration-select-field/configuration-select-field.component.html
@@ -99,7 +99,7 @@ <h5 *ngIf="formControllerName === 'cccExportType' && brandingConfig.brandId ===
                     <div *ngIf="!showExportPreview && isDisabled && isDisableTextRequired" class="sub-text tw-text-pretty">
                         <span>Auto-selected based on your export module</span>
                     </div>
-                    <div *ngIf="brandingConfig.brandId !== 'co' && form.controls[formControllerName].value==='spent_at' && isOnboarding && form.get('cccExportType')?.value" class="sub-text">
+                    <div *ngIf="brandingConfig.brandId !== 'co' && form.controls[formControllerName].value==='spent_at' && isOnboarding && form.get('cccExportType')?.value && form.get('cccExportGroup')?.value === 'REPORT'" class="sub-text">
                         <span>Using the Spend Date may lead to multiple single line<br>item entries.</span>
                     </div>
                 </div>

From baeefc0175d1e308ecb575674c119ba08cc25351 Mon Sep 17 00:00:00 2001
From: Viswas <viswas.h@fyle.in>
Date: Wed, 27 Nov 2024 20:51:12 +0530
Subject: [PATCH 3/3] fix: update import settings sublabels

---
 .../business-central-import-settings.component.html           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/integrations/business-central/business-central-shared/business-central-import-settings/business-central-import-settings.component.html b/src/app/integrations/business-central/business-central-shared/business-central-import-settings/business-central-import-settings.component.html
index bd7dfdf3f2..249b44a73c 100644
--- a/src/app/integrations/business-central/business-central-shared/business-central-import-settings/business-central-import-settings.component.html
+++ b/src/app/integrations/business-central/business-central-shared/business-central-import-settings/business-central-import-settings.component.html
@@ -16,7 +16,7 @@
                     <app-configuration-toggle-field 
                         [form]="importSettingForm"
                         [label]="'Import the Chart of Accounts as Categories in ' + brandingConfig.brandName " 
-                        [subLabel]="'Imported account will be available as Categories in ' + brandingConfig.brandName " 
+                        [subLabel]="'Imported accounts will appear in a dropdown under the \'Category\' field in ' + brandingConfig.brandName + ', enabling employees to use these values for coding their expenses. '" 
                         [formControllerName]="'importCategories'"
                         [isSectionHeader]="false"
                         [iconPath]="'arrow-tail-down'">
@@ -26,7 +26,7 @@
                     <app-configuration-toggle-field 
                         [form]="importSettingForm"
                         [label]="'Import Vendor as Merchant in ' + brandingConfig.brandName " 
-                        [subLabel]="'Imported Vendor will be available as Merchants in ' + brandingConfig.brandName " 
+                        [subLabel]="'Imported vendors will appear in a dropdown under the \'Merchant\' field in ' + brandingConfig.brandName + ', enabling employees to use these values for coding their expenses.'" 
                         [formControllerName]="'importVendorAsMerchant'"
                         [isSectionHeader]="false"
                         [iconPath]="'arrow-tail-down'">