diff --git a/requirements.txt b/requirements.txt index 715656642b..4283452b0d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,5 @@ # generated from manifests external_dependencies +openupgradelib pdf2image python-stdnum pyzbar diff --git a/server_action_merge/README.rst b/server_action_merge/README.rst new file mode 100644 index 0000000000..cb5c2b32dd --- /dev/null +++ b/server_action_merge/README.rst @@ -0,0 +1,110 @@ +============= +Merge records +============= + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Alpha-red.png + :target: https://odoo-community.org/page/development-status + :alt: Alpha +.. |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%2Fserver--ux-lightgray.png?logo=github + :target: https://github.com/OCA/server-ux/tree/13.0/server_action_merge + :alt: OCA/server-ux +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/server-ux-13-0/server-ux-13-0-server_action_merge + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/250/13.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module allows users to merge records of arbitrary models. + +.. IMPORTANT:: + This is an alpha version, the data model and design can change at any time without warning. + Only for development or testing purpose, do not use in production. + `More details on development status `_ + +**Table of contents** + +.. contents:: + :local: + +Configuration +============= + +To configure this module, you need to: + +#. Go to Settings/Technical/Server actions +#. Create a server action of type `Merge` (field `Action To Do`) +#. Click `Create Contextual Action` to make the action accessible for users + +Usage +===== + +To use this module, you need to: + +#. Go to a list view of a model for which you have created a merge server action +#. Mark at least two records and start your merge action +#. Select the record to merge into +#. Click `Merge` + +Known issues / Roadmap +====================== + +* add a cronjob that merges records based on some field(s) configured on the server action + +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 smashing it by providing a detailed and welcomed +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +~~~~~~~ + +* Hunki Enterprises BV + +Contributors +~~~~~~~~~~~~ + +* Holger Brunn (https://hunki-enterprises.com) + +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-hbrunn| image:: https://github.com/hbrunn.png?size=40px + :target: https://github.com/hbrunn + :alt: hbrunn + +Current `maintainer `__: + +|maintainer-hbrunn| + +This module is part of the `OCA/server-ux `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/server_action_merge/__init__.py b/server_action_merge/__init__.py new file mode 100644 index 0000000000..aee8895e7a --- /dev/null +++ b/server_action_merge/__init__.py @@ -0,0 +1,2 @@ +from . import models +from . import wizards diff --git a/server_action_merge/__manifest__.py b/server_action_merge/__manifest__.py new file mode 100644 index 0000000000..e4db6406e3 --- /dev/null +++ b/server_action_merge/__manifest__.py @@ -0,0 +1,18 @@ +# Copyright 2023 Hunki Enterprises BV +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl-3.0) + +{ + "name": "Merge records", + "summary": "Allows you to configure a wizard to merge records of arbitrary models", + "version": "13.0.1.0.0", + "development_status": "Alpha", + "category": "Extra Tools", + "website": "https://github.com/OCA/server-ux", + "author": "Hunki Enterprises BV, Odoo Community Association (OCA)", + "maintainers": ["hbrunn"], + "license": "AGPL-3", + "external_dependencies": {"python": ["openupgradelib"]}, + "depends": ["base"], + "data": ["wizards/server_action_merge_wizard.xml", "views/ir_actions_server.xml"], + "demo": ["demo/ir_actions_server.xml"], +} diff --git a/server_action_merge/demo/ir_actions_server.xml b/server_action_merge/demo/ir_actions_server.xml new file mode 100644 index 0000000000..36e1a5d479 --- /dev/null +++ b/server_action_merge/demo/ir_actions_server.xml @@ -0,0 +1,19 @@ + + + + + + Merge users + merge + + + + + + + diff --git a/server_action_merge/models/__init__.py b/server_action_merge/models/__init__.py new file mode 100644 index 0000000000..4ab5cb105f --- /dev/null +++ b/server_action_merge/models/__init__.py @@ -0,0 +1 @@ +from . import ir_actions_server diff --git a/server_action_merge/models/ir_actions_server.py b/server_action_merge/models/ir_actions_server.py new file mode 100644 index 0000000000..8d54cab754 --- /dev/null +++ b/server_action_merge/models/ir_actions_server.py @@ -0,0 +1,36 @@ +# Copyright 2023 Hunki Enterprises BV +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl-3.0) + + +from odoo import fields, models + + +class IrActionsServer(models.Model): + _inherit = "ir.actions.server" + + state = fields.Selection(selection_add=[("merge", "Merge records")]) + merge_method = fields.Selection( + [("orm", "ORM"), ("sql", "SQL")], default="orm", string="Merge method" + ) + merge_handling = fields.Selection( + [("delete", "Delete"), ("deactivate", "Deactivate"), ("none", "Do nothing")], + string="Merged records handling", + default="delete", + help="This determines what to do with records that have been merged into " + "another one, default is to delete them", + ) + merge_sudo = fields.Boolean("Run merge as superuser", default=False) + + def run_action_merge_multi(self, action, eval_context=None): + """Return the merge wizard""" + wizard = self.env["server.action.merge.wizard"].create({"action_id": action.id}) + wizard._onchange_line_ids() + return { + "type": "ir.actions.act_window", + "name": action.name, + "res_model": wizard._name, + "res_id": wizard.id, + "target": "new", + "view_mode": "form", + "context": self.env.context, + } diff --git a/server_action_merge/readme/CONFIGURE.rst b/server_action_merge/readme/CONFIGURE.rst new file mode 100644 index 0000000000..d59a4c6458 --- /dev/null +++ b/server_action_merge/readme/CONFIGURE.rst @@ -0,0 +1,5 @@ +To configure this module, you need to: + +#. Go to Settings/Technical/Server actions +#. Create a server action of type `Merge` (field `Action To Do`) +#. Click `Create Contextual Action` to make the action accessible for users diff --git a/server_action_merge/readme/CONTRIBUTORS.rst b/server_action_merge/readme/CONTRIBUTORS.rst new file mode 100644 index 0000000000..33b6eb2c3f --- /dev/null +++ b/server_action_merge/readme/CONTRIBUTORS.rst @@ -0,0 +1 @@ +* Holger Brunn (https://hunki-enterprises.com) diff --git a/server_action_merge/readme/DESCRIPTION.rst b/server_action_merge/readme/DESCRIPTION.rst new file mode 100644 index 0000000000..42c595e8b3 --- /dev/null +++ b/server_action_merge/readme/DESCRIPTION.rst @@ -0,0 +1 @@ +This module allows users to merge records of arbitrary models. diff --git a/server_action_merge/readme/ROADMAP.rst b/server_action_merge/readme/ROADMAP.rst new file mode 100644 index 0000000000..af00850771 --- /dev/null +++ b/server_action_merge/readme/ROADMAP.rst @@ -0,0 +1 @@ +* add a cronjob that merges records based on some field(s) configured on the server action diff --git a/server_action_merge/readme/USAGE.rst b/server_action_merge/readme/USAGE.rst new file mode 100644 index 0000000000..cdaa47588d --- /dev/null +++ b/server_action_merge/readme/USAGE.rst @@ -0,0 +1,6 @@ +To use this module, you need to: + +#. Go to a list view of a model for which you have created a merge server action +#. Mark at least two records and start your merge action +#. Select the record to merge into +#. Click `Merge` diff --git a/server_action_merge/readme/newsfragments/.gitkeep b/server_action_merge/readme/newsfragments/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/server_action_merge/static/description/icon.png b/server_action_merge/static/description/icon.png new file mode 100644 index 0000000000..3a0328b516 Binary files /dev/null and b/server_action_merge/static/description/icon.png differ diff --git a/server_action_merge/static/description/index.html b/server_action_merge/static/description/index.html new file mode 100644 index 0000000000..f015155a6b --- /dev/null +++ b/server_action_merge/static/description/index.html @@ -0,0 +1,455 @@ + + + + + + +Merge records + + + +
+

