Skip to content

[28.5] Backport PEPPOL onboarding and E-Document fixes #11049

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
Milica Đukić (djukicmilica) wants to merge 10 commits into
base: releases/28.5
Choose a base branch
from
Open

[28.5] Backport PEPPOL onboarding and E-Document fixes #11049

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3eaae0d
Read PEPPOL 3.0 Format from setup in E-Document bridge
May 8, 2026
f351171
Fix E-Document Demo Data to use new PEPPOL App codeunit
Apr 10, 2026
231070d
Set Customer E-Mail in EDocument test library
Jun 2, 2026
010bb9e
Force W1 PEPPOL 3.0 Service Format in EDoc Format Tests
Jun 2, 2026
7087858
Set contact e-mail in EDocument test library to avoid Sell-to confirm
Jun 4, 2026
9387364
Add DataClassification to PEPPOL 3.0 Setup fields 2 and 3
Jun 1, 2026
6f46132
Align PEPPOL dependency with 28.5 app version
Sep 4, 2026
c012198
Align Contoso dependency with 28.5 app version
Sep 4, 2026
1fcb821
Preserve legacy PEPPOL export events for W1 formats
Sep 4, 2026
af7971a
Revert "Preserve legacy PEPPOL export events for W1 formats"
Sep 4, 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
20 changes: 13 additions & 7 deletions src/Apps/W1/EDocument/App/src/DataExchange/EDocDataExchangeImpl.Codeunit.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,34 +26,40 @@ codeunit 6152 "E-Doc. Data Exchange Impl." implements "E-Document"
SalesCrMemoHeader: Record "Sales Cr.Memo Header";
ServiceInvoiceHeader: Record "Service Invoice Header";
ServiceCrMemoHeader: Record "Service Cr.Memo Header";
PEPPOLValidation: Codeunit "PEPPOL30 Sales Validation";
PEPPOLServiceValidation: Codeunit "PEPPOL30 Service Validation";
PeppolSetup: Record "PEPPOL 3.0 Setup";
SalesValidation: Interface "PEPPOL30 Validation";
ServiceValidation: Interface "PEPPOL30 Validation";
begin
PeppolSetup.GetSetup();
SalesValidation := PeppolSetup."PEPPOL 3.0 Sales Format";
ServiceValidation := PeppolSetup."PEPPOL 3.0 Service Format";

case SourceDocumentHeader.Number of
Database::"Sales Header":
begin
SourceDocumentHeader.SetTable(SalesHeader);
PEPPOLValidation.Run(SalesHeader);
SalesValidation.ValidateDocument(SalesHeader);
SalesValidation.ValidateDocumentLines(SalesHeader);
end;
Database::"Sales Invoice Header":
begin
SourceDocumentHeader.SetTable(SalesInvoiceHeader);
PEPPOLValidation.ValidatePostedDocument(SalesInvoiceHeader);
SalesValidation.ValidatePostedDocument(SalesInvoiceHeader);
end;
Database::"Sales Cr.Memo Header":
begin
SourceDocumentHeader.SetTable(SalesCrMemoHeader);
PEPPOLValidation.ValidatePostedDocument(SalesCrMemoHeader);
SalesValidation.ValidatePostedDocument(SalesCrMemoHeader);
end;
Database::"Service Invoice Header":
begin
SourceDocumentHeader.SetTable(ServiceInvoiceHeader);
PEPPOLServiceValidation.ValidatePostedDocument(ServiceInvoiceHeader);
ServiceValidation.ValidatePostedDocument(ServiceInvoiceHeader);
end;
Database::"Service Cr.Memo Header":
begin
SourceDocumentHeader.SetTable(ServiceCrMemoHeader);
PEPPOLServiceValidation.ValidatePostedDocument(ServiceCrMemoHeader);
ServiceValidation.ValidatePostedDocument(ServiceCrMemoHeader);
end;
end;
end;
Expand Down
59 changes: 41 additions & 18 deletions src/Apps/W1/EDocument/App/src/Format/EDocPEPPOLBIS30.Codeunit.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,35 +25,39 @@ codeunit 6165 "EDoc PEPPOL BIS 3.0" implements "E-Document"
ServiceCrMemoHeader: Record "Service Cr.Memo Header";
ReminderHeader: Record "Reminder Header";
FinChargeMemoHeader: Record "Finance Charge Memo Header";
PEPPOLValidation: Codeunit "PEPPOL30 Sales Validation";
PEPPOLServiceValidation: Codeunit "PEPPOL30 Service Validation";
EDocPEPPOLValidation: Codeunit "E-Doc. PEPPOL Validation";
SalesValidation: Interface "PEPPOL30 Validation";
ServiceValidation: Interface "PEPPOL30 Validation";
begin
SalesValidation := GetSalesFormat();
ServiceValidation := GetServiceFormat();

case SourceDocumentHeader.Number of
Database::"Sales Header":
begin
SourceDocumentHeader.SetTable(SalesHeader);
PEPPOLValidation.Run(SalesHeader);
SalesValidation.ValidateDocument(SalesHeader);
SalesValidation.ValidateDocumentLines(SalesHeader);
end;
Database::"Sales Invoice Header":
begin
SourceDocumentHeader.SetTable(SalesInvoiceHeader);
PEPPOLValidation.ValidatePostedDocument(SalesInvoiceHeader);
SalesValidation.ValidatePostedDocument(SalesInvoiceHeader);
end;
Database::"Sales Cr.Memo Header":
begin
SourceDocumentHeader.SetTable(SalesCrMemoHeader);
PEPPOLValidation.ValidatePostedDocument(SalesCrMemoHeader);
SalesValidation.ValidatePostedDocument(SalesCrMemoHeader);
end;
Database::"Service Invoice Header":
begin
SourceDocumentHeader.SetTable(ServiceInvoiceHeader);
PEPPOLServiceValidation.ValidatePostedDocument(ServiceInvoiceHeader);
ServiceValidation.ValidatePostedDocument(ServiceInvoiceHeader);
end;
Database::"Service Cr.Memo Header":
begin
SourceDocumentHeader.SetTable(ServiceCrMemoHeader);
PEPPOLServiceValidation.ValidatePostedDocument(ServiceCrMemoHeader);
ServiceValidation.ValidatePostedDocument(ServiceCrMemoHeader);
end;
Database::"Reminder Header":
begin
Expand All @@ -68,7 +72,8 @@ codeunit 6165 "EDoc PEPPOL BIS 3.0" implements "E-Document"
Database::"Service Header":
begin
SourceDocumentHeader.SetTable(ServiceHeader);
PEPPOLServiceValidation.Run(ServiceHeader);
ServiceValidation.ValidateDocument(ServiceHeader);
ServiceValidation.ValidateDocumentLines(ServiceHeader);
end;
end;
end;
Expand All @@ -80,10 +85,14 @@ codeunit 6165 "EDoc PEPPOL BIS 3.0" implements "E-Document"
begin
TempBlob.CreateOutStream(DocOutStream);
case EDocument."Document Type" of
EDocument."Document Type"::"Sales Invoice", EDocument."Document Type"::"Service Invoice":
GenerateInvoiceXMLFile(SourceDocumentHeader, DocOutStream, EDocumentService."Embed PDF in export");
EDocument."Document Type"::"Sales Credit Memo", EDocument."Document Type"::"Service Credit Memo":
GenerateCrMemoXMLFile(SourceDocumentHeader, DocOutStream, EDocumentService."Embed PDF in export");
EDocument."Document Type"::"Sales Invoice":
GenerateInvoiceXMLFile(SourceDocumentHeader, DocOutStream, EDocumentService."Embed PDF in export", GetSalesFormat());
EDocument."Document Type"::"Service Invoice":
GenerateInvoiceXMLFile(SourceDocumentHeader, DocOutStream, EDocumentService."Embed PDF in export", GetServiceFormat());
EDocument."Document Type"::"Sales Credit Memo":
GenerateCrMemoXMLFile(SourceDocumentHeader, DocOutStream, EDocumentService."Embed PDF in export", GetSalesFormat());
EDocument."Document Type"::"Service Credit Memo":
GenerateCrMemoXMLFile(SourceDocumentHeader, DocOutStream, EDocumentService."Embed PDF in export", GetServiceFormat());
EDocument."Document Type"::"Issued Reminder", EDocument."Document Type"::"Issued Finance Charge Memo":
GenerateFinancialResultsXMLFile(SourceDocumentHeader, DocOutStream);
EDocument."Document Type"::"Sales Shipment":
Expand Down Expand Up @@ -119,28 +128,42 @@ codeunit 6165 "EDoc PEPPOL BIS 3.0" implements "E-Document"
CreatedDocumentLines.GetTable(TempPurchaseLine);
end;

local procedure GenerateInvoiceXMLFile(VariantRec: Variant; var OutStr: OutStream; GeneratePDF: Boolean)
local procedure GenerateInvoiceXMLFile(VariantRec: Variant; var OutStr: OutStream; GeneratePDF: Boolean; PEPPOLFormat: Enum "PEPPOL 3.0 Format")
var
SalesInvoicePEPPOL30: XMLport "Sales Invoice - PEPPOL30";
PEPPOLFormat: Enum "PEPPOL 3.0 Format";
begin
SalesInvoicePEPPOL30.Initialize(VariantRec, PEPPOLFormat::"PEPPOL 3.0 - Sales");
SalesInvoicePEPPOL30.Initialize(VariantRec, PEPPOLFormat);
SalesInvoicePEPPOL30.SetGeneratePDF(GeneratePDF);
SalesInvoicePEPPOL30.SetDestination(OutStr);
SalesInvoicePEPPOL30.Export();
end;

local procedure GenerateCrMemoXMLFile(VariantRec: Variant; var OutStr: OutStream; GeneratePDF: Boolean)
local procedure GenerateCrMemoXMLFile(VariantRec: Variant; var OutStr: OutStream; GeneratePDF: Boolean; PEPPOLFormat: Enum "PEPPOL 3.0 Format")
var
SalesCrMemoPEPPOL30: XMLport "Sales Cr.Memo - PEPPOL30";
PEPPOLFormat: Enum "PEPPOL 3.0 Format";
begin
SalesCrMemoPEPPOL30.Initialize(VariantRec, PEPPOLFormat::"PEPPOL 3.0 - Sales");
SalesCrMemoPEPPOL30.Initialize(VariantRec, PEPPOLFormat);
SalesCrMemoPEPPOL30.SetGeneratePDF(GeneratePDF);
SalesCrMemoPEPPOL30.SetDestination(OutStr);
SalesCrMemoPEPPOL30.Export();
end;

local procedure GetSalesFormat(): Enum "PEPPOL 3.0 Format"
var
PeppolSetup: Record "PEPPOL 3.0 Setup";
begin
PeppolSetup.GetSetup();
exit(PeppolSetup."PEPPOL 3.0 Sales Format");
end;

local procedure GetServiceFormat(): Enum "PEPPOL 3.0 Format"
var
PeppolSetup: Record "PEPPOL 3.0 Setup";
begin
PeppolSetup.GetSetup();
exit(PeppolSetup."PEPPOL 3.0 Service Format");
end;

local procedure GenerateFinancialResultsXMLFile(VariantRec: Variant; var OutStr: OutStream)
var
FinResultsPEPPOLBIS30: XMLport "Fin. Results - PEPPOL BIS 3.0";
Expand Down
16 changes: 8 additions & 8 deletions src/Apps/W1/EDocument/Demo Data/3.Transactions/CreateEDocumentTransactions.Codeunit.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ using Microsoft.Purchases.Posting;
using Microsoft.Purchases.Vendor;
using Microsoft.Sales.Document;
using Microsoft.Sales.History;
using Microsoft.Sales.Peppol;
using Microsoft.Peppol;
using Microsoft.Sales.Setup;
using System.IO;
using System.Utilities;
Expand Down Expand Up @@ -142,7 +142,7 @@ codeunit 5376 "Create E-Document Transactions"
SalesSetup: Record "Sales & Receivables Setup";
ContosoCustomer: Codeunit "Create Common Customer/Vendor";
CreateEDocTransactions: Codeunit "Create E-Document Transactions";
ExportSalesInv: Codeunit "Exp. Sales Inv. PEPPOL BIS3.0";
ExportSalesInv: Codeunit "Exp. Sales Inv. PEPPOL30";
TempBlob: Codeunit "Temp Blob";
TempBlobList: Codeunit "Temp Blob List";
OutStr: OutStream;
Expand Down Expand Up @@ -170,7 +170,7 @@ codeunit 5376 "Create E-Document Transactions"
CorrectSalesInvHeader(SalesInvHeader);

TempBlob.CreateOutStream(OutStr);
ExportSalesInv.GenerateXMLFile(SalesInvHeader, OutStr);
ExportSalesInv.GenerateXMLFile(SalesInvHeader, OutStr, "PEPPOL 3.0 Format"::"PEPPOL 3.0 - Sales");
TempBlobList.Add(TempBlob);
SalesInvHeader.Delete(true);
SalesHeader.Delete();
Expand Down Expand Up @@ -200,7 +200,7 @@ codeunit 5376 "Create E-Document Transactions"

Clear(TempBlob);
TempBlob.CreateOutStream(OutStr);
ExportSalesInv.GenerateXMLFile(SalesInvHeader, OutStr);
ExportSalesInv.GenerateXMLFile(SalesInvHeader, OutStr, "PEPPOL 3.0 Format"::"PEPPOL 3.0 - Sales");
TempBlobList.Add(TempBlob);
SalesInvHeader.Delete(true);
SalesHeader.Delete();
Expand All @@ -220,7 +220,7 @@ codeunit 5376 "Create E-Document Transactions"

Clear(TempBlob);
TempBlob.CreateOutStream(OutStr);
ExportSalesInv.GenerateXMLFile(SalesInvHeader, OutStr);
ExportSalesInv.GenerateXMLFile(SalesInvHeader, OutStr, "PEPPOL 3.0 Format"::"PEPPOL 3.0 - Sales");
TempBlobList.Add(TempBlob);
SalesInvHeader.Delete(true);
SalesHeader.Delete();
Expand All @@ -245,7 +245,7 @@ codeunit 5376 "Create E-Document Transactions"

Clear(TempBlob);
TempBlob.CreateOutStream(OutStr);
ExportSalesInv.GenerateXMLFile(SalesInvHeader, OutStr);
ExportSalesInv.GenerateXMLFile(SalesInvHeader, OutStr, "PEPPOL 3.0 Format"::"PEPPOL 3.0 - Sales");
TempBlobList.Add(TempBlob);
SalesInvHeader.Delete(true);
SalesHeader.Delete();
Expand All @@ -268,7 +268,7 @@ codeunit 5376 "Create E-Document Transactions"

Clear(TempBlob);
TempBlob.CreateOutStream(OutStr);
ExportSalesInv.GenerateXMLFile(SalesInvHeader, OutStr);
ExportSalesInv.GenerateXMLFile(SalesInvHeader, OutStr, "PEPPOL 3.0 Format"::"PEPPOL 3.0 - Sales");
TempBlobList.Add(TempBlob);
SalesInvHeader.Delete(true);
SalesHeader.Delete();
Expand All @@ -288,7 +288,7 @@ codeunit 5376 "Create E-Document Transactions"

