From e6be7d538e67bf963dd5c3f2db218e95dde843bb Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Tue, 20 Feb 2024 19:04:49 +0000 Subject: [PATCH] [BOT] post-merge updates --- README.md | 1 + setup/_metapackage/VERSION.txt | 2 +- setup/_metapackage/setup.py | 1 + subscription_oca/README.rst | 17 +++++++++-------- subscription_oca/static/description/index.html | 12 ++++++------ 5 files changed, 18 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 4b6e7b6c5..d09441961 100644 --- a/README.md +++ b/README.md @@ -28,6 +28,7 @@ addon | version | maintainers | summary [contract_sale](contract_sale/) | 16.0.1.2.0 | | Contract from Sale [contract_sale_generation](contract_sale_generation/) | 16.0.1.0.0 | | Contracts Management - Recurring Sales [contract_variable_quantity](contract_variable_quantity/) | 16.0.1.0.0 | | Variable quantity in contract recurrent invoicing +[subscription_oca](subscription_oca/) | 16.0.1.0.0 | | Generate recurring invoices. [//]: # (end addons) diff --git a/setup/_metapackage/VERSION.txt b/setup/_metapackage/VERSION.txt index d0d2b6fcc..9fe3c3c82 100644 --- a/setup/_metapackage/VERSION.txt +++ b/setup/_metapackage/VERSION.txt @@ -1 +1 @@ -16.0.20240108.0 \ No newline at end of file +16.0.20240220.0 \ No newline at end of file diff --git a/setup/_metapackage/setup.py b/setup/_metapackage/setup.py index e23b0c123..9e1a0c15a 100644 --- a/setup/_metapackage/setup.py +++ b/setup/_metapackage/setup.py @@ -15,6 +15,7 @@ setuptools.setup( 'odoo-addon-contract_sale>=16.0dev,<16.1dev', 'odoo-addon-contract_sale_generation>=16.0dev,<16.1dev', 'odoo-addon-contract_variable_quantity>=16.0dev,<16.1dev', + 'odoo-addon-subscription_oca>=16.0dev,<16.1dev', ], classifiers=[ 'Programming Language :: Python', diff --git a/subscription_oca/README.rst b/subscription_oca/README.rst index 9ba4a3b68..4511f0c68 100644 --- a/subscription_oca/README.rst +++ b/subscription_oca/README.rst @@ -2,12 +2,12 @@ Subscription management ======================= -.. +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - !! source digest: sha256:42fc353409c68ca6defc36ba2273b97ae36edb6f629c0c041db1ef7f1e01ba00 + !! source digest: sha256:7f85e1d860d2d5332db014c46c57b9bece8f76a849049bda632499d422ba6dd8 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png @@ -17,13 +17,13 @@ Subscription management :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fcontract-lightgray.png?logo=github - :target: https://github.com/OCA/contract/tree/15.0/subscription_oca + :target: https://github.com/OCA/contract/tree/16.0/subscription_oca :alt: OCA/contract .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/contract-15-0/contract-15-0-subscription_oca + :target: https://translation.odoo-community.org/projects/contract-16-0/contract-16-0-subscription_oca :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/contract&target_branch=15.0 + :target: https://runboat.odoo-community.org/builds?repo=OCA/contract&target_branch=16.0 :alt: Try me on Runboat |badge1| |badge2| |badge3| |badge4| |badge5| @@ -43,7 +43,7 @@ To make a subscription: #. Go to *Subscriptions > Configuration > Subscription templates*. #. Create the templates you consider, choosing the billing frequency: daily, monthly... and the method of creating the invoice and/or order. #. Go to *Subscription > Subscriptions*. -#. Create a subscription and indicate the start date. When the *Subscriptions Management* cron job is executed, the subscription will begin and the first invoice will be created if the execution date matches the start date. The invoice will also be created when the execution date matches the next invoice date. Additionally, you can manually change the subscription status and create an invoice. +#. Create a subscription and indicate the start date. When the *Subscriptions Management* cron job is executed, the subscription will begin and the first invoice will be created if the execution date matches the start date. The invoice will also be created when the execution date matches the next invoice date. Additionally, you can manually change the subscription status and create an invoice by using the *Create Invoice* button. This action creates just an invoice even if the subscription template has the *Sale Order & Invoice* option selected, because the *Invoicing mode* option is triggered through the cron job. #. The cron job will also end the subscription if its end date has been reached. To create subscriptions with the sale of a product: @@ -64,7 +64,7 @@ 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 `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -80,6 +80,7 @@ Contributors ~~~~~~~~~~~~ * Carlos Martínez +* Carolina Ferrer * `Ooops404 `__: @@ -99,6 +100,6 @@ 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/contract `_ project on GitHub. +This module is part of the `OCA/contract `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/subscription_oca/static/description/index.html b/subscription_oca/static/description/index.html index da81d249f..2f09cbdd6 100644 --- a/subscription_oca/static/description/index.html +++ b/subscription_oca/static/description/index.html @@ -1,4 +1,3 @@ - @@ -367,9 +366,9 @@ ul.auto-toc { !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -!! source digest: sha256:42fc353409c68ca6defc36ba2273b97ae36edb6f629c0c041db1ef7f1e01ba00 +!! source digest: sha256:7f85e1d860d2d5332db014c46c57b9bece8f76a849049bda632499d422ba6dd8 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

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

+

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

This module allows creating subscriptions that generate recurring invoices or orders. It also enables the sale of products that generate subscriptions.

Table of contents

@@ -392,7 +391,7 @@ ul.auto-toc {
  • Go to Subscriptions > Configuration > Subscription templates.
  • Create the templates you consider, choosing the billing frequency: daily, monthly… and the method of creating the invoice and/or order.
  • Go to Subscription > Subscriptions.
    • -
  • Create a subscription and indicate the start date. When the Subscriptions Management cron job is executed, the subscription will begin and the first invoice will be created if the execution date matches the start date. The invoice will also be created when the execution date matches the next invoice date. Additionally, you can manually change the subscription status and create an invoice.
    • +
  • Create a subscription and indicate the start date. When the Subscriptions Management cron job is executed, the subscription will begin and the first invoice will be created if the execution date matches the start date. The invoice will also be created when the execution date matches the next invoice date. Additionally, you can manually change the subscription status and create an invoice by using the Create Invoice button. This action creates just an invoice even if the subscription template has the Sale Order & Invoice option selected, because the Invoicing mode option is triggered through the cron job.
  • The cron job will also end the subscription if its end date has been reached.

    • To create subscriptions with the sale of a product:

    @@ -414,7 +413,7 @@ ul.auto-toc {

    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.

    +feedback.

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

    @@ -429,6 +428,7 @@ If you spotted it first, help us to smash it by providing a detailed and welcome

    Contributors