Merge records

+ + +

Alpha License: AGPL-3 OCA/server-ux Translate me on Weblate Try me on Runbot

+

This module allows users to merge records of arbitrary models.

+
+

Important

+

This is an alpha version, the data model and design can change at any time without warning. +Only for development or testing purpose, do not use in production. +More details on development status

+
+

Table of contents

+ +
+

Configuration

+

To configure this module, you need to:

+
    +
  1. Go to Settings/Technical/Server actions
    2. +
  2. Create a server action of type Merge (field Action To Do)
    3. +
  3. Click Create Contextual Action to make the action accessible for users
    4. +
+
+
+

Usage

+

To use this module, you need to:

+
    +
  1. Go to a list view of a model for which you have created a merge server action
    2. +
  2. Mark at least two records and start your merge action
    3. +
  3. Select the record to merge into
    4. +
  4. Click Merge
    5. +
+
+
+

Known issues / Roadmap

+
    +
  • add a cronjob that merges records based on some field(s) configured on the server action
    • +
+
+
+

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 smashing it by providing a detailed and welcomed +feedback.

+

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

+
+
+

Credits

+
+

Authors

+
    +
  • Hunki Enterprises BV
    • +
+
+ +
+

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:

+

hbrunn

+

This module is part of the OCA/server-ux project on GitHub.

