Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/AL-Go-Settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"runs-on": "windows-latest",
"cacheImageName": "",
"UsePsSession": false,
"artifact": "https://bcinsider-fvh2ekdjecfjd6gk.b02.azurefd.net/sandbox/28.0.44491.0/base",
"artifact": "https://bcinsider-fvh2ekdjecfjd6gk.b02.azurefd.net/sandbox/28.0.45539.0/base",
"country": "base",
"useProjectDependencies": true,
"repoVersion": "28.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<Direction />
</TransformationRules>
</DataExchFieldMapping>
<DataExchFieldMapping ColumnNo="2" FieldID="6" Optional="true" />
<DataExchFieldMapping ColumnNo="2" FieldID="101" Optional="true" />
<DataExchFieldMapping ColumnNo="3" FieldID="7" Optional="true" />
<DataExchFieldMapping ColumnNo="4" FieldID="24" Optional="true" />
<DataExchFieldMapping ColumnNo="5" FieldID="8" Optional="true" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -153,10 +153,7 @@ codeunit 17131 "AU Contoso Localization"
Codeunit.Run(Codeunit::"Create VAT Setup Post.Grp. AU");
end;
Enum::"Contoso Demo Data Level"::"Master Data":
begin
Codeunit.Run(Codeunit::"Create Currency Ex. Rate AU");
Codeunit.Run(Codeunit::"Create Allocation Account AU");
end;
Codeunit.Run(Codeunit::"Create Currency Ex. Rate AU");
end;
end;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#if not CLEAN28
// ------------------------------------------------------------------------------------------------
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License. See License.txt in the project root for license information.
Expand All @@ -12,6 +13,9 @@ codeunit 17180 "Create Allocation Account AU"
{
InherentEntitlements = X;
InherentPermissions = X;
ObsoleteState = Pending;
ObsoleteReason = 'Replaced by Create Allocation Account Codeunit in ContosoCoffeeDemoDataset';
ObsoleteTag = '28.0';

trigger OnRun()
var
Expand Down Expand Up @@ -45,4 +49,5 @@ codeunit 17180 "Create Allocation Account AU"
var
LicensesTok: Label 'LICENSES', MaxLength = 20;
YearlyLicenseFeeTok: Label 'Yearly license fee', MaxLength = 100;
}
}
#endif
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ codeunit 17213 "Create Demo EDocs AU"

procedure GetShipmentDHLInvoiceDescription(): Text[100]
var
ShipmentDHLLbl: Label 'Shipment, DHL', MaxLength = 100;
ShipmentDHLLbl: Label 'Shipment', MaxLength = 100;
begin
exit(ShipmentDHLLbl);
end;
Expand All @@ -40,7 +40,7 @@ codeunit 17213 "Create Demo EDocs AU"
CreateCommonUnitOfMeasure: Codeunit "Create Common Unit Of Measure";
CreateEDocumentMasterData: Codeunit "Create E-Document Master Data";
CreateJobItem: Codeunit "Create Job Item";
CreateAllocationAccountAU: Codeunit "Create Allocation Account AU";
CreateAllocationAccount: Codeunit "Create Allocation Account";
CreateDeferralTemplate: Codeunit "Create Deferral Template";
CreateGLAccount: Codeunit "Create G/L Account";
EDocSamplePurchaseInvoice: Codeunit "E-Doc Sample Purchase Invoice";
Expand All @@ -49,44 +49,48 @@ codeunit 17213 "Create Demo EDocs AU"
ITServicesMarchLbl: Label 'IT Services Support period: March', MaxLength = 100;
ITServicesAprilLbl: Label 'IT Services Support period: April', MaxLength = 100;
ITServicesMayLbl: Label 'IT Services Support period: May', MaxLength = 100;
SavedWorkDate, SampleInvoiceDate : Date;
begin
ContosoInboundEDocument.AddEDocPurchaseHeader(CreateVendor.EUGraphicDesign(), EDocSamplePurchaseInvoice.GetSampleInvoicePostingDate(), '245');
SavedWorkDate := WorkDate();
SampleInvoiceDate := EDocSamplePurchaseInvoice.GetSampleInvoicePostingDate();
WorkDate(SampleInvoiceDate);
ContosoInboundEDocument.AddEDocPurchaseHeader(CreateVendor.EUGraphicDesign(), SampleInvoiceDate, '245');
ContosoInboundEDocument.AddEDocPurchaseLine(
Enum::"Purchase Line Type"::"Allocation Account", CreateAllocationAccountAU.Licenses(), '',
Enum::"Purchase Line Type"::"Allocation Account", CreateAllocationAccount.Licenses(), '',
6, 500, CreateDeferralTemplate.DeferralCode1Y(), '');
ContosoInboundEDocument.Generate();

