From 17ab6e0956fca177d4b2a685663e1f2c43f68d84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20BEAU?= Date: Wed, 15 Nov 2023 12:18:02 +0100 Subject: [PATCH] sale_delivery_state: merge sale_delivery_state_view in sale_delivery_state --- .../views/sale_order_views.xml | 18 + sale_delivery_state_view/README.rst | 82 ---- sale_delivery_state_view/__init__.py | 0 sale_delivery_state_view/__manifest__.py | 26 -- .../readme/CONTRIBUTORS.rst | 1 - .../readme/DESCRIPTION.rst | 2 - .../static/description/index.html | 428 ------------------ .../views/sale_order_views.xml | 47 -- sale_stock_delivery_state/README.rst | 2 +- sale_stock_delivery_state/__manifest__.py | 2 +- .../static/description/index.html | 2 +- .../views/sale_order_views.xml | 32 ++ .../odoo/addons/sale_delivery_state_view | 1 - setup/sale_delivery_state_view/setup.py | 6 - 14 files changed, 53 insertions(+), 596 deletions(-) delete mode 100644 sale_delivery_state_view/README.rst delete mode 100644 sale_delivery_state_view/__init__.py delete mode 100644 sale_delivery_state_view/__manifest__.py delete mode 100644 sale_delivery_state_view/readme/CONTRIBUTORS.rst delete mode 100644 sale_delivery_state_view/readme/DESCRIPTION.rst delete mode 100644 sale_delivery_state_view/static/description/index.html delete mode 100644 sale_delivery_state_view/views/sale_order_views.xml create mode 100644 sale_stock_delivery_state/views/sale_order_views.xml delete mode 120000 setup/sale_delivery_state_view/odoo/addons/sale_delivery_state_view delete mode 100644 setup/sale_delivery_state_view/setup.py diff --git a/sale_delivery_state/views/sale_order_views.xml b/sale_delivery_state/views/sale_order_views.xml index 678dad861906..205e46ad9216 100644 --- a/sale_delivery_state/views/sale_order_views.xml +++ b/sale_delivery_state/views/sale_order_views.xml @@ -32,4 +32,22 @@ + + sale.order.tree + + sale.order + + + + + + + diff --git a/sale_delivery_state_view/README.rst b/sale_delivery_state_view/README.rst deleted file mode 100644 index 9fb0b1f03093..000000000000 --- a/sale_delivery_state_view/README.rst +++ /dev/null @@ -1,82 +0,0 @@ -======================== -Sale Delivery State View -======================== - -.. - !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - !! This file is generated by oca-gen-addon-readme !! - !! changes will be overwritten. !! - !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - !! source digest: sha256:8e9bc2b31d2ae4e1ae22ec3532f7104036a1d29d2b7a20324dc59b0fff99e0ef - !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - -.. |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--workflow-lightgray.png?logo=github - :target: https://github.com/OCA/sale-workflow/tree/16.0/sale_delivery_state_view - :alt: OCA/sale-workflow -.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/sale-workflow-16-0/sale-workflow-16-0-sale_delivery_state_view - :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-workflow&target_branch=16.0 - :alt: Try me on Runboat - -|badge1| |badge2| |badge3| |badge4| |badge5| - -This module show the field `delivery_status` on the sale order. -This module should be only installed if you have the module `sale` without `sale_stock` - -.. 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: - -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 -~~~~~~~ - -* Akretion - -Contributors -~~~~~~~~~~~~ - -* Sébastien BEAU - -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. - -This module is part of the `OCA/sale-workflow `_ project on GitHub. - -You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/sale_delivery_state_view/__init__.py b/sale_delivery_state_view/__init__.py deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/sale_delivery_state_view/__manifest__.py b/sale_delivery_state_view/__manifest__.py deleted file mode 100644 index 374b314c32fa..000000000000 --- a/sale_delivery_state_view/__manifest__.py +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 2023 Akretion (https://www.akretion.com). -# @author Sébastien BEAU -# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). - -{ - "name": "Sale Delivery State View", - "summary": "Show the delivery state on sale order when not having sale_stock", - "version": "16.0.1.0.0", - "development_status": "Alpha", - "category": "Uncategorized", - "website": "https://github.com/OCA/sale-workflow", - "author": " Akretion,Odoo Community Association (OCA)", - "license": "AGPL-3", - "external_dependencies": { - "python": [], - "bin": [], - }, - "depends": [ - "sale_delivery_state", - ], - "excludes": ["sale_stock"], - "data": [ - "views/sale_order_views.xml", - ], - "demo": [], -} diff --git a/sale_delivery_state_view/readme/CONTRIBUTORS.rst b/sale_delivery_state_view/readme/CONTRIBUTORS.rst deleted file mode 100644 index 9e0ae5f27a38..000000000000 --- a/sale_delivery_state_view/readme/CONTRIBUTORS.rst +++ /dev/null @@ -1 +0,0 @@ -* Sébastien BEAU diff --git a/sale_delivery_state_view/readme/DESCRIPTION.rst b/sale_delivery_state_view/readme/DESCRIPTION.rst deleted file mode 100644 index ca580be7f633..000000000000 --- a/sale_delivery_state_view/readme/DESCRIPTION.rst +++ /dev/null @@ -1,2 +0,0 @@ -This module show the field `delivery_status` on the sale order. -This module should be only installed if you have the module `sale` without `sale_stock` diff --git a/sale_delivery_state_view/static/description/index.html b/sale_delivery_state_view/static/description/index.html deleted file mode 100644 index 073bb5666052..000000000000 --- a/sale_delivery_state_view/static/description/index.html +++ /dev/null @@ -1,428 +0,0 @@ - - - - - - -Sale Delivery State View - - - -
-