+

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

+
+
+
+ + diff --git a/server_action_merge/tests/__init__.py b/server_action_merge/tests/__init__.py new file mode 100644 index 0000000000..808782bdf0 --- /dev/null +++ b/server_action_merge/tests/__init__.py @@ -0,0 +1 @@ +from . import test_server_action_merge diff --git a/server_action_merge/tests/test_server_action_merge.py b/server_action_merge/tests/test_server_action_merge.py new file mode 100644 index 0000000000..4c83e87bc8 --- /dev/null +++ b/server_action_merge/tests/test_server_action_merge.py @@ -0,0 +1,54 @@ +# Copyright 2023 Hunki Enterprises BV +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl-3.0) + + +from odoo import exceptions +from odoo.tests.common import TransactionCase + + +class TestServerActionMerge(TransactionCase): + def setUp(self): + super().setUp() + self.user_demo = self.env.ref("base.user_demo") + self.user_demo.phone = False + self.user_test = self.env["res.users"].create( + {"login": "testuser", "name": "testuser", "phone": "from testuser"} + ) + self.partner_test = self.user_test.partner_id + + def _get_wizard(self, records, merge_action): + wizard_action = merge_action.with_context( + active_model=records._name, + active_id=records[:1].id, + active_ids=records.ids, + ).run() + return self.env[wizard_action["res_model"]].browse(wizard_action["res_id"]) + + def test_user_merge(self): + """Test we can merge users""" + wizard = self._get_wizard( + self.user_test + self.env.ref("base.user_demo"), + self.env.ref("server_action_merge.server_action_merge_users"), + ) + self.assertEqual(wizard.target_line_id.record, self.user_demo) + self.assertEqual(wizard.target_line_xmlid, "base.user_demo") + self.assertEqual(wizard.xmlid_count, 1) + wizard.action_id.groups_id = self.env.ref("base.group_portal") + with self.assertRaises(exceptions.AccessError): + wizard.action_merge() + wizard.action_id.groups_id = False + wizard.action_merge() + self.assertEqual(self.user_demo.phone, "from testuser") + self.assertFalse(self.user_test.exists()) + self.assertFalse(self.partner_test.exists()) + + def test_user_merge_deactivate(self): + action = self.env.ref("server_action_merge.server_action_merge_users") + action.merge_handling = "deactivate" + wizard = self._get_wizard( + self.user_test + self.env.ref("base.user_demo"), + self.env.ref("server_action_merge.server_action_merge_users"), + ) + wizard.action_merge() + self.assertTrue(self.user_test.exists()) + self.assertFalse(self.user_test.active) diff --git a/server_action_merge/views/ir_actions_server.xml b/server_action_merge/views/ir_actions_server.xml new file mode 100644 index 0000000000..fe9fb5ae24 --- /dev/null +++ b/server_action_merge/views/ir_actions_server.xml @@ -0,0 +1,26 @@ + + + + + + ir.actions.server + + + + + + + + + + + + + + + diff --git a/server_action_merge/wizards/__init__.py b/server_action_merge/wizards/__init__.py new file mode 100644 index 0000000000..73f11c09ff --- /dev/null +++ b/server_action_merge/wizards/__init__.py @@ -0,0 +1 @@ +from . import server_action_merge_wizard diff --git a/server_action_merge/wizards/server_action_merge_wizard.py b/server_action_merge/wizards/server_action_merge_wizard.py new file mode 100644 index 0000000000..570ee5f6e2 --- /dev/null +++ b/server_action_merge/wizards/server_action_merge_wizard.py @@ -0,0 +1,161 @@ +# Copyright 2023 Hunki Enterprises BV +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl-3.0) + + +import logging + +from openupgradelib.openupgrade_merge_records import merge_records + +from odoo import _, api, exceptions, fields, models + +_logger = logging.getLogger("server_action_merge") + + +class ServerActionMergeWizard(models.TransientModel): + _name = "server.action.merge.wizard" + _description = "Merge records" + + action_id = fields.Many2one("ir.actions.server", required=True, ondelete="cascade") + model_id = fields.Many2one( + "ir.model", + default=lambda self: self.env["ir.model"].search( + [("model", "=", self.env.context.get("active_model"))] + ), + ondelte="cascade", + ) + target_line_id = fields.Many2one("server.action.merge.wizard.line", string="Target") + target_line_xmlid = fields.Char(related="target_line_id.xmlid") + line_ids = fields.One2many( + "server.action.merge.wizard.line", + "wizard_id", + string="Merge records", + required=True, + default=lambda self: self._default_line_ids(), + ) + xmlid_count = fields.Integer(compute="_compute_xmlid_count") + + def action_merge(self): + """Merge records in line_ids into the one selected in target_line_id""" + self.ensure_one() + if self.action_id.groups_id and not ( + self.action_id.groups_id & self.env.user.groups_id + ): + raise exceptions.AccessError( + _("You don't have enough access rights to run this action.") + ) + + records = self.line_ids.mapped("record") - self.target_line_id.record + self._merge_records(self.target_line_id.record, records) + + return { + "type": "ir.actions.act_window", + "name": _("Merge result"), + "res_model": self.target_line_id.record._name, + "res_id": self.target_line_id.record.id, + "view_mode": "form", + } + + def _merge_records(self, target, records, delete=True): + """Merge records, possibly merging records the model inherits from""" + to_delete = {} + for field_name in target._inherits.values(): + inherit_target = target[field_name] + inherit_records = records.mapped(field_name) - inherit_target + if inherit_target and inherit_records: + to_delete.update( + **self._merge_records(inherit_target, inherit_records, False) + ) + + getattr(target, "_server_action_merge_pre", lambda *args: None)(records, self) + # fix for quants, supplierinfo + + _logger.info("Merging %s into %s", records, self.target_line_id.record) + merge_records( + self.env(*(self.env.args[:3] + tuple([self.action_id.merge_sudo]))), + records._name, + records.ids, + target.id, + method=self.action_id.merge_method, + delete=False, + model_table=records._table, + # TODO: allow this to be configured in the server action + field_spec={ + name: "first_not_null" + for name, field in target._fields.items() + if field.type in ("char", "float") + }, + ) + if self.action_id.merge_handling in ("delete", "deactivate"): + to_delete.setdefault(target._name, target.browse([])) + to_delete[target._name] += records + + if delete: + for records in to_delete.values(): + if self.action_id.merge_handling == "deactivate": + records.write({"active": False}) + else: + records.unlink() + + getattr(target, "_server_action_merge_post", lambda *args: None)(records, self) + + return to_delete + + def _default_line_ids(self): + active_model = self.env.context.get("active_model") + active_ids = self.env.context.get("active_ids", []) + return [ + (0, 0, {"record": "%s,%d" % (active_model, active_id)}) + for active_id in active_ids + if active_model + ] + + @api.depends("line_ids") + def _compute_xmlid_count(self): + for this in self: + this.xmlid_count = len(this.line_ids.filtered("xmlid")) + + @api.onchange("line_ids") + def _onchange_line_ids(self): + record = ( + self.target_line_id + if getattr(self.target_line_id.id, "origin", self.target_line_id.id) + in [getattr(record.id, "origin", record.id) for record in self.line_ids] + else self.line_ids.filtered("xmlid")[:1] or self.line_ids[:1] + ) + self.target_line_id = getattr(record.id, "origin", record.id or False) + + +class ServerActionMergeWizardLine(models.TransientModel): + _name = "server.action.merge.wizard.line" + _description = "Merge record line" + _rec_name = "record" + + sequence = fields.Integer("Sequence") + record = fields.Reference( + selection=lambda self: self.env["ir.model"] + .search([]) + .mapped(lambda model: (model.model, model.name)), + string="Record", + required=True, + readonly=True, + ) + wizard_id = fields.Many2one( + "server.action.merge.wizard", required=True, ondelete="cascade" + ) + xmlid = fields.Char("XMLID", compute="_compute_xmlid") + + @api.depends("record") + def _compute_xmlid(self): + for this in self: + this.xmlid = ( + self.env["ir.model.data"] + .search( + [ + ("module", "not like", "\\_\\_%\\_\\_"), + ("model", "=", this.record._name), + ("res_id", "=", this.record.id), + ], + limit=1, + ) + .complete_name + ) diff --git a/server_action_merge/wizards/server_action_merge_wizard.xml b/server_action_merge/wizards/server_action_merge_wizard.xml new file mode 100644 index 0000000000..63115f004d --- /dev/null +++ b/server_action_merge/wizards/server_action_merge_wizard.xml @@ -0,0 +1,56 @@ + + + + + + server.action.merge.wizard + +
+ + + + + + + + + + + + + + +
+
+ + +
 + + diff --git a/server_action_merge_stock/README.rst b/server_action_merge_stock/README.rst new file mode 100644 index 0000000000..a58e66dc00 --- /dev/null +++ b/server_action_merge_stock/README.rst @@ -0,0 +1,99 @@ +===================== +Merge records (stock) +===================== + +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:ae69fdb1f131ef7af3b08234aadb79d8e60fae65c438ea160d05fc82312ce5ee + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Alpha-red.png + :target: https://odoo-community.org/page/development-status + :alt: Alpha +.. |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%2Fserver--ux-lightgray.png?logo=github + :target: https://github.com/OCA/server-ux/tree/13.0/server_action_merge_stock + :alt: OCA/server-ux +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/server-ux-13-0/server-ux-13-0-server_action_merge_stock + :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/server-ux&target_branch=13.0 + :alt: Try me on Runboat + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module supports merging products with different UoMs. Without it, you'll end up with wrong stock levels when merging such products. + +.. IMPORTANT:: + This is an alpha version, the data model and design can change at any time without warning. + Only for development or testing purpose, do not use in production. + `More details on development status `_ + +**Table of contents** + +.. contents:: + :local: + +Usage +===== + +To use this module, you need to: + +#. Go to a list view of a model for which you have created a merge server action +#. Mark at least two records and start your merge action +#. Select the record to merge into +#. Click `Merge` + +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 +~~~~~~~ + +* Hunki Enterprises BV + +Contributors +~~~~~~~~~~~~ + +* Holger Brunn (https://hunki-enterprises.com) + +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-hbrunn| image:: https://github.com/hbrunn.png?size=40px + :target: https://github.com/hbrunn + :alt: hbrunn + +Current `maintainer `__: + +|maintainer-hbrunn| + +This module is part of the `OCA/server-ux `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/server_action_merge_stock/__init__.py b/server_action_merge_stock/__init__.py new file mode 100644 index 0000000000..aee8895e7a --- /dev/null +++ b/server_action_merge_stock/__init__.py @@ -0,0 +1,2 @@ +from . import models +from . import wizards diff --git a/server_action_merge_stock/__manifest__.py b/server_action_merge_stock/__manifest__.py new file mode 100644 index 0000000000..d76c0d897d --- /dev/null +++ b/server_action_merge_stock/__manifest__.py @@ -0,0 +1,18 @@ +# Copyright 2023 Hunki Enterprises BV +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl-3.0) + +{ + "name": "Merge records (stock)", + "summary": "Support merging products", + "version": "13.0.1.0.0", + "development_status": "Alpha", + "category": "Extra Tools", + "website": "https://github.com/OCA/server-ux", + "author": "Hunki Enterprises BV, Odoo Community Association (OCA)", + "maintainers": ["hbrunn"], + "license": "AGPL-3", + "depends": ["server_action_merge", "stock"], + "demo": ["demo/ir_actions_server.xml"], + "data": ["wizards/server_action_merge_wizard.xml"], + "auto_install": True, +} diff --git a/server_action_merge_stock/demo/ir_actions_server.xml b/server_action_merge_stock/demo/ir_actions_server.xml new file mode 100644 index 0000000000..75fa8bf738 --- /dev/null +++ b/server_action_merge_stock/demo/ir_actions_server.xml @@ -0,0 +1,19 @@ + + + + + + Merge products + merge + + + + + + + diff --git a/server_action_merge_stock/models/__init__.py b/server_action_merge_stock/models/__init__.py new file mode 100644 index 0000000000..493a1c85f6 --- /dev/null +++ b/server_action_merge_stock/models/__init__.py @@ -0,0 +1,2 @@ +from . import product_product +from . import uom_uom diff --git a/server_action_merge_stock/models/product_product.py b/server_action_merge_stock/models/product_product.py new file mode 100644 index 0000000000..5053082f41 --- /dev/null +++ b/server_action_merge_stock/models/product_product.py @@ -0,0 +1,116 @@ +# Copyright 2023 Hunki Enterprises BV +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl-3.0) + + +from openupgradelib.openupgrade import logged_query +from psycopg2.extensions import AsIs + +from odoo import models + + +class ProductProduct(models.Model): + _inherit = "product.product" + + def _server_action_merge_convert_fields(self): + """Return the models and fields to convert before merging products""" + return ( + ("product.supplierinfo", "product_id", ["min_qty"]), + ("stock.production.lot", "product_id", ["product_qty"]), + ("stock.quant", "product_id", ["quantity", "reserved_quantity"]), + ("stock.valuation.layer", "product_id", ["quantity"]), + ) + + def _server_action_merge_coerce_fields(self): + """ + Return the models and fields to coerce to the target product's UoM before + merging products + """ + return ( + ("account.analytic.line", "product_id", "product_uom_id"), + ("account.move.line", "product_id", "product_uom_id"), + ("contract.line", "product_id", "uom_id"), + ("contract.template.line", "product_id", "uom_id"), + ("hr.expense", "product_id", "product_uom_id"), + ("mrp.bom", "product_id", "product_uom_id"), + ("mrp.bom.line", "product_id", "product_uom_id"), + ("mrp.bom.byproduct", "product_id", "product_uom_id"), + ("mrp.production", "product_id", "product_uom_id"), + ("mrp.unbuild", "product_id", "product_uom_id"), + ("mrp.workorder", "product_id", "product_uom_id"), + ("mrp.workorder.line", "product_id", "product_uom_id"), + ("purchase.order.line", "product_id", "product_uom"), + ("sale.order.line", "product_id", "product_uom"), + ("sale.order.option", "product_id", "uom_id"), + ("sale.order.template.line", "product_id", "product_uom_id"), + ("sale.order.template.option", "product_id", "uom_id"), + ("stock.inventory.line", "product_id", "product_uom_id"), + ("stock.move", "product_id", "product_uom"), + ("stock.move.line", "product_id", "product_uom_id"), + ("stock.scrap", "product_id", "product_uom_id"), + ) + + def _server_action_merge_pre(self, records, action): + """ + Convert UoMs in quants and supplierinfo records as they refer to the product's + standard UoM. + If UoM categories differ, coerce all quantities to the target product's default UoM + """ + to_convert = records.filtered(lambda x: x.uom_id != self.uom_id) + for product in to_convert: + if product.uom_id.category_id != self.uom_id.category_id: + product._server_action_merge_coerce(self.uom_id) + else: + product._server_action_merge_convert(self.uom_id) + + def _server_action_merge_convert(self, to_uom): + """Convert quantities to the target UoM""" + self.ensure_one() + for ( + model, + product_field, + fields_list, + ) in self._server_action_merge_convert_fields(): + if model not in self.env: + continue + for record in ( + self.env[model] + .with_context(active_test=False) + .search([(product_field, "=", self.id)]) + ): + vals = { + field: self.uom_id._compute_quantity(record[field], to_uom) + for field in fields_list + } + record.write(vals) + + def _server_action_merge_coerce(self, to_uom): + """Coerce UoMs from other categories than to_uom to the target UoM""" + self.ensure_one() + # TODO would it make sense to ie convert dozens to 12 units before coersion to m? + for ( + model, + product_field, + uom_field, + ) in self._server_action_merge_coerce_fields(): + if model not in self.env: + continue + logged_query( + self.env.cr, + """ + update %(table)s set %(uom_field)s=%(target_uom_id)s + where %(product_field)s=%(product_id)s + and %(uom_field)s in %(coerce_uom_ids)s + """, + { + "table": AsIs(self.env[model]._table), + "uom_field": AsIs(uom_field), + "target_uom_id": to_uom.id, + "product_field": AsIs(product_field), + "product_id": self.id, + "coerce_uom_ids": tuple( + to_uom.with_context(active_test=False) + .search([("category_id", "!=", to_uom.category_id.id)]) + .ids + ), + }, + ) diff --git a/server_action_merge_stock/models/uom_uom.py b/server_action_merge_stock/models/uom_uom.py new file mode 100644 index 0000000000..e5cdf30927 --- /dev/null +++ b/server_action_merge_stock/models/uom_uom.py @@ -0,0 +1,39 @@ +# Copyright 2023 Hunki Enterprises BV +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl-3.0) + + +from odoo import models + + +class UomUom(models.Model): + _inherit = "uom.uom" + + def _server_action_merge_pre(self, records, action): + """ + Convert quantities in quants and supplierinfo records as they refer to the product's + standard UoM. + If UoM categories differ, coerce all quantities to the target UoM + """ + # lift off the uom conversion of procuts + to_convert = self.env["product.product"].search( + [ + ( + "uom_id", + "in", + records.filtered(lambda x: x.category_id == self.category_id).ids, + ) + ] + ) + to_coerce = self.env["product.product"].search( + [ + ( + "uom_id", + "in", + records.filtered(lambda x: x.category_id != self.category_id).ids, + ) + ] + ) + for product in to_convert: + product._server_action_merge_convert(self) + for product in to_coerce: + product._server_action_merge_coerce(self) diff --git a/server_action_merge_stock/readme/CONTRIBUTORS.rst b/server_action_merge_stock/readme/CONTRIBUTORS.rst new file mode 100644 index 0000000000..33b6eb2c3f --- /dev/null +++ b/server_action_merge_stock/readme/CONTRIBUTORS.rst @@ -0,0 +1 @@ +* Holger Brunn (https://hunki-enterprises.com) diff --git a/server_action_merge_stock/readme/DESCRIPTION.rst b/server_action_merge_stock/readme/DESCRIPTION.rst new file mode 100644 index 0000000000..29b2e8f5b8 --- /dev/null +++ b/server_action_merge_stock/readme/DESCRIPTION.rst @@ -0,0 +1 @@ +This module supports merging products with different UoMs. Without it, you'll end up with wrong stock levels when merging such products. diff --git a/server_action_merge_stock/readme/USAGE.rst b/server_action_merge_stock/readme/USAGE.rst new file mode 100644 index 0000000000..cdaa47588d --- /dev/null +++ b/server_action_merge_stock/readme/USAGE.rst @@ -0,0 +1,6 @@ +To use this module, you need to: + +#. Go to a list view of a model for which you have created a merge server action +#. Mark at least two records and start your merge action +#. Select the record to merge into +#. Click `Merge` diff --git a/server_action_merge_stock/readme/newsfragments/.gitkeep b/server_action_merge_stock/readme/newsfragments/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/server_action_merge_stock/static/description/icon.png b/server_action_merge_stock/static/description/icon.png new file mode 100644 index 0000000000..3a0328b516 Binary files /dev/null and b/server_action_merge_stock/static/description/icon.png differ diff --git a/server_action_merge_stock/static/description/index.html b/server_action_merge_stock/static/description/index.html new file mode 100644 index 0000000000..e5a3eef120 --- /dev/null +++ b/server_action_merge_stock/static/description/index.html @@ -0,0 +1,440 @@ + + + + + + +Merge records (stock) + + + +
