diff --git a/addons/payment/static/src/js/payment_transaction_portal.js b/addons/payment/static/src/js/payment_transaction_portal.js deleted file mode 100644 index 094149b6274f07c286a821d696dbae74afd6c934..0000000000000000000000000000000000000000 --- a/addons/payment/static/src/js/payment_transaction_portal.js +++ /dev/null @@ -1,2 +0,0 @@ -// This file is kept to avoid breaking assets compilation on instance that didn't run "-u payment". -// TBE TODO: Remove me in master \ No newline at end of file diff --git a/addons/payment/views/assets.xml b/addons/payment/views/assets.xml index 62fe9d2455f6416869839fb3a7db0531bc12f395..a1a2206e7d4abbd89cb7aaa3baad5f673ad3c851 100644 --- a/addons/payment/views/assets.xml +++ b/addons/payment/views/assets.xml @@ -8,7 +8,6 @@ <xpath expr="script[last()]" position="after"> <script type="text/javascript" src="/payment/static/lib/jquery.payment/jquery.payment.js"></script> <script type="text/javascript" src="/payment/static/src/js/payment_portal.js"></script> - <script type="text/javascript" src="/payment/static/src/js/payment_transaction_portal.js"></script> <script type="text/javascript" src="/payment/static/src/js/payment_form.js"></script> <script type="text/javascript" src="/payment/static/src/js/payment_processing.js"></script> </xpath> diff --git a/addons/sale_coupon/models/sale_order.py b/addons/sale_coupon/models/sale_order.py index a9f0bab4edbdafdc9478e7e06ce7263312c3b21c..670d07ea6811c5ad88bf79f0e248d29fb142b182 100644 --- a/addons/sale_coupon/models/sale_order.py +++ b/addons/sale_coupon/models/sale_order.py @@ -264,10 +264,6 @@ class SaleOrder(models.Model): ])._filter_programs_from_common_rules(self) return programs - def _get_applied_coupon_program_coming_from_another_so(self): - # TODO: Remove me in master as no more used - pass - def _get_valid_applied_coupon_program(self): self.ensure_one() # applied_coupon_ids's coupons might be coming from: diff --git a/addons/sale_coupon/tests/test_program_with_code_operations.py b/addons/sale_coupon/tests/test_program_with_code_operations.py index d00109153573e4e14bff388f0b366e9d47688b8c..92146c1d1f901bd391b6d029c2e92222c6557b56 100644 --- a/addons/sale_coupon/tests/test_program_with_code_operations.py +++ b/addons/sale_coupon/tests/test_program_with_code_operations.py @@ -243,8 +243,3 @@ class TestProgramWithCodeOperations(TestSaleCouponCommon): self.assertEqual(len(order_bis.order_line), 2, "You should get 1 regular product_B and 1 free product_B") order_bis.recompute_coupon_lines() self.assertEqual(len(order_bis.order_line), 2, "Free product from a coupon generated from a promotion program on next order should not dissapear") - -def test_on_next_order_reward_promo_program(self): - # TODO: remove me in master, this was never executed due to bad indentation (the method is not indented under the class) - # note that this flow did not worked and was not implemented.. now tested with `test_on_next_order_reward_promotion_program()` - pass