Mandatory Customer Data in Sales for xRechnung and ZUGFeRD

Author: miljance

Apps/DE/EDocumentDE/app/src/PEPPOL/EDocPEPPOLBIS30DE.Codeunit.al

@@ -237,6 +237,12 @@ codeunit 11035 "EDoc PEPPOL BIS 3.0 DE" implements "E-Document"
         IsHandled := true;
     end;
 
+    [EventSubscriber(ObjectType::Codeunit, Codeunit::"PEPPOL Validation", 'OnAfterCheckSalesDocument', '', false, false)]
+    local procedure OnAfterCheckSalesDocument(SalesHeader: Record "Sales Header")
+    begin
+        SalesHeader.TestField("Sell-to E-Mail");
+    end;
+
     [EventSubscriber(ObjectType::Codeunit, Codeunit::"PEPPOL Management", 'OnAfterGetBuyerReference', '', false, false)]
     local procedure SetReferenceOnAfterGetBuyerReference(SalesHeader: Record "Sales Header"; var BuyerReference: Text)
     begin

Apps/DE/EDocumentDE/app/src/XRechnung/XRechnungFormat.Codeunit.al

@@ -11,19 +11,22 @@ using System.IO;
 using Microsoft.Sales.Customer;
 using Microsoft.Foundation.Company;
 using Microsoft.eServices.EDocument;
+using Microsoft.eServices.EDocument.IO.Peppol;
 
 codeunit 13914 "XRechnung Format" implements "E-Document"
 {
     InherentEntitlements = X;
     InherentPermissions = X;
 
     var
+        EDocPEPPOLBIS30: Codeunit "EDoc PEPPOL BIS 3.0";
         EDocImportXRechnung: Codeunit "Import XRechnung Document";
 
     procedure Check(var SourceDocumentHeader: RecordRef; EDocumentService: Record "E-Document Service"; EDocumentProcessingPhase: Enum "E-Document Processing Phase")
     begin
         CheckCompanyInfoMandatory();
         CheckBuyerReferenceMandatory(EDocumentService, SourceDocumentHeader);
+        EDocPEPPOLBIS30.Check(SourceDocumentHeader, EDocumentService, EDocumentProcessingPhase);
     end;
 
     procedure Create(EDocumentService: Record "E-Document Service"; var EDocument: Record "E-Document"; var SourceDocumentHeader: RecordRef; var SourceDocumentLines: RecordRef; var TempBlob: Codeunit "Temp Blob")

Apps/DE/EDocumentDE/app/src/ZUGFeRD/ExportZUGFeRDDocument.Codeunit.al

@@ -644,14 +644,12 @@ codeunit 13917 "Export ZUGFeRD Document"
         PaymentTermsDescriptionElement: XmlElement;
         DueDateElement: XmlElement;
     begin
-        if PaymentTermsCode = '' then
-            exit;
-        if not PaymentTerms.Get(PaymentTermsCode) then
-            exit;
-
         PaymentTermsElement := XmlElement.Create('SpecifiedTradePaymentTerms', XmlNamespaceRAM);
-        PaymentTermsDescriptionElement := XmlElement.Create('Description', XmlNamespaceRAM, PaymentTerms.Description);
-        PaymentTermsElement.Add(PaymentTermsDescriptionElement);
+        if PaymentTermsCode <> '' then
+            if PaymentTerms.Get(PaymentTermsCode) then begin
+                PaymentTermsDescriptionElement := XmlElement.Create('Description', XmlNamespaceRAM, PaymentTerms.Description);
+                PaymentTermsElement.Add(PaymentTermsDescriptionElement);
+            end;
 
         DueDateElement := XmlElement.Create('DueDateDateTime', XmlNamespaceRAM);
         DueDateElement.Add(XmlElement.Create('DateTimeString', XmlNamespaceUDT, XmlAttribute.Create('format', '102'), FormatDate(DueDate)));
@@ -674,7 +672,7 @@ codeunit 13917 "Export ZUGFeRD Document"
         end;
 
         if CompanyInformation."SWIFT Code" <> '' then begin
-            PaymentMethodBICElement := XmlElement.Create('PayeePartyCreditorFinancialAccount', XmlNamespaceRAM);
+            PaymentMethodBICElement := XmlElement.Create('PayeeSpecifiedCreditorFinancialInstitution', XmlNamespaceRAM);
             PaymentMethodBICElement.Add(XmlElement.Create('BICID', XmlNamespaceRAM, GetIBAN(CompanyInformation."SWIFT Code")));
             PaymentMethodElement.Add(PaymentMethodBICElement);
         end;

Apps/DE/EDocumentDE/app/src/ZUGFeRD/ZUGFeRDFormat.Codeunit.al

@@ -11,19 +11,22 @@ using Microsoft.Sales.History;
 using Microsoft.Purchases.Document;
 using Microsoft.eServices.EDocument;
 using System.IO;
+using Microsoft.eServices.EDocument.IO.Peppol;
 
 codeunit 13920 "ZUGFeRD Format" implements "E-Document"
 {
     InherentEntitlements = X;
     InherentPermissions = X;
 
     var
+        EDocPEPPOLBIS30: Codeunit "EDoc PEPPOL BIS 3.0";
         EDocImportZUGFeRD: Codeunit "Import ZUGFeRD Document";
 
     procedure Check(var SourceDocumentHeader: RecordRef; EDocumentService: Record "E-Document Service"; EDocumentProcessingPhase: Enum "E-Document Processing Phase")
     begin
         CheckCompanyInfoMandatory();
         CheckBuyerReferenceMandatory(EDocumentService, SourceDocumentHeader);
+        EDocPEPPOLBIS30.Check(SourceDocumentHeader, EDocumentService, EDocumentProcessingPhase);
     end;
 
     procedure Create(EDocumentService: Record "E-Document Service"; var EDocument: Record "E-Document"; var SourceDocumentHeader: RecordRef; var SourceDocumentLines: RecordRef; var TempBlob: Codeunit "Temp Blob")