Skip to content

Extract AU Withholding Tax code #9258

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-Ya wants to merge 13 commits into
base: main
Choose a base branch
from
Open

Extract AU Withholding Tax code #9258

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
cf0e44a
Extract AU Withholding Tax code
Alexander-Ya Jul 8, 2026
0134ec9
Fix extra closing brace in Vendor.Table.al causing AU/NZ build failure
Copilot Jul 8, 2026
15ba39d
Fix compile errors
Alexander-Ya Jul 8, 2026
71f18c8
Reorganize objest extansions between layers
Alexander-Ya Jul 9, 2026
1ece95f
Update solution
Alexander-Ya Jul 9, 2026
b8ace60
Extract from Role Centers
Alexander-Ya Jul 9, 2026
800064b
Update Sales/Purch Invoice Posting
Alexander-Ya Jul 9, 2026
30a7d75
Update Sales Post
Alexander-Ya Jul 9, 2026
130bdd3
Fix Finance Manager Role Center extraction
Alexander-Ya Jul 10, 2026
a9e380b
Fix Finance Manager RC
Alexander-Ya Jul 11, 2026
c31f39c
Fix action change
Alexander-Ya Jul 11, 2026
24719c3
Fix code review comments
Alexander-Ya Jul 11, 2026
b4d9acb
Fix compile errors
Alexander-Ya Jul 11, 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
11 changes: 0 additions & 11 deletions src/Layers/APAC/BaseApp/Finance/GeneralLedger/Account/GLAccount.Table.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ using Microsoft.Finance.GeneralLedger.Ledger;
using Microsoft.Finance.GeneralLedger.Setup;
using Microsoft.Finance.SalesTax;
using Microsoft.Finance.VAT.Setup;
using Microsoft.Finance.WithholdingTax;
using Microsoft.Foundation.Comment;
using Microsoft.Foundation.Enums;
using Microsoft.Foundation.ExtendedText;
Expand Down Expand Up @@ -1067,16 +1066,6 @@ table 15 "G/L Account"
Caption = 'API Account Type';
Editable = false;
}
field(28040; "WHT Business Posting Group"; Code[20])
{
Caption = 'WHT Business Posting Group';
TableRelation = "WHT Business Posting Group";
}
field(28041; "WHT Product Posting Group"; Code[20])
{
Caption = 'WHT Product Posting Group';
TableRelation = "WHT Product Posting Group";
}
#if not CLEANSCHEMA25
field(28160; "G/L Entry Type Filter"; Option)
{
Expand Down
22 changes: 0 additions & 22 deletions src/Layers/APAC/BaseApp/Finance/GeneralLedger/Account/GLAccountCard.Page.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ using Microsoft.Finance.GeneralLedger.Ledger;
using Microsoft.Finance.GeneralLedger.Reports;
using Microsoft.Finance.GeneralLedger.Setup;
using Microsoft.Finance.VAT.Setup;
using Microsoft.Finance.WithholdingTax;
using Microsoft.Foundation.Comment;
using Microsoft.Foundation.ExtendedText;
using Microsoft.Pricing.Calculation;
Expand Down Expand Up @@ -213,16 +212,6 @@ page 17 "G/L Account Card"
{
ApplicationArea = Intercompany;
}
field("WHT Business Posting Group"; Rec."WHT Business Posting Group")
{
ApplicationArea = Basic, Suite;
ToolTip = 'Specifies a WHT business posting group.';
}
field("WHT Product Posting Group"; Rec."WHT Product Posting Group")
{
ApplicationArea = Basic, Suite;
ToolTip = 'Specifies a WHT Product posting group.';
}
field("Default Deferral Template Code"; Rec."Default Deferral Template Code")
{
ApplicationArea = Suite;
Expand Down Expand Up @@ -472,14 +461,6 @@ page 17 "G/L Account Card"
RunObject = Page "G/L Registers";
ToolTip = 'View posted G/L entries.';
}
action("WHT Posting Setup")
{
ApplicationArea = Basic, Suite;
Caption = 'WHT Posting Setup';
Image = VATPostingSetup;
RunObject = Page "WHT Posting Setup";
ToolTip = 'View the information posting.';
}
action(DocsWithoutIC)
{
ApplicationArea = Basic, Suite;
Expand Down Expand Up @@ -664,9 +645,6 @@ page 17 "G/L Account Card"
actionref("Apply Template_Promoted"; "Apply Template")
{
}
actionref("WHT Posting Setup_Promoted"; "WHT Posting Setup")
{
}
}
group(Category_Category4)
{
Expand Down
92 changes: 20 additions & 72 deletions src/Layers/APAC/BaseApp/Finance/GeneralLedger/Journal/GenJournalLine.Table.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ using Microsoft.Finance.SalesTax;
using Microsoft.Finance.VAT.Calculation;
using Microsoft.Finance.VAT.Registration;
using Microsoft.Finance.VAT.Setup;
using Microsoft.Finance.WithholdingTax;
using Microsoft.FixedAssets.Depreciation;
using Microsoft.FixedAssets.FixedAsset;
using Microsoft.FixedAssets.Insurance;
Expand Down Expand Up @@ -3957,58 +3956,6 @@ table 81 "Gen. Journal Line"
end;
end;
}
field(28040; "WHT Business Posting Group"; Code[20])
{
Caption = 'WHT Business Posting Group';
TableRelation = "WHT Business Posting Group";
}
field(28041; "WHT Product Posting Group"; Code[20])
{
Caption = 'WHT Product Posting Group';
TableRelation = "WHT Product Posting Group";
}
field(28042; "WHT Absorb Base"; Decimal)
{
AutoFormatType = 1;
AutoFormatExpression = Rec."Currency Code";
Caption = 'WHT Absorb Base';
}
field(28043; "WHT Entry No."; Integer)
{
Caption = 'WHT Entry No.';
}
field(28044; "WHT Report Line No."; Code[20])
{
Caption = 'WHT Report Line No.';
}
field(28045; "Skip WHT"; Boolean)
{
Caption = 'Skip WHT';
}
field(28046; "Certificate Printed"; Boolean)
{
Caption = 'Certificate Printed';
}
field(28047; "WHT Payment"; Boolean)
{
Caption = 'WHT Payment';

trigger OnValidate()
begin
ReadGLSetup();
if not GLSetup."Manual Sales WHT Calc." then
"WHT Payment" := false;
end;
}
field(28048; "Actual Vendor No."; Code[20])
{
Caption = 'Actual Vendor No.';
TableRelation = Vendor;
}
field(28049; "Is WHT"; Boolean)
{
Caption = 'Is WHT';
}
field(28081; "VAT Base (ACY)"; Decimal)
{
AutoFormatType = 1;
Expand Down Expand Up @@ -4193,11 +4140,6 @@ table 81 "Gen. Journal Line"
GenJnlAlloc.DeleteAll();
end;

TempWHTEntry.SetRange("Document Type", "Document Type");
TempWHTEntry.SetRange("Original Document No.", "Document No.");
if TempWHTEntry.FindFirst() then
TempWHTEntry.DeleteAll();

DeferralUtilities.DeferralCodeOnDelete(
DeferralDocType::"G/L".AsInteger(),
"Journal Template Name", "Journal Batch Name", 0, '', "Line No.");
Expand Down Expand Up @@ -4355,7 +4297,6 @@ table 81 "Gen. Journal Line"
DocDate: Date;
CustBankAcc: Record "Customer Bank Account";
VendBankAcc: Record "Vendor Bank Account";
TempWHTEntry: Record "Temp WHT Entry";
Text1500001: Label '%1 and %2 must be identical or %1 must be Blank.';
Text020: Label 'You have not selected the Adjustment Applies-to, Do you still want to continue with the Document.';
Text021: Label 'The posting has been interrupted to respect the warning.';
Expand Down Expand Up @@ -7082,15 +7023,14 @@ table 81 "Gen. Journal Line"
"Recipient Bank Account" := '';
if xRec."Account No." <> '' then begin
ClearPostingGroups();
"WHT Business Posting Group" := '';
"WHT Product Posting Group" := '';
"Tax Area Code" := '';
"Tax Liable" := false;
"Tax Group Code" := '';
"Bill-to/Pay-to No." := '';
"Ship-to/Order Address Code" := '';
"Sell-to/Buy-from No." := '';
UpdateCountryCodeAndVATRegNo('');
OnCleanLineOnAfterUpdateCountryCodeAndVATRegNo(Rec, xRec);
end;

case "Account Type" of
Expand Down Expand Up @@ -8183,17 +8123,15 @@ table 81 "Gen. Journal Line"
"Gen. Prod. Posting Group" := GLAcc."Gen. Prod. Posting Group";
"VAT Bus. Posting Group" := GLAcc."VAT Bus. Posting Group";
"VAT Prod. Posting Group" := GLAcc."VAT Prod. Posting Group";
"WHT Business Posting Group" := GLAcc."WHT Business Posting Group";
"WHT Product Posting Group" := GLAcc."WHT Product Posting Group";
OnGetGLAccountOnAfterCopyVATSetupToJnlLines(Rec, GLAcc);
end;
"Tax Area Code" := GLAcc."Tax Area Code";
"Tax Liable" := GLAcc."Tax Liable";
"Tax Group Code" := GLAcc."Tax Group Code";
if Rec."Posting Date" <> 0D then
if "Posting Date" = ClosingDate("Posting Date") then begin
ClearPostingGroups();
"WHT Business Posting Group" := '';
"WHT Product Posting Group" := '';
OnGetAccountNoOnAfterClearPostingGroupsForClosingDate(Rec);
end;
Validate("Deferral Code", GLAcc."Default Deferral Template Code");

Expand Down Expand Up @@ -8274,8 +8212,6 @@ table 81 "Gen. Journal Line"
if not SetCurrencyCode("Bal. Account Type", "Bal. Account No.") then
"Currency Code" := Cust."Currency Code";
ClearPostingGroups();
"WHT Business Posting Group" := Cust."WHT Business Posting Group";
"WHT Product Posting Group" := '';
CheckConfirmDifferentCustomerAndBillToCustomer(Cust, "Account No.");
OnGetCustomerAccountOnBeforeValidatePaymentTermsCode(Rec, Cust, HideValidationDialog);
Validate("Payment Terms Code");
Expand Down Expand Up @@ -8350,12 +8286,11 @@ table 81 "Gen. Journal Line"
Vend.Get("Account No.");
Vend.CheckBlockedVendOnJnls(Vend, "Document Type", false);
CheckICPartner(Vend."IC Partner Code", "Account Type", "Account No.");
"Skip WHT" := Vend.ABN <> '';
UpdateDescription(Vend.Name);
"Payment Method Code" := Vend."Payment Method Code";
"Creditor No." := Vend."Creditor No.";

OnGenJnlLineGetVendorAccount(Vend);
OnGenJnlLineGetVendorAccount(Vend, Rec);

Validate("Recipient Bank Account", Vend."Preferred Bank Account Code");
"Posting Group" := Vend."Vendor Posting Group";
Expand All @@ -8366,8 +8301,6 @@ table 81 "Gen. Journal Line"
if not SetCurrencyCode("Bal. Account Type", "Bal. Account No.") then
"Currency Code" := Vend."Currency Code";
ClearPostingGroups();
"WHT Business Posting Group" := Vend."WHT Business Posting Group";
"WHT Product Posting Group" := '';
CheckConfirmDifferentVendorAndPayToVendor(Vend, "Account No.");
Validate("Payment Terms Code");
CheckPaymentTolerance();
Expand Down Expand Up @@ -11774,7 +11707,7 @@ table 81 "Gen. Journal Line"
/// </param>
[IntegrationEvent(true, false)]
[Scope('OnPrem')]
procedure OnGenJnlLineGetVendorAccount(Vendor: Record Vendor)
procedure OnGenJnlLineGetVendorAccount(Vendor: Record Vendor; var Rec: Record "Gen. Journal Line")
Comment thread
Alexander-Ya marked this conversation as resolved.
Outdated
begin
end;

Expand Down Expand Up @@ -13270,4 +13203,19 @@ table 81 "Gen. Journal Line"
local procedure OnBeforeGetAccCurrencyCode(var GenJnlLine: Record "Gen. Journal Line"; var CurrencyCode: Code[10]; var IsHandled: Boolean)
begin
end;

[IntegrationEvent(false, false)]
local procedure OnGetGLAccountOnAfterCopyVATSetupToJnlLines(var Rec: Record "Gen. Journal Line"; var GLAcc: Record "G/L Account")
begin
end;

[IntegrationEvent(false, false)]
local procedure OnGetAccountNoOnAfterClearPostingGroupsForClosingDate(var Rec: Record "Gen. Journal Line")
begin
end;

[IntegrationEvent(false, false)]
local procedure OnCleanLineOnAfterUpdateCountryCodeAndVATRegNo(var Rec: Record "Gen. Journal Line"; var xRec: Record "Gen. Journal Line")
begin
end;
}
38 changes: 0 additions & 38 deletions src/Layers/APAC/BaseApp/Finance/GeneralLedger/Journal/PaymentJournal.Page.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ using Microsoft.Finance.Dimension;
using Microsoft.Finance.GeneralLedger.Posting;
using Microsoft.Finance.GeneralLedger.Setup;
using Microsoft.Finance.ReceivablesPayables;
using Microsoft.Finance.WithholdingTax;
using Microsoft.Foundation.Reporting;
using Microsoft.HumanResources.Payables;
using Microsoft.Purchases.Payables;
Expand Down Expand Up @@ -206,18 +205,6 @@ page 256 "Payment Journal"
Style = Attention;
StyleExpr = HasPmtFileErr;
}
field("WHT Business Posting Group"; Rec."WHT Business Posting Group")
{
ApplicationArea = Basic, Suite;
ToolTip = 'Specifies that the WHT Business Posting Group will be assigned to this field based on the Account Type and Account No. selected.';
Visible = false;
}
field("WHT Product Posting Group"; Rec."WHT Product Posting Group")
{
ApplicationArea = Basic, Suite;
ToolTip = 'Specifies the WHT product posting group you want to use for your journal transactions.';
Visible = false;
}
field("Salespers./Purch. Code"; Rec."Salespers./Purch. Code")
{
ApplicationArea = Suite;
Expand Down Expand Up @@ -273,18 +260,6 @@ page 256 "Payment Journal"
Editable = IsPostingGroupEditable;
Visible = IsPostingGroupEditable;
}
field("WHT Payment"; Rec."WHT Payment")
{
ApplicationArea = Basic, Suite;
ToolTip = 'Specifies during manual calculation of WHT that the cash receipt is only for WHT and no VAT calculation shall be done for this transaction.';
Visible = false;
}
field("Skip WHT"; Rec."Skip WHT")
{
ApplicationArea = Basic, Suite;
ToolTip = 'Specifies that this field can be checked if we want to skip the WHT Calculation for a particular journal transaction.';
Visible = false;
}
field("Allocation Account No."; Rec."Selected Alloc. Account No.")
{
ApplicationArea = All;
Expand Down Expand Up @@ -1097,18 +1072,6 @@ page 256 "Payment Journal"
end;
end;
}
action("Print WHT Certificate")
{
ApplicationArea = Basic, Suite;
Caption = 'Print WHT Certificate';
Image = PrintVAT;
ToolTip = 'Print the withholding tax certificate.';

trigger OnAction()
begin
WHTManagement.PreprintingWHT(Rec);
end;
}
action(CreditTransferRegEntries)
{
ApplicationArea = Basic, Suite;
Expand Down Expand Up @@ -1968,7 +1931,6 @@ page 256 "Payment Journal"
ApprovalMgmt: Codeunit "Approvals Mgmt.";
ClientTypeManagement: Codeunit "Client Type Management";
ChangeExchangeRate: Page "Change Exchange Rate";
WHTManagement: Codeunit WHTManagement;
PostDatedCheckMgt: Codeunit PostDatedCheckMgt;
GenJnlBatchApprovalStatus: Text[20];
GenJnlLineApprovalStatus: Text[20];
Expand Down
46 changes: 0 additions & 46 deletions src/Layers/APAC/BaseApp/Finance/GeneralLedger/Journal/PostedGenJournalLine.Table.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ using Microsoft.Finance.GeneralLedger.Ledger;
using Microsoft.Finance.GeneralLedger.Setup;
using Microsoft.Finance.SalesTax;
using Microsoft.Finance.VAT.Setup;
using Microsoft.Finance.WithholdingTax;
using Microsoft.FixedAssets.Depreciation;
using Microsoft.FixedAssets.FixedAsset;
using Microsoft.FixedAssets.Insurance;
Expand Down Expand Up @@ -1863,51 +1862,6 @@ table 181 "Posted Gen. Journal Line"
else
if ("Account Type" = const(Vendor)) "Vendor Bank Account".Code where("Vendor No." = field("Account No."));
}
field(28040; "WHT Business Posting Group"; Code[20])
{
Caption = 'WHT Business Posting Group';
TableRelation = "WHT Business Posting Group";
}
field(28041; "WHT Product Posting Group"; Code[20])
{
Caption = 'WHT Product Posting Group';
TableRelation = "WHT Product Posting Group";
}
field(28042; "WHT Absorb Base"; Decimal)
{
AutoFormatType = 1;
AutoFormatExpression = "Currency Code";
Caption = 'WHT Absorb Base';
}
field(28043; "WHT Entry No."; Integer)
{
Caption = 'WHT Entry No.';
}
field(28044; "WHT Report Line No."; Code[20])
{
Caption = 'WHT Report Line No.';
}
field(28045; "Skip WHT"; Boolean)
{
Caption = 'Skip WHT';
}
field(28046; "Certificate Printed"; Boolean)
{
Caption = 'Certificate Printed';
}
field(28047; "WHT Payment"; Boolean)
{
Caption = 'WHT Payment';
}
field(28048; "Actual Vendor No."; Code[20])
{
Caption = 'Actual Vendor No.';
TableRelation = Vendor;
}
field(28049; "Is WHT"; Boolean)
{
Caption = 'Is WHT';
}
field(28081; "VAT Base (ACY)"; Decimal)
{
AutoFormatType = 1;
Expand Down
Loading
Loading