+

Merge records (stock)

+ + +

Alpha License: AGPL-3 OCA/server-ux Translate me on Weblate Try me on Runboat

+

This module supports merging products with different UoMs. Without it, you’ll end up with wrong stock levels when merging such products.

+
+

Important

+

This is an alpha version, the data model and design can change at any time without warning. +Only for development or testing purpose, do not use in production. +More details on development status

+
+

Table of contents

+ +
+

Usage

+

To use this module, you need to:

+
    +
  1. Go to a list view of a model for which you have created a merge server action
    2. +
  2. Mark at least two records and start your merge action
    3. +
  3. Select the record to merge into
    4. +
  4. Click Merge
    5. +
+
+
+

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

+
    +
  • Hunki Enterprises BV
    • +
+
+ +
+

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:

+

hbrunn

+

This module is part of the OCA/server-ux project on GitHub.

+

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

+
+
+
+ + diff --git a/server_action_merge_stock/tests/__init__.py b/server_action_merge_stock/tests/__init__.py new file mode 100644 index 0000000000..8263c42025 --- /dev/null +++ b/server_action_merge_stock/tests/__init__.py @@ -0,0 +1 @@ +from . import test_server_action_merge_stock diff --git a/server_action_merge_stock/tests/test_server_action_merge_stock.py b/server_action_merge_stock/tests/test_server_action_merge_stock.py new file mode 100644 index 0000000000..c5c67abd97 --- /dev/null +++ b/server_action_merge_stock/tests/test_server_action_merge_stock.py @@ -0,0 +1,82 @@ +# Copyright 2023 Hunki Enterprises BV +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl-3.0) + + +from odoo.tests.common import TransactionCase + + +class TestServerActionMerge(TransactionCase): + def setUp(self): + super().setUp() + + self.target_product = self.env["product.product"].create( + {"name": "target", "uom_id": self.env.ref("uom.product_uom_unit").id} + ) + self.source_product_dozen = self.env["product.product"].create( + { + "name": "source with UoM dozen", + "type": "product", + "uom_id": self.env.ref("uom.product_uom_dozen").id, + } + ) + self.source_product_meter = self.env["product.product"].create( + { + "name": "source with UoM m", + "type": "product", + "uom_id": self.env.ref("uom.product_uom_meter").id, + "uom_po_id": self.env.ref("uom.product_uom_meter").id, + } + ) + self.quant = self.env["stock.quant"].create( + { + "product_id": self.source_product_dozen.id, + "location_id": self.env.ref("stock.stock_location_stock").id, + "quantity": 1, + } + ) + self.inventory = self.env["stock.inventory"].create( + { + "name": "Inventory", + "line_ids": [ + ( + 0, + 0, + { + "product_id": self.source_product_meter.id, + "product_uom_id": self.env.ref("uom.product_uom_meter").id, + "location_id": self.env["stock.location"] + .search([], limit=1) + .id, + }, + ), + ], + } + ) + + def test_product_merge(self): + """Test we can merge products""" + self.env["server.action.merge.wizard"]._merge_records( + self.target_product, self.source_product_dozen + self.source_product_meter, + ) + self.quant.invalidate_cache() + self.inventory.invalidate_cache() + self.assertEqual(self.quant.quantity, 12) + self.assertEqual( + self.inventory.line_ids.product_uom_id, self.env.ref("uom.product_uom_unit") + ) + + def test_uom_merge(self): + """Test we can merge uoms""" + self.env["server.action.merge.wizard"]._merge_records( + self.env.ref("uom.product_uom_unit"), + self.env.ref("uom.product_uom_dozen") + + self.env.ref("uom.product_uom_meter"), + ) + self.env.cache.invalidate() + self.assertEqual(self.quant.quantity, 12) + self.assertEqual( + self.inventory.line_ids.product_uom_id, self.env.ref("uom.product_uom_unit") + ) + self.assertEqual( + self.source_product_meter.uom_po_id, self.env.ref("uom.product_uom_unit") + ) diff --git a/server_action_merge_stock/wizards/__init__.py b/server_action_merge_stock/wizards/__init__.py new file mode 100644 index 0000000000..73f11c09ff --- /dev/null +++ b/server_action_merge_stock/wizards/__init__.py @@ -0,0 +1 @@ +from . import server_action_merge_wizard diff --git a/server_action_merge_stock/wizards/server_action_merge_wizard.py b/server_action_merge_stock/wizards/server_action_merge_wizard.py new file mode 100644 index 0000000000..a6bd3ba2ea --- /dev/null +++ b/server_action_merge_stock/wizards/server_action_merge_wizard.py @@ -0,0 +1,44 @@ +# Copyright 2023 Hunki Enterprises BV +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl-3.0) + + +from odoo import api, fields, models + + +class ServerActionMergeWizard(models.TransientModel): + _inherit = "server.action.merge.wizard" + + product_uom_different_factor = fields.Boolean(compute="_compute_product_uom_flags") + product_uom_different_category = fields.Boolean( + compute="_compute_product_uom_flags" + ) + + @api.depends("target_line_id", "line_ids") + def _compute_product_uom_flags(self): + """ + Set flags to show warnings about potential inconsistencies resulting + from the merge + """ + for this in self: + if ( + this.model_id.model not in ("product.product", "product.template") + or not this.target_line_id + ): + this.update( + { + "product_uom_different_category": False, + "product_uom_different_factor": False, + } + ) + continue + source_products = sum( + (this.line_ids - this.target_line_id).mapped("record"), + self.env[this.model_id.model], + ) + this.product_uom_different_category = ( + source_products.mapped("uom_id.category_id") + != this.target_line_id.record.uom_id.category_id + ) + this.product_uom_different_factor = set( + source_products.mapped("uom_id.factor") + ) != {this.target_line_id.record.uom_id.factor} diff --git a/server_action_merge_stock/wizards/server_action_merge_wizard.xml b/server_action_merge_stock/wizards/server_action_merge_wizard.xml new file mode 100644 index 0000000000..aeeee26211 --- /dev/null +++ b/server_action_merge_stock/wizards/server_action_merge_wizard.xml @@ -0,0 +1,38 @@ + + + + + + server.action.merge.wizard + + + + + + + + + + + + diff --git a/setup/server_action_merge/odoo/addons/server_action_merge b/setup/server_action_merge/odoo/addons/server_action_merge new file mode 120000 index 0000000000..e7eb40a18b --- /dev/null +++ b/setup/server_action_merge/odoo/addons/server_action_merge @@ -0,0 +1 @@ +../../../../server_action_merge \ No newline at end of file diff --git a/setup/server_action_merge/setup.py b/setup/server_action_merge/setup.py new file mode 100644 index 0000000000..28c57bb640 --- /dev/null +++ b/setup/server_action_merge/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +) diff --git a/setup/server_action_merge_stock/odoo/addons/server_action_merge_stock b/setup/server_action_merge_stock/odoo/addons/server_action_merge_stock new file mode 120000 index 0000000000..3aa4892a3c --- /dev/null +++ b/setup/server_action_merge_stock/odoo/addons/server_action_merge_stock @@ -0,0 +1 @@ +../../../../server_action_merge_stock \ No newline at end of file diff --git a/setup/server_action_merge_stock/setup.py b/setup/server_action_merge_stock/setup.py new file mode 100644 index 0000000000..28c57bb640 --- /dev/null +++ b/setup/server_action_merge_stock/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +)