Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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'"
Expand Down Expand Up @@ -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'"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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'">
Expand All @@ -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'">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down