ContosoInboundEDocument.AddEDocPurchaseHeader(CreateVendor.DomesticFirstUp(), EDocSamplePurchaseInvoice.GetSampleInvoicePostingDate(), '1419');
ContosoInboundEDocument.AddEDocPurchaseHeader(CreateVendor.DomesticFirstUp(), SampleInvoiceDate, '1419');
ContosoInboundEDocument.AddEDocPurchaseLine(
Enum::"Purchase Line Type"::"G/L Account", CreateGLAccount.ConsultantServices(),
ITServicesJanuaryLbl, 6, 200, '', CreateCommonUnitOfMeasure.Hour());
ContosoInboundEDocument.Generate();

ContosoInboundEDocument.AddEDocPurchaseHeader(CreateVendor.DomesticFirstUp(), EDocSamplePurchaseInvoice.GetSampleInvoicePostingDate(), '1425');
ContosoInboundEDocument.AddEDocPurchaseHeader(CreateVendor.DomesticFirstUp(), SampleInvoiceDate, '1425');
ContosoInboundEDocument.AddEDocPurchaseLine(
Enum::"Purchase Line Type"::"G/L Account", CreateGLAccount.ConsultantServices(),
ITServicesFebruaryLbl, 19, 200, '', CreateCommonUnitOfMeasure.Hour());
ContosoInboundEDocument.Generate();

ContosoInboundEDocument.AddEDocPurchaseHeader(CreateVendor.DomesticFirstUp(), EDocSamplePurchaseInvoice.GetSampleInvoicePostingDate(), '1437');
ContosoInboundEDocument.AddEDocPurchaseHeader(CreateVendor.DomesticFirstUp(), SampleInvoiceDate, '1437');
ContosoInboundEDocument.AddEDocPurchaseLine(
Enum::"Purchase Line Type"::"G/L Account", CreateGLAccount.ConsultantServices(),
ITServicesMarchLbl, 2, 200, '', CreateCommonUnitOfMeasure.Hour());
ContosoInboundEDocument.Generate();

ContosoInboundEDocument.AddEDocPurchaseHeader(CreateVendor.DomesticFirstUp(), EDocSamplePurchaseInvoice.GetSampleInvoicePostingDate(), '1456');
ContosoInboundEDocument.AddEDocPurchaseHeader(CreateVendor.DomesticFirstUp(), SampleInvoiceDate, '1456');
ContosoInboundEDocument.AddEDocPurchaseLine(
Enum::"Purchase Line Type"::"G/L Account", CreateGLAccount.ConsultantServices(),
ITServicesAprilLbl, 7, 200, '', CreateCommonUnitOfMeasure.Hour());
ContosoInboundEDocument.Generate();

ContosoInboundEDocument.AddEDocPurchaseHeader(CreateVendor.DomesticFirstUp(), EDocSamplePurchaseInvoice.GetSampleInvoicePostingDate(), '1479');
ContosoInboundEDocument.AddEDocPurchaseHeader(CreateVendor.DomesticFirstUp(), SampleInvoiceDate, '1479');
ContosoInboundEDocument.AddEDocPurchaseLine(
Enum::"Purchase Line Type"::"G/L Account", CreateGLAccount.ConsultantServices(),
ITServicesMayLbl, 16, 200, '', CreateCommonUnitOfMeasure.Hour());
ContosoInboundEDocument.Generate();

ContosoInboundEDocument.AddEDocPurchaseHeader(CreateVendor.ExportFabrikam(), EDocSamplePurchaseInvoice.GetSampleInvoicePostingDate(), 'F12938');
ContosoInboundEDocument.AddEDocPurchaseHeader(CreateVendor.ExportFabrikam(), SampleInvoiceDate, 'F12938');
ContosoInboundEDocument.AddEDocPurchaseLine(
Enum::"Purchase Line Type"::Item, CreateEDocumentMasterData.WholeDecafBeansColombia(),
'', 50, 5, '', CreateCommonUnitOfMeasure.Piece());
Expand All @@ -98,14 +102,15 @@ codeunit 17213 "Create Demo EDocs AU"
GetShipmentDHLInvoiceDescription(), 1, 60, '', '');
ContosoInboundEDocument.Generate();

