diff --git a/README.md b/README.md index 0a57e882c..23f2f0cd3 100644 --- a/README.md +++ b/README.md @@ -23,6 +23,7 @@ addon | version | maintainers | summary --- | --- | --- | --- [account_move_line_product](account_move_line_product/) | 15.0.1.0.1 | | Displays the product in the journal entries and items [account_move_line_stock_info](account_move_line_stock_info/) | 15.0.1.1.0 | | Account Move Line Stock Info +[base_product_merge](base_product_merge/) | 15.0.1.0.0 | [![JasminSForgeFlow](https://github.com/JasminSForgeFlow.png?size=30px)](https://github.com/JasminSForgeFlow) | Merge duplicate products [procurement_auto_create_group](procurement_auto_create_group/) | 15.0.1.0.0 | | Allows to configure the system to propose automatically new procurement groups during the procurement run. [sale_stock_available_info_popup](sale_stock_available_info_popup/) | 15.0.1.0.0 | | Adds an 'Available to promise' quantity to the popover shown in sale order line that display stock info of the product [scrap_reason_code](scrap_reason_code/) | 15.0.1.1.0 | [![bodedra](https://github.com/bodedra.png?size=30px)](https://github.com/bodedra) | Reason code for scrapping diff --git a/base_product_merge/README.rst b/base_product_merge/README.rst index f9a649109..2846525b9 100644 --- a/base_product_merge/README.rst +++ b/base_product_merge/README.rst @@ -1,3 +1,91 @@ =================== Base Products Merge =================== + +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:b7b89aa2d12bfa897bc0a6587324fb6a013b3410c47e7e2733779da135813019 + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png + :target: https://odoo-community.org/page/development-status + :alt: Beta +.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fstock--logistics--warehouse-lightgray.png?logo=github + :target: https://github.com/OCA/stock-logistics-warehouse/tree/15.0/base_product_merge + :alt: OCA/stock-logistics-warehouse +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/stock-logistics-warehouse-15-0/stock-logistics-warehouse-15-0-base_product_merge + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png + :target: https://runboat.odoo-community.org/builds?repo=OCA/stock-logistics-warehouse&target_branch=15.0 + :alt: Try me on Runboat + +|badge1| |badge2| |badge3| |badge4| |badge5| + +We can merge duplicates products into single product + +**Table of contents** + +.. contents:: + :local: + +Usage +===== + +Select products or templates then click on Merge products in Action menu. +Select Destination product in which need to merge all other products +Then click on Merge Product, it will merge all the products. + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues `_. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us to smash it by providing a detailed and welcomed +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +~~~~~~~ + +* ForgeFlow + +Contributors +~~~~~~~~~~~~ + +* Jasmin Solanki + +Maintainers +~~~~~~~~~~~ + +This module is maintained by the OCA. + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use. + +.. |maintainer-JasminSForgeFlow| image:: https://github.com/JasminSForgeFlow.png?size=40px + :target: https://github.com/JasminSForgeFlow + :alt: JasminSForgeFlow + +Current `maintainer `__: + +|maintainer-JasminSForgeFlow| + +This module is part of the `OCA/stock-logistics-warehouse `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/base_product_merge/static/description/icon.png b/base_product_merge/static/description/icon.png new file mode 100644 index 000000000..3a0328b51 Binary files /dev/null and b/base_product_merge/static/description/icon.png differ diff --git a/base_product_merge/static/description/index.html b/base_product_merge/static/description/index.html new file mode 100644 index 000000000..d7e9702ea --- /dev/null +++ b/base_product_merge/static/description/index.html @@ -0,0 +1,429 @@ + + + + + +Base Products Merge + + + +
+

Base Products Merge

+ + +

Beta License: AGPL-3 OCA/stock-logistics-warehouse Translate me on Weblate Try me on Runboat

+

We can merge duplicates products into single product

+

Table of contents

+ +
+

Usage

+

Select products or templates then click on Merge products in Action menu. +Select Destination product in which need to merge all other products +Then click on Merge Product, it will merge all the products.

+
+
+

Bug Tracker

+

Bugs are tracked on GitHub Issues. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us to smash it by providing a detailed and welcomed +feedback.

+

Do not contact contributors directly about support or help with technical issues.

+
+
+

Credits

+
+

Authors

+
    +
  • ForgeFlow
    • +
+
+
+

Contributors

+ +
+
+

Maintainers

+

This module is maintained by the OCA.

+Odoo Community Association +

OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use.

+

Current maintainer:

+

JasminSForgeFlow

+

This module is part of the OCA/stock-logistics-warehouse project on GitHub.

+

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

+
+
+
+ + diff --git a/setup/_metapackage/VERSION.txt b/setup/_metapackage/VERSION.txt index ddc2691af..d37e1559b 100644 --- a/setup/_metapackage/VERSION.txt +++ b/setup/_metapackage/VERSION.txt @@ -1 +1 @@ -15.0.20240314.0 \ No newline at end of file +15.0.20240314.1 \ No newline at end of file diff --git a/setup/_metapackage/setup.py b/setup/_metapackage/setup.py index 5bad7678e..d51753a0d 100644 --- a/setup/_metapackage/setup.py +++ b/setup/_metapackage/setup.py @@ -10,6 +10,7 @@ setuptools.setup( install_requires=[ 'odoo-addon-account_move_line_product>=15.0dev,<15.1dev', 'odoo-addon-account_move_line_stock_info>=15.0dev,<15.1dev', + 'odoo-addon-base_product_merge>=15.0dev,<15.1dev', 'odoo-addon-procurement_auto_create_group>=15.0dev,<15.1dev', 'odoo-addon-sale_stock_available_info_popup>=15.0dev,<15.1dev', 'odoo-addon-scrap_reason_code>=15.0dev,<15.1dev',