Skip to content

CopyPolicySettings: add missing rules and categories fields #93936

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yuwenmemon merged 5 commits into from
Jul 28, 2026
Merged

CopyPolicySettings: add missing rules and categories fields #93936

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
014690f
CopyPolicySettings: add missing rules and categories fields
ishpaul777 Jun 18, 2026
2170084
Merge upstream/main into copy-policy-settings-rules-fields
ishpaul777 Jun 26, 2026
8b179cd
Merge branch 'Expensify:main' into copy-policy-settings-rules-fields
ishpaul777 Jul 15, 2026
f29812e
Merge remote-tracking branch 'upstream/main' into copy-policy-setting…
ishpaul777 Jul 27, 2026
f445bda
Include new rule fields in the rules-row eligibility gate
ishpaul777 Jul 27, 2026
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
6 changes: 5 additions & 1 deletion src/libs/actions/Policy/CopyPolicySettings.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ const PARTS_TO_POLICY_FIELDS = {
members: ['employeeList'],
reports: ['fieldList', 'areReportFieldsEnabled'],
accounting: ['connections', 'areConnectionsEnabled'],
categories: ['areCategoriesEnabled'],
categories: ['areCategoriesEnabled', 'requiresCategory'],
tags: ['areTagsEnabled'],
taxes: ['tax', 'taxRates'],
// achAccount is intentionally excluded — the backend remaps bankAccountID per-caller
Expand All @@ -51,12 +51,16 @@ const PARTS_TO_POLICY_FIELDS = {
'maxExpenseAmountNoReceipt',
'maxExpenseAmountNoItemizedReceipt',
'defaultBillable',
'defaultReimbursable',
'prohibitedExpenses',
'eReceipts',
'isAttendeeTrackingEnabled',
'preventSelfApproval',
'disabledFields',
'glCodes',
'shouldShowAutoApprovalOptions',
'shouldShowAutoReimbursementLimitOption',
'customRules',
Comment thread
ishpaul777 marked this conversation as resolved.
],
codingRules: ['rules'],
distanceRates: ['areDistanceRatesEnabled', 'customUnits'],
Expand Down
12 changes: 12 additions & 0 deletions src/pages/workspace/duplicate/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,18 @@ function getWorkspaceRules(policy: Policy | undefined, translate: LocaleContextP
if (policy?.shouldShowAutoReimbursementLimitOption && !autoPayApprovedReportsUnavailable) {
total.push(translate('workspace.rules.expenseReportRules.autoPayApprovedReportsTitle'));
}
if (policy?.customRules) {
total.push(translate('workspace.rules.customRules.title'));
}
if (policy?.glCodes) {
total.push(translate('workspace.categories.glCode'));
}

// defaultReimbursable defaults to true, so a flipped default or a hidden billable/reimbursable field
// (disabledFields) both indicate a non-default cash expense rule worth copying.
if (policy?.defaultReimbursable === false || Object.values(policy?.disabledFields ?? {}).some(Boolean)) {
total.push(translate('workspace.rules.individualExpenseRules.cashExpenseDefault'));
}

return total.length > 0 ? total : null;
}
Expand Down
Loading