-
Notifications
You must be signed in to change notification settings - Fork 3.5k
Add reimbursable total and non reimbursable total to custom columns #77812
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.
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
Conversation
🦜 Polyglot Parrot! 🦜Squawk! Looks like you added some shiny new English strings. Allow me to parrot them back to you in other tongues: View the translation diffdiff --git a/src/languages/de.ts b/src/languages/de.ts
index d3f2b7f6..4b7fcbe4 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -691,6 +691,8 @@ const translations: TranslationDeepObject<typeof en> = {
actionRequired: 'Aktion erforderlich',
duplicate: 'Duplizieren',
duplicated: 'Dupliziert',
+ reimbursableTotal: 'Erstattungsfähiger Gesamtbetrag',
+ nonReimbursableTotal: 'Nicht erstattungsfähiger Gesamtbetrag',
},
supportalNoAccess: {
title: 'Nicht so schnell',
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index 9d7b9a18..83d43eac 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -693,6 +693,8 @@ const translations: TranslationDeepObject<typeof en> = {
actionRequired: 'Action requise',
duplicate: 'Dupliquer',
duplicated: 'Dupliqué',
+ reimbursableTotal: 'Total remboursable',
+ nonReimbursableTotal: 'Total non remboursable',
},
supportalNoAccess: {
title: 'Pas si vite',
diff --git a/src/languages/it.ts b/src/languages/it.ts
index cdecb098..079f08aa 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -692,6 +692,8 @@ const translations: TranslationDeepObject<typeof en> = {
actionRequired: 'Azione richiesta',
duplicate: 'Duplica',
duplicated: 'Duplicato',
+ reimbursableTotal: 'Totale rimborsabile',
+ nonReimbursableTotal: 'Totale non rimborsabile',
},
supportalNoAccess: {
title: 'Non così in fretta',
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index 3e62d11f..85034d18 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -691,6 +691,8 @@ const translations: TranslationDeepObject<typeof en> = {
actionRequired: '対応が必要',
duplicate: '複製',
duplicated: '重複',
+ reimbursableTotal: '経費精算対象の合計',
+ nonReimbursableTotal: '非払い戻し合計',
},
supportalNoAccess: {
title: 'ちょっと待ってください',
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index eaa4dfc0..77447c68 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -692,6 +692,8 @@ const translations: TranslationDeepObject<typeof en> = {
actionRequired: 'Actie vereist',
duplicate: 'Dupliceren',
duplicated: 'Gedupliceerd',
+ reimbursableTotal: 'Totaal te vergoeden',
+ nonReimbursableTotal: 'Niet-vergoedbaar totaal',
},
supportalNoAccess: {
title: 'Niet zo snel',
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index 7832371a..89b0bf5f 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -692,6 +692,8 @@ const translations: TranslationDeepObject<typeof en> = {
actionRequired: 'Wymagane działanie',
duplicate: 'Duplikat',
duplicated: 'Zduplikowano',
+ reimbursableTotal: 'Łączna kwota podlegająca zwrotowi',
+ nonReimbursableTotal: 'Suma niepodlegająca zwrotowi',
},
supportalNoAccess: {
title: 'Nie tak szybko',
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index 8e3eec5a..0d75dd40 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -691,6 +691,8 @@ const translations: TranslationDeepObject<typeof en> = {
actionRequired: 'Ação necessária',
duplicate: 'Duplicar',
duplicated: 'Duplicado',
+ reimbursableTotal: 'Total reembolsável',
+ nonReimbursableTotal: 'Total não reembolsável',
},
supportalNoAccess: {
title: 'Não tão rápido',
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index 0ee2a324..a626722f 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -688,6 +688,8 @@ const translations: TranslationDeepObject<typeof en> = {
actionRequired: '需要操作',
duplicate: '复制',
duplicated: '已重复',
+ reimbursableTotal: '可报销总额',
+ nonReimbursableTotal: '不可报销总额',
},
supportalNoAccess: {
title: '先别急',
Note You can apply these changes to your branch by copying the patch to your clipboard, then running |
|
@hoangzinh Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button] |
Codecov Report❌ Looks like you've decreased code coverage for some files. Please write tests to increase, or at least maintain, the existing level of code coverage. See our documentation here for how to interpret this table.
|
This PR is only about |
|
@brunovjk correct, just the totals |
|
Update: A bug has been reported here. |
…e-4-reimbursable-amt
…e-4-reimbursable-amt
Reviewer Checklist
Screenshots/VideosAndroid: HybridAppAndroid: mWeb ChromeiOS: HybridAppiOS: mWeb SafariMacOS: Chrome / SafariScreen.Recording.2025-12-17.at.17.01.25.mov |
|
@arosiclair Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button] |
luacmartins
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
|
✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release. |
|
🚀 Deployed to staging by https://github.com/luacmartins in version: 9.2.82-0 🚀
|
|
🚀 Deployed to staging by https://github.com/luacmartins in version: 9.2.82-0 🚀
|
|
This PR is failing because of issue ##78047 The issue is reproducible in: Web Bug7033166_1766087265983.10.2.mp4 |
|
🚀 Deployed to staging by https://github.com/luacmartins in version: 9.2.82-0 🚀
|
|
🚀 Deployed to staging by https://github.com/luacmartins in version: 9.2.84-0 🚀
|
|
🚀 Deployed to production by https://github.com/AndrewGable in version: 9.2.84-8 🚀
|
Explanation of Change
Adds support for 'Reimbursable total' & 'Nonreimbursable total' in the expense reports page view, via custom columns
Fixed Issues
$ #76871
Tests
The reimbursable total & nonreimbursable total columns should not be visible by default
Open the reports page 'Columns' RHP
Toggle reimbursable total & nonreimbursable total on
Ensure that the reimbursable total & nonreimbursable columns are visible and accurate
Offline tests
N/A
QA Steps
Same as tests
PR Author Checklist
### Fixed Issuessection aboveTestssectionOffline stepssectionQA stepssectioncanBeMissingparam foruseOnyxtoggleReportand notonIconClick)src/languages/*files and using the translation methodSTYLE.md) were followedAvatar, I verified the components usingAvatarare working as expected)StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))npm run compress-svg)Avataris modified, I verified thatAvataris working as expected in all cases)Designlabel and/or tagged@Expensify/designso the design team can review the changes.ScrollViewcomponent to make it scrollable when more elements are added to the page.mainbranch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTeststeps.Screenshots/Videos
Screen.Recording.2025-12-16.at.12.28.05.PM.mov