diff --git a/sale_report_delivered_deposit/README.rst b/sale_report_delivered_deposit/README.rst new file mode 100644 index 000000000..74898ae8e --- /dev/null +++ b/sale_report_delivered_deposit/README.rst @@ -0,0 +1,114 @@ +=============================== +Sale Report Delivered - Deposit +=============================== + +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:05c19bad73ebed077d749044beaac73ad885e44498d52a23567cdfb351d44e65 + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |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%2Fsale--reporting-lightgray.png?logo=github + :target: https://github.com/OCA/sale-reporting/tree/18.0/sale_report_delivered_deposit + :alt: OCA/sale-reporting +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/sale-reporting-18-0/sale-reporting-18-0-sale_report_delivered_deposit + :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/sale-reporting&target_branch=18.0 + :alt: Try me on Runboat + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module extends the functionality of **Sale Report Delivered** to +support view lines that comes from **Customer Deposits** and to allow +you to have a better view of Deliveries. + +.. 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: + +Use Cases / Context +=================== + +This module was developed because we want to show **Customer Deposits** +on **Sale Report Delivered** report. + +It will be useful for you if want to take into account customer +deposits. + +Usage +===== + +To use this module, you need to: + +1. Go to your Warehouse and activate **Customer Deposits** +2. Go to Sales and create and send a **Customer Deposit**. +3. Go to **Sale Delivered Report**. +4. Check the deposit is shown. + +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 +------- + +* Moduon + +Contributors +------------ + +- Eduardo de Miguel (`Moduon `__) +- David Vidal (`Moduon `__) + +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-Shide| image:: https://github.com/Shide.png?size=40px + :target: https://github.com/Shide + :alt: Shide +.. |maintainer-rafaelbn| image:: https://github.com/rafaelbn.png?size=40px + :target: https://github.com/rafaelbn + :alt: rafaelbn + +Current `maintainers `__: + +|maintainer-Shide| |maintainer-rafaelbn| + +This module is part of the `OCA/sale-reporting `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/sale_report_delivered_deposit/__init__.py b/sale_report_delivered_deposit/__init__.py new file mode 100644 index 000000000..4c4f242fa --- /dev/null +++ b/sale_report_delivered_deposit/__init__.py @@ -0,0 +1 @@ +from . import report diff --git a/sale_report_delivered_deposit/__manifest__.py b/sale_report_delivered_deposit/__manifest__.py new file mode 100644 index 000000000..d909b27df --- /dev/null +++ b/sale_report_delivered_deposit/__manifest__.py @@ -0,0 +1,20 @@ +# Copyright 2024 Moduon Team S.L. +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl-3.0) + +{ + "name": "Sale Report Delivered - Deposit", + "summary": "Allow to view Customer Deposits on Sale Report Delivered", + "version": "18.0.1.0.0", + "development_status": "Alpha", + "category": "Sales", + "website": "https://github.com/OCA/sale-reporting", + "author": "Moduon, Odoo Community Association (OCA)", + "maintainers": ["Shide", "rafaelbn"], + "license": "AGPL-3", + "auto_install": True, + "depends": [ + "sale_report_delivered", + "stock_customer_deposit", + ], + "data": [], +} diff --git a/sale_report_delivered_deposit/i18n/it.po b/sale_report_delivered_deposit/i18n/it.po new file mode 100644 index 000000000..19647dbea --- /dev/null +++ b/sale_report_delivered_deposit/i18n/it.po @@ -0,0 +1,22 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * sale_report_delivered_deposit +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 16.0\n" +"Report-Msgid-Bugs-To: \n" +"PO-Revision-Date: 2024-10-31 01:06+0000\n" +"Last-Translator: mymage \n" +"Language-Team: none\n" +"Language: it\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 5.6.2\n" + +#. module: sale_report_delivered_deposit +#: model:ir.model,name:sale_report_delivered_deposit.model_sale_report_delivered +msgid "Sales Delivered Analysis Report" +msgstr "Resoconto analisi vendite consegnate" diff --git a/sale_report_delivered_deposit/i18n/sale_report_delivered_deposit.pot b/sale_report_delivered_deposit/i18n/sale_report_delivered_deposit.pot new file mode 100644 index 000000000..7454bb8cd --- /dev/null +++ b/sale_report_delivered_deposit/i18n/sale_report_delivered_deposit.pot @@ -0,0 +1,19 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * sale_report_delivered_deposit +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 16.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: sale_report_delivered_deposit +#: model:ir.model,name:sale_report_delivered_deposit.model_sale_report_delivered +msgid "Sales Delivered Analysis Report" +msgstr "" diff --git a/sale_report_delivered_deposit/pyproject.toml b/sale_report_delivered_deposit/pyproject.toml new file mode 100644 index 000000000..4231d0ccc --- /dev/null +++ b/sale_report_delivered_deposit/pyproject.toml @@ -0,0 +1,3 @@ +[build-system] +requires = ["whool"] +build-backend = "whool.buildapi" diff --git a/sale_report_delivered_deposit/readme/CONTEXT.md b/sale_report_delivered_deposit/readme/CONTEXT.md new file mode 100644 index 000000000..2a209a2be --- /dev/null +++ b/sale_report_delivered_deposit/readme/CONTEXT.md @@ -0,0 +1,4 @@ +This module was developed because we want to show **Customer Deposits** on +**Sale Report Delivered** report. + +It will be useful for you if want to take into account customer deposits. diff --git a/sale_report_delivered_deposit/readme/CONTRIBUTORS.md b/sale_report_delivered_deposit/readme/CONTRIBUTORS.md new file mode 100644 index 000000000..3f3aeef82 --- /dev/null +++ b/sale_report_delivered_deposit/readme/CONTRIBUTORS.md @@ -0,0 +1,2 @@ +- Eduardo de Miguel ([Moduon](https://www.moduon.team/)) +- David Vidal ([Moduon](https://www.moduon.team/)) diff --git a/sale_report_delivered_deposit/readme/DESCRIPTION.md b/sale_report_delivered_deposit/readme/DESCRIPTION.md new file mode 100644 index 000000000..63094da51 --- /dev/null +++ b/sale_report_delivered_deposit/readme/DESCRIPTION.md @@ -0,0 +1,3 @@ +This module extends the functionality of **Sale Report Delivered** to support view lines +that comes from **Customer Deposits** and to allow you to have a better view of +Deliveries. diff --git a/sale_report_delivered_deposit/readme/USAGE.md b/sale_report_delivered_deposit/readme/USAGE.md new file mode 100644 index 000000000..053bbeddd --- /dev/null +++ b/sale_report_delivered_deposit/readme/USAGE.md @@ -0,0 +1,6 @@ +To use this module, you need to: + +1. Go to your Warehouse and activate **Customer Deposits** +1. Go to Sales and create and send a **Customer Deposit**. +1. Go to **Sale Delivered Report**. +1. Check the deposit is shown. diff --git a/sale_report_delivered_deposit/report/__init__.py b/sale_report_delivered_deposit/report/__init__.py new file mode 100644 index 000000000..cd23411b8 --- /dev/null +++ b/sale_report_delivered_deposit/report/__init__.py @@ -0,0 +1 @@ +from . import sale_report diff --git a/sale_report_delivered_deposit/report/sale_report.py b/sale_report_delivered_deposit/report/sale_report.py new file mode 100644 index 000000000..f727bd2cb --- /dev/null +++ b/sale_report_delivered_deposit/report/sale_report.py @@ -0,0 +1,31 @@ +# Copyright 2024 Moduon Team S.L. +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl-3.0) + +from odoo import models + + +class Name(models.AbstractModel): + _inherit = "sale.report.delivered" + + def _sub_select_signed_qty(self): + """Case for the signed quantity of Deposits""" + res = super()._sub_select_signed_qty() + deposit_sub_select_signed_qty = """ + WHEN ( + source_location.usage = 'internal' AND + dest_location.usage = 'internal' AND + s.customer_deposit is TRUE + ) + THEN 1 + """ + return res + deposit_sub_select_signed_qty + + def _sub_where(self): + """Add the case for Deposits""" + res = super()._sub_where() + deposit_sub_where = """ OR ( + source_location.usage = 'internal' AND + dest_location.usage = 'internal' AND + s.customer_deposit + )""" + return res + deposit_sub_where diff --git a/sale_report_delivered_deposit/static/description/icon.png b/sale_report_delivered_deposit/static/description/icon.png new file mode 100644 index 000000000..3a0328b51 Binary files /dev/null and b/sale_report_delivered_deposit/static/description/icon.png differ diff --git a/sale_report_delivered_deposit/static/description/index.html b/sale_report_delivered_deposit/static/description/index.html new file mode 100644 index 000000000..478725f02 --- /dev/null +++ b/sale_report_delivered_deposit/static/description/index.html @@ -0,0 +1,453 @@ + + + + + +Sale Report Delivered - Deposit + + + +
+

