Skip to content

Commit 821f23d

Browse files
aholstrup1aholstrup1
authored
Syncing with version 26.0.29027.0 (#27952)
Fixes [AB#560539](https://dynamicssmb2.visualstudio.com/1fcb79e7-ab07-432a-a3c6-6cf5a88ba4a5/_workitems/edit/560539)
1 parent 2840c2f commit 821f23d

File tree

636 files changed

+793464
-16548
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

636 files changed

+793464
-16548
lines changed

‎.github/AL-Go-Settings.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"runs-on": "windows-latest",
66
"cacheImageName": "",
77
"UsePsSession": false,
8-
"artifact": "https://bcinsider-fvh2ekdjecfjd6gk.b02.azurefd.net/sandbox/26.0.28000.0/base",
8+
"artifact": "https://bcinsider-fvh2ekdjecfjd6gk.b02.azurefd.net/sandbox/26.0.29027.0/base",
99
"country": "base",
1010
"useProjectDependencies": true,
1111
"repoVersion": "26.0",

‎Apps/AT/ContosoCoffeeDemoDatasetAT/app/Demo Data/Finance/1. Setup Data/CreateATGLAccount.Codeunit.al

+18-24
Original file line numberDiff line numberDiff line change
@@ -1301,6 +1301,24 @@ codeunit 11148 "Create AT GL Account"
13011301
until GLAccountCategory.Next() = 0;
13021302
end;
13031303

1304+
internal procedure UpdateVATProdPostGrpInGLAccounts()
1305+
var
1306+
GLAccounts: Record "G/L Account";
1307+
CreateVATPostingGroups: Codeunit "Create VAT Posting Groups";
1308+
CreateVATPostingGroupAT: Codeunit "Create VAT Posting Group AT";
1309+
begin
1310+
GLAccounts.SetFilter("VAT Prod. Posting Group", '<>%1', '');
1311+
if GLAccounts.FindSet() then
1312+
repeat
1313+
if GLAccounts."VAT Prod. Posting Group" = CreateVATPostingGroups.Standard() then
1314+
GLAccounts.Validate(GLAccounts."VAT Prod. Posting Group", CreateVATPostingGroupAT.VAT20());
1315+
if GLAccounts."VAT Prod. Posting Group" = CreateVATPostingGroups.Reduced() then
1316+
GLAccounts.Validate(GLAccounts."VAT Prod. Posting Group", CreateVATPostingGroupAT.VAT10());
1317+
if GLAccounts."VAT Prod. Posting Group" <> CreateVATPostingGroupAT.NOVAT() then
1318+
GLAccounts.Modify(true);
1319+
until GLAccounts.Next() = 0;
1320+
end;
1321+
13041322
procedure AssignCategoryToChartOfAccounts(GLAccountCategory: Record "G/L Account Category")
13051323
var
13061324
CreateGLAccount: Codeunit "Create G/L Account";
@@ -1336,20 +1354,12 @@ codeunit 11148 "Create AT GL Account"
13361354
CreateGLAccount: Codeunit "Create G/L Account";
13371355
begin
13381356
case GLAccountCategory.Description of
1339-
// GLAccountCategoryMgt.GetCurrentAssets():
1340-
// ;
13411357
GLAccountCategoryMgt.GetCash():
13421358
UpdateGLAccounts(GLAccountCategory, CashAndBank(), TotalCashAndBank());
13431359
GLAccountCategoryMgt.GetAR():
13441360
UpdateGLAccounts(GLAccountCategory, OtherCurrentAssets(), TotalAccountsReceivable());
1345-
// GLAccountCategoryMgt.GetPrepaidExpenses():
1346-
// ;
13471361
GLAccountCategoryMgt.GetInventory():
13481362
UpdateGLAccounts(GLAccountCategory, SUPPLIES(), TOTALSUPPLIES());
1349-
// GLAccountCategoryMgt.GetEquipment():
1350-
// ;
1351-
// GLAccountCategoryMgt.GetAccumDeprec():
1352-
// ;
13531363
GLAccountCategoryMgt.GetCurrentLiabilities():
13541364
begin
13551365
UpdateGLAccounts(GLAccountCategory, LIABILITIESPROVISIONS(), TotalProvisions());
@@ -1374,30 +1384,14 @@ codeunit 11148 "Create AT GL Account"
13741384
UpdateGLAccounts(GLAccountCategory, SalesRevenuesRawMaterial(), TotalSalesRevenuesRawMaterial());
13751385
GLAccountCategoryMgt.GetIncomeSalesDiscounts():
13761386
UpdateGLAccounts(GLAccountCategory, RevenueAdjustments(), TotalRevenueAdjustments());
1377-
// GLAccountCategoryMgt.GetIncomeSalesReturns():
1378-
// ;
13791387
GLAccountCategoryMgt.GetIncomeInterest():
13801388
UpdateGLAccounts(GLAccountCategory, ChargesAndInterest(), TotalChargesAndInterest());
1381-
// GLAccountCategoryMgt.GetCOGSLabor():
1382-
// ;
13831389
GLAccountCategoryMgt.GetCOGSMaterials():
13841390
UpdateGLAccounts(GLAccountCategory, COSTOFMATERIALS(), TOTALCOSTOFMATERIALS());
1385-
// GLAccountCategoryMgt.GetRentExpense():
1386-
// ;
1387-
// GLAccountCategoryMgt.GetAdvertisingExpense():
1388-
// ;
13891391
GLAccountCategoryMgt.GetInterestExpense():
13901392
UpdateGLAccounts(GLAccountCategory, FINANCIALREVENUESANDEXPENDITURESBeginTotal(), TotalFinancialIncomeAndExpensesEndTotal());
1391-
// GLAccountCategoryMgt.GetFeesExpense():
1392-
// ;
1393-
// GLAccountCategoryMgt.GetInsuranceExpense():
1394-
// ;
13951393
GLAccountCategoryMgt.GetPayrollExpense():
13961394
UpdateGLAccounts(GLAccountCategory, CreateGLAccount.PersonnelExpenses(), CreateGLAccount.TotalPersonnelExpenses());
1397-
// GLAccountCategoryMgt.GetBenefitsExpense():
1398-
// ;
1399-
// GLAccountCategoryMgt.GetRepairsExpense():
1400-
// ;
14011395
GLAccountCategoryMgt.GetUtilitiesExpense():
14021396
UpdateGLAccounts(GLAccountCategory, OfficeAdvertisingAndMaintenanceExpenditure(), TotalOfficeAdvertisingMaintenanceExpenditure());
14031397
GLAccountCategoryMgt.GetOtherIncomeExpense():

‎Apps/AT/ContosoCoffeeDemoDatasetAT/app/Demo Data/Finance/1. Setup Data/CreatePostingGroupsAT.Codeunit.al

-16
Original file line numberDiff line numberDiff line change
@@ -12,28 +12,12 @@ codeunit 11149 "Create Posting Groups AT"
1212
var
1313
ContosoPostingGroup: Codeunit "Contoso Posting Group";
1414
CreateVATPostingGroupAT: codeunit "Create VAT Posting Group AT";
15-
CreatePostingGroup: Codeunit "Create Posting Groups";
1615
begin
1716
ContosoPostingGroup.SetOverwriteData(true);
1817
ContosoPostingGroup.InsertGenProductPostingGroup(NoVATPostingGroup(), MiscDescriptionLbl, CreateVATPostingGroupAT.NOVAT());
19-
UpdateGenProdPostingGrp(CreatePostingGroup.FreightPostingGroup(), CreateVATPostingGroupAT.VAT20());
20-
UpdateGenProdPostingGrp(CreatePostingGroup.RawMatPostingGroup(), CreateVATPostingGroupAT.VAT20());
21-
UpdateGenProdPostingGrp(CreatePostingGroup.RetailPostingGroup(), CreateVATPostingGroupAT.VAT20());
22-
UpdateGenProdPostingGrp(CreatePostingGroup.MiscPostingGroup(), CreateVATPostingGroupAT.VAT20());
23-
UpdateGenProdPostingGrp(CreatePostingGroup.ServicesPostingGroup(), CreateVATPostingGroupAT.VAT10());
2418
ContosoPostingGroup.SetOverwriteData(false);
2519
end;
2620

27-
local procedure UpdateGenProdPostingGrp(ProdPostingGroup: COde[20]; DefaultVATProdPostingGroup: Code[20])
28-
var
29-
GenProdPostingGroup: Record "Gen. Product Posting Group";
30-
begin
31-
if GenProdPostingGroup.Get(ProdPostingGroup) then begin
32-
GenProdPostingGroup.Validate("Def. VAT Prod. Posting Group", DefaultVATProdPostingGroup);
33-
GenProdPostingGroup.Modify(true);
34-
end;
35-
end;
36-
3721
procedure UpdateGenPostingSetup()
3822
var
3923
ContosoGenPostingSetup: Codeunit "Contoso Posting Setup";

‎Apps/AT/ContosoCoffeeDemoDatasetAT/app/Demo Data/Finance/1. Setup Data/CreateVatPostingGroupAT.Codeunit.al

+21
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,27 @@ codeunit 11186 "Create VAT Posting Group AT"
6363
ContosoPostingGroup.InsertVATProductPostingGroup(VAT10(), StrSubstNo(MiscellaneousVATLbl, '10'));
6464
end;
6565

66+
procedure UpdateGeneralProdPostingGroup()
67+
var
68+
CreatePostingGroup: Codeunit "Create Posting Groups";
69+
begin
70+
UpdateGenProdPostingGrp(CreatePostingGroup.FreightPostingGroup(), VAT20());
71+
UpdateGenProdPostingGrp(CreatePostingGroup.RawMatPostingGroup(), VAT20());
72+
UpdateGenProdPostingGrp(CreatePostingGroup.RetailPostingGroup(), VAT20());
73+
UpdateGenProdPostingGrp(CreatePostingGroup.MiscPostingGroup(), VAT20());
74+
UpdateGenProdPostingGrp(CreatePostingGroup.ServicesPostingGroup(), VAT10());
75+
end;
76+
77+
local procedure UpdateGenProdPostingGrp(ProdPostingGroup: COde[20]; DefaultVATProdPostingGroup: Code[20])
78+
var
79+
GenProdPostingGroup: Record "Gen. Product Posting Group";
80+
begin
81+
if GenProdPostingGroup.Get(ProdPostingGroup) then begin
82+
GenProdPostingGroup.Validate("Def. VAT Prod. Posting Group", DefaultVATProdPostingGroup);
83+
GenProdPostingGroup.Modify(true);
84+
end;
85+
end;
86+
6687
procedure NOVAT(): Code[20]
6788
begin
6889
exit(NoVATTok);

‎Apps/AT/ContosoCoffeeDemoDatasetAT/app/Demo Data/Finance/2. Master Data/CreateVatStatementNameAT.Codeunit.al

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
codeunit 11189 "Create VAT Statement NameAT"
1+
codeunit 11189 "Create VAT Statement Name AT"
22
{
33
InherentEntitlements = X;
44
InherentPermissions = X;
55

66
trigger OnRun()
77
var
88
CreateVATStatement: Codeunit "Create VAT Statement";
9-
ContosoVatStatmentES: Codeunit "Contoso Vat Statment ES";
9+
ContosoVATStatement: Codeunit "Contoso VAT Statement";
1010
begin
11-
ContosoVatStatmentES.InsertVATStatementName(CreateVATStatement.VATTemplateName(), StatementUstvaLbl, VATStatementGermanyDescLbl);
11+
ContosoVATStatement.InsertVATStatementName(CreateVATStatement.VATTemplateName(), StatementUstvaLbl, VATStatementGermanyDescLbl);
1212
end;
1313

1414
var

‎Apps/AT/ContosoCoffeeDemoDatasetAT/app/Demo Data/Foundation/1. Setup Data/CreatePostCodeAT.Codeunit.al

-8
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,6 @@ codeunit 11145 "Create Post Code AT"
33
InherentEntitlements = X;
44
InherentPermissions = X;
55

6-
// TODO: MS
7-
// Discuss it
8-
// Maybe a service provide a better list of post codes?
9-
// This can be the same for now, then we convert to a list later.
10-
11-
// Keep as it is for now
12-
// Wael
13-
146
trigger OnRun()
157
var
168
ContosoPostCodeDK: Codeunit "Contoso Post Code AT";

‎Apps/AT/ContosoCoffeeDemoDatasetAT/app/Demo Tool/Contoso Helpers/ContosoVatStatmentES.Codeunit.al

-37
This file was deleted.

‎Apps/AT/ContosoCoffeeDemoDatasetAT/app/Demo Tool/ContosoATLocalization.Codeunit.al

+12-6
Original file line numberDiff line numberDiff line change
@@ -40,37 +40,41 @@ codeunit 11157 "Contoso AT Localization"
4040
case ContosoDemoDataLevel of
4141
Enum::"Contoso Demo Data Level"::"Setup Data":
4242
begin
43-
Codeunit.Run(Codeunit::"Create Company Information AT");
4443
Codeunit.Run(Codeunit::"Create No. Series AT");
4544
Codeunit.Run(Codeunit::"Create Post Code AT");
4645
end;
46+
Enum::"Contoso Demo Data Level"::"Master Data":
47+
Codeunit.Run(Codeunit::"Create Company Information AT");
4748
end;
4849
end;
4950

5051
local procedure FinanceModule(ContosoDemoDataLevel: Enum "Contoso Demo Data Level")
5152
var
5253
CreateVatPostingGroupAT: Codeunit "Create VAT Posting Group AT";
5354
CreatePostingGroupsAT: Codeunit "Create Posting Groups AT";
55+
CreateATGLAccount: Codeunit "Create AT GL Account";
5456
begin
5557
case ContosoDemoDataLevel of
5658
Enum::"Contoso Demo Data Level"::"Setup Data":
5759
begin
5860
Codeunit.Run(Codeunit::"Create AT GL Account");
5961
CreateVatPostingGroupAT.CreateVATPostingSetup();
62+
CreateVatPostingGroupAT.UpdateGeneralProdPostingGroup();
63+
CreateATGLAccount.UpdateVATProdPostGrpInGLAccounts();
6064
CreatePostingGroupsAT.UpdateGenPostingSetup();
6165
Codeunit.Run(Codeunit::"Create Currency AT");
6266
Codeunit.Run(Codeunit::"Create General Ledger Setup AT");
6367
Codeunit.Run(Codeunit::"Create Vat Report Setup AT");
6468
Codeunit.Run(Codeunit::"Create Vat Setup Post Grp AT");
69+
Codeunit.Run(Codeunit::"Create VAT Statement Name AT");
70+
Codeunit.Run(Codeunit::"Create VAT Statement Line AT");
6571
end;
6672

6773
Enum::"Contoso Demo Data Level"::"Master Data":
6874
begin
6975
Codeunit.Run(Codeunit::"Create Currency Ex. Rate AT");
7076
Codeunit.Run(Codeunit::"Create Resource AT");
7177
Codeunit.Run(Codeunit::"Create VAT Template AT");
72-
Codeunit.Run(Codeunit::"Create VAT Statement NameAT");
73-
Codeunit.Run(Codeunit::"Create VAT Statement Line AT");
7478
end;
7579
end;
7680
end;
@@ -103,7 +107,7 @@ codeunit 11157 "Contoso AT Localization"
103107
end;
104108

105109
[EventSubscriber(ObjectType::Codeunit, Codeunit::"Contoso Demo Tool", 'OnBeforeGeneratingDemoData', '', false, false)]
106-
local procedure OnBeforeGeneratingDemoData(Module: Enum "Contoso Demo Data Module")
110+
local procedure OnBeforeGeneratingDemoData(Module: Enum "Contoso Demo Data Module"; ContosoDemoDataLevel: Enum "Contoso Demo Data Level")
107111
var
108112
CreateResourceAT: Codeunit "Create Resource AT";
109113
CreateCurrencyExcRate: Codeunit "Create Currency Ex. Rate AT";
@@ -134,8 +138,10 @@ codeunit 11157 "Contoso AT Localization"
134138
BindSubscription(CreatePaymentTermAT);
135139
Enum::"Contoso Demo Data Module"::Finance:
136140
begin
137-
Codeunit.Run(Codeunit::"Create VAT Posting Group AT");
138-
Codeunit.Run(Codeunit::"Create Posting Groups AT");
141+
if ContosoDemoDataLevel = Enum::"Contoso Demo Data Level"::"Setup Data" then begin
142+
Codeunit.Run(Codeunit::"Create VAT Posting Group AT");
143+
Codeunit.Run(Codeunit::"Create Posting Groups AT");
144+
end;
139145
BindSubscription(CreateResourceAT);
140146
BindSubscription(CreateCurrencyExcRate);
141147
BindSubscription(CreateAccScheduleLineAT);

‎Apps/AU/ContosoCoffeeDemoDatasetAU/app/DemoData/Finance/1.Setup Data/CreateAUAccScheduleLine.Codeunit.al

-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ codeunit 17156 "Create AU Acc. Schedule Line"
55
InherentEntitlements = X;
66
InherentPermissions = X;
77

8-
// ToDo: Need to Check with MS Team why standard Schedule Name are commented in W1
9-
108
[EventSubscriber(ObjectType::Table, Database::"Acc. Schedule Line", 'OnBeforeInsertEvent', '', false, false)]
119
local procedure OnInsertRecord(var Rec: Record "Acc. Schedule Line")
1210
var

‎Apps/AU/ContosoCoffeeDemoDatasetAU/app/DemoData/Finance/1.Setup Data/CreateAUAccScheduleName.Codeunit.al

-55
This file was deleted.

0 commit comments

Comments
 (0)