[FIX] sale_coupon_domain_product_discount, coupon_domain_product_disc…

…ount: Fix migration Fix migration of module sale_coupon_domain_product_discount. This module was split in v15 into coupon_domain_product_discount and s ale_coupon_domain_product_discount but the _filter_not_ordered_reward_programs method of the coupon.program model should go in the sale_coupon_domain_product_discount module. In addition, the dependency of coupon_domain_product_discount has been corrected, since it is the base module and should depend on coupon and not on sale_coupon, and unusable data has been removed from the manifest. TT45749
OCA · Oct 31, 2023 · fdb618e · fdb618e
1 parent df3423d
commit fdb618e
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 7 deletions.
diff --git a/coupon_domain_product_discount/README.rst b/coupon_domain_product_discount/README.rst
@@ -7,7 +7,7 @@ Coupon Promotion Product Domain Discount
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:22b27a2c23cf060f69581d84ce0d8f386ddb103a12ad1fd42c863f6eb8cd2c01
+   !! source digest: sha256:e19a43133e84890d158b97379738d7992d4d2b570e24ea2a2e9d41e6e7acbbfe
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

diff --git a/coupon_domain_product_discount/__manifest__.py b/coupon_domain_product_discount/__manifest__.py
@@ -11,7 +11,7 @@
     "license": "AGPL-3",
     "category": "Sales Management",
     "website": "https://github.com/OCA/sale-promotion",
-    "depends": ["sale_coupon"],
+    "depends": ["coupon"],
     "data": [
         "views/coupon_program_views.xml",
         "report/sale_coupon_report_template.xml",

diff --git a/coupon_domain_product_discount/models/__init__.py b/coupon_domain_product_discount/models/__init__.py
@@ -1,3 +1,2 @@
-from . import coupon_program
 from . import coupon_reward
 from . import coupon_rule
diff --git a/coupon_domain_product_discount/static/description/index.html b/coupon_domain_product_discount/static/description/index.html
@@ -367,7 +367,7 @@ <h1 class="title">Coupon Promotion Product Domain Discount</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:22b27a2c23cf060f69581d84ce0d8f386ddb103a12ad1fd42c863f6eb8cd2c01
+!! source digest: sha256:e19a43133e84890d158b97379738d7992d4d2b570e24ea2a2e9d41e6e7acbbfe
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/sale-promotion/tree/15.0/coupon_domain_product_discount"><img alt="OCA/sale-promotion" src="https://img.shields.io/badge/github-OCA%2Fsale--promotion-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/sale-promotion-15-0/sale-promotion-15-0-coupon_domain_product_discount"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/sale-promotion&amp;target_branch=15.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>Base module for applying promotions only to the products matching the “Based on Products” domain.</p>

diff --git a/sale_coupon_domain_product_discount/README.rst b/sale_coupon_domain_product_discount/README.rst
@@ -7,7 +7,7 @@ Sale Coupon Promotion Product Domain Discount
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:73555b4604f26d993c4b15577596d0cc03403163d00beb13b88f3ff896e2e474
+   !! source digest: sha256:d99fdb6e0d262e977245b50b7edbff970c6e0ed5b5f1b1c0ea7a821216d94c51
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

diff --git a/sale_coupon_domain_product_discount/__manifest__.py b/sale_coupon_domain_product_discount/__manifest__.py
@@ -11,7 +11,6 @@
     "category": "Sales Management",
     "website": "https://github.com/OCA/sale-promotion",
     "depends": ["sale_coupon", "coupon_domain_product_discount"],
-    "data": [],
     "installable": True,
     "application": False,
 }
diff --git a/sale_coupon_domain_product_discount/models/__init__.py b/sale_coupon_domain_product_discount/models/__init__.py
@@ -1 +1,2 @@
 from . import sale_order
+from . import coupon_program
diff --git a/...product_discount/models/coupon_program.py → ...product_discount/models/coupon_program.py b/...product_discount/models/coupon_program.py → ...product_discount/models/coupon_program.py
diff --git a/sale_coupon_domain_product_discount/static/description/index.html b/sale_coupon_domain_product_discount/static/description/index.html
@@ -367,7 +367,7 @@ <h1 class="title">Sale Coupon Promotion Product Domain Discount</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:73555b4604f26d993c4b15577596d0cc03403163d00beb13b88f3ff896e2e474
+!! source digest: sha256:d99fdb6e0d262e977245b50b7edbff970c6e0ed5b5f1b1c0ea7a821216d94c51
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/sale-promotion/tree/15.0/sale_coupon_domain_product_discount"><img alt="OCA/sale-promotion" src="https://img.shields.io/badge/github-OCA%2Fsale--promotion-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/sale-promotion-15-0/sale-promotion-15-0-sale_coupon_domain_product_discount"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/sale-promotion&amp;target_branch=15.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module extends <em>coupon_domain_product_discount</em> to allow applying the promotions on the sale orders.</p>
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		from . import sale_order
		from . import coupon_program