[E-Documents Core] - Migrate electronic formats to new purchase draft concept for e-invoicing (e-invoice preview) (PEPPOL) #28983

GMatuleviciute · 2025-08-06T06:44:31Z

This pull request does not have a related issue as it's part of the delivery for development agreed directly with @altotovi @Groenbech96

Implementation

Introduced new enum and interface for handling Purchase Credit Memos.
Updated Purchase Invoice codeunit to validate and handle additional fields.
Enhanced E-Document Purchase Header table to include E-Document Type.
Implemented logic in PEPPOL handler for processing Credit Notes.
Added methods for populating Credit Memo headers and lines in XML.
Refactored existing methods to utilize a new XML helper codeunit for cleaner code. (This codeunit enables localization apps to reuse same procedures as used in W1)
Updated unit of measure provider interface to include retrieval of default unit of measure.

Fixes #

Fixes AB#598453

- Introduced new enum and interface for handling Purchase Credit Memos. - Updated Purchase Invoice codeunit to validate and handle additional fields. - Enhanced E-Document Purchase Header table to include E-Document Type. - Implemented logic in PEPPOL handler for processing Credit Notes. - Added methods for populating Credit Memo headers and lines in XML. - Refactored existing methods to utilize a new XML helper codeunit for cleaner code. - Updated unit of measure provider interface to include retrieval of default unit of measure.

…essing

Changes the purchase line lookup from FindFirst to FindLast to ensure proper line number sequencing when creating new purchase lines. Moves the CreatePurchaseLine method to the end of the file for better code organization.

Improves code maintainability by adding comprehensive XML documentation comments to helper methods in the E-Document module. Documents parameter types, descriptions, and return values for XML parsing utilities and purchase credit memo creation procedures to enhance developer experience and code understanding.

Use next available ID (recent MSFT changes introduced new obects)

Changes codeunit number from 6175 to 6177 to resolve potential ID conflicts. Alphabetizes using statements across multiple files to improve code organization and maintainability. Adds missing blank lines in enum definitions for better formatting consistency. Enhances documentation by adding parameter descriptions to interface method.

Improves code formatting by adding a blank line after the exit statement to enhance visual separation between the early return and subsequent logic flow.

github-actions · 2025-08-06T06:44:55Z

Could not find linked issues in the pull request description. Please make sure the pull request description contains a line that contains 'Fixes #' followed by the issue number being fixed. Use that pattern for every issue you want to link.

Sets default unit of measure when missing during purchase line processing to prevent validation errors. Clears item reference number when purchase type changes to maintain data consistency and avoid mismatched references.

Groenbech96

Really good work on this. We have reviewed and left some feedback that should be addressed.

Apps/W1/EDocument/app/src/Processing/Import/FinishDraft/EDocCreatePurchCrMemo.Codeunit.al

Groenbech96 · 2025-08-11T09:01:46Z

Apps/W1/EDocument/app/src/Processing/Import/FinishDraft/EDocCreatePurchaseInvoice.Codeunit.al

        end;

        PurchaseHeader.Validate("Vendor Invoice No.", VendorInvoiceNo);
+        PurchaseHeader.Validate("Vendor Order No.", EDocumentPurchaseHeader."Purchase Order No.");


Vendor Order No. refers to external number for seller. Purchase Order No. on EDocumentPurchaseHeader refers to internal numbering system.

I'm not sure I undersand the issue @Groenbech96.
codeunit 6166 "EDoc Import PEPPOL BIS 3.0" reads Invoice/cac:OrderReference/cbc:ID into Purchase Header field "Vendor Order No."
codeunit 6140 "E-Doc. Import" procedure V1_CopyFromPurchaseHeader also assigns information to E-Document Purchase Header field "Purchase Order No." from Purchase Header field "Vendor Order No."
As I understand this should be "our" reference, or I misunderstood this?

here is why i think it is wrong.
https://docs.peppol.eu/poacc/billing/3.0/syntax/ubl-invoice/cac-OrderReference/cbc-ID/
States that it is issued by Buyer.

https://learn.microsoft.com/en-us/dynamics365/business-central/purchasing-how-record-purchases#external-document-number
States that "On purchase documents and journals, you can specify a document number that refers to the vendor's numbering system." Aka, issued by Seller.

So we might have had a bug for some time.

