[REF] split beesdoo_product

into: - product_main_supplier - sale_suggested_price - sale_adapt_price_wizard [REF] split beesdoo_product -> product_main_supplier [FIX] sale_suggested_price dep on product_main_supplier [ADD] module sale_edit_price_wizard [REF] rename sale_edit_price_wizard -> sale_adapt_price_wizard [REF] move rounding_method to sale_suggested_price [REF] refactor following PR 320 [REF] search product_code -> product_main_seller [FIX] bug adapt_sales_price [IMP] use float_compare to compare prices [REF] move list_price_write_date to sale_adapt_price_wizard [FIX] beesdoo_product: main_seller_id search [FIX] run precommit fix
beescoop · Oct 28, 2022 · fa8695a · fa8695a
1 parent af7938c
commit fa8695a
Show file tree

Hide file tree

Showing 114 changed files with 2,403 additions and 521 deletions.
diff --git a/.copier-answers.yml b/.copier-answers.yml
@@ -11,7 +11,7 @@ org_slug: beescoop
 rebel_module_groups:
 - macavrac_base
 - polln_shift
-repo_description: Specific module for the Beescoop
+repo_description: Specific module for the BEES coop
 repo_name: Obeesdoo
 repo_slug: obeesdoo
 repo_website: https://coopiteasy.be

