From e9040d1b9f3f7f9be3d0359c17bd03df02347eb1 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Mon, 18 Dec 2023 12:58:07 +0000 Subject: [PATCH] [BOT] post-merge updates --- README.md | 1 + pos_order_to_sale_order_delivery/README.rst | 120 ++++- .../static/description/index.html | 460 ++++++++++++++++++ setup/_metapackage/VERSION.txt | 2 +- setup/_metapackage/setup.py | 1 + 5 files changed, 582 insertions(+), 2 deletions(-) create mode 100644 pos_order_to_sale_order_delivery/static/description/index.html diff --git a/README.md b/README.md index 558bb313ce..7399474909 100644 --- a/README.md +++ b/README.md @@ -37,6 +37,7 @@ addon | version | maintainers | summary [pos_order_remove_line](pos_order_remove_line/) | 16.0.1.2.0 | [![robyf70](https://github.com/robyf70.png?size=30px)](https://github.com/robyf70) | Add button to remove POS order line. [pos_order_reorder](pos_order_reorder/) | 16.0.0.1.1 | | Simple Re-order in the Point of Sale [pos_order_to_sale_order](pos_order_to_sale_order/) | 16.0.1.0.7 | [![legalsylvain](https://github.com/legalsylvain.png?size=30px)](https://github.com/legalsylvain) | PoS Order To Sale Order +[pos_order_to_sale_order_delivery](pos_order_to_sale_order_delivery/) | 16.0.1.0.0 | [![GabbasovDinar](https://github.com/GabbasovDinar.png?size=30px)](https://github.com/GabbasovDinar) [![CetmixGitDrone](https://github.com/CetmixGitDrone.png?size=30px)](https://github.com/CetmixGitDrone) | Compatibility of pos_order_to_sale_order and delivery modules [pos_order_to_sale_order_report](pos_order_to_sale_order_report/) | 16.0.1.0.1 | | Report will be downloaded after the sales order is created. [pos_partner_birthdate](pos_partner_birthdate/) | 16.0.1.0.4 | [![ecino](https://github.com/ecino.png?size=30px)](https://github.com/ecino) | Adds the birthdate in the customer screen of POS [pos_partner_firstname](pos_partner_firstname/) | 16.0.1.0.0 | [![robyf70](https://github.com/robyf70.png?size=30px)](https://github.com/robyf70) | POS Support of partner firstname diff --git a/pos_order_to_sale_order_delivery/README.rst b/pos_order_to_sale_order_delivery/README.rst index 98dbb4d62e..6f18c5eefd 100644 --- a/pos_order_to_sale_order_delivery/README.rst +++ b/pos_order_to_sale_order_delivery/README.rst @@ -1 +1,119 @@ -TODO :) +================================= +PoS Order To Sale Order: Delivery +================================= + +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:16a95b6d0b71de8add338dda13850eb3894e835acdb4b5305446ffb934072745 + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |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%2Fpos-lightgray.png?logo=github + :target: https://github.com/OCA/pos/tree/16.0/pos_order_to_sale_order_delivery + :alt: OCA/pos +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/pos-16-0/pos-16-0-pos_order_to_sale_order_delivery + :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/pos&target_branch=16.0 + :alt: Try me on Runboat + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module extends the functionality of the pos_order_to_sale_order module +by allowing you to create sales orders specifying a delivery method from +the Point of Sale. + +It is enough to specify that you want to add a shipping method during the +creation of a sales order in the Point of Sale. + +**Table of contents** + +.. contents:: + :local: + +Configuration +============= + +Select PoS > Configuration > Settings > Inventory > enable flag "Allow Delivery Carrier" > specify "Shipping Methods": + .. image:: https://raw.githubusercontent.com/OCA/pos/16.0/pos_order_to_sale_order_delivery/static/img/pos_config.png + +Usage +===== + + +* Open your Point of sale +* Create a new order and select products +* Select a customer +* Click on the "Create Order" button +* Click on the "Add a shipping method" button + +.. figure:: https://raw.githubusercontent.com/OCA/pos/16.0/pos_order_to_sale_order_delivery/static/img/pos_add_shipping.png + +* Click Create Sale order button + +Before creating a sales order, a popup will open where you can specify the shipping method + +.. figure:: https://raw.githubusercontent.com/OCA/pos/16.0/pos_order_to_sale_order_delivery/static/img/pos_select_shipping.png + +* Click on the "Confirm" button to add the selected method during the sales order creation process + +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 +~~~~~~~ + +* Cetmix + +Contributors +~~~~~~~~~~~~ + +* Dinar Gabbasov +* Cetmix + +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-GabbasovDinar| image:: https://github.com/GabbasovDinar.png?size=40px + :target: https://github.com/GabbasovDinar + :alt: GabbasovDinar +.. |maintainer-CetmixGitDrone| image:: https://github.com/CetmixGitDrone.png?size=40px + :target: https://github.com/CetmixGitDrone + :alt: CetmixGitDrone + +Current `maintainers `__: + +|maintainer-GabbasovDinar| |maintainer-CetmixGitDrone| + +This module is part of the `OCA/pos `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/pos_order_to_sale_order_delivery/static/description/index.html b/pos_order_to_sale_order_delivery/static/description/index.html new file mode 100644 index 0000000000..243aea4c81 --- /dev/null +++ b/pos_order_to_sale_order_delivery/static/description/index.html @@ -0,0 +1,460 @@ + + + + + +PoS Order To Sale Order: Delivery + + + +
+

PoS Order To Sale Order: Delivery

+ + +

Beta License: AGPL-3 OCA/pos Translate me on Weblate Try me on Runboat

+

This module extends the functionality of the pos_order_to_sale_order module +by allowing you to create sales orders specifying a delivery method from +the Point of Sale.

+

It is enough to specify that you want to add a shipping method during the +creation of a sales order in the Point of Sale.

+

Table of contents

+ +
+

Configuration

+
+
Select PoS > Configuration > Settings > Inventory > enable flag “Allow Delivery Carrier” > specify “Shipping Methods”:
+
https://raw.githubusercontent.com/OCA/pos/16.0/pos_order_to_sale_order_delivery/static/img/pos_config.png +
+
+
+
+

Usage

+
    +
  • Open your Point of sale
    • +
  • Create a new order and select products
    • +
  • Select a customer
    • +
  • Click on the “Create Order” button
    • +
  • Click on the “Add a shipping method” button
    • +
+
+https://raw.githubusercontent.com/OCA/pos/16.0/pos_order_to_sale_order_delivery/static/img/pos_add_shipping.png +
+
    +
  • Click Create Sale order button
    • +
+

Before creating a sales order, a popup will open where you can specify the shipping method

+
+https://raw.githubusercontent.com/OCA/pos/16.0/pos_order_to_sale_order_delivery/static/img/pos_select_shipping.png +
+
    +
  • Click on the “Confirm” button to add the selected method during the sales order creation process
    • +
+
+
+

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

+
    +
  • Cetmix
    • +
+
+ +
+

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:

+

GabbasovDinar CetmixGitDrone

+

This module is part of the OCA/pos 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 b56bf4c951..8bc6f2d8bd 100644 --- a/setup/_metapackage/VERSION.txt +++ b/setup/_metapackage/VERSION.txt @@ -1 +1 @@ -16.0.20231116.0 \ No newline at end of file +16.0.20231218.0 \ No newline at end of file diff --git a/setup/_metapackage/setup.py b/setup/_metapackage/setup.py index 22a6bf13fc..f4b0aee269 100644 --- a/setup/_metapackage/setup.py +++ b/setup/_metapackage/setup.py @@ -24,6 +24,7 @@ 'odoo-addon-pos_order_remove_line>=16.0dev,<16.1dev', 'odoo-addon-pos_order_reorder>=16.0dev,<16.1dev', 'odoo-addon-pos_order_to_sale_order>=16.0dev,<16.1dev', + 'odoo-addon-pos_order_to_sale_order_delivery>=16.0dev,<16.1dev', 'odoo-addon-pos_order_to_sale_order_report>=16.0dev,<16.1dev', 'odoo-addon-pos_partner_birthdate>=16.0dev,<16.1dev', 'odoo-addon-pos_partner_firstname>=16.0dev,<16.1dev',