From f7ee9d36241a52c00cde674107e97fc37e46c193 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Thu, 9 Nov 2023 16:30:45 +0000 Subject: [PATCH] [BOT] post-merge updates --- README.md | 1 + contract_sale_invoicing/README.rst | 14 ++++++++------ .../static/description/index.html | 9 +++++---- setup/_metapackage/VERSION.txt | 2 +- setup/_metapackage/setup.py | 1 + 5 files changed, 16 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index b5ef6b237b..65f28722ad 100644 --- a/README.md +++ b/README.md @@ -27,6 +27,7 @@ addon | version | maintainers | summary [contract_price_revision](contract_price_revision/) | 15.0.1.0.0 | [![carlosdauden](https://github.com/carlosdauden.png?size=30px)](https://github.com/carlosdauden) | Easy revision of contract prices [contract_sale](contract_sale/) | 15.0.1.1.0 | | Contract from Sale [contract_sale_generation](contract_sale_generation/) | 15.0.1.0.3 | | Contracts Management - Recurring Sales +[contract_sale_invoicing](contract_sale_invoicing/) | 15.0.1.0.0 | | Include sales to invoice in contract invoice creation [contract_variable_qty_timesheet](contract_variable_qty_timesheet/) | 15.0.1.0.0 | [![carlosdauden](https://github.com/carlosdauden.png?size=30px)](https://github.com/carlosdauden) [![pedrobaeza](https://github.com/pedrobaeza.png?size=30px)](https://github.com/pedrobaeza) | Add formula to invoice [contract_variable_quantity](contract_variable_quantity/) | 15.0.1.0.0 | | Variable quantity in contract recurrent invoicing [subscription_oca](subscription_oca/) | 15.0.1.0.1 | | Generate recurring invoices. diff --git a/contract_sale_invoicing/README.rst b/contract_sale_invoicing/README.rst index 03c32fb199..348b23b1d5 100644 --- a/contract_sale_invoicing/README.rst +++ b/contract_sale_invoicing/README.rst @@ -7,7 +7,7 @@ Contract Invoicing of Pending Sales Orders !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - !! source digest: sha256:677f350039713fce998708f88a5907a26cde8dac2595c5f0e5d78af8c31a3c9f + !! source digest: sha256:2b2b2e531417f29b197fed649fe83609b1f0277ad1946cd51d1dc644c2e30479 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png @@ -17,13 +17,13 @@ Contract Invoicing of Pending Sales Orders :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/12.0/contract_sale_invoicing + :target: https://github.com/OCA/contract/tree/15.0/contract_sale_invoicing :alt: OCA/contract .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/contract-12-0/contract-12-0-contract_sale_invoicing + :target: https://translation.odoo-community.org/projects/contract-15-0/contract-15-0-contract_sale_invoicing :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=12.0 + :target: https://runboat.odoo-community.org/builds?repo=OCA/contract&target_branch=15.0 :alt: Try me on Runboat |badge1| |badge2| |badge3| |badge4| |badge5| @@ -55,7 +55,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. @@ -73,6 +73,8 @@ Contributors * `Tecnativa `_: * Carlos Dauden + * Carolina Fernandez + * Pedro M. Baeza * Souheil Bejaoui Maintainers @@ -88,6 +90,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/contract_sale_invoicing/static/description/index.html b/contract_sale_invoicing/static/description/index.html index b5940f171c..644b091ff7 100644 --- a/contract_sale_invoicing/static/description/index.html +++ b/contract_sale_invoicing/static/description/index.html @@ -367,9 +367,9 @@

Contract Invoicing of Pending Sales Orders

!! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -!! source digest: sha256:677f350039713fce998708f88a5907a26cde8dac2595c5f0e5d78af8c31a3c9f +!! source digest: sha256:2b2b2e531417f29b197fed649fe83609b1f0277ad1946cd51d1dc644c2e30479 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

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 modules allows to include on the same invoice than the recurring invoice contract, all the pending to invoice sales orders that you have with the same analytic account.

@@ -403,7 +403,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.

@@ -420,6 +420,7 @@

Contributors

  • Tecnativa:
    • Carlos Dauden
    • Carolina Fernandez
      • +
    • Pedro M. Baeza
  • Souheil Bejaoui <souheil.bejaoui@acsone.eu>
    • @@ -432,7 +433,7 @@

    Maintainers

    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/setup/_metapackage/VERSION.txt b/setup/_metapackage/VERSION.txt index 87b27c656d..cf18b70806 100644 --- a/setup/_metapackage/VERSION.txt +++ b/setup/_metapackage/VERSION.txt @@ -1 +1 @@ -15.0.20231010.0 \ No newline at end of file +15.0.20231109.0 \ No newline at end of file diff --git a/setup/_metapackage/setup.py b/setup/_metapackage/setup.py index 32823e4e77..e628c333e7 100644 --- a/setup/_metapackage/setup.py +++ b/setup/_metapackage/setup.py @@ -14,6 +14,7 @@ 'odoo-addon-contract_price_revision>=15.0dev,<15.1dev', 'odoo-addon-contract_sale>=15.0dev,<15.1dev', 'odoo-addon-contract_sale_generation>=15.0dev,<15.1dev', + 'odoo-addon-contract_sale_invoicing>=15.0dev,<15.1dev', 'odoo-addon-contract_variable_qty_timesheet>=15.0dev,<15.1dev', 'odoo-addon-contract_variable_quantity>=15.0dev,<15.1dev', 'odoo-addon-subscription_oca>=15.0dev,<15.1dev',