From d0bcf89c334510fdadc442092252acde6a495e52 Mon Sep 17 00:00:00 2001
From: Victor Feyens <vfe@odoo.com>
Date: Tue, 21 Jan 2020 14:43:29 +0000
Subject: [PATCH] [IMP] *: remove 'remove me in master'
---
addons/payment/static/src/js/payment_transaction_portal.js | 2 --
addons/payment/views/assets.xml | 1 -
addons/sale_coupon/models/sale_order.py | 4 ----
.../sale_coupon/tests/test_program_with_code_operations.py | 5 -----
4 files changed, 12 deletions(-)
delete mode 100644 addons/payment/static/src/js/payment_transaction_portal.js
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 094149b6274f..000000000000
--- 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 62fe9d2455f6..a1a2206e7d4a 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 a9f0bab4edbd..670d07ea6811 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 d00109153573..92146c1d1f90 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
--
GitLab