Sale Report Delivered - Deposit

+ + +

Alpha License: AGPL-3 OCA/sale-reporting Translate me on Weblate Try me on Runboat

+

This module extends the functionality of Sale Report Delivered to +support view lines that comes from Customer Deposits and to allow +you to have a better view of Deliveries.

+
+

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

+ +
+

Use Cases / Context

+

This module was developed because we want to show Customer Deposits +on Sale Report Delivered report.

+

It will be useful for you if want to take into account customer +deposits.

+
+
+

Usage

+

To use this module, you need to:

+
    +
  1. Go to your Warehouse and activate Customer Deposits
    2. +
  2. Go to Sales and create and send a Customer Deposit.
    3. +
  3. Go to Sale Delivered Report.
    4. +
  4. Check the deposit is shown.
    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

+
    +
  • Moduon
    • +
+
+
+

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 maintainers:

+

Shide rafaelbn

+

This module is part of the OCA/sale-reporting project on GitHub.

+

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

+
+
+
+ + diff --git a/sale_report_delivered_deposit/tests/__init__.py b/sale_report_delivered_deposit/tests/__init__.py new file mode 100644 index 000000000..75f0be52f --- /dev/null +++ b/sale_report_delivered_deposit/tests/__init__.py @@ -0,0 +1 @@ +from . import test_sale_report_delivered_deposit diff --git a/sale_report_delivered_deposit/tests/test_sale_report_delivered_deposit.py b/sale_report_delivered_deposit/tests/test_sale_report_delivered_deposit.py new file mode 100644 index 000000000..50e4c5404 --- /dev/null +++ b/sale_report_delivered_deposit/tests/test_sale_report_delivered_deposit.py @@ -0,0 +1,64 @@ +# Copyright 2024 Moduon Team S.L. +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl-3.0) + +from odoo.tests.common import users + +from odoo.addons.sale_report_delivered.tests.test_sale_report_delivered import ( + TestSaleReportDeliveredBase, +) + + +class TestSaleReportDeliveredDeposit(TestSaleReportDeliveredBase): + @classmethod + def setUpClass(cls): + super().setUpClass() + cls.product_deposit = cls.env["product.product"].create( + { + "name": "Test product Deposit", + "type": "consu", + "is_storable": True, + "list_price": 10, + } + ) + cls.deposit_wh = cls.env["stock.warehouse"].search( + [("company_id", "=", cls.company.id)] + ) + cls.deposit_wh.use_customer_deposits = True + cls._create_stock_quant(cls, cls.product_deposit) + cls.order_deposit = cls._create_order(cls, cls.product_deposit) + cls.order_deposit.customer_deposit = True + cls.order_deposit.action_confirm() + cls.order_deposit.picking_ids.action_confirm() + cls.order_deposit.picking_ids.move_ids.write({"quantity": 1.0}) + cls.order_deposit.picking_ids.button_validate() + + @users("admin", "test_user-sale_report_delivered") + def test_sale_report_delivered_deposit(self): + items = self.env["sale.report.delivered"].search( + [("order_id", "in", self.order_deposit.ids)] + ) + self.assertIn(self.order_deposit, items.mapped("order_id")) + self.assertIn(self.order_deposit.picking_ids, items.mapped("picking_id")) + self.assertIn(self.product_deposit, items.mapped("product_id")) + + def _test_sale_report_delivered_deposit_read_group(self): + self.product_deposit.stock_valuation_layer_ids.value = 1 + res = self.env["sale.report.delivered"].read_group( + domain=[("order_id", "in", self.order_deposit.ids)], + fields=[ + "order_id", + "margin_percent:sum", + "price_subtotal:sum", + "margin:sum", + ], + groupby=["order_id"], + ) + self.assertAlmostEqual(res[0]["margin_percent"], 100.00) + + @users("admin") + def test_sale_report_delivered_deposit_read_group_admin(self): + self._test_sale_report_delivered_deposit_read_group() + + @users("test_user-sale_report_delivered") + def test_sale_report_delivered_deposit_read_group(self): + self._test_sale_report_delivered_deposit_read_group()