details: https://code.openbravo.com/erp/devel/pi/rev/c4b090768bd1 changeset: 32020:c4b090768bd1 user: Armaignac <collazoandy4 <at> gmail.com> date: Sun Apr 16 23:23:43 2017 -0400 summary: Related to issue 35699: Add some automated tests.
Incluided support for taxes test with discount lines Two new products, and 10% and 100% discount was added to the dataset of QA Client Code refactoring for test taxes with discount lines Two taxes test group with 10% and 100% discount was added details: https://code.openbravo.com/erp/devel/pi/rev/6a7acea80102 changeset: 32021:6a7acea80102 user: Armaignac <collazoandy4 <at> gmail.com> date: Thu Apr 13 17:56:06 2017 -0400 summary: Fixes issue 35785: Not rounded discount lines in processed invoices The Discounts lines created in the invoice complete process was not rounded their quantities in database A call to the round process was added with the standard currency precision to the discount value diffstat: referencedata/sampledata/QA_Testing/C_DISCOUNT.xml | 14 + referencedata/sampledata/QA_Testing/C_INVOICE_DISCOUNT.xml | 33 ++ referencedata/sampledata/QA_Testing/C_ORDER_DISCOUNT.xml | 33 ++ referencedata/sampledata/QA_Testing/M_PRODUCT.xml | 58 +++- referencedata/sampledata/QA_Testing/M_PRODUCT_ACCT.xml | 34 ++ src-db/database/model/functions/C_INVOICE_POST.xml | 1 + src-test/src/org/openbravo/test/taxes/TaxesTest.java | 153 ++++++--- src-test/src/org/openbravo/test/taxes/data/ProductDataConstants.java | 4 + src-test/src/org/openbravo/test/taxes/data/TaxesTestData185.java | 107 ++++++ src-test/src/org/openbravo/test/taxes/data/TaxesTestData186.java | 107 ++++++ src-test/src/org/openbravo/test/taxes/data/TaxesTestData187.java | 107 ++++++ src-test/src/org/openbravo/test/taxes/data/TaxesTestData188.java | 107 ++++++ src-test/src/org/openbravo/test/taxes/data/TaxesTestData189.java | 107 ++++++ src-test/src/org/openbravo/test/taxes/data/TaxesTestData190.java | 107 ++++++ src-test/src/org/openbravo/test/taxes/data/TaxesTestData191.java | 107 ++++++ src-test/src/org/openbravo/test/taxes/data/TaxesTestData192.java | 107 ++++++ src-test/src/org/openbravo/test/taxes/data/TaxesTestData193.java | 106 ++++++ src-test/src/org/openbravo/test/taxes/data/TaxesTestData194.java | 107 ++++++ src-test/src/org/openbravo/test/taxes/data/TaxesTestData195.java | 106 ++++++ src-test/src/org/openbravo/test/taxes/data/TaxesTestData196.java | 107 ++++++ src-test/src/org/openbravo/test/taxes/data/TaxesTestData197.java | 106 ++++++ src-test/src/org/openbravo/test/taxes/data/TaxesTestData198.java | 107 ++++++ src-test/src/org/openbravo/test/taxes/data/TaxesTestData199.java | 106 ++++++ src-test/src/org/openbravo/test/taxes/data/TaxesTestData200.java | 107 ++++++ 24 files changed, 1984 insertions(+), 54 deletions(-) diffs (truncated from 2227 to 300 lines): diff -r bc83ba843f84 -r 6a7acea80102 referencedata/sampledata/QA_Testing/C_DISCOUNT.xml --- a/referencedata/sampledata/QA_Testing/C_DISCOUNT.xml Thu May 04 09:14:58 2017 +0200 +++ b/referencedata/sampledata/QA_Testing/C_DISCOUNT.xml Thu Apr 13 17:56:06 2017 -0400 @@ -28,4 +28,18 @@ <M_PRODUCT_ID><![CDATA[0C96FDE47EFD49D9934FC4BCE73571A1]]></M_PRODUCT_ID> </C_DISCOUNT> +<C_DISCOUNT> + <C_DISCOUNT_ID><![CDATA[32927ECCF7D644BCBB0B312254219935]]></C_DISCOUNT_ID> + <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID> + <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> + <ISACTIVE><![CDATA[Y]]></ISACTIVE> + <CREATED><![CDATA[2017-04-11 11:29:56.943]]></CREATED> + <CREATEDBY><![CDATA[100]]></CREATEDBY> + <UPDATED><![CDATA[2017-04-11 11:29:56.943]]></UPDATED> + <UPDATEDBY><![CDATA[100]]></UPDATEDBY> + <NAME><![CDATA[Discount 100%]]></NAME> + <DISCOUNT><![CDATA[100]]></DISCOUNT> + <M_PRODUCT_ID><![CDATA[7AA829D1675248A786D97438616BCDC0]]></M_PRODUCT_ID> +</C_DISCOUNT> + </data> diff -r bc83ba843f84 -r 6a7acea80102 referencedata/sampledata/QA_Testing/C_INVOICE_DISCOUNT.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/referencedata/sampledata/QA_Testing/C_INVOICE_DISCOUNT.xml Thu Apr 13 17:56:06 2017 -0400 @@ -0,0 +1,33 @@ +<?xml version='1.0' encoding='UTF-8'?> +<data> +<C_INVOICE_DISCOUNT> + <C_INVOICE_DISCOUNT_ID><![CDATA[B69005DFD0334E4094A648805B05C253]]></C_INVOICE_DISCOUNT_ID> + <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID> + <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID> + <ISACTIVE><![CDATA[Y]]></ISACTIVE> + <CREATED><![CDATA[2017-04-11 11:24:40.866]]></CREATED> + <CREATEDBY><![CDATA[100]]></CREATEDBY> + <UPDATED><![CDATA[2017-04-11 11:24:40.866]]></UPDATED> + <UPDATEDBY><![CDATA[100]]></UPDATEDBY> + <C_INVOICE_ID><![CDATA[F889F6E61CA6454EA50BDD6DD75582E3]]></C_INVOICE_ID> + <C_DISCOUNT_ID><![CDATA[098A46DBB0DC45779ADE258624E1333F]]></C_DISCOUNT_ID> + <LINE><![CDATA[10]]></LINE> + <CASCADE><![CDATA[N]]></CASCADE> +</C_INVOICE_DISCOUNT> + +<C_INVOICE_DISCOUNT> + <C_INVOICE_DISCOUNT_ID><![CDATA[E8CA92874B174ECC84928A04FE783285]]></C_INVOICE_DISCOUNT_ID> + <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID> + <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID> + <ISACTIVE><![CDATA[Y]]></ISACTIVE> + <CREATED><![CDATA[2017-04-11 11:24:48.464]]></CREATED> + <CREATEDBY><![CDATA[100]]></CREATEDBY> + <UPDATED><![CDATA[2017-04-11 11:24:48.464]]></UPDATED> + <UPDATEDBY><![CDATA[100]]></UPDATEDBY> + <C_INVOICE_ID><![CDATA[9D0F6E57E59247F6AB6D063951811F51]]></C_INVOICE_ID> + <C_DISCOUNT_ID><![CDATA[098A46DBB0DC45779ADE258624E1333F]]></C_DISCOUNT_ID> + <LINE><![CDATA[10]]></LINE> + <CASCADE><![CDATA[N]]></CASCADE> +</C_INVOICE_DISCOUNT> + +</data> diff -r bc83ba843f84 -r 6a7acea80102 referencedata/sampledata/QA_Testing/C_ORDER_DISCOUNT.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/referencedata/sampledata/QA_Testing/C_ORDER_DISCOUNT.xml Thu Apr 13 17:56:06 2017 -0400 @@ -0,0 +1,33 @@ +<?xml version='1.0' encoding='UTF-8'?> +<data> +<C_ORDER_DISCOUNT> + <C_ORDER_DISCOUNT_ID><![CDATA[02029BE2E6F84E09AE7D9C8BDFFA5A1C]]></C_ORDER_DISCOUNT_ID> + <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID> + <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID> + <ISACTIVE><![CDATA[Y]]></ISACTIVE> + <CREATED><![CDATA[2017-04-11 11:25:07.913]]></CREATED> + <CREATEDBY><![CDATA[100]]></CREATEDBY> + <UPDATED><![CDATA[2017-04-11 11:25:07.913]]></UPDATED> + <UPDATEDBY><![CDATA[100]]></UPDATEDBY> + <C_ORDER_ID><![CDATA[8B53B7E6CF3B4D8D9BCF3A49EED6FCB4]]></C_ORDER_ID> + <C_DISCOUNT_ID><![CDATA[098A46DBB0DC45779ADE258624E1333F]]></C_DISCOUNT_ID> + <LINE><![CDATA[10]]></LINE> + <CASCADE><![CDATA[N]]></CASCADE> +</C_ORDER_DISCOUNT> + +<C_ORDER_DISCOUNT> + <C_ORDER_DISCOUNT_ID><![CDATA[1EE97A9933A545D2B4A330B5B6A83FFF]]></C_ORDER_DISCOUNT_ID> + <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID> + <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID> + <ISACTIVE><![CDATA[Y]]></ISACTIVE> + <CREATED><![CDATA[2017-04-11 11:24:56.424]]></CREATED> + <CREATEDBY><![CDATA[100]]></CREATEDBY> + <UPDATED><![CDATA[2017-04-11 11:24:56.424]]></UPDATED> + <UPDATEDBY><![CDATA[100]]></UPDATEDBY> + <C_ORDER_ID><![CDATA[2C9CEDC0761A41DCB276A5124F8AAA90]]></C_ORDER_ID> + <C_DISCOUNT_ID><![CDATA[098A46DBB0DC45779ADE258624E1333F]]></C_DISCOUNT_ID> + <LINE><![CDATA[10]]></LINE> + <CASCADE><![CDATA[N]]></CASCADE> +</C_ORDER_DISCOUNT> + +</data> diff -r bc83ba843f84 -r 6a7acea80102 referencedata/sampledata/QA_Testing/M_PRODUCT.xml --- a/referencedata/sampledata/QA_Testing/M_PRODUCT.xml Thu May 04 09:14:58 2017 +0200 +++ b/referencedata/sampledata/QA_Testing/M_PRODUCT.xml Thu Apr 13 17:56:06 2017 -0400 @@ -1299,16 +1299,68 @@ <PROD_CAT_SELECTION><![CDATA[Y]]></PROD_CAT_SELECTION> <PRODUCT_SELECTION><![CDATA[Y]]></PRODUCT_SELECTION> <PRINT_DESCRIPTION><![CDATA[N]]></PRINT_DESCRIPTION> - <ALLOW_ANONYMOUS_SALE><![CDATA[N]]></ALLOW_ANONYMOUS_SALE> - <OVERDUE_AVAILABLE_DAYS><![CDATA[1]]></OVERDUE_AVAILABLE_DAYS> <RETURNABLE><![CDATA[N]]></RETURNABLE> - <EDITABLE_PRICE><![CDATA[N]]></EDITABLE_PRICE> <ISPRICERULEBASED><![CDATA[N]]></ISPRICERULEBASED> <UNIQUE_PER_DOCUMENT><![CDATA[N]]></UNIQUE_PER_DOCUMENT> <RELATEPRODCATTOSERVICE><![CDATA[N]]></RELATEPRODCATTOSERVICE> <RELATEPRODTOSERVICE><![CDATA[N]]></RELATEPRODTOSERVICE> <ISLINKEDTOPRODUCT><![CDATA[Y]]></ISLINKEDTOPRODUCT> <QUANTITY_RULE><![CDATA[UQ]]></QUANTITY_RULE> + <ALLOW_DEFERRED_SELL><![CDATA[N]]></ALLOW_DEFERRED_SELL> + <EM_AEAT347_ISLEASEBUSINESS><![CDATA[N]]></EM_AEAT347_ISLEASEBUSINESS> +</M_PRODUCT> + +<M_PRODUCT> + <M_PRODUCT_ID><![CDATA[7AA829D1675248A786D97438616BCDC0]]></M_PRODUCT_ID> + <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID> + <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> + <ISACTIVE><![CDATA[Y]]></ISACTIVE> + <CREATED><![CDATA[2017-04-11 11:28:20.499]]></CREATED> + <CREATEDBY><![CDATA[100]]></CREATEDBY> + <UPDATED><![CDATA[2017-04-11 11:30:26.234]]></UPDATED> + <UPDATEDBY><![CDATA[100]]></UPDATEDBY> + <VALUE><![CDATA[D100]]></VALUE> + <NAME><![CDATA[Discount 100%]]></NAME> + <C_UOM_ID><![CDATA[100]]></C_UOM_ID> + <SALESREP_ID><![CDATA[100]]></SALESREP_ID> + <ISSUMMARY><![CDATA[N]]></ISSUMMARY> + <ISSTOCKED><![CDATA[N]]></ISSTOCKED> + <ISPURCHASED><![CDATA[Y]]></ISPURCHASED> + <ISSOLD><![CDATA[Y]]></ISSOLD> + <ISBOM><![CDATA[N]]></ISBOM> + <ISINVOICEPRINTDETAILS><![CDATA[N]]></ISINVOICEPRINTDETAILS> + <ISPICKLISTPRINTDETAILS><![CDATA[N]]></ISPICKLISTPRINTDETAILS> + <ISVERIFIED><![CDATA[N]]></ISVERIFIED> + <M_PRODUCT_CATEGORY_ID><![CDATA[D4FA40C9285449309C5FD62B8783CC92]]></M_PRODUCT_CATEGORY_ID> + <VOLUME><![CDATA[0]]></VOLUME> + <WEIGHT><![CDATA[0]]></WEIGHT> + <C_TAXCATEGORY_ID><![CDATA[E02F948001F44F479D709EBC6911E310]]></C_TAXCATEGORY_ID> + <DISCONTINUED><![CDATA[N]]></DISCONTINUED> + <PROCESSING><![CDATA[N]]></PROCESSING> + <PRODUCTTYPE><![CDATA[S]]></PRODUCTTYPE> + <M_LOCATOR_ID><![CDATA[96DEDCC179504711A81497DE68900F49]]></M_LOCATOR_ID> + <ISPRICEPRINTED><![CDATA[Y]]></ISPRICEPRINTED> + <ENFORCE_ATTRIBUTE><![CDATA[N]]></ENFORCE_ATTRIBUTE> + <CALCULATED><![CDATA[N]]></CALCULATED> + <PRODUCTION><![CDATA[N]]></PRODUCTION> + <QTYTYPE><![CDATA[N]]></QTYTYPE> + <ISQUANTITYVARIABLE><![CDATA[N]]></ISQUANTITYVARIABLE> + <ISDEFERREDREVENUE><![CDATA[N]]></ISDEFERREDREVENUE> + <ISDEFERREDEXPENSE><![CDATA[N]]></ISDEFERREDEXPENSE> + <BOOKUSINGPOPRICE><![CDATA[N]]></BOOKUSINGPOPRICE> + <ISGENERIC><![CDATA[N]]></ISGENERIC> + <CREATEVARIANTS><![CDATA[N]]></CREATEVARIANTS> + <UPDATEINVARIANTS><![CDATA[N]]></UPDATEINVARIANTS> + <MANAGEVARIANTS><![CDATA[N]]></MANAGEVARIANTS> + <PRINT_DESCRIPTION><![CDATA[N]]></PRINT_DESCRIPTION> + <RETURNABLE><![CDATA[N]]></RETURNABLE> + <ISPRICERULEBASED><![CDATA[N]]></ISPRICERULEBASED> + <UNIQUE_PER_DOCUMENT><![CDATA[N]]></UNIQUE_PER_DOCUMENT> + <RELATEPRODCATTOSERVICE><![CDATA[N]]></RELATEPRODCATTOSERVICE> + <RELATEPRODTOSERVICE><![CDATA[N]]></RELATEPRODTOSERVICE> + <ISLINKEDTOPRODUCT><![CDATA[N]]></ISLINKEDTOPRODUCT> + <ALLOW_DEFERRED_SELL><![CDATA[N]]></ALLOW_DEFERRED_SELL> + <EM_AEAT347_ISLEASEBUSINESS><![CDATA[N]]></EM_AEAT347_ISLEASEBUSINESS> </M_PRODUCT> <M_PRODUCT> diff -r bc83ba843f84 -r 6a7acea80102 referencedata/sampledata/QA_Testing/M_PRODUCT_ACCT.xml --- a/referencedata/sampledata/QA_Testing/M_PRODUCT_ACCT.xml Thu May 04 09:14:58 2017 +0200 +++ b/referencedata/sampledata/QA_Testing/M_PRODUCT_ACCT.xml Thu Apr 13 17:56:06 2017 -0400 @@ -393,6 +393,23 @@ </M_PRODUCT_ACCT> <M_PRODUCT_ACCT> + <M_PRODUCT_ACCT_ID><![CDATA[680BF170BD20489ABF8C840F9E772C66]]></M_PRODUCT_ACCT_ID> + <M_PRODUCT_ID><![CDATA[7AA829D1675248A786D97438616BCDC0]]></M_PRODUCT_ID> + <C_ACCTSCHEMA_ID><![CDATA[9A68A0F8D72D4580B3EC3CAA00A5E1F0]]></C_ACCTSCHEMA_ID> + <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID> + <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> + <ISACTIVE><![CDATA[Y]]></ISACTIVE> + <CREATED><![CDATA[2017-04-11 11:28:20.0]]></CREATED> + <CREATEDBY><![CDATA[100]]></CREATEDBY> + <UPDATED><![CDATA[2017-04-11 11:28:20.0]]></UPDATED> + <UPDATEDBY><![CDATA[100]]></UPDATEDBY> + <P_REVENUE_ACCT><![CDATA[988029814B4D4B19BD7BA9EAB4F1FC29]]></P_REVENUE_ACCT> + <P_EXPENSE_ACCT><![CDATA[17263FD54AE64546A89C79D797AEFF4F]]></P_EXPENSE_ACCT> + <P_ASSET_ACCT><![CDATA[07840D840D0940CBA1254D1A0CDD64A0]]></P_ASSET_ACCT> + <P_COGS_ACCT><![CDATA[F9B6701E65A94F6E804287B808E919BE]]></P_COGS_ACCT> +</M_PRODUCT_ACCT> + +<M_PRODUCT_ACCT> <M_PRODUCT_ACCT_ID><![CDATA[6ACB03046ADA4F4095CE2E7ABE564D85]]></M_PRODUCT_ACCT_ID> <M_PRODUCT_ID><![CDATA[4028E6C72959682B01295ADC1DC2022E]]></M_PRODUCT_ID> <C_ACCTSCHEMA_ID><![CDATA[432EAC71E1B8451E97C7F54718C4A06B]]></C_ACCTSCHEMA_ID> @@ -597,6 +614,23 @@ </M_PRODUCT_ACCT> <M_PRODUCT_ACCT> + <M_PRODUCT_ACCT_ID><![CDATA[9817B322AF5F44D493C7369B2A2F1907]]></M_PRODUCT_ACCT_ID> + <M_PRODUCT_ID><![CDATA[7AA829D1675248A786D97438616BCDC0]]></M_PRODUCT_ID> + <C_ACCTSCHEMA_ID><![CDATA[432EAC71E1B8451E97C7F54718C4A06B]]></C_ACCTSCHEMA_ID> + <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID> + <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> + <ISACTIVE><![CDATA[Y]]></ISACTIVE> + <CREATED><![CDATA[2017-04-11 11:28:20.0]]></CREATED> + <CREATEDBY><![CDATA[100]]></CREATEDBY> + <UPDATED><![CDATA[2017-04-11 11:28:20.0]]></UPDATED> + <UPDATEDBY><![CDATA[100]]></UPDATEDBY> + <P_REVENUE_ACCT><![CDATA[56821CE085F846D7AC31278C253B4534]]></P_REVENUE_ACCT> + <P_EXPENSE_ACCT><![CDATA[DEFD960D4AA8470596B125D1C051D68E]]></P_EXPENSE_ACCT> + <P_ASSET_ACCT><![CDATA[95E4C0C233994DE283922DA5221EBB9B]]></P_ASSET_ACCT> + <P_COGS_ACCT><![CDATA[7EBB52E1D49F4A7AB660E8AEBE53E88C]]></P_COGS_ACCT> +</M_PRODUCT_ACCT> + +<M_PRODUCT_ACCT> <M_PRODUCT_ACCT_ID><![CDATA[991C1A762A934D5481164FA26ACDD1BD]]></M_PRODUCT_ACCT_ID> <M_PRODUCT_ID><![CDATA[4028E6C72959682B01295ADC1D07022A]]></M_PRODUCT_ID> <C_ACCTSCHEMA_ID><![CDATA[9A68A0F8D72D4580B3EC3CAA00A5E1F0]]></C_ACCTSCHEMA_ID> diff -r bc83ba843f84 -r 6a7acea80102 src-db/database/model/functions/C_INVOICE_POST.xml --- a/src-db/database/model/functions/C_INVOICE_POST.xml Thu May 04 09:14:58 2017 +0200 +++ b/src-db/database/model/functions/C_INVOICE_POST.xml Thu Apr 13 17:56:06 2017 -0400 @@ -1275,6 +1275,7 @@ END IF; v_InvoiceLineSeqNo:=10 + v_InvoiceLineSeqNo; v_InvoiceLine:=get_uuid(); + v_Discount := ROUND(v_Discount, v_stdPrecision); INSERT INTO C_INVOICELINE ( C_INVOICELINE_ID, AD_CLIENT_ID, AD_ORG_ID, ISACTIVE, diff -r bc83ba843f84 -r 6a7acea80102 src-test/src/org/openbravo/test/taxes/TaxesTest.java --- a/src-test/src/org/openbravo/test/taxes/TaxesTest.java Thu May 04 09:14:58 2017 +0200 +++ b/src-test/src/org/openbravo/test/taxes/TaxesTest.java Thu Apr 13 17:56:06 2017 -0400 @@ -47,9 +47,11 @@ import org.openbravo.model.ad.access.OrderLineTax; import org.openbravo.model.common.businesspartner.BusinessPartner; import org.openbravo.model.common.invoice.Invoice; +import org.openbravo.model.common.invoice.InvoiceDiscount; import org.openbravo.model.common.invoice.InvoiceLine; import org.openbravo.model.common.invoice.InvoiceTax; import org.openbravo.model.common.order.Order; +import org.openbravo.model.common.order.OrderDiscount; import org.openbravo.model.common.order.OrderLine; import org.openbravo.model.common.order.OrderTax; import org.openbravo.model.common.plm.Product; @@ -78,7 +80,7 @@ private final String ORGANIZATION_ID = "357947E87C284935AD1D783CF6F099A1"; // Role QA Testing Admin private final String ROLE_ID = "4028E6C72959682B01295A071429011E"; - // Sales Invoice: 10000017 + // Sales Invoice: Taxes Test Template private final String SALESINVOICE_ID = "F889F6E61CA6454EA50BDD6DD75582E3"; // Purchase Invoice: 10000017 private final String PURCHASEINVOICE_ID = "9D0F6E57E59247F6AB6D063951811F51"; @@ -304,6 +306,22 @@ { "182", "PriceIncludingTaxes 182: Doc Big 10% negative", new TaxesTestData182() }, // { "183", "PriceIncludingTaxes 183: Line Big 10% positive", new TaxesTestData183() }, // { "184", "PriceIncludingTaxes 184: Line Big 10% negative", new TaxesTestData184() }, // + { "185", "PriceExcludingTaxes 185: Doc Small Discount positive", new TaxesTestData185() }, // + { "186", "PriceExcludingTaxes 186: Doc Small Discount negative", new TaxesTestData186() }, // + { "187", "PriceExcludingTaxes 187: Line Small Discount positive", new TaxesTestData187() }, // + { "188", "PriceExcludingTaxes 188: Line Small Discount negative", new TaxesTestData188() }, // + { "189", "PriceIncludingTaxes 189: Doc Small Discount positive", new TaxesTestData189() }, // + { "190", "PriceIncludingTaxes 190: Doc Small Discount negative", new TaxesTestData190() }, // + { "191", "PriceIncludingTaxes 191: Line Small Discount positive", new TaxesTestData191() }, // + { "192", "PriceIncludingTaxes 192: Line Small Discount negative", new TaxesTestData192() }, // + { "193", "PriceExcludingTaxes 193: Doc Big Discount positive", new TaxesTestData193() }, // + { "194", "PriceExcludingTaxes 194: Doc Big Discount negative", new TaxesTestData194() }, // + { "195", "PriceExcludingTaxes 195: Line Big Discount positive", new TaxesTestData195() }, // + { "196", "PriceExcludingTaxes 196: Line Big Discount negative", new TaxesTestData196() }, // + { "197", "PriceIncludingTaxes 197: Doc Big Discount positive", new TaxesTestData197() }, // + { "198", "PriceIncludingTaxes 198: Doc Big Discount negative", new TaxesTestData198() }, // + { "199", "PriceIncludingTaxes 199: Line Big Discount positive", new TaxesTestData199() }, // + { "200", "PriceIncludingTaxes 200: Line Big Discount negative", new TaxesTestData200() }, // }); } @@ -527,39 +545,55 @@ PRICEEXCLUDINGTAXES_PRICELIST_PURCHASE)); } } - OBDal.getInstance().save(testOrder); OrderLine orderLine = order.getOrderLineList().get(0); + OrderDiscount orderDiscount = order.getOrderDiscountList().get(0); for (int i = 0; i < linesData.length; i++) { - OrderLine testOrderLine = (OrderLine) DalUtil.copy(orderLine, false); Product product = OBDal.getInstance().get(Product.class, linesData[i].getProductId()); - testOrderLine.setLineNo((i + 1) * 10L); - testOrderLine.setBusinessPartner(OBDal.getInstance().get(BusinessPartner.class, - isSales ? BPartnerDataConstants.CUSTOMER_A : BPartnerDataConstants.VENDOR_A)); - testOrderLine.setProduct(product); - testOrderLine.setUOM(product.getUOM()); - testOrderLine.setOrderedQuantity(linesData[i].getQuantity()); - if (isPriceIncludingTaxes) { ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