ContosoInboundEDocument.AddEDocPurchaseHeader(CreateVendor.DomesticWorldImporter(), EDocSamplePurchaseInvoice.GetSampleInvoicePostingDate(), '000982');
ContosoInboundEDocument.AddEDocPurchaseHeader(CreateVendor.DomesticWorldImporter(), SampleInvoiceDate, '000982');
ContosoInboundEDocument.AddEDocPurchaseLine(
Enum::"Purchase Line Type"::Item, CreateEDocumentMasterData.SmartGrindHome(),
'', 100, 299, '', CreateCommonUnitOfMeasure.Piece());
ContosoInboundEDocument.AddEDocPurchaseLine(
Enum::"Purchase Line Type"::Item, CreateEDocumentMasterData.PrecisionGrindHome(),
'', 50, 199, '', CreateCommonUnitOfMeasure.Piece());
ContosoInboundEDocument.Generate();
WorkDate(SavedWorkDate);
end;

}
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ codeunit 17214 "Create E-Doc Sample Inv. AU"
CreateJobItem: Codeunit "Create Job Item";
CreateCommonUnitOfMeasure: Codeunit "Create Common Unit Of Measure";
CreateDemoEDocsAU: Codeunit "Create Demo EDocs AU";
CreateAllocationAccountAU: Codeunit "Create Allocation Account AU";
CreateAllocationAccount: Codeunit "Create Allocation Account";

trigger OnRun()
var
Expand All @@ -51,7 +51,7 @@ codeunit 17214 "Create E-Doc Sample Inv. AU"

EDocSamplePurchaseInvoice.AddInvoice(CreateVendor.EUGraphicDesign(), '108244', YearlyLicenstCostLbl);
EDocSamplePurchaseInvoice.AddLine(
Enum::"Purchase Line Type"::" ", '', CreateAllocationAccountAU.LicensesDescription(), 6, 500, '', CreateCommonUnitOfMeasure.Piece());
Enum::"Purchase Line Type"::" ", '', CreateAllocationAccount.LicensesDescription(), 6, 500, '', CreateCommonUnitOfMeasure.Piece());
EDocSamplePurchaseInvoice.Generate();
end;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
// ------------------------------------------------------------------------------------------------
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License. See License.txt in the project root for license information.
// ------------------------------------------------------------------------------------------------
namespace Microsoft.DemoData.Finance;

codeunit 11455 "Create Deferral Template BE"
{
Access = Internal;
InherentEntitlements = X;
InherentPermissions = X;

trigger OnRun()
var
FinanceModuleSetup: Record "Finance Module Setup";
CreateGLAccountBE: Codeunit "Create GL Account BE";
begin
FinanceModuleSetup.Get();
FinanceModuleSetup."Deferral Account No." := CreateGLAccountBE.Transfers();
FinanceModuleSetup.Modify();
end;
}
Original file line number Diff line number Diff line change
Expand Up @@ -412,6 +412,8 @@ codeunit 11357 "Create GL Account BE"
UpdateGLAccountVatSetup(PostAccount(), '', '', false, 0);
UpdateGLAccountVatSetup(CreateGLAccount.Cash(), '', '', false, 0);
GLAccountIndent.Indent();

Codeunit.Run(Codeunit::"Create Deferral Template BE");
end;

local procedure UpdateGLAccountVatSetup(GLAccountNo: Code[20]; VATBusPostingGroup: Code[20]; VATProdPostingGroup: Code[20]; PrintDetails: Boolean; NonDeductibleVAT: Decimal)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,16 +69,20 @@ codeunit 11364 "Create Posting Group BE"
ContosoGenPostingSetup.InsertGeneralPostingSetup('', NoVATPostingGroup(), '', '', CreateBEGLAccount.InventAdjRetail(), CreateBEGLAccount.Goods(), '', '', '', '', '', '', CreateBEGLAccount.PurchaseCostsRetail(), CreateBEGLAccount.PurchaseCostsInterim(), CreateGLAccount.VATPayable());
ContosoGenPostingSetup.InsertGeneralPostingSetup('', CreatePostingGroup.RetailPostingGroup(), '', '', CreateBEGLAccount.InventAdjRetail(), CreateBEGLAccount.Goods(), '', '', '', '', '', '', CreateBEGLAccount.PurchaseCostsRetail(), CreateBEGLAccount.PurchaseCostsInterim(), CreateGLAccount.VATPayable());
ContosoGenPostingSetup.InsertGeneralPostingSetup('', CreatePostingGroup.ServicesPostingGroup(), '', '', CreateBEGLAccount.InventAdjRetail(), CreateBEGLAccount.Goods(), '', '', '', '', '', '', CreateBEGLAccount.PurchaseCostsRetail(), CreateBEGLAccount.PurchaseCostsInterim(), CreateGLAccount.VATPayable());
ContosoGenPostingSetup.InsertGeneralPostingSetup('', CreatePostingGroup.MiscPostingGroup(), '', '', CreateBEGLAccount.InventAdjRetail(), CreateBEGLAccount.Goods(), '', '', '', '', '', '', CreateBEGLAccount.PurchaseCostsRetail(), CreateBEGLAccount.PurchaseCostsInterim(), CreateGLAccount.VATPayable());