ok so as agreed, we'll keep this as it is now:
Invoice/cbc:ID is used to set "Sales Invoice No." on E-Document Purchase Header which then set as "Vendor Invoice No."/"Vendor Cr. Memo No." on the Purchase Header
cac:OrderReference/cbc:ID is used to set "Purchase Order No." on E-Document Purchase Header which then set as "Vendor Order No." on the Purchase Header

...ment/app/src/Processing/Import/StructureReceivedEDocument/EDocumentPEPPOLHandler.Codeunit.al

Apps/W1/EDocument/app/src/Processing/Import/FinishDraft/EDocCreatePurchCrMemo.Enum.al

Apps/W1/EDocument/app/src/Processing/Import/FinishDraft/EDocCreatePurchaseInvoice.Enum.al

Apps/W1/EDocument/app/src/Processing/Import/ImportEDocumentProcess.Codeunit.al

Groenbech96 · 2025-08-11T09:19:15Z

Apps/W1/EDocument/app/src/Processing/Import/PrepareDraft/EDocProviders.Codeunit.al

-        if PurchaseHeader.Get("Purchase Document Type"::Order, EDocumentPurchaseHeader."Purchase Order No.") then;
+        Vendor.SetLoadFields("Receive E-Document To");
+        Vendor.Get(EDocumentPurchaseHeader."[BC] Vendor No.");
+        case Vendor."Receive E-Document To" of


We should exit if Receive to invoice. This function should never return a purchase order. :)
I think we can keep it at that for now.

the original code was retrieving Order - I've just implemented the logic to retrieve the document type based on settings on Vendor card.

Yes, but this entire function is called GetPurchaseOrder.
It Maybe it should not be called at the callsite, based on that setting, but returning an invoice is confusing and not intention of the function.

Should I revert my changes?

Code updated to be more consistent with naming

Apps/W1/EDocument/app/src/Processing/Import/PrepareDraft/EDocProviders.Codeunit.al

Adds three new test methods to validate PEPPOL invoice processing workflow including data extraction viewing, purchase invoice creation, and draft modification scenarios. Improves test data consistency by introducing mock currency and date variables that can be configured across test methods rather than hardcoded values. Fixes page validation trigger formatting by removing unnecessary page update call and correcting indentation. Strengthens assertion messages with detailed error information including field names, table names, expected and actual values for better debugging.

Consolidates duplicate code between invoice and credit memo creation into a shared helper class to improve maintainability and consistency. Adds ResetDraft method to structured format readers for proper cleanup when undoing processing steps. Removes obsolete enum and simplifies unit of measure handling by moving default logic to item reference processing. Enhances credit memo creation with applies-to document support for better document linking.

Introduces a utility method that simplifies extracting text content from XML nodes using XPath expressions. The method handles node selection and safely returns the inner text value or an empty string if the node is not found, reducing boilerplate code for XML parsing operations.

Consolidates duplicate draft reset code by moving the implementation to a central ResetDraft method on the E-Document table. Multiple codeunits previously contained identical logic for deleting purchase headers, lines, mappings, and line fields. Improves maintainability by eliminating code duplication and providing a single source of truth for draft cleanup operations.

Corrects the assignment of purchase order number and applies-to document number fields in credit note XML structure. Previously, the values were swapped between OrderReference and BillingReference sections, causing incorrect document references in generated PEPPOL credit notes.

Adds empty checks before calling delete operations to avoid potential runtime errors when attempting to delete records that don't exist. Improves robustness by ensuring delete operations are only performed when there are actual records to delete.

…ons.Codeunit.al Co-authored-by: Grasiele Matuleviciute <131970463+GMatuleviciute@users.noreply.github.com>

….Codeunit.al Co-authored-by: Grasiele Matuleviciute <131970463+GMatuleviciute@users.noreply.github.com>

Apps/W1/EDocument/app/src/Document/EDocument.Table.al

Groenbech96 · 2025-08-15T08:13:57Z

Apps/W1/EDocument/app/src/Processing/Import/PrepareDraft/EDocProviders.Codeunit.al

-        if PurchaseHeader.Get("Purchase Document Type"::Order, EDocumentPurchaseHeader."Purchase Order No.") then;
+        Vendor.SetLoadFields("Receive E-Document To");
+        Vendor.Get(EDocumentPurchaseHeader."[BC] Vendor No.");
+        case Vendor."Receive E-Document To" of


Yes, but this entire function is called GetPurchaseOrder.
It Maybe it should not be called at the callsite, based on that setting, but returning an invoice is confusing and not intention of the function.

Groenbech96 · 2025-08-15T08:16:57Z

There is also a merge conflict.

