diff --git a/src/Apps/W1/APIV1/test/src/APIV1SalesCreditMemosE2E.Codeunit.al b/src/Apps/W1/APIV1/test/src/APIV1SalesCreditMemosE2E.Codeunit.al index 1927a6f4047..4f2323b2746 100644 --- a/src/Apps/W1/APIV1/test/src/APIV1SalesCreditMemosE2E.Codeunit.al +++ b/src/Apps/W1/APIV1/test/src/APIV1SalesCreditMemosE2E.Codeunit.al @@ -816,12 +816,17 @@ codeunit 139728 "APIV1 - Sales Credit Memos E2E" local procedure CreateCorrectiveSalesCreditMemo(var SalesCrMemoHeader: Record "Sales Cr.Memo Header") var + ReasonCode: Record "Reason Code"; SalesInvoiceHeader: Record "Sales Invoice Header"; SalesHeader: Record "Sales Header"; InvoiceCode: Code[20]; begin LibrarySales.CreateSalesInvoice(SalesHeader); ModifySalesHeaderPostingDate(SalesHeader, WORKDATE()); + EnsureReasonCode(); + ReasonCode.FindFirst(); + SalesHeader.Validate("Reason Code", ReasonCode.Code); + SalesHeader.Modify(true); InvoiceCode := LibrarySales.PostSalesDocument(SalesHeader, false, true); SalesInvoiceHeader.Get(InvoiceCode); Commit(); @@ -830,6 +835,16 @@ codeunit 139728 "APIV1 - Sales Credit Memos E2E" SalesCrMemoHeader.FindFirst(); end; + local procedure EnsureReasonCode() + var + ReasonCode: Record "Reason Code"; + begin + if not ReasonCode.IsEmpty() then + exit; + + LibraryERM.CreateReasonCode(ReasonCode); + end; + local procedure CreateDraftSalesCreditMemo(var SalesHeader: Record "Sales Header") begin LibrarySales.CreateSalesCreditMemo(SalesHeader); diff --git a/src/Apps/W1/APIV1/test/src/SalesInvoicesE2E.Codeunit.al b/src/Apps/W1/APIV1/test/src/SalesInvoicesE2E.Codeunit.al index 72437b7152f..0f3c2fb8772 100644 --- a/src/Apps/W1/APIV1/test/src/SalesInvoicesE2E.Codeunit.al +++ b/src/Apps/W1/APIV1/test/src/SalesInvoicesE2E.Codeunit.al @@ -930,6 +930,7 @@ codeunit 139709 "Sales Invoices E2E" DocumentId := SalesInvoiceHeader."Draft Invoice SystemId"; // Special case for AU + EnsureReasonCode(); LibrarySales.SetDefaultCancelReasonCodeForSalesAndReceivablesSetup(); Commit(); @@ -969,6 +970,7 @@ codeunit 139709 "Sales Invoices E2E" DocumentId := SalesInvoiceHeader."Draft Invoice SystemId"; // Special case for AU + EnsureReasonCode(); LibrarySales.SetDefaultCancelReasonCodeForSalesAndReceivablesSetup(); Commit(); @@ -1292,9 +1294,22 @@ codeunit 139709 "Sales Invoices E2E" local procedure CreateCancelledSalesInvoice(var SalesInvoiceHeader: Record "Sales Invoice Header") begin CreatePostedSalesInvoice(SalesInvoiceHeader); + EnsureReasonCode(); + LibrarySales.SetDefaultCancelReasonCodeForSalesAndReceivablesSetup(); + Commit(); CODEUNIT.Run(CODEUNIT::"Correct Posted Sales Invoice", SalesInvoiceHeader); end; + local procedure EnsureReasonCode() + var + ReasonCode: Record "Reason Code"; + begin + if not ReasonCode.IsEmpty() then + exit; + + LibraryERM.CreateReasonCode(ReasonCode); + end; + local procedure CreateSalesInvoices(var InvoiceID1: Text; var InvoiceID2: Text) var SalesInvoiceHeader: Record "Sales Invoice Header"; diff --git a/src/Apps/W1/APIV2/test/src/APIV2SalesCreditMemosE2E.Codeunit.al b/src/Apps/W1/APIV2/test/src/APIV2SalesCreditMemosE2E.Codeunit.al index f52ecbcdf53..bdb34624da4 100644 --- a/src/Apps/W1/APIV2/test/src/APIV2SalesCreditMemosE2E.Codeunit.al +++ b/src/Apps/W1/APIV2/test/src/APIV2SalesCreditMemosE2E.Codeunit.al @@ -798,11 +798,16 @@ codeunit 139828 "APIV2 - Sales Credit Memos E2E" local procedure CreateCorrectiveSalesCreditMemo(var SalesCrMemoHeader: Record "Sales Cr.Memo Header") var + ReasonCode: Record "Reason Code"; SalesInvoiceHeader: Record "Sales Invoice Header"; SalesHeader: Record "Sales Header"; InvoiceCode: Code[20]; begin LibrarySales.CreateSalesInvoice(SalesHeader); + EnsureReasonCode(); + ReasonCode.FindFirst(); + SalesHeader.Validate("Reason Code", ReasonCode.Code); + SalesHeader.Modify(true); InvoiceCode := LibrarySales.PostSalesDocument(SalesHeader, false, true); SalesInvoiceHeader.Get(InvoiceCode); Commit(); @@ -811,6 +816,16 @@ codeunit 139828 "APIV2 - Sales Credit Memos E2E" SalesCrMemoHeader.FindFirst(); end; + local procedure EnsureReasonCode() + var + ReasonCode: Record "Reason Code"; + begin + if not ReasonCode.IsEmpty() then + exit; + + LibraryERM.CreateReasonCode(ReasonCode); + end; + local procedure CreateDraftSalesCreditMemo(var SalesHeader: Record "Sales Header") begin LibrarySales.CreateSalesCreditMemo(SalesHeader); diff --git a/src/Apps/W1/APIV2/test/src/APIV2SalesInvoicesE2E.Codeunit.al b/src/Apps/W1/APIV2/test/src/APIV2SalesInvoicesE2E.Codeunit.al index 37722082ff0..f539fe75f71 100644 --- a/src/Apps/W1/APIV2/test/src/APIV2SalesInvoicesE2E.Codeunit.al +++ b/src/Apps/W1/APIV2/test/src/APIV2SalesInvoicesE2E.Codeunit.al @@ -959,6 +959,7 @@ codeunit 139809 "APIV2 - Sales Invoices E2E" DocumentId := SalesInvoiceHeader."Draft Invoice SystemId"; // Special case for AU + EnsureReasonCode(); LibrarySales.SetDefaultCancelReasonCodeForSalesAndReceivablesSetup(); Commit(); @@ -998,6 +999,7 @@ codeunit 139809 "APIV2 - Sales Invoices E2E" DocumentId := SalesInvoiceHeader."Draft Invoice SystemId"; // Special case for AU + EnsureReasonCode(); LibrarySales.SetDefaultCancelReasonCodeForSalesAndReceivablesSetup(); Commit(); @@ -1359,9 +1361,22 @@ codeunit 139809 "APIV2 - Sales Invoices E2E" local procedure CreateCancelledSalesInvoice(var SalesInvoiceHeader: Record "Sales Invoice Header") begin CreatePostedSalesInvoice(SalesInvoiceHeader); + EnsureReasonCode(); + LibrarySales.SetDefaultCancelReasonCodeForSalesAndReceivablesSetup(); + Commit(); CODEUNIT.Run(CODEUNIT::"Correct Posted Sales Invoice", SalesInvoiceHeader); end; + local procedure EnsureReasonCode() + var + ReasonCode: Record "Reason Code"; + begin + if not ReasonCode.IsEmpty() then + exit; + + LibraryERM.CreateReasonCode(ReasonCode); + end; + local procedure CreateSalesInvoices(var InvoiceID1: Text; var InvoiceID2: Text) var SalesInvoiceHeader: Record "Sales Invoice Header"; diff --git a/src/DisabledTests/_Exclude_APIV1__Tests/_Exclude_APIV1__Tests.DisabledTest.json b/src/DisabledTests/_Exclude_APIV1__Tests/_Exclude_APIV1__Tests.DisabledTest.json index d3c507ad4aa..eabd57a432e 100644 --- a/src/DisabledTests/_Exclude_APIV1__Tests/_Exclude_APIV1__Tests.DisabledTest.json +++ b/src/DisabledTests/_Exclude_APIV1__Tests/_Exclude_APIV1__Tests.DisabledTest.json @@ -1,19 +1,4 @@ [ - { - "codeunitId": 139709, - "codeunitName": "Sales Invoices E2E", - "method": "TestActionCancelAndSendInvoice" - }, - { - "codeunitId": 139709, - "codeunitName": "Sales Invoices E2E", - "method": "TestActionCancelInvoice" - }, - { - "codeunitId": 139709, - "codeunitName": "Sales Invoices E2E", - "method": "TestActionSendCancelledInvoice" - }, { "codeunitId": 139709, "codeunitName": "Sales Invoices E2E", @@ -39,16 +24,6 @@ "codeunitName": "APIV1 - Sales Quotes E2E", "method": "TestCreateQuoteThroughPageAndAPI" }, - { - "codeunitId": 139728, - "codeunitName": "APIV1 - Sales Credit Memos E2E", - "method": "TestActionCancelAndSendCorrectiveCreditMemo" - }, - { - "codeunitId": 139728, - "codeunitName": "APIV1 - Sales Credit Memos E2E", - "method": "TestActionCancelCorrectiveCreditMemo" - }, { "codeunitId": 139728, "codeunitName": "APIV1 - Sales Credit Memos E2E", diff --git a/src/DisabledTests/_Exclude_APIV2__Tests/_Exclude_APIV2__Tests.DisabledTest.json b/src/DisabledTests/_Exclude_APIV2__Tests/_Exclude_APIV2__Tests.DisabledTest.json index 23c00dc143b..44baa6cbba3 100644 --- a/src/DisabledTests/_Exclude_APIV2__Tests/_Exclude_APIV2__Tests.DisabledTest.json +++ b/src/DisabledTests/_Exclude_APIV2__Tests/_Exclude_APIV2__Tests.DisabledTest.json @@ -9,21 +9,6 @@ "codeunitName": "APIV2 - Company Info. E2E", "method": "TestModifyCompanyInformation" }, - { - "codeunitId": 139809, - "codeunitName": "APIV2 - Sales Invoices E2E", - "method": "TestActionCancelAndSendInvoice" - }, - { - "codeunitId": 139809, - "codeunitName": "APIV2 - Sales Invoices E2E", - "method": "TestActionCancelInvoice" - }, - { - "codeunitId": 139809, - "codeunitName": "APIV2 - Sales Invoices E2E", - "method": "TestActionSendCancelledInvoice" - }, { "codeunitId": 139809, "codeunitName": "APIV2 - Sales Invoices E2E", @@ -44,16 +29,6 @@ "codeunitName": "APIV2 - Sales Quotes E2E", "method": "TestCreateQuoteThroughPageAndAPI" }, - { - "codeunitId": 139828, - "codeunitName": "APIV2 - Sales Credit Memos E2E", - "method": "TestActionCancelAndSendCorrectiveCreditMemo" - }, - { - "codeunitId": 139828, - "codeunitName": "APIV2 - Sales Credit Memos E2E", - "method": "TestActionCancelCorrectiveCreditMemo" - }, { "codeunitId": 139828, "codeunitName": "APIV2 - Sales Credit Memos E2E",