diff --git a/beesdoo_account/__manifest__.py b/beesdoo_account/__manifest__.py
@@ -5,7 +5,7 @@
 #   - Augustin Borsu
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 {
-    "name": "Beescoop  Account Module",
+    "name": "BEES coop  Account Module",
     "summary": "Emptied.",
     "author": "Beescoop - Cellule IT, Coop IT Easy SC",
     "website": "https://github.com/beescoop/Obeesdoo",

diff --git a/beesdoo_account/readme/CONTRIBUTORS.rst b/beesdoo_account/readme/CONTRIBUTORS.rst
@@ -1,2 +1,2 @@
-* Beescoop - Cellule IT
+* BEES coop - Cellule IT
 * Coop IT Easy SC
diff --git a/beesdoo_base/__manifest__.py b/beesdoo_base/__manifest__.py
@@ -6,7 +6,7 @@
 #   - Thibault François
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 {
-    "name": "Beescoop Base Module",
+    "name": "BEES coop Base Module",
     "summary": "Emptied",
     "author": "Beescoop - Cellule IT, Coop IT Easy SC",
     "website": "https://github.com/beescoop/Obeesdoo",

diff --git a/beesdoo_crelan_csv/__manifest__.py b/beesdoo_crelan_csv/__manifest__.py
@@ -3,11 +3,11 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 {
-    "name": "Beescoop Crelan Import module",
+    "name": "BEES coop Crelan Import module",
     "summary": """
         Import Crelan CSV Wizard
     """,
-    "author": "Beescoop - Cellule IT, Coop IT Easy SC",
+    "author": "BEES coop - Cellule IT, Coop IT Easy SC",
     "website": "https://github.com/beescoop/Obeesdoo",
     "category": "Accounting & Finance",
     "version": "12.0.1.0.0",

diff --git a/beesdoo_crelan_csv/readme/CONTRIBUTORS.rst b/beesdoo_crelan_csv/readme/CONTRIBUTORS.rst
@@ -1,2 +1,2 @@
-* Beescoop - Cellule IT
+* BEES coop - Cellule IT
 * Coop IT Easy SC
diff --git a/beesdoo_easy_my_coop/README.rst b/beesdoo_easy_my_coop/README.rst
@@ -46,13 +46,13 @@ Credits
 Authors
 ~~~~~~~
 
-* BEES coop
+* Beescoop
 * Coop IT Easy SC
 
 Contributors
 ~~~~~~~~~~~~
 
-* BEES coop
+* Beescoop
 * Coop IT Easy SC
 
 Maintainers

diff --git a/beesdoo_easy_my_coop/__manifest__.py b/beesdoo_easy_my_coop/__manifest__.py
@@ -1,5 +1,5 @@
 {
-    "name": "Beescoop link with easy my coop",
+    "name": "BEES coop link with easy my coop",
     "summary": """Link between beesdoo customization and easy_my_coop""",
     "author": "BEES coop, Coop IT Easy SC",
     "website": "https://github.com/beescoop/Obeesdoo",

diff --git a/beesdoo_inventory/__manifest__.py b/beesdoo_inventory/__manifest__.py
@@ -8,7 +8,7 @@
     "name": "Beesdoo Inventory",
     "summary": "Emptied. Leftover: Restrict selectable products to those"
     " sold as main supplier by the picking partner.",
-    "author": "Beescoop - Cellule IT, Coop IT Easy SC",
+    "author": "BEES coop - Cellule IT, Coop IT Easy SC",
     "website": "https://github.com/beescoop/Obeesdoo",
     "category": "Inventory",
     "version": "12.0.3.0.2",

diff --git a/beesdoo_inventory/readme/CONTRIBUTORS.rst b/beesdoo_inventory/readme/CONTRIBUTORS.rst
@@ -1,2 +1,2 @@
-* Beescoop - Cellule IT
+* BEES coop - Cellule IT
 * Coop IT Easy SC
diff --git a/beesdoo_pos/__manifest__.py b/beesdoo_pos/__manifest__.py
@@ -8,10 +8,10 @@
 #   - Houssine Bakkali <[email protected]>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 {
-    "name": "Beescoop Point of sale",
+    "name": "BEES coop Point of sale",
     "summary": """This module adds the eaters of the customer to the POS
     ActionpadWidget and PaymentScreenWidget.""",
-    "author": "Beescoop - Cellule IT, Coop IT Easy SC",
+    "author": "BEES coop - Cellule IT, Coop IT Easy SC",
     "website": "https://github.com/beescoop/Obeesdoo",
     "category": "Point Of Sale",
     "version": "12.0.2.0.0",

diff --git a/beesdoo_pos/readme/CONTRIBUTORS.rst b/beesdoo_pos/readme/CONTRIBUTORS.rst
@@ -1,2 +1,2 @@
-* Beescoop - Cellule IT
+* BEES coop - Cellule IT
 * Coop IT Easy SC
diff --git a/beesdoo_pos_coop_status/__manifest__.py b/beesdoo_pos_coop_status/__manifest__.py
@@ -4,7 +4,7 @@
 
 
 {
-    "name": "Beescoop Point of sale - Cooperator Status",
+    "name": "BEES coop Point of sale - Cooperator Status",
     "summary": """POS Support for cooperator status.""",
     "author": "Coop IT Easy SC",
     "website": "https://github.com/beescoop/Obeesdoo",

diff --git a/beesdoo_pos_email_ticket/__manifest__.py b/beesdoo_pos_email_ticket/__manifest__.py
@@ -7,10 +7,10 @@
 #   - Grégoire Leeuwerck
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 {
-    "name": "Beescoop Send POS ticket by email",
+    "name": "BEES coop Send POS ticket by email",
     "summary": """This module adds the eaters of the customer to the POS
     ActionpadWidget and PaymentScreenWidget.""",
-    "author": "Beescoop - Cellule IT, Coop IT Easy SC",
+    "author": "BEES coop - Cellule IT, Coop IT Easy SC",
     "website": "https://github.com/beescoop/Obeesdoo",
     "category": "Point Of Sale",
     "version": "12.0.1.1.0",

diff --git a/beesdoo_pos_email_ticket/readme/CONTRIBUTORS.rst b/beesdoo_pos_email_ticket/readme/CONTRIBUTORS.rst
@@ -1,3 +1,3 @@
-* Beescoop - Cellule IT
+* BEES coop - Cellule IT
 * Coop IT Easy SC
 * Thibault Francois
diff --git a/beesdoo_pos_reporting/readme/CONTRIBUTORS.rst b/beesdoo_pos_reporting/readme/CONTRIBUTORS.rst
@@ -1,2 +1,2 @@
-* Beescoop - Cellule IT
+* BEES coop - Cellule IT
 * Coop IT Easy SC
diff --git a/beesdoo_print_label/data/product_print_category.xml b/beesdoo_print_label/data/product_print_category.xml
@@ -8,7 +8,7 @@
             name="field_ids"
             eval="[(6, 0, [
             ref('product.field_product_template__name'),
-            ref('beesdoo_product.field_product_template__main_seller_id'),
+            ref('product_main_supplier.field_product_template__main_seller_id'),
             ref('beesdoo_product.field_product_template__eco_label'),
             ref('beesdoo_product.field_product_template__local_label'),
             ref('beesdoo_product.field_product_template__fair_label'),

diff --git a/beesdoo_product/__manifest__.py b/beesdoo_product/__manifest__.py
@@ -12,28 +12,26 @@
     "summary": """
         Modification of product module for the needs of beescoop
         """,
-    "author": "Beescoop - Cellule IT, Coop IT Easy SC",
+    "author": "BEES coop - Cellule IT, Coop IT Easy SC",
     "website": "https://github.com/beescoop/Obeesdoo",
     "category": "Sales",
-    "version": "12.0.1.4.1",
+    "version": "12.0.2.0.0",
     "depends": [
         "product",
         "sale",
         "point_of_sale",
         "purchase",
+        "product_main_supplier",
+        "sale_suggested_price",
+        "sale_adapt_price_wizard",
     ],
     "data": [
         "data/product_label.xml",
         "data/product_hazard.xml",
         "data/barcode_rule.xml",
         "data/product_sequence.xml",
         "views/beesdoo_product.xml",
-        "views/point_of_sale_view.xml",
-        "views/purchase_views.xml",
-        "views/sale_views.xml",
         "views/assets.xml",
-        "views/res_config_settings.xml",
-        "wizard/views/adapt_sales_price_wizard_view.xml",
         "wizard/views/label_printing_utils.xml",
         "security/ir.model.access.csv",
     ],

diff --git a/beesdoo_product/migrations/12.0.2.0.0/pre-migration.py b/beesdoo_product/migrations/12.0.2.0.0/pre-migration.py
@@ -0,0 +1,55 @@
+import logging
+
+from openupgradelib import openupgrade
+
+_logger = logging.getLogger(__name__ + " 12.0.2.0.0")
+
+
+renamed_view_xml_ids = (
+    (
+        "beesdoo_product.beesdoo_product_category_form",
+        "sale_suggested_price.product_category_form_view",
+    ),
+    (
+        "beesdoo_product.product_template_edit_price_tree_view",
+        "sale_suggested_price.product_template_edit_price_tree_view",
+    ),
+    (
+        "beesdoo_product.beesdoo_product_category_list",
+        "sale_suggested_price.product_category_list_view",
+    ),
+    (
+        "beesdoo_product.beesdoo_product_supplierinfo_tree_view",
+        "sale_suggested_price.product_supplierinfo_tree_view",
+    ),
+    (
+        "beesdoo_product.product_template_edit_price_tree_view",
+        "sale_suggested_price.product_template_edit_price_tree_view",
+    ),
+    (
+        "beesdoo_product.beesdoo_product_res_parter_form",
+        "sale_suggested_price.view_partner_form",
+    ),
+    (
+        "beesdoo_product.res_config_settings_view_form",
+        "sale_suggested_price.res_config_settings_view_form",
+    ),
+)
+
+modules_to_install = [
+    "sale_suggested_price",
+    "product_main_suplier",
+]
+
+
+@openupgrade.migrate()
+def migrate(env, version):
+    _logger.info("renaming view xml ids")
+    openupgrade.rename_xmlids(env.cr, renamed_view_xml_ids)
+
+    for module in modules_to_install:
+        module_ids = env["ir.module.module"].search(
+            [("name", "=", module), ("state", "=", "uninstalled")]
+        )
+        if module_ids:
+            module_ids.button_install()
diff --git a/beesdoo_product/models/__init__.py b/beesdoo_product/models/__init__.py
@@ -1,2 +1 @@
 from . import beesdoo_product
-from . import res_config_settings
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		from . import beesdoo_product
		from . import res_config_settings