Refactors validation helpers to avoid shared state by passing required data explicitly, reducing test coupling and flakiness. Unifies and locks label tokens, standardizes error messages, and fixes API usage for captions. Cleans up unused variables and minor formatting. Updates tests to use the new helper signature.

Moves draft cleanup from the document level to the purchase header, deleting header, lines, header mappings, and additional line fields in one place. Updates import handlers to fetch the purchase header from the document and invoke the new reset, improving encapsulation and avoiding partial cleanup. Aligns a history-mapping call with the updated API naming for clarity.

AndriusAndrulevicius · 2025-08-18T11:59:18Z

merge conflict resolved

…mework Implements comprehensive PEPPOL e-document validation improvements including: - Stateless and consistent PEPPOL validation implementation - Enhanced structured e-document testing framework - Improved test coverage for PEPPOL validation scenarios - Refined validation logic for better consistency across operations

Moves draft cleanup to the record delete trigger to always remove related lines and mappings when discarding a draft, removing the custom reset method and updating callers to delete the header directly. Splits purchase document lookup by exposing separate methods for order and invoice. The caller now chooses based on vendor setup, decoupling provider logic from vendor configuration and avoiding provider-level validation errors. Minor refactor in draft preparation to handle the new lookup and streamline flow.

Groenbech96 · 2025-08-20T05:14:35Z

Apps/W1/EDocument/app/src/Processing/Import/PrepareDraft/PreparePurchaseEDocDraft.Codeunit.al

        end;

-        PurchaseOrder := IPurchaseOrderProvider.GetPurchaseOrder(EDocumentPurchaseHeader);
+        case Vendor."Receive E-Document To" of


I would use this in the exit clause on line 62.
exit(if Vendor.Receive E-Document To = Purchase Order ? E-Document Type::PO : E-Document Type::Invoice)

Then the rest can be left as it was. This setting should probably only influence that bit. Even if we have invoice, it would be okay to fill [BC] Purchase Order No.

Updates draft preparation to honor the vendor’s target (order or invoice), validating document type and returning the corresponding e-document type instead of always using order. Ensures purchase header data is initialized from the e-document before processing to prevent missing header values. Adapts tests to the parameter-based import call and updates helpers/mocks accordingly. Adds attachment dependency for purchase invoice creation.

AndriusAndrulevicius

All comments should be now resolved.
Automated tests also included in this PR

github-actions · 2025-08-25T10:40:29Z

Processing this PR. The branch is now locked 🔒 Please don't push updates unless otherwise agreed.

JesperSchulz · 2025-09-04T09:29:20Z

Thanks for reporting this. We agree, and we’ll publish a fix asap, either in an update for the current version or in the next major release. Please do not reply to this, as we do not monitor closed issues. If you have follow-up questions or requests, please create a new issue where you reference this one.

Build ID: .

AndriusAndrulevicius and others added 8 commits July 29, 2025 12:20

refactor: Simplify Purchase Credit Memo creation and enhance XML proc…

6207947

…essing

Fixes purchase line numbering by using FindLast

a3f2ad7

Changes the purchase line lookup from FindFirst to FindLast to ensure proper line number sequencing when creating new purchase lines. Moves the CreatePurchaseLine method to the end of the file for better code organization.

Update EDocumentXMLHelper.Codeunit.al

45d806b

Use next available ID (recent MSFT changes introduced new obects)

merge main into dev/aan/PEPPOL-v2

e99adee

Adds whitespace for code readability

9235e05

Improves code formatting by adding a blank line after the exit statement to enhance visual separation between the early return and subsequent logic flow.

GMatuleviciute marked this pull request as ready for review August 6, 2025 06:44

GMatuleviciute requested review from a team as code owners August 6, 2025 06:44

AndriusAndrulevicius and others added 3 commits August 9, 2025 04:32

Improves unit of measure handling in purchase documents

23d1e89

Sets default unit of measure when missing during purchase line processing to prevent validation errors. Clears item reference number when purchase type changes to maintain data consistency and avoid mismatched references.

Apply suggestion from @GMatuleviciute

78c5796

Apply suggestion from @GMatuleviciute

e13670c

Groenbech96 requested changes Aug 11, 2025

View reviewed changes

JesperSchulz added the Integration GitHub request for Integration area label Aug 13, 2025

JesperSchulz assigned Groenbech96 Aug 13, 2025

AndriusAndrulevicius added 5 commits August 13, 2025 16:29

GMatuleviciute mentioned this pull request Aug 14, 2025