Sale Delivery State View

- - -

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

-

This module show the field delivery_status on the sale order. -This module should be only installed if you have the module sale without sale_stock

-
-

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

- -
-

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

-
    -
  • Akretion
    • -
-
-
-

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.

-

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

-

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

-
-
-
- - diff --git a/sale_delivery_state_view/views/sale_order_views.xml b/sale_delivery_state_view/views/sale_order_views.xml deleted file mode 100644 index 0774bef99733..000000000000 --- a/sale_delivery_state_view/views/sale_order_views.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - sale.order - - - - 0 - - - - - - - sale.order - - - - - - - - - sale.order.tree - - sale.order - - - - - - - diff --git a/sale_stock_delivery_state/README.rst b/sale_stock_delivery_state/README.rst index a8bd8187409b..6e59459ed61e 100644 --- a/sale_stock_delivery_state/README.rst +++ b/sale_stock_delivery_state/README.rst @@ -7,7 +7,7 @@ Sale Stock Delivery State !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - !! source digest: sha256:682c52e04b4a5a7d11cf60134c2d18ebcbc1dee0c583f1e5459e49f75b0e3a8b + !! source digest: sha256:bde26e8868eb8dab93c96b3b43cfcb92fc25298c6fe38e07172a2585d8d46215 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .. |badge1| image:: https://img.shields.io/badge/maturity-Alpha-red.png diff --git a/sale_stock_delivery_state/__manifest__.py b/sale_stock_delivery_state/__manifest__.py index e8810d1fe7f0..fe87f9c77cbb 100644 --- a/sale_stock_delivery_state/__manifest__.py +++ b/sale_stock_delivery_state/__manifest__.py @@ -19,6 +19,6 @@ "sale_stock", "sale_delivery_state", ], - "data": [], + "data": ["views/sale_order_views.xml"], "demo": [], } diff --git a/sale_stock_delivery_state/static/description/index.html b/sale_stock_delivery_state/static/description/index.html index d7f1caaed06b..a3ff1dfd20b6 100644 --- a/sale_stock_delivery_state/static/description/index.html +++ b/sale_stock_delivery_state/static/description/index.html @@ -367,7 +367,7 @@

Sale Stock Delivery State

!! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -!! source digest: sha256:682c52e04b4a5a7d11cf60134c2d18ebcbc1dee0c583f1e5459e49f75b0e3a8b +!! source digest: sha256:bde26e8868eb8dab93c96b3b43cfcb92fc25298c6fe38e07172a2585d8d46215 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->

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

This is a glue module for sale_delivery_state and sale_stock

diff --git a/sale_stock_delivery_state/views/sale_order_views.xml b/sale_stock_delivery_state/views/sale_order_views.xml new file mode 100644 index 000000000000..b8db3387e6c2 --- /dev/null +++ b/sale_stock_delivery_state/views/sale_order_views.xml @@ -0,0 +1,32 @@ + + + sale.order + + + + 1 + + + + + + sale.order.tree + + sale.order + + + 1 + + + + diff --git a/setup/sale_delivery_state_view/odoo/addons/sale_delivery_state_view b/setup/sale_delivery_state_view/odoo/addons/sale_delivery_state_view deleted file mode 120000 index f68807121bd2..000000000000 --- a/setup/sale_delivery_state_view/odoo/addons/sale_delivery_state_view +++ /dev/null @@ -1 +0,0 @@ -../../../../sale_delivery_state_view \ No newline at end of file diff --git a/setup/sale_delivery_state_view/setup.py b/setup/sale_delivery_state_view/setup.py deleted file mode 100644 index 28c57bb64031..000000000000 --- a/setup/sale_delivery_state_view/setup.py +++ /dev/null @@ -1,6 +0,0 @@ -import setuptools - -setuptools.setup( - setup_requires=['setuptools-odoo'], - odoo_addon=True, -)