ContosoGenPostingSetup.InsertGeneralPostingSetup(CreatePostingGroup.DomesticPostingGroup(), NoVATPostingGroup(), CreateGLAccount.SalesRetailDom(), CreateBEGLAccount.PurchasesRetailDom(), CreateBEGLAccount.InventAdjRetail(), CreateBEGLAccount.Goods(), '', '', CreateBEGLAccount.PaymentDiscReceived(), CreateBEGLAccount.PaymentDiscReceived(), CreateGLAccount.DiscReceivedRetail(), CreateGLAccount.DiscReceivedRetail(), CreateBEGLAccount.PurchaseCostsRetail(), CreateBEGLAccount.PurchaseCostsInterim(), CreateGLAccount.VATPayable());
ContosoGenPostingSetup.InsertGeneralPostingSetup(CreatePostingGroup.DomesticPostingGroup(), CreatePostingGroup.RetailPostingGroup(), CreateGLAccount.SalesRetailDom(), CreateBEGLAccount.PurchasesRetailDom(), CreateBEGLAccount.InventAdjRetail(), CreateBEGLAccount.Goods(), '', '', CreateBEGLAccount.PaymentDiscReceived(), CreateBEGLAccount.PaymentDiscReceived(), CreateGLAccount.DiscReceivedRetail(), CreateGLAccount.DiscReceivedRetail(), CreateBEGLAccount.PurchaseCostsRetail(), CreateBEGLAccount.PurchaseCostsInterim(), CreateGLAccount.VATPayable());
ContosoGenPostingSetup.InsertGeneralPostingSetup(CreatePostingGroup.DomesticPostingGroup(), CreatePostingGroup.ServicesPostingGroup(), CreateGLAccount.SalesResourcesDom(), CreateBEGLAccount.PurchasesRetailDom(), CreateBEGLAccount.InventAdjRetail(), CreateBEGLAccount.Goods(), '', '', CreateBEGLAccount.PaymentDiscReceived(), CreateBEGLAccount.PaymentDiscReceived(), CreateGLAccount.DiscReceivedRetail(), CreateGLAccount.DiscReceivedRetail(), CreateBEGLAccount.InventAdjRetail(), CreateBEGLAccount.PurchaseCostsInterim(), CreateBEGLAccount.InventAdjRetailInt());
ContosoGenPostingSetup.InsertGeneralPostingSetup(CreatePostingGroup.DomesticPostingGroup(), CreatePostingGroup.MiscPostingGroup(), CreateGLAccount.SalesRetailDom(), CreateBEGLAccount.PurchasesRetailDom(), CreateBEGLAccount.InventAdjRetail(), CreateBEGLAccount.Goods(), '', '', CreateBEGLAccount.PaymentDiscReceived(), CreateBEGLAccount.PaymentDiscReceived(), CreateGLAccount.DiscReceivedRetail(), CreateGLAccount.DiscReceivedRetail(), CreateBEGLAccount.PurchaseCostsRetail(), CreateBEGLAccount.PurchaseCostsInterim(), CreateGLAccount.VATPayable());

