Skip to content

Backport #10990: [29.x] Add Expense VAT settings to Contoso demo tool #10994

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

Open
Alexander Yakunin (Alexander-Ya) wants to merge 3 commits into
base: releases/29.x
Choose a base branch
from
Open

Backport #10990: [29.x] Add Expense VAT settings to Contoso demo tool #10994

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5354de3
Add-Expense-VAT-settings-to-Contoso-demo-tool
Alexander-Ya Sep 3, 2026
429bb07
Merge branch 'releases/29.x' of https://github.com/microsoft/BCApps i…
Alexander-Ya Sep 9, 2026
0fd59bb
Sync from main PR
Alexander-Ya Sep 9, 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
5 changes: 2 additions & 3 deletions src/Apps/W1/ExpenseAgent/app/src/ExpenseReport/Codeunits/CreateExpenseReport.Codeunit.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ codeunit 6983 "Create Expense Report"
else
Error('');

ExpenseReportHeader := GetExpenseReportHeader(ExpenseReportNo, Expense."Expense User No.", Expense."Currency Code", Expense."VAT Bus. Posting Group");
ExpenseReportHeader := GetExpenseReportHeader(ExpenseReportNo, Expense."Expense User No.", Expense."VAT Bus. Posting Group");
LoopThruExpenseToAddInReport(Expense, ExpenseReportHeader);
ShowExpenseReport(ExpenseReportHeader, ExpenseReportNo <> '');
end;
Expand All @@ -81,7 +81,7 @@ codeunit 6983 "Create Expense Report"
Page.Run(Page::"Expense Report", ExpenseReportHeader);
end;

local procedure GetExpenseReportHeader(ExpenseReportNo: Code[20]; ExpenseUserNo: Code[20]; CurrencyCode: Code[10]; VATBusPostingGroup: Code[20]): Record "Expense Report Header"
local procedure GetExpenseReportHeader(ExpenseReportNo: Code[20]; ExpenseUserNo: Code[20]; VATBusPostingGroup: Code[20]): Record "Expense Report Header"
var
ExpenseReportHeader: Record "Expense Report Header";
begin
Expand All @@ -90,7 +90,6 @@ codeunit 6983 "Create Expense Report"

ExpenseReportHeader.Init();
ExpenseReportHeader.Validate("Expense User No.", ExpenseUserNo);
ExpenseReportHeader.Validate("Reimbursement Currency Code", CurrencyCode);
ExpenseReportHeader.Validate("VAT Bus. Posting Group", VATBusPostingGroup);
ExpenseReportHeader.Insert(true);

Expand Down
16 changes: 14 additions & 2 deletions src/Apps/W1/ExpenseAgent/app/src/Setup/Codeunits/CreateExpenseCategories.Codeunit.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,8 +287,8 @@ codeunit 6973 "Create Expense Categories"
AddSubcategorySeed(TempSubcategory, XINCIDENTSTxt, XHOTELSTxt, XHotelIncidentsDescTxt, XSubHotelIncidentsPostingTxt, true, false);
AddSubcategorySeed(TempSubcategory, XLAUNDRYTxt, XHOTELSTxt, XHotelLaundryDescTxt, XSubLaundryPostingTxt, true, false);
AddSubcategorySeed(TempSubcategory, XROOMSERVICETxt, XHOTELSTxt, XHotelRoomServiceDescTxt, XSubRoomServicePostingTxt, true, false);
AddSubcategorySeed(TempSubcategory, XPARKINGTxt, XHOTELSTxt, XHotelParkingDescTxt, XSubHotelParkingPostingTxt, true, false);
AddSubcategorySeed(TempSubcategory, XOTHERTxt, XHOTELSTxt, XHotelOtherDescTxt, XSubOtherPostingTxt, true, false);
AddSubcategorySeed(TempSubcategory, XHOTELPARKTxt, XHOTELSTxt, XHotelParkingDescTxt, XSubHotelParkingPostingTxt, true, false);
AddSubcategorySeed(TempSubcategory, XHOTELOTHERTxt, XHOTELSTxt, XHotelOtherDescTxt, XSubOtherPostingTxt, true, false);
AddSubcategorySeed(TempSubcategory, XTIPSTxt, XHOTELSTxt, XHotelTipsDescTxt, XTipsPostingTxt, true, false);
AddSubcategorySeed(TempSubcategory, XTRANSPORTTxt, XHOTELSTxt, XHotelTransportDescTxt, XSubHotelTransportPostingTxt, true, false);

Expand Down Expand Up @@ -569,6 +569,16 @@ codeunit 6973 "Create Expense Categories"
exit(XROOMSERVICETxt);
end;

internal procedure GetHOTELPARKTxt(): Code[20]
begin
exit(XHOTELPARKTxt);
end;

internal procedure GetHOTELOTHERTxt(): Code[20]
begin
exit(XHOTELOTHERTxt);
end;

internal procedure GetPARKINGTxt(): Code[20]
begin
exit(XPARKINGTxt);
Expand Down Expand Up @@ -1215,7 +1225,9 @@ codeunit 6973 "Create Expense Categories"
XHotelLaundryDescTxt: Label 'Expenses for laundry, dry-cleaning, or pressing services provided by the hotel during a business trip.', MaxLength = 250;
XROOMSERVICETxt: Label 'ROOM-SERVICE', Locked = true;
XHotelRoomServiceDescTxt: Label 'Expenses for meals, minibar items, and beverages provided via hotel room service during a business stay.', MaxLength = 250;
XHOTELPARKTxt: Label 'HOTEL-PARK', Locked = true;
XHotelParkingDescTxt: Label 'Expenses for valet or self-parking services provided by the hotel during a business stay.', MaxLength = 250;
XHOTELOTHERTxt: Label 'HOTELOTHER', Locked = true;
XHotelOtherDescTxt: Label 'Hotel-related expenses incurred during a business stay that do not fall into defined hotel subcategories.', MaxLength = 250;
XHotelTipsDescTxt: Label 'Expenses for tips paid to hotel staff such as bell services, housekeeping, or concierge during a business stay.', MaxLength = 250;
XHotelTransportDescTxt: Label 'Expenses for transportation services arranged or provided by the hotel, such as hotel shuttles, transfers, or arranged rides.', MaxLength = 250;
Expand Down
Loading
Loading