0029872: Add the Payment status in sales order window

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<Object[]> 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. **"); }

Notes
(0079769) hgbot (developer) 2015-08-27 10:21	Repository: erp/devel/pi Changeset: fba0bdc5a8289513a6cfd71ddac00c2c938307a2 Author: Gorka Ion Damián <gorkaion.damian <at> openbravo.com> Date: Thu Aug 27 10:20:53 2015 +0200 URL: http://code.openbravo.com/erp/devel/pi/rev/fba0bdc5a8289513a6cfd71ddac00c2c938307a2 [^] Fixed issue 29872.Added computed column to show paid percentage. --- M src-db/database/sourcedata/AD_COLUMN.xml M src-db/database/sourcedata/AD_ELEMENT.xml M src-db/database/sourcedata/AD_FIELD.xml ---

(0079772) AugustoMauch (manager) 2015-08-27 11:07 edited on: 2015-08-31 10:56	Computed columns can potentially perform very poorly in high volume environments, specially when the grid is filtered and sorted using the computed column. Before closing this issue this should be tested in a high volume environment.

(0079781) hudsonbot (developer) 2015-08-27 17:02	A changeset related to this issue has been promoted main and to the Central Repository, after passing a series of tests. Promotion changeset: https://code.openbravo.com/erp/devel/main/rev/aa1822be5622 [^] Maturity status: Test

(0080278) hgbot (developer) 2015-09-09 13:36	Repository: erp/devel/pi Changeset: fd369e6a038303e2bc833c76bf9c422a7b4fac4b Author: Víctor Martínez Romanos <victor.martinez <at> openbravo.com> Date: Wed Sep 09 13:35:01 2015 +0200 URL: http://code.openbravo.com/erp/devel/pi/rev/fd369e6a038303e2bc833c76bf9c422a7b4fac4b [^] Related to issue 29872: Deactivated the field for 15Q4 Due to the terrible impact both sorting and filtering by this field have for the performance, we have decided to deactivate this field for 15Q4, and to think about a generalistic way to deactivate the filtering and sorting for this field (and others) in 16Q1 --- M src-db/database/sourcedata/AD_FIELD.xml ---

(0080279) vmromanos (manager) 2015-09-09 13:38	The field has been deactivated for 15Q4, as the filtering and sorting have a great impact in performance. In 16Q1 we will think about a generalist way to avoid filtering and sorting for this field and others.

(0080300) hudsonbot (developer) 2015-09-09 23:11	A changeset related to this issue has been promoted main and to the Central Repository, after passing a series of tests. Promotion changeset: https://code.openbravo.com/erp/devel/main/rev/35a1eec70785 [^] Maturity status: Test

(0080400) lorenzofidalgo (developer) 2015-09-15 12:01	"Payment status" has generated several problems. For now, it will not be shown and it has been delayed. So, for now, tests will not check that field.

(0080401) hgbot (developer) 2015-09-15 12:12	Repository: erp/devel/pi Changeset: f8a6e3e544bfb582b4c65408999e372fc4b1797d Author: Víctor Martínez Romanos <victor.martinez <at> openbravo.com> Date: Tue Sep 15 12:11:05 2015 +0200 URL: http://code.openbravo.com/erp/devel/pi/rev/f8a6e3e544bfb582b4c65408999e372fc4b1797d [^] Related to bug 29872: Payment Status in Sales Order set as ISSHOWNINSTATUSBAR=N This is a workaround for issue 30825, which shows this field in the Status Bar regardless it is set as Active = N --- M src-db/database/sourcedata/AD_FIELD.xml ---

(0080424) hudsonbot (developer) 2015-09-16 02:20	A changeset related to this issue has been promoted main and to the Central Repository, after passing a series of tests. Promotion changeset: https://code.openbravo.com/erp/devel/main/rev/ab68e2868765 [^] Maturity status: Test

Issue History
Date Modified	Username	Field	Change
2015-05-13 17:38	guillermogil	New Issue
2015-05-13 17:38	guillermogil	Assigned To	=> guillermogil
2015-05-13 17:38	guillermogil	Modules	=> Core
2015-05-13 17:38	guillermogil	Triggers an Emergency Pack	=> No
2015-05-13 17:40	guillermogil	File Added: Screenshot from 2015-05-13 17:39:31.png
2015-05-14 16:45	guillermogil	File Added: paymentStatus.diff
2015-05-20 17:24	guillermogil	File Added: testPaymentStatus.diff
2015-05-28 16:50	guillermogil	File Deleted: testPaymentStatus.diff
2015-05-28 16:51	guillermogil	File Added: paymentStatusTests.diff
2015-08-27 10:21	hgbot	Checkin
2015-08-27 10:21	hgbot	Note Added: 0079769
2015-08-27 10:21	hgbot	Status	new => resolved
2015-08-27 10:21	hgbot	Resolution	open => fixed
2015-08-27 10:21	hgbot	Fixed in SCM revision	=> http://code.openbravo.com/erp/devel/pi/rev/fba0bdc5a8289513a6cfd71ddac00c2c938307a2 [^]
2015-08-27 11:07	AugustoMauch	Note Added: 0079772
2015-08-27 17:02	hudsonbot	Checkin
2015-08-27 17:02	hudsonbot	Note Added: 0079781
2015-08-31 10:56	AugustoMauch	Note Edited: 0079772	View Revisions
2015-09-04 09:08	AugustoMauch	Relationship added	related to 0030760
2015-09-09 13:36	hgbot	Checkin
2015-09-09 13:36	hgbot	Note Added: 0080278
2015-09-09 13:38	vmromanos	Review Assigned To	=> vmromanos
2015-09-09 13:38	vmromanos	Note Added: 0080279
2015-09-09 13:38	vmromanos	Status	resolved => closed
2015-09-09 23:11	hudsonbot	Checkin
2015-09-09 23:11	hudsonbot	Note Added: 0080300
2015-09-15 11:37	vmromanos	Relationship added	related to 0030825
2015-09-15 12:01	lorenzofidalgo	Note Added: 0080400
2015-09-15 12:12	hgbot	Checkin
2015-09-15 12:12	hgbot	Note Added: 0080401
2015-09-16 02:20	hudsonbot	Checkin
2015-09-16 02:20	hudsonbot	Note Added: 0080424