ContosoGenPostingSetup.InsertGeneralPostingSetup(CreatePostingGroup.EUPostingGroup(), CreatePostingGroup.RetailPostingGroup(), CreateGLAccount.SalesRetailEU(), CreateBEGLAccount.PurchasesRetailEu(), CreateBEGLAccount.InventAdjRetail(), CreateBEGLAccount.Goods(), '', '', CreateBEGLAccount.PaymentDiscReceived(), CreateBEGLAccount.PaymentDiscReceived(), CreateGLAccount.DiscReceivedRetail(), CreateGLAccount.DiscReceivedRetail(), CreateBEGLAccount.PurchaseCostsRetail(), CreateBEGLAccount.PurchaseCostsInterim(), CreateGLAccount.VATPayable());
ContosoGenPostingSetup.InsertGeneralPostingSetup(CreatePostingGroup.EUPostingGroup(), CreatePostingGroup.MiscPostingGroup(), CreateGLAccount.SalesRetailEU(), CreateBEGLAccount.PurchasesRetailEu(), CreateBEGLAccount.InventAdjRetail(), CreateBEGLAccount.Goods(), '', '', CreateBEGLAccount.PaymentDiscReceived(), CreateBEGLAccount.PaymentDiscReceived(), CreateGLAccount.DiscReceivedRetail(), CreateGLAccount.DiscReceivedRetail(), CreateBEGLAccount.PurchaseCostsRetail(), CreateBEGLAccount.PurchaseCostsInterim(), CreateGLAccount.VATPayable());

ContosoGenPostingSetup.InsertGeneralPostingSetup(CreatePostingGroup.ExportPostingGroup(), NoVATPostingGroup(), CreateGLAccount.SalesRetailExport(), CreateBEGLAccount.PurchasesRetailExport(), CreateBEGLAccount.InventAdjRetail(), CreateBEGLAccount.Goods(), '', '', CreateBEGLAccount.PaymentDiscReceived(), CreateBEGLAccount.PaymentDiscReceived(), CreateGLAccount.DiscReceivedRetail(), CreateGLAccount.DiscReceivedRetail(), CreateBEGLAccount.PurchaseCostsRetail(), CreateBEGLAccount.PurchaseCostsInterim(), CreateGLAccount.VATPayable());
ContosoGenPostingSetup.InsertGeneralPostingSetup(CreatePostingGroup.ExportPostingGroup(), CreatePostingGroup.RetailPostingGroup(), CreateGLAccount.SalesRetailExport(), CreateBEGLAccount.PurchasesRetailExport(), CreateBEGLAccount.InventAdjRetail(), CreateBEGLAccount.Goods(), '', '', CreateBEGLAccount.PaymentDiscReceived(), CreateBEGLAccount.PaymentDiscReceived(), CreateGLAccount.DiscReceivedRetail(), CreateGLAccount.DiscReceivedRetail(), CreateBEGLAccount.PurchaseCostsRetail(), CreateBEGLAccount.PurchaseCostsInterim(), CreateGLAccount.VATPayable());
ContosoGenPostingSetup.InsertGeneralPostingSetup(CreatePostingGroup.ExportPostingGroup(), CreatePostingGroup.ServicesPostingGroup(), CreateGLAccount.SalesResourcesExport(), CreateBEGLAccount.PurchasesRetailExport(), CreateBEGLAccount.InventAdjRetail(), CreateBEGLAccount.Goods(), '', '', CreateBEGLAccount.PaymentDiscReceived(), CreateBEGLAccount.PaymentDiscReceived(), CreateGLAccount.DiscReceivedRetail(), CreateGLAccount.DiscReceivedRetail(), CreateBEGLAccount.InventAdjRetail(), CreateBEGLAccount.PurchaseCostsInterim(), CreateBEGLAccount.InventAdjRetailInt());
ContosoGenPostingSetup.InsertGeneralPostingSetup(CreatePostingGroup.ExportPostingGroup(), CreatePostingGroup.MiscPostingGroup(), CreateGLAccount.SalesRetailExport(), CreateBEGLAccount.PurchasesRetailExport(), CreateBEGLAccount.InventAdjRetail(), CreateBEGLAccount.Goods(), '', '', CreateBEGLAccount.PaymentDiscReceived(), CreateBEGLAccount.PaymentDiscReceived(), CreateGLAccount.DiscReceivedRetail(), CreateGLAccount.DiscReceivedRetail(), CreateBEGLAccount.PurchaseCostsRetail(), CreateBEGLAccount.PurchaseCostsInterim(), CreateGLAccount.VATPayable());
ContosoGenPostingSetup.SetOverwriteData(false);

UpdatePmtDiscAccounts(CreatePostingGroup.DomesticPostingGroup(), NoVATPostingGroup(), CreateGLAccount.SalesRetailDom(), CreateBEGLAccount.PurchasesRetailDom());
Expand Down
2 changes: 1 addition & 1 deletion Apps/BE/ContosoCoffeeDemoDatasetBE/app/app.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"idRanges": [
{
"from": 11345,
"to": 11450
"to": 11455
}
],
"resourceExposurePolicy": {
Expand Down
Loading
Loading