Clear(TempBlob);
TempBlob.CreateOutStream(OutStr);
ExportSalesInv.GenerateXMLFile(SalesInvHeader, OutStr);
ExportSalesInv.GenerateXMLFile(SalesInvHeader, OutStr, "PEPPOL 3.0 Format"::"PEPPOL 3.0 - Sales");
TempBlobList.Add(TempBlob);
SalesInvHeader.Delete(true);
SalesHeader.Delete();
Expand Down
6 changes: 6 additions & 0 deletions src/Apps/W1/EDocument/Demo Data/app.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,12 @@
"name": "Contoso Coffee Demo Dataset",
"publisher": "Microsoft",
"version": "28.5.0.0"
},
{
"id": "e1966889-b5fb-4fda-a84c-ea71b590e1a9",
"name": "PEPPOL",
"publisher": "Microsoft",
"version": "28.5.0.0"
}
],
"internalsVisibleTo": [
Expand Down
15 changes: 15 additions & 0 deletions src/Apps/W1/EDocument/Test/src/LibraryEDocument.Codeunit.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ codeunit 139629 "Library - E-Document"
CountryRegion: Record "Country/Region";
DocumentSendingProfile: Record "Document Sending Profile";
SalesSetup: Record "Sales & Receivables Setup";
Contact: Record Contact;
ContactBusinessRelation: Record "Contact Business Relation";
WorkflowSetup: Codeunit "Workflow Setup";
WorkflowCode: Code[20];
begin
Expand All @@ -92,9 +94,22 @@ codeunit 139629 "Library - E-Document"
Customer.Validate("VAT Bus. Posting Group", VATPostingSetup."VAT Bus. Posting Group");
Customer."VAT Registration No." := LibraryERM.GenerateVATRegistrationNo(CountryRegion.Code);
Customer.Validate(GLN, '1234567890128');
Customer.Validate("E-Mail", 'edoc-test@contoso.com');
Customer."Document Sending Profile" := DocumentSendingProfile.Code;
Customer.Modify(true);

// Set the same e-mail on the customer's contact. Validating the sell-to customer on a sales
// document copies the customer e-mail to "Sell-to E-Mail"; if the linked contact has no
// e-mail (e.g. via the OIOUBL "Sell-to Customer No." validation on NAV_DK) base app raises
// the "contact has no e-mail address" confirm, which fails these tests as Unhandled UI.
ContactBusinessRelation.SetRange("Link to Table", ContactBusinessRelation."Link to Table"::Customer);
ContactBusinessRelation.SetRange("No.", Customer."No.");
if ContactBusinessRelation.FindFirst() then
if Contact.Get(ContactBusinessRelation."Contact No.") then begin
Contact."E-Mail" := 'edoc-test@contoso.com';
Contact.Modify();
end;

// Create Item
if StandardItem."No." = '' then begin
VATPostingSetup.TestField("VAT Prod. Posting Group");
Expand Down
8 changes: 8 additions & 0 deletions src/Apps/W1/EDocument/Test/src/Processing/EDocFormatTests.Codeunit.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ using Microsoft.Finance.VAT.Setup;
using Microsoft.Foundation.Address;
using Microsoft.Foundation.Company;
using Microsoft.Foundation.Reporting;
using Microsoft.Peppol;
using Microsoft.Inventory.Item;
using Microsoft.Purchases.History;
using Microsoft.Purchases.Payables;
Expand Down Expand Up @@ -51,13 +52,20 @@ codeunit 139519 "E-Doc. Format Tests"
DocumentSendingProfile: Record "Document Sending Profile";
ServiceHeader: Record "Service Header";
ServiceMngmtSetup: Record "Service Mgt. Setup";
Peppol30Setup: Record "PEPPOL 3.0 Setup";
LibraryERMCountryData: Codeunit "Library - ERM Country Data";
ExpectedErr: Text;
WorkflowCode: Code[20];
begin
// [SCENARIO 608765] E-Documents: Check 'Your reference' not available in service documents in Belgian localisation
Initialize(Enum::"Service Integration"::Mock);

// Force the W1 PEPPOL 3.0 service validation impl so that country-specific overrides (e.g. DE,
// which omits the Your Reference check) do not change the asserted W1 behavior.
Peppol30Setup.GetSetup();
Peppol30Setup."PEPPOL 3.0 Service Format" := Peppol30Setup."PEPPOL 3.0 Service Format"::"PEPPOL 3.0 - Service";
Peppol30Setup.Modify();

// [WHEN] Team member create invoice and update company information.
UpdateCompanyInformation();
LibraryLowerPermission.SetTeamMember();
Expand Down
2 changes: 2 additions & 0 deletions src/Apps/W1/PEPPOL/App/src/Setup/PEPPOL30Setup.Table.al
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,13 @@ table 37202 "PEPPOL 3.0 Setup"
{
Caption = 'PEPPOL 3.0 Sales Format';
ToolTip = 'Specifies the PEPPOL 3.0 format to be used for electronic documents of type sales.';
DataClassification = SystemMetadata;
}
field(3; "PEPPOL 3.0 Service Format"; Enum "PEPPOL 3.0 Format")
{
Caption = 'PEPPOL 3.0 Service Format';
ToolTip = 'Specifies the PEPPOL 3.0 format to be used for electronic documents of type service.';
DataClassification = SystemMetadata;
}
}

Expand Down
Loading