diff --git a/src/Apps/W1/APIV1/test/src/APIV1SalesCreditMemosE2E.Codeunit.al b/src/Apps/W1/APIV1/test/src/APIV1SalesCreditMemosE2E.Codeunit.al index 70b9714f81e..26fc2078cdf 100644 --- a/src/Apps/W1/APIV1/test/src/APIV1SalesCreditMemosE2E.Codeunit.al +++ b/src/Apps/W1/APIV1/test/src/APIV1SalesCreditMemosE2E.Codeunit.al @@ -817,12 +817,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(); @@ -831,6 +836,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 549feabec64..9d839757e46 100644 --- a/src/Apps/W1/APIV1/test/src/SalesInvoicesE2E.Codeunit.al +++ b/src/Apps/W1/APIV1/test/src/SalesInvoicesE2E.Codeunit.al @@ -931,6 +931,7 @@ codeunit 139709 "Sales Invoices E2E" DocumentId := SalesInvoiceHeader."Draft Invoice SystemId"; // Special case for AU + EnsureReasonCode(); LibrarySales.SetDefaultCancelReasonCodeForSalesAndReceivablesSetup(); Commit(); @@ -970,6 +971,7 @@ codeunit 139709 "Sales Invoices E2E" DocumentId := SalesInvoiceHeader."Draft Invoice SystemId"; // Special case for AU + EnsureReasonCode(); LibrarySales.SetDefaultCancelReasonCodeForSalesAndReceivablesSetup(); Commit(); @@ -1293,9 +1295,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 e37ba185768..f9abde31df7 100644 --- a/src/Apps/W1/APIV2/test/src/APIV2SalesCreditMemosE2E.Codeunit.al +++ b/src/Apps/W1/APIV2/test/src/APIV2SalesCreditMemosE2E.Codeunit.al @@ -797,11 +797,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(); @@ -810,6 +815,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 d3f4600a9e6..f1fa3f06251 100644 --- a/src/Apps/W1/APIV2/test/src/APIV2SalesInvoicesE2E.Codeunit.al +++ b/src/Apps/W1/APIV2/test/src/APIV2SalesInvoicesE2E.Codeunit.al @@ -958,6 +958,7 @@ codeunit 139809 "APIV2 - Sales Invoices E2E" DocumentId := SalesInvoiceHeader."Draft Invoice SystemId"; // Special case for AU + EnsureReasonCode(); LibrarySales.SetDefaultCancelReasonCodeForSalesAndReceivablesSetup(); Commit(); @@ -997,6 +998,7 @@ codeunit 139809 "APIV2 - Sales Invoices E2E" DocumentId := SalesInvoiceHeader."Draft Invoice SystemId"; // Special case for AU + EnsureReasonCode(); LibrarySales.SetDefaultCancelReasonCodeForSalesAndReceivablesSetup(); Commit(); @@ -1358,9 +1360,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 90f4da553ab..77367b155ed 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", @@ -34,16 +19,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 492094bf450..81eacdd1870 100644 --- a/src/DisabledTests/_Exclude_APIV2__Tests/_Exclude_APIV2__Tests.DisabledTest.json +++ b/src/DisabledTests/_Exclude_APIV2__Tests/_Exclude_APIV2__Tests.DisabledTest.json @@ -4,21 +4,6 @@ "codeunitName": "APIV2 - Company Info. E2E", "method": "TestGetCompanyAndEnvironmentDescriptions" }, - { - "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", @@ -39,16 +24,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",