Notes |
|
(0120260)
|
hgbot
|
2020-05-26 09:32
|
|
|
|
(0120263)
|
hgbot
|
2020-05-26 09:32
|
|
Repository: erp/pmods/org.openbravo.retail.discounts
Changeset: bfeb73b5a47a33ed9ba56a6bc64483625ae31309
Author: Álvaro Ferraz <alvaro.ferraz <at> openbravo.com>
Date: Mon May 25 11:53:50 2020 +0200
URL: http://code.openbravo.com/erp/pmods/org.openbravo.retail.discounts/rev/bfeb73b5a47a33ed9ba56a6bc64483625ae31309 [^]
Fixes ISSUE-44181: Use same Ticket API in Discount and Tax engine
---
M web/org.openbravo.retail.discounts/app/model/business-logic/discounts-engine/engine/discount-engine.js
M web/org.openbravo.retail.discounts/app/model/business-logic/discounts-engine/engine/discount-rules.js
---
|
|
|
(0120264)
|
hgbot
|
2020-05-26 09:37
|
|
|
|
(0120299)
|
hgbot
|
2020-05-26 17:34
|
|
|
|
(0120347)
|
hgbot
|
2020-05-27 11:59
|
|
|
|
(0120389)
|
hgbot
|
2020-05-28 11:08
|
|
|
|
(0120439)
|
hgbot
|
2020-05-29 08:33
|
|
|
|
(0120441)
|
hgbot
|
2020-05-29 08:34
|
|
|
|
(0120452)
|
hgbot
|
2020-05-29 10:15
|
|
Repository: erp/pmods/org.openbravo.retail.discounts
Changeset: bf902b3532e967e8fb0b2e27a9307ac423ef93c8
Author: Álvaro Ferraz <alvaro.ferraz <at> openbravo.com>
Date: Fri May 29 10:15:28 2020 +0200
URL: http://code.openbravo.com/erp/pmods/org.openbravo.retail.discounts/rev/bf902b3532e967e8fb0b2e27a9307ac423ef93c8 [^]
Related to ISSUE-44181: Use same Ticket API in Discount and Tax engine
---
M src-test/org/openbravo/retail/discounts/test/base/Discount.java
M src-test/org/openbravo/retail/discounts/test/base/DiscountResult.java
M src-test/org/openbravo/retail/discounts/test/base/LineDiscounts.java
M src-test/org/openbravo/retail/discounts/test/base/model/Line.java
M src-test/org/openbravo/retail/discounts/test/base/model/Ticket.java
M src-test/org/openbravo/retail/discounts/test/integration/PriceAdjusmentAndBuyXGiftY.java
M src-test/org/openbravo/retail/discounts/test/integration/PriceAdjusmentAndBuyXPayYDifferentProducts.java
M src-test/org/openbravo/retail/discounts/test/integration/PriceAdjusmentAndBuyXPayYSameProducts.java
M src-test/org/openbravo/retail/discounts/test/integration/PriceAdjusmentAndUserDefinedAmount.java
M src-test/org/openbravo/retail/discounts/test/integration/PriceAdjustmentAndFixedPercentage.java
M src-test/org/openbravo/retail/discounts/test/matchers/DiscountMatchers.java
M src-test/org/openbravo/retail/discounts/test/unittests/DiscountBuyXGiftYTest.java
M src-test/org/openbravo/retail/discounts/test/unittests/DiscountBuyXPayYDifferentProductsTest.java
M src-test/org/openbravo/retail/discounts/test/unittests/DiscountBuyXPayYSameProductsTest.java
M src-test/org/openbravo/retail/discounts/test/unittests/DiscountDiscretionaryFixedAmountTest.java
M src-test/org/openbravo/retail/discounts/test/unittests/DiscountDiscretionaryFixedPercentageTest.java
M src-test/org/openbravo/retail/discounts/test/unittests/DiscountFixedPercentageTest.java
M src-test/org/openbravo/retail/discounts/test/unittests/DiscountPackTest.java
M src-test/org/openbravo/retail/discounts/test/unittests/DiscountPriceAdjusmentTest.java
M src-test/org/openbravo/retail/discounts/test/unittests/DiscountUserDefinedAmountTest.java
M src-test/org/openbravo/retail/discounts/test/unittests/DiscountUserDefinedLineAmountTest.java
M src-test/org/openbravo/retail/discounts/test/unittests/DiscountUserDefinedPercentageTest.java
M src-test/org/openbravo/retail/discounts/test/unittests/combined/I28120_SameProductInTwoPacks.java
M src-test/org/openbravo/retail/discounts/test/unittests/combined/I28164_DiscountsRemovedWhenReturnPresent.java
M src-test/org/openbravo/retail/discounts/test/unittests/combined/I30176_UndefinedDiscountWhenReturning.java
M src-test/org/openbravo/retail/discounts/test/unittests/combined/I30385_LayawayDiscountUndef.java
M src-test/org/openbravo/retail/discounts/test/unittests/combined/I30542_BuyXPayYDiffProd_Average.java
M src-test/org/openbravo/retail/discounts/test/unittests/combined/I30542_BuyXPayYDiffProd_Lowest.java
M src-test/org/openbravo/retail/discounts/test/unittests/combined/I30542_BuyXPayYDiffProd_LowestDistributed.java
M src-test/org/openbravo/retail/discounts/test/unittests/combined/I30542_BuyXPayYDiffProd_MostExpensive.java
M src-test/org/openbravo/retail/discounts/test/unittests/combined/I32243_VerifyProductDiscountWithVariableAmount.java
M src-test/org/openbravo/retail/discounts/test/unittests/combined/I32338_ApplyManualPromoAfterTapButtonPay.java
M src-test/org/openbravo/retail/discounts/test/unittests/combined/I32533_DiscountsByProductCharacteristic.java
M src-test/org/openbravo/retail/discounts/test/unittests/combined/I32596_AddProductNotCreateNewPack.java
M src-test/org/openbravo/retail/discounts/test/unittests/combined/I32601_ReturnLineAndApplyPromotion.java
M src-test/org/openbravo/retail/discounts/test/unittests/combined/I32674_VerifyDiscountOnReloadTicket.java
M src-test/org/openbravo/retail/discounts/test/unittests/combined/I33201_VerifyPackCombinedWithManualPromotions.java
M src-test/org/openbravo/retail/discounts/test/unittests/combined/I33390_BuyXPayYSameNonGroupProduct.java
M src-test/org/openbravo/retail/discounts/test/unittests/combined/I34372_VerifyDiscountInDeletedReceipt.java
M src-test/org/openbravo/retail/discounts/test/unittests/combined/I35006_VerifyDiscountPriorityOnUpdate.java
M src-test/org/openbravo/retail/discounts/test/unittests/combined/I35082_PriceAdjusmentWithALineCandidateForPack.java
M src-test/org/openbravo/retail/discounts/test/unittests/combined/I35583_VerifyPackAmountWithLineAmount.java
M src-test/org/openbravo/retail/discounts/test/unittests/combined/I35637_VerifyPriceAdjWithIsMultiple.java
M src-test/org/openbravo/retail/discounts/test/unittests/combined/I36003_VerifyDiscountWithNonGroupedProduct.java
M src-test/org/openbravo/retail/discounts/test/unittests/combined/I36160_VerifyDiscountWithIncludeExcludeProducts.java
M src-test/org/openbravo/retail/discounts/test/unittests/combined/I36520_VerifyDiscountWithAssortmentProducts.java
M src-test/org/openbravo/retail/discounts/test/unittests/combined/I36549_VerifyPriceAdjIsNotBiggestThanLinePrice.java
M src-test/org/openbravo/retail/discounts/test/unittests/combined/I36851_PackDiscountIsNotWorkingWithNonGroupedProducts.java
M src-test/org/openbravo/retail/discounts/test/unittests/combined/I37220_VerifyDiscountOnVerifiedReturns.java
M src-test/org/openbravo/retail/discounts/test/unittests/combined/I39495_VerifyDiscountOnNegativeLine.java
M src-test/org/openbravo/retail/discounts/test/unittests/combined/I39841_VerifyTicketPaymentIfApprovalForDiscretionaryDiscount.java
M src-test/org/openbravo/retail/discounts/test/unittests/combined/I40812_VerifyMultiManualDiscounts.java
M src-test/org/openbravo/retail/discounts/test/unittests/combined/I41396_VerifyDiscountAppliedToOneLineAfterSplit.java
M src-test/org/openbravo/retail/discounts/test/unittests/combined/I42883_DiscountsByCharacteristicIsWellApplied.java
M src-test/org/openbravo/retail/discounts/test/unittests/combined/I43502_DiscountsByProductCharacteristic.java
M src-test/org/openbravo/retail/discounts/test/unittests/combined/ManualAfterAutomatic_DiscretionaryDiscountAfterAutomatic.java
M src-test/org/openbravo/retail/discounts/test/unittests/combined/ManualAfterAutomatic_DiscretionaryDiscountAfterAutomaticPercent.java
M src-test/org/openbravo/retail/discounts/test/unittests/combined/ManualAfterAutomatic_VerifyDiscountWithAmount.java
M src-test/org/openbravo/retail/discounts/test/unittests/combined/ManualAfterAutomatic_VerifyDiscountWithoutAmount.java
M src-test/org/openbravo/retail/discounts/test/unittests/combined/MultiPromotions_BuyXPayYDiffProducts_AverageI.java
M src-test/org/openbravo/retail/discounts/test/unittests/combined/MultiPromotions_BuyXPayYDiffProducts_AverageII.java
M src-test/org/openbravo/retail/discounts/test/unittests/combined/MultiPromotions_BuyXPayYDiffProducts_LowestDistributedI.java
M src-test/org/openbravo/retail/discounts/test/unittests/combined/MultiPromotions_BuyXPayYDiffProducts_LowestDistributedII.java
M src-test/org/openbravo/retail/discounts/test/unittests/combined/MultiPromotions_BuyXPayYDiffProducts_LowestNotDistributedI.java
M src-test/org/openbravo/retail/discounts/test/unittests/combined/MultiPromotions_BuyXPayYDiffProducts_LowestNotDistributedII.java
M src-test/org/openbravo/retail/discounts/test/unittests/combined/MultiPromotions_BuyXPayYDiffProducts_MostExpensiveNotDistributedI.java
M src-test/org/openbravo/retail/discounts/test/unittests/combined/MultiPromotions_BuyXPayYDiffProducts_MostExpensiveNotDistributedII.java
M src-test/org/openbravo/retail/discounts/test/unittests/combined/ReceiptDiscount.java
M src-test/org/openbravo/retail/discounts/test/unittests/combined/SplitDiscountsForNonGroupedProducts.java
A src-test/org/openbravo/retail/discounts/test/matchers/IsExpectedGrossUnitAmount.java
A src-test/org/openbravo/retail/discounts/test/matchers/IsExpectedGrossUnitPrice.java
A src-test/org/openbravo/retail/discounts/test/matchers/IsExpectedNetUnitAmount.java
A src-test/org/openbravo/retail/discounts/test/matchers/IsExpectedNetUnitPrice.java
R src-test/org/openbravo/retail/discounts/test/matchers/IsExpectedFinalLinePrice.java
R src-test/org/openbravo/retail/discounts/test/matchers/IsExpectedFinalUnitPrice.java
---
|
|
|
(0120456)
|
hgbot
|
2020-05-29 11:03
|
|
Repository: erp/pmods/org.openbravo.retail.discounts.bytotal
Changeset: 695097fd43e2535f6e02a6ae3cbb860c71acb229
Author: Álvaro Ferraz <alvaro.ferraz <at> openbravo.com>
Date: Fri May 29 11:03:16 2020 +0200
URL: http://code.openbravo.com/erp/pmods/org.openbravo.retail.discounts.bytotal/rev/695097fd43e2535f6e02a6ae3cbb860c71acb229 [^]
Related to ISSUE-44181: Use same Ticket API in Discount and Tax engine
---
M src-test/org/openbravo/discounts/bytotal/test/unittests/CheckDiscountByTotalTest.java
M src-test/org/openbravo/discounts/bytotal/test/unittests/DiscountByTotalAmountTest.java
M src-test/org/openbravo/discounts/bytotal/test/unittests/DiscountByTotalFreeItemsTest.java
M src-test/org/openbravo/discounts/bytotal/test/unittests/DiscountByTotalPercentageTest.java
M src-test/org/openbravo/discounts/bytotal/test/unittests/DiscountFixedDiscountPerTotalAmountTest.java
M src-test/org/openbravo/discounts/bytotal/test/unittests/DiscountFixedPercentagePerTotalAmountTest.java
M src-test/org/openbravo/discounts/bytotal/test/unittests/DiscountVariableDiscountPerTotalAmountTest.java
M src-test/org/openbravo/discounts/bytotal/test/unittests/DiscountVariablePercentagePerTotalAmountTest.java
M src-test/org/openbravo/discounts/bytotal/test/unittests/I35975_VerifyFreeProductsPerTotalAmountTest.java
M src-test/org/openbravo/discounts/bytotal/test/unittests/I37027_VerifyManualDiscountsByTotalTest.java
M src-test/org/openbravo/discounts/bytotal/test/unittests/I39536_VerifyTotalDiscountWithSplitLinesTest.java
M src-test/org/openbravo/discounts/bytotal/test/unittests/I40007_VerifyWhenAddDiscFixed5EuroTest.java
M src-test/org/openbravo/discounts/bytotal/test/unittests/I40460_VerifyTotalDiscountWithPriorityTest.java
M src-test/org/openbravo/discounts/bytotal/test/unittests/I40666_VerifyTotalDiscountWithNonGroupedProductTest.java
M src-test/org/openbravo/discounts/bytotal/test/unittests/I40812_VerifyMultiManualTotalDiscountsTest.java
M src-test/org/openbravo/discounts/bytotal/test/unittests/I41097_VerifyManualAndTotalDiscountsTest.java
M src-test/org/openbravo/discounts/bytotal/test/unittests/I41397_VerifyNoNegativeTotalPriceWithManualDiscountsTest.java
---
|
|
|
(0120457)
|
hgbot
|
2020-05-29 11:03
|
|
Repository: erp/pmods/org.openbravo.retail.discounts.combo
Changeset: e708e8797cc0e88e15b822f98a2939c1f6edc9a2
Author: Álvaro Ferraz <alvaro.ferraz <at> openbravo.com>
Date: Fri May 29 11:03:48 2020 +0200
URL: http://code.openbravo.com/erp/pmods/org.openbravo.retail.discounts.combo/rev/e708e8797cc0e88e15b822f98a2939c1f6edc9a2 [^]
Related to ISSUE-44181: Use same Ticket API in Discount and Tax engine
---
M src-test/org/openbravo/discounts/combo/test/unittests/AutoincludeComboWithFamiliesWithOneItemTest.java
M src-test/org/openbravo/discounts/combo/test/unittests/CheckComboFixPriceDiscountsTest.java
M src-test/org/openbravo/discounts/combo/test/unittests/DiscountComboFixedPriceTest.java
M src-test/org/openbravo/discounts/combo/test/unittests/DiscountComboProductFixedPriceTest.java
M src-test/org/openbravo/discounts/combo/test/unittests/DiscountComboTest.java
M src-test/org/openbravo/discounts/combo/test/unittests/I34809_WrongCalculationOfComboDependingSequenceTest.java
M src-test/org/openbravo/discounts/combo/test/unittests/I35583_VerifyComboFixPriceTest.java
M src-test/org/openbravo/discounts/combo/test/unittests/I35583_VerifyComboFixPriceTest2.java
M src-test/org/openbravo/discounts/combo/test/unittests/I38074_VerifyComboFixedPriceDiscountsTest.java
M src-test/org/openbravo/discounts/combo/test/unittests/I39513_VerifyMultiComboFixedPriceTest.java
M src-test/org/openbravo/discounts/combo/test/unittests/I39831_VerifyComboFixedPriceDiscountAppliedToProductWithSamePriceTest.java
M src-test/org/openbravo/discounts/combo/test/unittests/I40197_ComboApplyDiscountByHoursTest.java
---
|
|
|
(0120458)
|
hgbot
|
2020-05-29 11:04
|
|
Repository: erp/pmods/org.openbravo.retail.discounts.scaledprice
Changeset: 733285c51db7dd6336c00983f18d2ad796d9e0b7
Author: Álvaro Ferraz <alvaro.ferraz <at> openbravo.com>
Date: Fri May 29 11:04:11 2020 +0200
URL: http://code.openbravo.com/erp/pmods/org.openbravo.retail.discounts.scaledprice/rev/733285c51db7dd6336c00983f18d2ad796d9e0b7 [^]
Related to ISSUE-44181: Use same Ticket API in Discount and Tax engine
---
M src-test/org/openbravo/discounts/scaledprice/test/unittests/DiscountScaledPriceTest.java
M src-test/org/openbravo/discounts/scaledprice/test/unittests/I38736_VerifyScalePriceDiscountTest.java
M src-test/org/openbravo/discounts/scaledprice/test/unittests/I38813_VerifyDiscountWhenCanceledByAnotherTest.java
M src-test/org/openbravo/discounts/scaledprice/test/unittests/I38813_VerifyDiscountWhenCanceledByAnotherTest2.java
M src-test/org/openbravo/discounts/scaledprice/test/unittests/I40478_VerifyScaledDiscountWithLowerPriceTest.java
---
|
|
|
(0120459)
|
hgbot
|
2020-05-29 11:04
|
|
Repository: erp/pmods/org.openbravo.retail.discount.twofamiliescombo
Changeset: bdb12e33bf10de105024d20c5f4134f455a13cf0
Author: Álvaro Ferraz <alvaro.ferraz <at> openbravo.com>
Date: Fri May 29 11:04:27 2020 +0200
URL: http://code.openbravo.com/erp/pmods/org.openbravo.retail.discount.twofamiliescombo/rev/bdb12e33bf10de105024d20c5f4134f455a13cf0 [^]
Related to ISSUE-44181: Use same Ticket API in Discount and Tax engine
---
M src-test/org/openbravo/discount/twofamiliescombo/test/unittests/CheckTwoFamiliesDiscountsTest.java
M src-test/org/openbravo/discount/twofamiliescombo/test/unittests/DiscountTwoFamiliesComboTest.java
M src-test/org/openbravo/discount/twofamiliescombo/test/unittests/I32421_TwoFamiliesWithSameProductTest.java
M src-test/org/openbravo/discount/twofamiliescombo/test/unittests/I32526_TwoFamiliesWithSameTwoProductsTest.java
---
|
|
|
(0120468)
|
hgbot
|
2020-05-29 11:35
|
|
|