Skip to content

Commit 0faeaa1

Browse files
Magnus Hartvig Grønbechclaude
Magnus Hartvig Grønbech
and
claude
committed
Switch E-Document Core from obsoleted BaseApp PEPPOL objects to new PEPPOL App
Replace references to obsoleted BaseApp PEPPOL codeunits and xmlports (PEPPOL Validation, PEPPOL Service Validation, PEPPOL Management, Serv. PEPPOL Management, Sales Invoice - PEPPOL BIS 3.0, Sales Cr.Memo - PEPPOL BIS 3.0) with their new PEPPOL App equivalents (PEPPOL30 Sales Validation, PEPPOL30 Service Validation, PEPPOL30, Sales Invoice - PEPPOL30, Sales Cr.Memo - PEPPOL30). Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent afef6cd commit 0faeaa1

5 files changed

Lines changed: 50 additions & 42 deletions

File tree

‎src/Apps/W1/EDocument/App/app.json‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,14 @@
1111
"url": "https://go.microsoft.com/fwlink/?LinkId=724011",
1212
"logo": "ExtensionLogo.png",
1313
"contextSensitiveHelpUrl": "https://learn.microsoft.com/en-us/dynamics365/business-central/",
14-
"dependencies": [],
14+
"dependencies": [
15+
{
16+
"id": "e1966889-b5fb-4fda-a84c-ea71b590e1a9",
17+
"name": "PEPPOL",
18+
"publisher": "Microsoft",
19+
"version": "28.0.0.0"
20+
}
21+
],
1522
"internalsVisibleTo": [
1623
{
1724
"id": "e1d97edc-c239-46b4-8d84-6368bdf67c8c",

‎src/Apps/W1/EDocument/App/src/DataExchange/EDocDataExchangeImpl.Codeunit.al‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ using Microsoft.Foundation.Company;
1010
using Microsoft.Purchases.Document;
1111
using Microsoft.Sales.Document;
1212
using Microsoft.Sales.History;
13-
using Microsoft.Sales.Peppol;
13+
using Microsoft.Peppol;
1414
using Microsoft.Service.History;
1515
using System.IO;
1616
using System.Reflection;
@@ -27,8 +27,8 @@ codeunit 6152 "E-Doc. Data Exchange Impl." implements "E-Document"
2727
SalesCrMemoHeader: Record "Sales Cr.Memo Header";
2828
ServiceInvoiceHeader: Record "Service Invoice Header";
2929
ServiceCrMemoHeader: Record "Service Cr.Memo Header";
30-
PEPPOLValidation: Codeunit "PEPPOL Validation";
31-
PEPPOLServiceValidation: Codeunit "PEPPOL Service Validation";
30+
PEPPOLValidation: Codeunit "PEPPOL30 Sales Validation";
31+
PEPPOLServiceValidation: Codeunit "PEPPOL30 Service Validation";
3232
begin
3333
case SourceDocumentHeader.Number of
3434
Database::"Sales Header":
@@ -39,22 +39,22 @@ codeunit 6152 "E-Doc. Data Exchange Impl." implements "E-Document"
3939
Database::"Sales Invoice Header":
4040
begin
4141
SourceDocumentHeader.SetTable(SalesInvoiceHeader);
42-
PEPPOLValidation.CheckSalesInvoice(SalesInvoiceHeader);
42+
PEPPOLValidation.ValidatePostedDocument(SalesInvoiceHeader);
4343
end;
4444
Database::"Sales Cr.Memo Header":
4545
begin
4646
SourceDocumentHeader.SetTable(SalesCrMemoHeader);
47-
PEPPOLValidation.CheckSalesCreditMemo(SalesCrMemoHeader);
47+
PEPPOLValidation.ValidatePostedDocument(SalesCrMemoHeader);
4848
end;
4949
Database::"Service Invoice Header":
5050
begin
5151
SourceDocumentHeader.SetTable(ServiceInvoiceHeader);
52-
PEPPOLServiceValidation.CheckServiceInvoice(ServiceInvoiceHeader);
52+
PEPPOLServiceValidation.ValidatePostedDocument(ServiceInvoiceHeader);
5353
end;
5454
Database::"Service Cr.Memo Header":
5555
begin
5656
SourceDocumentHeader.SetTable(ServiceCrMemoHeader);
57-
PEPPOLServiceValidation.CheckServiceCreditMemo(ServiceCrMemoHeader);
57+
PEPPOLServiceValidation.ValidatePostedDocument(ServiceCrMemoHeader);
5858
end;
5959
end;
6060
end;

‎src/Apps/W1/EDocument/App/src/DataExchange/PEPPOL Data Exchange Definition/EDocDEDPEPPOLSubscribers.Codeunit.al‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ using Microsoft.Foundation.Attachment;
1212
using Microsoft.Sales.Customer;
1313
using Microsoft.Sales.Document;
1414
using Microsoft.Sales.History;
15-
using Microsoft.Sales.Peppol;
15+
using Microsoft.Peppol;
1616
using Microsoft.Service.History;
1717
using System.IO;
1818
using System.Utilities;
@@ -451,7 +451,7 @@ codeunit 6162 "E-Doc. DED PEPPOL Subscribers"
451451
OriginCountryIdCode,
452452
OriginCountryIdCodeListID);
453453

454-
PEPPOLMgt.GetLineItemClassfiedTaxCategoryBIS(
454+
PEPPOLMgt.GetLineItemClassifiedTaxCategoryBIS(
455455
SalesLine,
456456
ClassifiedTaxCategoryID,
457457
DummyVar,
@@ -631,7 +631,7 @@ codeunit 6162 "E-Doc. DED PEPPOL Subscribers"
631631
TempSalesLineRounding.TransferFields(SalesLine);
632632
TempSalesLineRounding.Insert();
633633
end else begin
634-
PEPPOLMgt.GetTotals(SalesLine, TempVATAmtLine);
634+
PEPPOLMgt.GetTaxTotals(SalesLine, TempVATAmtLine);
635635
PEPPOLMgt.GetTaxCategories(SalesLine, TempVATProductPostingGroup);
636636
end;
637637
until SalesInvoiceLine.Next() = 0;
@@ -650,12 +650,12 @@ codeunit 6162 "E-Doc. DED PEPPOL Subscribers"
650650
if ServiceInvoiceLine.FindSet() then
651651
repeat
652652
PEPPOLMgt.TransferLineToSalesLine(ServiceInvoiceLine, SalesLine);
653-
SalesLine.Type := ServPEPPOLMgt.MapServiceLineTypeToSalesLineType(ServiceInvoiceLine.Type);
653+
SalesLine.Type := PEPPOLMgt.MapServiceLineTypeToSalesLineType(ServiceInvoiceLine.Type);
654654
if IsRoundingLine(SalesLine) then begin
655655
TempSalesLineRounding.TransferFields(SalesLine);
656656
TempSalesLineRounding.Insert();
657657
end else begin
658-
PEPPOLMgt.GetTotals(SalesLine, TempVATAmtLine);
658+
PEPPOLMgt.GetTaxTotals(SalesLine, TempVATAmtLine);
659659
PEPPOLMgt.GetTaxCategories(SalesLine, TempVATProductPostingGroup);
660660
end;
661661
until ServiceInvoiceLine.Next() = 0;
@@ -678,7 +678,7 @@ codeunit 6162 "E-Doc. DED PEPPOL Subscribers"
678678
TempSalesLineRounding.TransferFields(SalesLine);
679679
TempSalesLineRounding.Insert();
680680
end else begin
681-
PEPPOLMgt.GetTotals(SalesLine, TempVATAmtLine);
681+
PEPPOLMgt.GetTaxTotals(SalesLine, TempVATAmtLine);
682682
PEPPOLMgt.GetTaxCategories(SalesLine, TempVATProductPostingGroup);
683683
end;
684684
until SalesCrMemoLine.Next() = 0;
@@ -697,12 +697,12 @@ codeunit 6162 "E-Doc. DED PEPPOL Subscribers"
697697
if ServiceCrMemoLine.FindSet() then
698698
repeat
699699
PEPPOLMgt.TransferLineToSalesLine(ServiceCrMemoLine, SalesLine);
700-
SalesLine.Type := ServPEPPOLMgt.MapServiceLineTypeToSalesLineType(ServiceCrMemoLine.Type);
700+
SalesLine.Type := PEPPOLMgt.MapServiceLineTypeToSalesLineType(ServiceCrMemoLine.Type);
701701
if IsRoundingLine(SalesLine) then begin
702702
TempSalesLineRounding.TransferFields(SalesLine);
703703
TempSalesLineRounding.Insert();
704704
end else begin
705-
PEPPOLMgt.GetTotals(SalesLine, TempVATAmtLine);
705+
PEPPOLMgt.GetTaxTotals(SalesLine, TempVATAmtLine);
706706
PEPPOLMgt.GetTaxCategories(SalesLine, TempVATProductPostingGroup);
707707
end;
708708
until ServiceCrMemoLine.Next() = 0;
@@ -738,7 +738,7 @@ codeunit 6162 "E-Doc. DED PEPPOL Subscribers"
738738
ServiceInvoiceLine.FindFirst();
739739

740740
PEPPOLMgt.TransferLineToSalesLine(ServiceInvoiceLine, SalesLine);
741-
SalesLine.Type := ServPEPPOLMgt.MapServiceLineTypeToSalesLineType(ServiceInvoiceLine.Type);
741+
SalesLine.Type := PEPPOLMgt.MapServiceLineTypeToSalesLineType(ServiceInvoiceLine.Type);
742742
end;
743743
ProcessedDocType::"Sales Credit Memo":
744744
begin
@@ -754,7 +754,7 @@ codeunit 6162 "E-Doc. DED PEPPOL Subscribers"
754754
ServiceCrMemoLine.FindFirst();
755755

756756
PEPPOLMgt.TransferLineToSalesLine(ServiceCrMemoLine, SalesLine);
757-
SalesLine.Type := ServPEPPOLMgt.MapServiceLineTypeToSalesLineType(ServiceCrMemoLine.Type);
757+
SalesLine.Type := PEPPOLMgt.MapServiceLineTypeToSalesLineType(ServiceCrMemoLine.Type);
758758
end;
759759
end;
760760
end;
@@ -801,8 +801,7 @@ codeunit 6162 "E-Doc. DED PEPPOL Subscribers"
801801
#pragma warning restore AL0432
802802
TempSalesLineRounding: Record "Sales Line" temporary;
803803
TempVATProductPostingGroup: Record "VAT Product Posting Group" temporary;
804-
PEPPOLMgt: Codeunit "PEPPOL Management";
805-
ServPEPPOLMgt: Codeunit "Serv. PEPPOL Management";
804+
PEPPOLMgt: Codeunit "PEPPOL30";
806805
ProcessedDocType: Enum "E-Document Type";
807806
DocumentAttachmentNumber, ProcessedDocTypeInt : Integer;
808807
AdditionalDocumentReferenceID, AdditionalDocRefDocumentType, URI, Filename, MimeCode, EmbeddedDocumentBinaryObject : Text;

‎src/Apps/W1/EDocument/App/src/Format/EDocPEPPOLBIS30.Codeunit.al‎

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ using Microsoft.Purchases.Document;
77
using Microsoft.Sales.Document;
88
using Microsoft.Sales.FinanceCharge;
99
using Microsoft.Sales.History;
10-
using Microsoft.Sales.Peppol;
10+
using Microsoft.Peppol;
1111
using Microsoft.Sales.Reminder;
1212
using Microsoft.Service.Document;
1313
using Microsoft.Service.History;
@@ -25,8 +25,8 @@ codeunit 6165 "EDoc PEPPOL BIS 3.0" implements "E-Document"
2525
ServiceCrMemoHeader: Record "Service Cr.Memo Header";
2626
ReminderHeader: Record "Reminder Header";
2727
FinChargeMemoHeader: Record "Finance Charge Memo Header";
28-
PEPPOLValidation: Codeunit "PEPPOL Validation";
29-
PEPPOLServiceValidation: Codeunit "PEPPOL Service Validation";
28+
PEPPOLValidation: Codeunit "PEPPOL30 Sales Validation";
29+
PEPPOLServiceValidation: Codeunit "PEPPOL30 Service Validation";
3030
EDocPEPPOLValidation: Codeunit "E-Doc. PEPPOL Validation";
3131
begin
3232
case SourceDocumentHeader.Number of
@@ -38,22 +38,22 @@ codeunit 6165 "EDoc PEPPOL BIS 3.0" implements "E-Document"
3838
Database::"Sales Invoice Header":
3939
begin
4040
SourceDocumentHeader.SetTable(SalesInvoiceHeader);
41-
PEPPOLValidation.CheckSalesInvoice(SalesInvoiceHeader);
41+
PEPPOLValidation.ValidatePostedDocument(SalesInvoiceHeader);
4242
end;
4343
Database::"Sales Cr.Memo Header":
4444
begin
4545
SourceDocumentHeader.SetTable(SalesCrMemoHeader);
46-
PEPPOLValidation.CheckSalesCreditMemo(SalesCrMemoHeader);
46+
PEPPOLValidation.ValidatePostedDocument(SalesCrMemoHeader);
4747
end;
4848
Database::"Service Invoice Header":
4949
begin
5050
SourceDocumentHeader.SetTable(ServiceInvoiceHeader);
51-
PEPPOLServiceValidation.CheckServiceInvoice(ServiceInvoiceHeader);
51+
PEPPOLServiceValidation.ValidatePostedDocument(ServiceInvoiceHeader);
5252
end;
5353
Database::"Service Cr.Memo Header":
5454
begin
5555
SourceDocumentHeader.SetTable(ServiceCrMemoHeader);
56-
PEPPOLServiceValidation.CheckServiceCreditMemo(ServiceCrMemoHeader);
56+
PEPPOLServiceValidation.ValidatePostedDocument(ServiceCrMemoHeader);
5757
end;
5858
Database::"Reminder Header":
5959
begin
@@ -68,7 +68,7 @@ codeunit 6165 "EDoc PEPPOL BIS 3.0" implements "E-Document"
6868
Database::"Service Header":
6969
begin
7070
SourceDocumentHeader.SetTable(ServiceHeader);
71-
PEPPOLServiceValidation.CheckServiceHeader(ServiceHeader);
71+
PEPPOLServiceValidation.Run(ServiceHeader);
7272
end;
7373
end;
7474
end;
@@ -121,22 +121,24 @@ codeunit 6165 "EDoc PEPPOL BIS 3.0" implements "E-Document"
121121

122122
local procedure GenerateInvoiceXMLFile(VariantRec: Variant; var OutStr: OutStream; GeneratePDF: Boolean)
123123
var
124-
SalesInvoicePEPPOLBIS30: XMLport "Sales Invoice - PEPPOL BIS 3.0";
124+
SalesInvoicePEPPOL30: XMLport "Sales Invoice - PEPPOL30";
125+
PEPPOLFormat: Enum "PEPPOL 3.0 Format";
125126
begin
126-
SalesInvoicePEPPOLBIS30.Initialize(VariantRec);
127-
SalesInvoicePEPPOLBIS30.SetGeneratePDF(GeneratePDF);
128-
SalesInvoicePEPPOLBIS30.SetDestination(OutStr);
129-
SalesInvoicePEPPOLBIS30.Export();
127+
SalesInvoicePEPPOL30.Initialize(VariantRec, PEPPOLFormat::"PEPPOL 3.0 - Sales");
128+
SalesInvoicePEPPOL30.SetGeneratePDF(GeneratePDF);
129+
SalesInvoicePEPPOL30.SetDestination(OutStr);
130+
SalesInvoicePEPPOL30.Export();
130131
end;
131132

132133
local procedure GenerateCrMemoXMLFile(VariantRec: Variant; var OutStr: OutStream; GeneratePDF: Boolean)
133134
var
134-
SalesCrMemoPEPPOLBIS30: XMLport "Sales Cr.Memo - PEPPOL BIS 3.0";
135+
SalesCrMemoPEPPOL30: XMLport "Sales Cr.Memo - PEPPOL30";
136+
PEPPOLFormat: Enum "PEPPOL 3.0 Format";
135137
begin
136-
SalesCrMemoPEPPOLBIS30.Initialize(VariantRec);
137-
SalesCrMemoPEPPOLBIS30.SetGeneratePDF(GeneratePDF);
138-
SalesCrMemoPEPPOLBIS30.SetDestination(OutStr);
139-
SalesCrMemoPEPPOLBIS30.Export();
138+
SalesCrMemoPEPPOL30.Initialize(VariantRec, PEPPOLFormat::"PEPPOL 3.0 - Sales");
139+
SalesCrMemoPEPPOL30.SetGeneratePDF(GeneratePDF);
140+
SalesCrMemoPEPPOL30.SetDestination(OutStr);
141+
SalesCrMemoPEPPOL30.Export();
140142
end;
141143

142144
local procedure GenerateFinancialResultsXMLFile(VariantRec: Variant; var OutStr: OutStream)

‎src/Apps/W1/EDocument/App/src/Format/FinResultsPEPPOLBIS30.XmlPort.al‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ using Microsoft.Finance.VAT.Calculation;
44
using Microsoft.Finance.VAT.Setup;
55
using Microsoft.Sales.Document;
66
using Microsoft.Sales.FinanceCharge;
7-
using Microsoft.Sales.Peppol;
7+
using Microsoft.Peppol;
88
using Microsoft.Sales.Reminder;
99
using System.Utilities;
1010

@@ -1179,7 +1179,7 @@ xmlport 6100 "Fin. Results - PEPPOL BIS 3.0"
11791179
GlobalIssuedFinChargeMemoHeader: Record "Issued Fin. Charge Memo Header";
11801180
GlobalIssuedFinChargeMemoLine: Record "Issued Fin. Charge Memo Line";
11811181
TempVATProductPostingGroup: Record "VAT Product Posting Group" temporary;
1182-
PEPPOLMgt: Codeunit "PEPPOL Management";
1182+
PEPPOLMgt: Codeunit "PEPPOL30";
11831183
SourceRecRef: RecordRef;
11841184
DummyVar: Text;
11851185
IsReminder: Boolean;
@@ -1194,7 +1194,7 @@ xmlport 6100 "Fin. Results - PEPPOL BIS 3.0"
11941194
if this.GlobalIssuedReminderLine.FindSet() then
11951195
repeat
11961196
this.CopyReminderLineToSalesLine(this.GlobalSalesLine, this.GlobalIssuedReminderHeader, this.GlobalIssuedReminderLine);
1197-
this.PEPPOLMgt.GetTotals(this.GlobalSalesLine, this.TempVATAmtLine);
1197+
this.PEPPOLMgt.GetTaxTotals(this.GlobalSalesLine, this.TempVATAmtLine);
11981198
this.PEPPOLMgt.GetTaxCategories(this.GlobalSalesLine, this.TempVATProductPostingGroup);
11991199
until this.GlobalIssuedReminderLine.Next() = 0;
12001200
end;
@@ -1204,7 +1204,7 @@ xmlport 6100 "Fin. Results - PEPPOL BIS 3.0"
12041204
if this.GlobalIssuedFinChargeMemoLine.FindSet() then
12051205
repeat
12061206
this.CopyFinChargeMemoLineToSalesLine(this.GlobalSalesLine, this.GlobalIssuedFinChargeMemoHeader, this.GlobalIssuedFinChargeMemoLine);
1207-
this.PEPPOLMgt.GetTotals(this.GlobalSalesLine, this.TempVATAmtLine);
1207+
this.PEPPOLMgt.GetTaxTotals(this.GlobalSalesLine, this.TempVATAmtLine);
12081208
this.PEPPOLMgt.GetTaxCategories(this.GlobalSalesLine, this.TempVATProductPostingGroup);
12091209
until this.GlobalIssuedFinChargeMemoLine.Next() = 0;
12101210
end;

0 commit comments

Comments
 (0)