diff --git a/src-test/com/openbravo/test/integration/erp/modules/functionalteam/addpayment/testsuites/APR_AddPaymentRefactor/APRSales002.java b/src-test/com/openbravo/test/integration/erp/modules/functionalteam/addpayment/testsuites/APR_AddPaymentRefactor/APRSales002.java --- a/src-test/com/openbravo/test/integration/erp/modules/functionalteam/addpayment/testsuites/APR_AddPaymentRefactor/APRSales002.java +++ b/src-test/com/openbravo/test/integration/erp/modules/functionalteam/addpayment/testsuites/APR_AddPaymentRefactor/APRSales002.java @@ -132,7 +132,7 @@ new AddPaymentPopUpData.Builder().amount_gl_items("0.00").amount_inv_ords("20.70") .total("20.70").difference("0.00").build(), new SalesOrderHeaderData.Builder().documentStatus("Booked").summedLineAmount("20.00") - .grandTotalAmount("20.70").currency("EUR").build() } }); + .grandTotalAmount("20.70").currency("EUR").paymentStatus("100 %").build() } }); } /** diff --git a/src-test/com/openbravo/test/integration/erp/modules/functionalteam/addpayment/testsuites/APR_AddPaymentRefactor/APRSales004.java b/src-test/com/openbravo/test/integration/erp/modules/functionalteam/addpayment/testsuites/APR_AddPaymentRefactor/APRSales004.java --- a/src-test/com/openbravo/test/integration/erp/modules/functionalteam/addpayment/testsuites/APR_AddPaymentRefactor/APRSales004.java +++ b/src-test/com/openbravo/test/integration/erp/modules/functionalteam/addpayment/testsuites/APR_AddPaymentRefactor/APRSales004.java @@ -116,6 +116,8 @@ /** The data to verify the application of the payment. */ SalesInvoiceHeaderData payedSalesInvoiceHeaderVerificationData; + SalesOrderHeaderData payedSalesOrderHeaderVerificationDataAgain; + /** * Class constructor. * @@ -157,6 +159,7 @@ * The data to verify the totals data in the add payment pop up. * @param payedSalesInvoiceHeaderVerificationData * The data to verify the application of the payment. + * @param payedSalesOrderHeaderVerificationDataAgain */ public APRSales004(SalesOrderHeaderData salesOrderHeaderData, SalesOrderHeaderData salesOrderHeaderVerficationData, @@ -173,7 +176,8 @@ SalesInvoiceLinesData salesInvoiceLineVerificationData, PaymentPlanData paymentInPlanData, AddPaymentPopUpData addPaymentInVerificationData, AddPaymentPopUpData addPaymentTotalsVerificationData, - SalesInvoiceHeaderData payedSalesInvoiceHeaderVerificationData) { + SalesInvoiceHeaderData payedSalesInvoiceHeaderVerificationData, + SalesOrderHeaderData payedSalesOrderHeaderVerificationDataAgain) { this.salesOrderHeaderData = salesOrderHeaderData; this.salesOrderHeaderVerficationData = salesOrderHeaderVerficationData; this.salesOrderLinesData = salesOrderLinesData; @@ -193,6 +197,7 @@ this.addPaymentInVerificationData = addPaymentInVerificationData; this.addPaymentTotalsVerificationData = addPaymentTotalsVerificationData; this.payedSalesInvoiceHeaderVerificationData = payedSalesInvoiceHeaderVerificationData; + this.payedSalesOrderHeaderVerificationDataAgain = payedSalesOrderHeaderVerificationDataAgain; logInData = new LogInData.Builder().userName("QAAdmin").password("QAAdmin").build(); } @@ -206,29 +211,33 @@ public static Collection salesOrderValues() { Object[][] data = new Object[][] { { /* Parameters for [APRSales004] Create Sales Order. */ - new SalesOrderHeaderData.Builder().transactionDocument("Standard Order").businessPartner( - new BusinessPartnerSelectorData.Builder().name("Customer A").build()).build(), + new SalesOrderHeaderData.Builder().transactionDocument("Standard Order") + .businessPartner(new BusinessPartnerSelectorData.Builder().name("Customer A").build()) + .build(), new SalesOrderHeaderData.Builder().partnerAddress(".Pamplona, Street Customer center nº1") - .invoiceAddress(".Pamplona, Street Customer center nº1").invoiceTerms( - "Customer Schedule After Delivery").warehouse("Spain warehouse").priceList( - "Customer A").paymentMethod("1 (Spain)").paymentTerms("30 days, 5").build(), - new SalesOrderLinesData.Builder().product( - new ProductSelectorData.Builder().searchKey("FGA").build()).orderedQuantity("100") - .build(), - new SalesOrderLinesData.Builder().uOM("Bag").unitPrice("2.00").listPrice("2.00").tax( - "VAT(3)+CHARGE(0.5)").lineNetAmount("200.00").build(), + .invoiceAddress(".Pamplona, Street Customer center nº1") + .invoiceTerms("Customer Schedule After Delivery").warehouse("Spain warehouse") + .priceList("Customer A").paymentMethod("1 (Spain)").paymentTerms("30 days, 5") + .paymentStatus("0 %").build(), + new SalesOrderLinesData.Builder() + .product(new ProductSelectorData.Builder().searchKey("FGA").build()) + .orderedQuantity("100").build(), + new SalesOrderLinesData.Builder().uOM("Bag").unitPrice("2.00").listPrice("2.00") + .tax("VAT(3)+CHARGE(0.5)").lineNetAmount("200.00").build(), new SalesOrderHeaderData.Builder().documentStatus("Booked").summedLineAmount("200.00") .grandTotalAmount("207.00").currency("EUR").build(), new TaxData[] { new TaxData.Builder().tax("VAT(3) - VAT 3%").taxAmount("6.00").taxableAmount("200.00") .build(), - new TaxData.Builder().tax("CHARGE 0.5% - VAT 3%").taxAmount("1.00").taxableAmount( - "200.00").build() }, + new TaxData.Builder().tax("CHARGE 0.5% - VAT 3%").taxAmount("1.00") + .taxableAmount("200.00").build() }, /* Parameters for [APRSales004] Create Good Shipment. */ - new GoodsShipmentHeaderData.Builder().documentType("MM Shipment").businessPartner( - new BusinessPartnerSelectorData.Builder().name("Customer A").build()).build(), - new GoodsShipmentHeaderData.Builder().partnerAddress( - ".Pamplona, Street Customer center nº1").warehouse("Spain warehouse").build(), + new GoodsShipmentHeaderData.Builder().documentType("MM Shipment") + .businessPartner(new BusinessPartnerSelectorData.Builder().name("Customer A").build()) + .build(), + new GoodsShipmentHeaderData.Builder() + .partnerAddress(".Pamplona, Street Customer center nº1").warehouse("Spain warehouse") + .build(), new GoodsShipmentLinesData.Builder().product( new ProductCompleteSelectorData.Builder().searchKey("FGA").storageBin("spain111") .build()).build(), @@ -236,29 +245,32 @@ .movementQuantity("100").build(), new GoodsShipmentHeaderData.Builder().documentStatus("Completed").build(), /* Parameters for [APRSales004] Create Sales Invoice. */ - new SalesInvoiceHeaderData.Builder().transactionDocument("AR Invoice").businessPartner( - new BusinessPartnerSelectorData.Builder().name("Customer A").build()).build(), + new SalesInvoiceHeaderData.Builder().transactionDocument("AR Invoice") + .businessPartner(new BusinessPartnerSelectorData.Builder().name("Customer A").build()) + .build(), new SalesInvoiceHeaderData.Builder() .partnerAddress(".Pamplona, Street Customer center nº1").priceList("Customer A") .paymentMethod("1 (Spain)").paymentTerms("30 days, 5").build(), new SalesInvoiceHeaderData.Builder().totalPaid("0.00").outstandingAmount("207.00") .documentStatus("Completed").summedLineAmount("200.00").grandTotalAmount("207.00") .currency("EUR").paymentComplete(false).build(), - new SalesInvoiceLinesData.Builder().product( - new ProductSimpleSelectorData.Builder().productName("Final good A").build()) - .invoicedQuantity("100").uOM("Bag").unitPrice("2.00").listPrice("2.00").tax( - "VAT(3)+CHARGE(0.5)").lineNetAmount("200.00").build(), - new PaymentPlanData.Builder().dueDate(OBDate.GET_30_DAYS_5_FROM_SYSTEM_DATE).finPaymentmethod( - "1 (Spain)").amount("207.00").paidAmount("0.00").outstandingAmount("207.00").build(), + new SalesInvoiceLinesData.Builder() + .product(new ProductSimpleSelectorData.Builder().productName("Final good A").build()) + .invoicedQuantity("100").uOM("Bag").unitPrice("2.00").listPrice("2.00") + .tax("VAT(3)+CHARGE(0.5)").lineNetAmount("200.00").build(), + new PaymentPlanData.Builder().dueDate(OBDate.GET_30_DAYS_5_FROM_SYSTEM_DATE) + .finPaymentmethod("1 (Spain)").amount("207.00").paidAmount("0.00") + .outstandingAmount("207.00").build(), /* Data for [APRSales004] Add Payment. */ - new AddPaymentPopUpData.Builder().received_from("Customer A").fin_paymentmethod_id( - "1 (Spain)").fin_financial_account_id("Spain Bank - EUR").c_currency_id("EUR") - .expected_payment("207.00").actual_payment("207.00").payment_date( - OBDate.CURRENT_DATE).transaction_type("Invoices").build(), - new AddPaymentPopUpData.Builder().amount_gl_items("0.00").amount_inv_ords("207.00").total( - "207.00").difference("793.00").build(), + new AddPaymentPopUpData.Builder().received_from("Customer A") + .fin_paymentmethod_id("1 (Spain)").fin_financial_account_id("Spain Bank - EUR") + .c_currency_id("EUR").expected_payment("207.00").actual_payment("207.00") + .payment_date(OBDate.CURRENT_DATE).transaction_type("Invoices").build(), + new AddPaymentPopUpData.Builder().amount_gl_items("0.00").amount_inv_ords("207.00") + .total("207.00").difference("793.00").build(), new SalesInvoiceHeaderData.Builder().paymentComplete(true).documentStatus("Completed") - .summedLineAmount("200.00").grandTotalAmount("207.00").currency("EUR").build() } }; + .summedLineAmount("200.00").grandTotalAmount("207.00").currency("EUR").build(), + new SalesOrderHeaderData.Builder().paymentStatus("100 %").build() } }; return Arrays.asList(data); } @@ -298,8 +310,9 @@ goodsShipment.assertData(goodsShipmentHeaderVerificationData); // TODO when the fields in status bar are automated, we can take the grand total amount from the // same object. - String salesOrderIdentifier = String.format("%s - %s - %s", completedSalesOrderHeaderData - .getDataField("documentNo"), completedSalesOrderHeaderData.getDataField("orderDate"), + String salesOrderIdentifier = String.format("%s - %s - %s", + completedSalesOrderHeaderData.getDataField("documentNo"), + completedSalesOrderHeaderData.getDataField("orderDate"), bookedSalesOrderHeaderVerificationData.getDataField("grandTotalAmount")); goodsShipment.createLinesFrom("spain111", salesOrderIdentifier); goodsShipment.assertProcessCompletedSuccessfully(); @@ -349,6 +362,10 @@ salesInvoice.assertPaymentCreatedSuccessfully(); salesInvoice.assertData(payedSalesInvoiceHeaderVerificationData); + salesOrder.open(); + salesOrder.select(salesOrderHeaderData); + salesOrder.assertData(payedSalesOrderHeaderVerificationDataAgain); + logger .info("** End of test case [APRSales004] Adding a Payment to a sales invoice with an associated sales order as a generated credit. **"); }