Skip to content

Commit

Permalink
[BOT] post-merge updates
Browse files Browse the repository at this point in the history
  • Loading branch information
@OCA-git-bot
OCA-git-bot committed Sep 26, 2023
1 parent 17a071c commit fa0344a
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 35 deletions.
1 change: 1 addition & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ addon | version | maintainers | summary
[sale_order_general_discount](sale_order_general_discount/) | 16.0.1.0.0 | | General discount per sale order
[sale_order_general_discount_triple](sale_order_general_discount_triple/) | 16.0.2.0.0 | [![ashishhirapara](https://github.com/ashishhirapara.png?size=30px)](https://github.com/ashishhirapara) | General discount per sale order with triple
[sale_order_invoice_amount](sale_order_invoice_amount/) | 16.0.1.0.0 | | Display the invoiced and uninvoiced total in the sale order
[sale_order_invoicing_finished_task](sale_order_invoicing_finished_task/) | 16.0.1.0.0 | | Control invoice order lines if their related task has been set to invoiceable
[sale_order_line_date](sale_order_line_date/) | 16.0.1.0.0 | | Adds a commitment date to each sale order line.
[sale_order_line_delivery_state](sale_order_line_delivery_state/) | 16.0.1.0.0 | | Show the delivery state on the sale order line
[sale_order_line_menu](sale_order_line_menu/) | 16.0.1.3.1 | | Adds a Sale Order Lines Menu
Expand Down
28 changes: 16 additions & 12 deletions sale_order_invoicing_finished_task/README.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,13 @@
Sale Order Invoicing Finished Task
==================================

.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
..
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:21a59b416faa81d08124554beff5593a57935b993fdb8431eb57779f7e3c3e1c
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
:target: https://odoo-community.org/page/development-status
Expand All @@ -14,16 +17,16 @@ Sale Order Invoicing Finished Task
: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/15.0/sale_order_invoicing_finished_task
:target: https://github.com/OCA/sale-workflow/tree/16.0/sale_order_invoicing_finished_task
: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-15-0/sale-workflow-15-0-sale_order_invoicing_finished_task
:target: https://translation.odoo-community.org/projects/sale-workflow-16-0/sale-workflow-16-0-sale_order_invoicing_finished_task
:alt: Translate me on Weblate
.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
:target: https://runbot.odoo-community.org/runbot/167/15.0
:alt: Try me on Runbot
.. |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|
|badge1| |badge2| |badge3| |badge4| |badge5|

This module brings the possibility to indicate if a task is available to be
invoiced or not, within the task itself. Moreover, even if the task is not
Expand Down Expand Up @@ -51,7 +54,7 @@ To use this module, you need to:
* From **Create on Order** select *Task* or *Project & Task*.
* Tick off **Invoicing control by task** checkbox, and save.

.. image:: https://raw.githubusercontent.com/OCA/sale-workflow/15.0/sale_order_invoicing_finished_task/static/description/product_view_invoicefinishedtask2.png
.. image:: https://raw.githubusercontent.com/OCA/sale-workflow/16.0/sale_order_invoicing_finished_task/static/description/product_view_invoicefinishedtask2.png

3. Go to **Sales > Orders > Orders** and create a new one. Add a customer and
the product you have created.
Expand All @@ -61,7 +64,7 @@ To use this module, you need to:
5. Go to the task and you will find a smartbutton named *Not invoiceable*. When
you click on it, you will indicate that the task can be invoiced.

.. image:: https://raw.githubusercontent.com/OCA/sale-workflow/15.0/sale_order_invoicing_finished_task/static/description/task_view_invoicefinishedtask2.png
.. image:: https://raw.githubusercontent.com/OCA/sale-workflow/16.0/sale_order_invoicing_finished_task/static/description/task_view_invoicefinishedtask2.png

If the product is configured with an invoicing policy "Timesheets on tasks",
time spent on the task is used to compute the delivered quantity.
Expand All @@ -75,8 +78,8 @@ Bug Tracker

Bugs are tracked on `GitHub Issues <https://github.com/OCA/sale-workflow/issues>`_.
In case of trouble, please check there if your issue has already been reported.
If you spotted it first, help us smashing it by providing a detailed and welcomed
`feedback <https://github.com/OCA/sale-workflow/issues/new?body=module:%20sale_order_invoicing_finished_task%0Aversion:%2015.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
If you spotted it first, help us to smash it by providing a detailed and welcomed
`feedback <https://github.com/OCA/sale-workflow/issues/new?body=module:%20sale_order_invoicing_finished_task%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.

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

Expand All @@ -102,6 +105,7 @@ Contributors
* Ernesto Tejeda
* César A. Sánchez
* Luis D. Lafaurie
* Yadier A. De Quesada

* nikulchaudhary2112@gmail.com

Expand All @@ -118,6 +122,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/sale-workflow <https://github.com/OCA/sale-workflow/tree/15.0/sale_order_invoicing_finished_task>`_ project on GitHub.
This module is part of the `OCA/sale-workflow <https://github.com/OCA/sale-workflow/tree/16.0/sale_order_invoicing_finished_task>`_ project on GitHub.

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
47 changes: 25 additions & 22 deletions sale_order_invoicing_finished_task/static/description/index.html
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="utf-8" ?>
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" />
<meta name="generator" content="Docutils: https://docutils.sourceforge.io/" />
<title>Sale Order Invoicing Finished Task</title>
<style type="text/css">

/*
:Author: David Goodger (goodger@python.org)
:Id: $Id: html4css1.css 7952 2016-07-26 18:15:59Z milde $
:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
:Copyright: This stylesheet has been placed in the public domain.

Default cascading style sheet for the HTML output of Docutils.

See http://docutils.sf.net/docs/howto/html-stylesheets.html for how to
See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
customize this style sheet.
*/

Expand Down Expand Up @@ -366,8 +366,10 @@ <h1 class="title">Sale Order Invoicing Finished Task</h1>
<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:21a59b416faa81d08124554beff5593a57935b993fdb8431eb57779f7e3c3e1c
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/sale-workflow/tree/15.0/sale_order_invoicing_finished_task"><img alt="OCA/sale-workflow" src="https://img.shields.io/badge/github-OCA%2Fsale--workflow-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/sale-workflow-15-0/sale-workflow-15-0-sale_order_invoicing_finished_task"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/167/15.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/sale-workflow/tree/16.0/sale_order_invoicing_finished_task"><img alt="OCA/sale-workflow" src="https://img.shields.io/badge/github-OCA%2Fsale--workflow-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/sale-workflow-16-0/sale-workflow-16-0-sale_order_invoicing_finished_task"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/sale-workflow&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
<p>This module brings the possibility to indicate if a task is available to be
invoiced or not, within the task itself. Moreover, even if the task is not
finished yet, it can be set as invoiceable.</p>
Expand All @@ -377,18 +379,18 @@ <h1 class="title">Sale Order Invoicing Finished Task</h1>
<p><strong>Table of contents</strong></p>
<div class="contents local topic" id="contents">
<ul class="simple">
<li><a class="reference internal" href="#usage" id="id1">Usage</a></li>
<li><a class="reference internal" href="#bug-tracker" id="id2">Bug Tracker</a></li>
<li><a class="reference internal" href="#credits" id="id3">Credits</a><ul>
<li><a class="reference internal" href="#authors" id="id4">Authors</a></li>
<li><a class="reference internal" href="#contributors" id="id5">Contributors</a></li>
<li><a class="reference internal" href="#maintainers" id="id6">Maintainers</a></li>
<li><a class="reference internal" href="#usage" id="toc-entry-1">Usage</a></li>
<li><a class="reference internal" href="#bug-tracker" id="toc-entry-2">Bug Tracker</a></li>
<li><a class="reference internal" href="#credits" id="toc-entry-3">Credits</a><ul>
<li><a class="reference internal" href="#authors" id="toc-entry-4">Authors</a></li>
<li><a class="reference internal" href="#contributors" id="toc-entry-5">Contributors</a></li>
<li><a class="reference internal" href="#maintainers" id="toc-entry-6">Maintainers</a></li>
</ul>
</li>
</ul>
</div>
<div class="section" id="usage">
<h1><a class="toc-backref" href="#id1">Usage</a></h1>
<h1><a class="toc-backref" href="#toc-entry-1">Usage</a></h1>
<p>To use this module, you need to:</p>
<ol class="arabic">
<li><p class="first">Go to <strong>Sales &gt; Products &gt; Products</strong> and create a <strong>service</strong> product.</p>
Expand All @@ -399,7 +401,7 @@ <h1><a class="toc-backref" href="#id1">Usage</a></h1>
<li>From <strong>Create on Order</strong> select <em>Task</em> or <em>Project &amp; Task</em>.</li>
<li>Tick off <strong>Invoicing control by task</strong> checkbox, and save.</li>
</ul>
<img alt="https://raw.githubusercontent.com/OCA/sale-workflow/15.0/sale_order_invoicing_finished_task/static/description/product_view_invoicefinishedtask2.png" src="https://raw.githubusercontent.com/OCA/sale-workflow/15.0/sale_order_invoicing_finished_task/static/description/product_view_invoicefinishedtask2.png" />
<img alt="https://raw.githubusercontent.com/OCA/sale-workflow/16.0/sale_order_invoicing_finished_task/static/description/product_view_invoicefinishedtask2.png" src="https://raw.githubusercontent.com/OCA/sale-workflow/16.0/sale_order_invoicing_finished_task/static/description/product_view_invoicefinishedtask2.png" />
</li>
<li><p class="first">Go to <strong>Sales &gt; Orders &gt; Orders</strong> and create a new one. Add a customer and
the product you have created.</p>
Expand All @@ -408,7 +410,7 @@ <h1><a class="toc-backref" href="#id1">Usage</a></h1>
</li>
<li><p class="first">Go to the task and you will find a smartbutton named <em>Not invoiceable</em>. When
you click on it, you will indicate that the task can be invoiced.</p>
<img alt="https://raw.githubusercontent.com/OCA/sale-workflow/15.0/sale_order_invoicing_finished_task/static/description/task_view_invoicefinishedtask2.png" src="https://raw.githubusercontent.com/OCA/sale-workflow/15.0/sale_order_invoicing_finished_task/static/description/task_view_invoicefinishedtask2.png" />
<img alt="https://raw.githubusercontent.com/OCA/sale-workflow/16.0/sale_order_invoicing_finished_task/static/description/task_view_invoicefinishedtask2.png" src="https://raw.githubusercontent.com/OCA/sale-workflow/16.0/sale_order_invoicing_finished_task/static/description/task_view_invoicefinishedtask2.png" />
<p>If the product is configured with an invoicing policy “Timesheets on tasks”,
time spent on the task is used to compute the delivered quantity.</p>
</li>
Expand All @@ -419,24 +421,24 @@ <h1><a class="toc-backref" href="#id1">Usage</a></h1>
</ol>
</div>
<div class="section" id="bug-tracker">
<h1><a class="toc-backref" href="#id2">Bug Tracker</a></h1>
<h1><a class="toc-backref" href="#toc-entry-2">Bug Tracker</a></h1>
<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/sale-workflow/issues">GitHub Issues</a>.
In case of trouble, please check there if your issue has already been reported.
If you spotted it first, help us smashing it by providing a detailed and welcomed
<a class="reference external" href="https://github.com/OCA/sale-workflow/issues/new?body=module:%20sale_order_invoicing_finished_task%0Aversion:%2015.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
If you spotted it first, help us to smash it by providing a detailed and welcomed
<a class="reference external" href="https://github.com/OCA/sale-workflow/issues/new?body=module:%20sale_order_invoicing_finished_task%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
<p>Do not contact contributors directly about support or help with technical issues.</p>
</div>
<div class="section" id="credits">
<h1><a class="toc-backref" href="#id3">Credits</a></h1>
<h1><a class="toc-backref" href="#toc-entry-3">Credits</a></h1>
<div class="section" id="authors">
<h2><a class="toc-backref" href="#id4">Authors</a></h2>
<h2><a class="toc-backref" href="#toc-entry-4">Authors</a></h2>
<ul class="simple">
<li>Tecnativa</li>
<li>Camptocamp</li>
</ul>
</div>
<div class="section" id="contributors">
<h2><a class="toc-backref" href="#id5">Contributors</a></h2>
<h2><a class="toc-backref" href="#toc-entry-5">Contributors</a></h2>
<ul class="simple">
<li>Denis Leemann &lt;<a class="reference external" href="mailto:denis.leemann&#64;camptocamp.com">denis.leemann&#64;camptocamp.com</a>&gt;</li>
<li><a class="reference external" href="https://www.tecnativa.com">Tecnativa</a>:<ul>
Expand All @@ -447,19 +449,20 @@ <h2><a class="toc-backref" href="#id5">Contributors</a></h2>
<li>Ernesto Tejeda</li>
<li>César A. Sánchez</li>
<li>Luis D. Lafaurie</li>
<li>Yadier A. De Quesada</li>
</ul>
</li>
<li><a class="reference external" href="mailto:nikulchaudhary2112&#64;gmail.com">nikulchaudhary2112&#64;gmail.com</a></li>
</ul>
</div>
<div class="section" id="maintainers">
<h2><a class="toc-backref" href="#id6">Maintainers</a></h2>
<h2><a class="toc-backref" href="#toc-entry-6">Maintainers</a></h2>
<p>This module is maintained by the OCA.</p>
<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
<p>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.</p>
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/sale-workflow/tree/15.0/sale_order_invoicing_finished_task">OCA/sale-workflow</a> project on GitHub.</p>
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/sale-workflow/tree/16.0/sale_order_invoicing_finished_task">OCA/sale-workflow</a> project on GitHub.</p>
<p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion setup/_metapackage/VERSION.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16.0.20230919.1
16.0.20230926.0
1 change: 1 addition & 0 deletions setup/_metapackage/setup.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
'odoo-addon-sale_order_general_discount>=16.0dev,<16.1dev',
'odoo-addon-sale_order_general_discount_triple>=16.0dev,<16.1dev',
'odoo-addon-sale_order_invoice_amount>=16.0dev,<16.1dev',
'odoo-addon-sale_order_invoicing_finished_task>=16.0dev,<16.1dev',
'odoo-addon-sale_order_line_date>=16.0dev,<16.1dev',
'odoo-addon-sale_order_line_delivery_state>=16.0dev,<16.1dev',
'odoo-addon-sale_order_line_menu>=16.0dev,<16.1dev',
Expand Down

0 comments on commit fa0344a

Please sign in to comment.