[E-Document Formats][OIOUBL] - Migrate electronic formats to new purchase draft concept for e-invoicing (e-invoice preview) (OIOUBL)(DK localization) #29056

Open

AndriusAndrulevicius and others added 3 commits August 14, 2025 17:25

Update Apps/W1/EDocument/test/src/Processing/PEPPOLStructuredValidati…

24fae99

…ons.Codeunit.al Co-authored-by: Grasiele Matuleviciute <131970463+GMatuleviciute@users.noreply.github.com>

Update Apps/W1/EDocument/test/src/Processing/EDocumentStructuredTests…

f34e79e

….Codeunit.al Co-authored-by: Grasiele Matuleviciute <131970463+GMatuleviciute@users.noreply.github.com>

Update Apps/W1/EDocument/test/src/Processing/EDocumentStructuredTests…

5f300e0

….Codeunit.al Co-authored-by: Grasiele Matuleviciute <131970463+GMatuleviciute@users.noreply.github.com>

AndriusAndrulevicius and others added 5 commits August 14, 2025 17:27

Update Apps/W1/EDocument/test/src/Processing/EDocumentStructuredTests…

6435c88

….Codeunit.al Co-authored-by: Grasiele Matuleviciute <131970463+GMatuleviciute@users.noreply.github.com>

Update Apps/W1/EDocument/test/src/Processing/EDocumentStructuredTests…

345a48c

….Codeunit.al Co-authored-by: Grasiele Matuleviciute <131970463+GMatuleviciute@users.noreply.github.com>

Update Apps/W1/EDocument/test/src/Processing/EDocumentStructuredTests…

ae9ff0e

….Codeunit.al Co-authored-by: Grasiele Matuleviciute <131970463+GMatuleviciute@users.noreply.github.com>

Update Apps/W1/EDocument/test/src/Processing/EDocumentStructuredTests…

1ed84e8

….Codeunit.al Co-authored-by: Grasiele Matuleviciute <131970463+GMatuleviciute@users.noreply.github.com>

Update Apps/W1/EDocument/test/src/Processing/EDocumentStructuredTests…

bc16422

….Codeunit.al Co-authored-by: Grasiele Matuleviciute <131970463+GMatuleviciute@users.noreply.github.com>

Groenbech96 reviewed Aug 15, 2025

View reviewed changes

Apps/W1/EDocument/app/src/Document/EDocument.Table.al Outdated Show resolved Hide resolved

Groenbech96 requested changes Aug 15, 2025

View reviewed changes

Groenbech96 requested a review from AndriusAndrulevicius August 18, 2025 06:34

AndriusAndrulevicius added 3 commits August 18, 2025 14:38

Merge branch 'main' into dev/aan/PEPPOL-v2

83ebedf

AndriusAndrulevicius added 2 commits August 19, 2025 16:15

Groenbech96 requested changes Aug 20, 2025

View reviewed changes

AndriusAndrulevicius added 2 commits August 21, 2025 10:48

Merge branch 'main' into dev/aan/PEPPOL-v2

f5c9349

AndriusAndrulevicius reviewed Aug 21, 2025

View reviewed changes

GMatuleviciute mentioned this pull request Aug 25, 2025

[E-Document Formats][XRechnung] - Migrate electronic formats to new purchase draft concept for e-invoicing (e-invoice preview) (XRechnung)(DE localization) #29097

Open

Groenbech96 added the processing-PR The PR is currently being reviewed label Aug 25, 2025

JesperSchulz added the ships-in-future-update Fix ships in a future update label Sep 4, 2025

JesperSchulz closed this Sep 4, 2025

Groenbech96 reopened this Sep 7, 2025

[E-Documents Core] - Migrate electronic formats to new purchase draft concept for e-invoicing (e-invoice preview) (PEPPOL) #28983

Are you sure you want to change the base?

[E-Documents Core] - Migrate electronic formats to new purchase draft concept for e-invoicing (e-invoice preview) (PEPPOL) #28983

Uh oh!

Conversation

GMatuleviciute commented Aug 6, 2025 • edited by azure-boards bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Aug 6, 2025

Uh oh!

Groenbech96 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Groenbech96 commented Aug 15, 2025

Uh oh!

AndriusAndrulevicius commented Aug 18, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

AndriusAndrulevicius left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Aug 25, 2025

Uh oh!

JesperSchulz commented Sep 4, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

GMatuleviciute commented Aug 6, 2025 •

edited by azure-boards bot

Loading