Skip to content

[29.x] Inconsistent Non-Deductible VAT calculations on Purchase & Sales Invoices containing lines with Full VAT calculation type #11245

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
Shikhverma wants to merge 4 commits into
base: releases/29.x
Choose a base branch
from
Open

[29.x] Inconsistent Non-Deductible VAT calculations on Purchase & Sales Invoices containing lines with Full VAT calculation type #11245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5255922
Initial commit
Shikhverma Sep 9, 2026
6ad5437
Merge branch 'releases/29.x' of https://github.com/microsoft/BCApps i…
Shikhverma Sep 9, 2026
d0a5443
Merge branch 'releases/29.x' of https://github.com/microsoft/BCApps i…
Shikhverma Sep 11, 2026
4a14264
Invoke Miapp
Shikhverma Sep 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
2 changes: 2 additions & 0 deletions src/Layers/APAC/BaseApp/Finance/VAT/Calculation/VATAmountLine.Table.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1034,6 +1034,7 @@ table 290 "VAT Amount Line"
"VAT Base" := 0;
"VAT Amount" := "VAT Difference" + CalcLineAmount();
"Amount Including VAT" := "VAT Amount";
NonDeductibleVAT.UpdateNonDeductibleAmountsWithDiffInVATAmountLine(Rec, Currency);
end;
"VAT Calculation Type"::"Sales Tax":
begin
Expand Down Expand Up @@ -1089,6 +1090,7 @@ table 290 "VAT Amount Line"
"VAT Base" := 0;
"VAT Amount" := "VAT Difference" + CalcLineAmount();
"Amount Including VAT" := "VAT Amount";
NonDeductibleVAT.UpdateNonDeductibleAmountsWithDiffInVATAmountLine(Rec, Currency);
end;
"VAT Calculation Type"::"Sales Tax":
begin
Expand Down
5 changes: 5 additions & 0 deletions src/Layers/APAC/BaseApp/Purchases/Document/PurchaseLine.Table.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7446,6 +7446,11 @@ table 39 "Purchase Line"
NewAmount := 0;
NewAmountACY := 0;
NewVATBaseAmount := 0;
if VATAmountLine.CalcLineAmount() = 0 then
NonDedVATAmount := 0
else
NonDedVATAmount :=
NonDeductibleVAT.GetNonDedVATAmountFromVATAmountLine(TempVATAmountLineRemainder, VATAmountLine, Currency, PurchLine.CalcLineAmount(), VATAmountLine.CalcLineAmount());
NewVATBaseAmountACY := 0;
end else begin
NewAmount := PurchLine.CalcLineAmount();
Expand Down
2 changes: 2 additions & 0 deletions src/Layers/BE/BaseApp/Finance/VAT/Calculation/VATAmountLine.Table.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -907,6 +907,7 @@ table 290 "VAT Amount Line"
"VAT Base" := 0;
"VAT Amount" := "VAT Difference" + CalcLineAmount();
"Amount Including VAT" := "VAT Amount";
NonDeductibleVAT.UpdateNonDeductibleAmountsWithDiffInVATAmountLine(Rec, Currency);
end;
"VAT Calculation Type"::"Sales Tax":
begin
Expand Down Expand Up @@ -962,6 +963,7 @@ table 290 "VAT Amount Line"
"VAT Base" := 0;
"VAT Amount" := "VAT Difference" + CalcLineAmount();
"Amount Including VAT" := "VAT Amount";
NonDeductibleVAT.UpdateNonDeductibleAmountsWithDiffInVATAmountLine(Rec, Currency);
end;
"VAT Calculation Type"::"Sales Tax":
begin
Expand Down
5 changes: 5 additions & 0 deletions src/Layers/BE/BaseApp/Purchases/Document/PurchaseLine.Table.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7267,6 +7267,11 @@ table 39 "Purchase Line"
VATAmount := PurchLine.CalcLineAmount();
NewAmount := 0;
NewVATBaseAmount := 0;
if VATAmountLine.CalcLineAmount() = 0 then
NonDedVATAmount := 0
else
NonDedVATAmount :=
NonDeductibleVAT.GetNonDedVATAmountFromVATAmountLine(TempVATAmountLineRemainder, VATAmountLine, Currency, PurchLine.CalcLineAmount(), VATAmountLine.CalcLineAmount());
end else begin
NewAmount := PurchLine.CalcLineAmount();
if (PurchLine."VAT %" <> 0) and (VATAmountLine.CalcLineAmount() <> 0) then
Expand Down
5 changes: 5 additions & 0 deletions src/Layers/CH/BaseApp/Purchases/Document/PurchaseLine.Table.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7246,6 +7246,11 @@ table 39 "Purchase Line"
VATAmount := PurchLine.CalcLineAmount();
NewAmount := 0;
NewVATBaseAmount := 0;
if VATAmountLine.CalcLineAmount() = 0 then
NonDedVATAmount := 0
else
NonDedVATAmount :=
NonDeductibleVAT.GetNonDedVATAmountFromVATAmountLine(TempVATAmountLineRemainder, VATAmountLine, Currency, PurchLine.CalcLineAmount(), VATAmountLine.CalcLineAmount());
end else begin
NewAmount := PurchLine.CalcLineAmount();
NewVATBaseAmount :=
Expand Down
5 changes: 5 additions & 0 deletions src/Layers/DACH/BaseApp/Purchases/Document/PurchaseLine.Table.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7245,6 +7245,11 @@ table 39 "Purchase Line"
VATAmount := PurchLine.CalcLineAmount();
NewAmount := 0;
NewVATBaseAmount := 0;
if VATAmountLine.CalcLineAmount() = 0 then
NonDedVATAmount := 0
else
NonDedVATAmount :=
NonDeductibleVAT.GetNonDedVATAmountFromVATAmountLine(TempVATAmountLineRemainder, VATAmountLine, Currency, PurchLine.CalcLineAmount(), VATAmountLine.CalcLineAmount());
end else begin
NewAmount := PurchLine.CalcLineAmount();
NewVATBaseAmount :=
Expand Down
2 changes: 2 additions & 0 deletions src/Layers/ES/BaseApp/Finance/VAT/Calculation/VATAmountLine.Table.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1076,6 +1076,7 @@ table 290 "VAT Amount Line"
"VAT Base" := 0;
"VAT Amount" := "VAT Difference" + CalcLineAmount();
"Amount Including VAT" := "VAT Amount";
NonDeductibleVAT.UpdateNonDeductibleAmountsWithDiffInVATAmountLine(Rec, Currency);
end;
"VAT Calculation Type"::"Sales Tax":
begin
Expand Down Expand Up @@ -1152,6 +1153,7 @@ table 290 "VAT Amount Line"
"VAT Base" := 0;
"VAT Amount" := "VAT Difference" + CalcLineAmount();
"Amount Including VAT" := "VAT Amount";
NonDeductibleVAT.UpdateNonDeductibleAmountsWithDiffInVATAmountLine(Rec, Currency);
end;
"VAT Calculation Type"::"Sales Tax":
begin
Expand Down
5 changes: 5 additions & 0 deletions src/Layers/ES/BaseApp/Purchases/Document/PurchaseLine.Table.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7253,6 +7253,11 @@ table 39 "Purchase Line"
VATAmount := PurchLine.CalcLineAmount() - PurchLine."Pmt. Discount Amount";
NewAmount := 0;
NewVATBaseAmount := 0;
if VATAmountLine.CalcLineAmount() = 0 then
NonDedVATAmount := 0
else
NonDedVATAmount :=
NonDeductibleVAT.GetNonDedVATAmountFromVATAmountLine(TempVATAmountLineRemainder, VATAmountLine, Currency, PurchLine.CalcLineAmount(), VATAmountLine.CalcLineAmount());
end else begin
NewAmount := PurchLine.CalcLineAmount() - PurchLine."Pmt. Discount Amount";
NewVATBaseAmount :=
Expand Down
5 changes: 5 additions & 0 deletions src/Layers/FI/BaseApp/Purchases/Document/PurchaseLine.Table.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7238,6 +7238,11 @@ table 39 "Purchase Line"
VATAmount := PurchLine.CalcLineAmount();
NewAmount := 0;
NewVATBaseAmount := 0;
if VATAmountLine.CalcLineAmount() = 0 then
NonDedVATAmount := 0
else
NonDedVATAmount :=
NonDeductibleVAT.GetNonDedVATAmountFromVATAmountLine(TempVATAmountLineRemainder, VATAmountLine, Currency, PurchLine.CalcLineAmount(), VATAmountLine.CalcLineAmount());
end else begin
NewAmount := PurchLine.CalcLineAmount();
NewVATBaseAmount :=
Expand Down
2 changes: 2 additions & 0 deletions src/Layers/GB/BaseApp/Finance/VAT/Calculation/VATAmountLine.Table.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -926,6 +926,7 @@ table 290 "VAT Amount Line"
"VAT Base" := 0;
"VAT Amount" := "VAT Difference" + CalcLineAmount();
"Amount Including VAT" := "VAT Amount";
NonDeductibleVAT.UpdateNonDeductibleAmountsWithDiffInVATAmountLine(Rec, Currency);
end;
"VAT Calculation Type"::"Sales Tax":
begin
Expand Down Expand Up @@ -981,6 +982,7 @@ table 290 "VAT Amount Line"
"VAT Base" := 0;
"VAT Amount" := "VAT Difference" + CalcLineAmount();
"Amount Including VAT" := "VAT Amount";
NonDeductibleVAT.UpdateNonDeductibleAmountsWithDiffInVATAmountLine(Rec, Currency);
end;
"VAT Calculation Type"::"Sales Tax":
begin
Expand Down
5 changes: 5 additions & 0 deletions src/Layers/GB/BaseApp/Purchases/Document/PurchaseLine.Table.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7273,6 +7273,11 @@ table 39 "Purchase Line"
VATAmount := PurchLine.CalcLineAmount();
NewAmount := 0;
NewVATBaseAmount := 0;
if VATAmountLine.CalcLineAmount() = 0 then
NonDedVATAmount := 0
else
NonDedVATAmount :=
NonDeductibleVAT.GetNonDedVATAmountFromVATAmountLine(TempVATAmountLineRemainder, VATAmountLine, Currency, PurchLine.CalcLineAmount(), VATAmountLine.CalcLineAmount());
end else begin
NewAmount := PurchLine.CalcLineAmount();
NewVATBaseAmount :=
Expand Down
2 changes: 2 additions & 0 deletions src/Layers/IT/BaseApp/Finance/VAT/Calculation/VATAmountLine.Table.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -953,6 +953,7 @@ table 290 "VAT Amount Line"
"VAT Base" := 0;
"VAT Amount" := "VAT Difference" + CalcLineAmount();
"Amount Including VAT" := "VAT Amount";
NonDeductibleVAT.UpdateNonDeductibleAmountsWithDiffInVATAmountLine(Rec, Currency);
end;
"VAT Calculation Type"::"Sales Tax":
begin
Expand Down Expand Up @@ -1008,6 +1009,7 @@ table 290 "VAT Amount Line"
"VAT Base" := 0;
"VAT Amount" := "VAT Difference" + CalcLineAmount();
"Amount Including VAT" := "VAT Amount";
NonDeductibleVAT.UpdateNonDeductibleAmountsWithDiffInVATAmountLine(Rec, Currency);
end;
"VAT Calculation Type"::"Sales Tax":
begin
Expand Down
5 changes: 5 additions & 0 deletions src/Layers/IT/BaseApp/Purchases/Document/PurchaseLine.Table.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7490,6 +7490,11 @@ table 39 "Purchase Line"
VATAmount := PurchLine.CalcLineAmount();
NewAmount := 0;
NewVATBaseAmount := 0;
if VATAmountLine.CalcLineAmount() = 0 then
NonDedVATAmount := 0
else
NonDedVATAmount :=
NonDeductibleVAT.GetNonDedVATAmountFromVATAmountLine(TempVATAmountLineRemainder, VATAmountLine, Currency, PurchLine.CalcLineAmount(), VATAmountLine.CalcLineAmount());
end else begin
NewAmount := PurchLine.CalcLineAmount();
NewVATBaseAmount :=
Expand Down
2 changes: 2 additions & 0 deletions src/Layers/NA/BaseApp/Finance/VAT/Calculation/VATAmountLine.Table.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -929,6 +929,7 @@ table 290 "VAT Amount Line"
"VAT Base" := 0;
"VAT Amount" := "VAT Difference" + CalcLineAmount();
"Amount Including VAT" := "VAT Amount";
NonDeductibleVAT.UpdateNonDeductibleAmountsWithDiffInVATAmountLine(Rec, Currency);
end;
"VAT Calculation Type"::"Sales Tax":
begin
Expand Down Expand Up @@ -984,6 +985,7 @@ table 290 "VAT Amount Line"
"VAT Base" := 0;
"VAT Amount" := "VAT Difference" + CalcLineAmount();
"Amount Including VAT" := "VAT Amount";
NonDeductibleVAT.UpdateNonDeductibleAmountsWithDiffInVATAmountLine(Rec, Currency);
end;
"VAT Calculation Type"::"Sales Tax":
begin
Expand Down
5 changes: 5 additions & 0 deletions src/Layers/NA/BaseApp/Purchases/Document/PurchaseLine.Table.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7453,6 +7453,11 @@ table 39 "Purchase Line"
VATAmount := PurchLine.CalcLineAmount();
NewAmount := 0;
NewVATBaseAmount := 0;
if VATAmountLine.CalcLineAmount() = 0 then
NonDedVATAmount := 0
else
NonDedVATAmount :=
NonDeductibleVAT.GetNonDedVATAmountFromVATAmountLine(TempVATAmountLineRemainder, VATAmountLine, Currency, PurchLine.CalcLineAmount(), VATAmountLine.CalcLineAmount());
end else begin
NewAmount := PurchLine.CalcLineAmount();
NewVATBaseAmount :=
Expand Down
5 changes: 5 additions & 0 deletions src/Layers/NL/BaseApp/Purchases/Document/PurchaseLine.Table.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7232,6 +7232,11 @@ table 39 "Purchase Line"
VATAmount := PurchLine.CalcLineAmount();
NewAmount := 0;
NewVATBaseAmount := 0;
if VATAmountLine.CalcLineAmount() = 0 then
NonDedVATAmount := 0
else
NonDedVATAmount :=
NonDeductibleVAT.GetNonDedVATAmountFromVATAmountLine(TempVATAmountLineRemainder, VATAmountLine, Currency, PurchLine.CalcLineAmount(), VATAmountLine.CalcLineAmount());
end else begin
NewAmount := PurchLine.CalcLineAmount();
NewVATBaseAmount :=
Expand Down
5 changes: 5 additions & 0 deletions src/Layers/NO/BaseApp/Purchases/Document/PurchaseLine.Table.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7251,6 +7251,11 @@ table 39 "Purchase Line"
VATAmount := PurchLine.CalcLineAmount();
NewAmount := 0;
NewVATBaseAmount := 0;
if VATAmountLine.CalcLineAmount() = 0 then
NonDedVATAmount := 0
else
NonDedVATAmount :=
NonDeductibleVAT.GetNonDedVATAmountFromVATAmountLine(TempVATAmountLineRemainder, VATAmountLine, Currency, PurchLine.CalcLineAmount(), VATAmountLine.CalcLineAmount());
end else begin
NewAmount := PurchLine.CalcLineAmount();
NewVATBaseAmount :=
Expand Down
2 changes: 2 additions & 0 deletions src/Layers/RU/BaseApp/Finance/VAT/Calculation/VATAmountLine.Table.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -892,6 +892,7 @@ table 290 "VAT Amount Line"
"VAT Base" := 0;
"VAT Amount" := "VAT Difference" + CalcLineAmount();
"Amount Including VAT" := "VAT Amount";
NonDeductibleVAT.UpdateNonDeductibleAmountsWithDiffInVATAmountLine(Rec, Currency);
end;
"VAT Calculation Type"::"Sales Tax":
begin
Expand Down Expand Up @@ -953,6 +954,7 @@ table 290 "VAT Amount Line"
"VAT Base" := 0;
"VAT Amount" := "VAT Difference" + CalcLineAmount();
"Amount Including VAT" := "VAT Amount";
NonDeductibleVAT.UpdateNonDeductibleAmountsWithDiffInVATAmountLine(Rec, Currency);
end;
"VAT Calculation Type"::"Sales Tax":
begin
Expand Down
5 changes: 5 additions & 0 deletions src/Layers/RU/BaseApp/Purchases/Document/PurchaseLine.Table.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7453,6 +7453,11 @@ table 39 "Purchase Line"
VATAmount := PurchLine.CalcLineAmount();
NewAmount := 0;
NewVATBaseAmount := 0;
if VATAmountLine.CalcLineAmount() = 0 then
NonDedVATAmount := 0
else
NonDedVATAmount :=
NonDeductibleVAT.GetNonDedVATAmountFromVATAmountLine(TempVATAmountLineRemainder, VATAmountLine, Currency, PurchLine.CalcLineAmount(), VATAmountLine.CalcLineAmount());
end else begin
NewAmount := PurchLine.CalcLineAmount();
NewVATBaseAmount :=
Expand Down
5 changes: 5 additions & 0 deletions src/Layers/SE/BaseApp/Purchases/Document/PurchaseLine.Table.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7238,6 +7238,11 @@ table 39 "Purchase Line"
VATAmount := PurchLine.CalcLineAmount();
NewAmount := 0;
NewVATBaseAmount := 0;
if VATAmountLine.CalcLineAmount() = 0 then
NonDedVATAmount := 0
else
NonDedVATAmount :=
NonDeductibleVAT.GetNonDedVATAmountFromVATAmountLine(TempVATAmountLineRemainder, VATAmountLine, Currency, PurchLine.CalcLineAmount(), VATAmountLine.CalcLineAmount());
end else begin
NewAmount := PurchLine.CalcLineAmount();
NewVATBaseAmount :=
Expand Down
2 changes: 2 additions & 0 deletions src/Layers/W1/BaseApp/Finance/VAT/Calculation/VATAmountLine.Table.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -900,6 +900,7 @@ table 290 "VAT Amount Line"
"VAT Base" := 0;
"VAT Amount" := "VAT Difference" + CalcLineAmount();
"Amount Including VAT" := "VAT Amount";
NonDeductibleVAT.UpdateNonDeductibleAmountsWithDiffInVATAmountLine(Rec, Currency);
end;
"VAT Calculation Type"::"Sales Tax":
begin
Expand Down Expand Up @@ -955,6 +956,7 @@ table 290 "VAT Amount Line"
"VAT Base" := 0;
"VAT Amount" := "VAT Difference" + CalcLineAmount();
"Amount Including VAT" := "VAT Amount";
NonDeductibleVAT.UpdateNonDeductibleAmountsWithDiffInVATAmountLine(Rec, Currency);
end;
"VAT Calculation Type"::"Sales Tax":
begin
Expand Down
5 changes: 5 additions & 0 deletions src/Layers/W1/BaseApp/Purchases/Document/PurchaseLine.Table.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7227,6 +7227,11 @@ table 39 "Purchase Line"
VATAmount := PurchLine.CalcLineAmount();
NewAmount := 0;
NewVATBaseAmount := 0;
if VATAmountLine.CalcLineAmount() = 0 then
NonDedVATAmount := 0
else
NonDedVATAmount :=
NonDeductibleVAT.GetNonDedVATAmountFromVATAmountLine(TempVATAmountLineRemainder, VATAmountLine, Currency, PurchLine.CalcLineAmount(), VATAmountLine.CalcLineAmount());
end else begin
NewAmount := PurchLine.CalcLineAmount();
NewVATBaseAmount :=
Expand Down
Loading
Loading