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 Nov 6, 2023
1 parent e5c08bf commit 2a0dff2
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 19 deletions.
1 change: 1 addition & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ addon | version | maintainers | summary
[pos_margin](pos_margin/) | 11.0.1.0.1 | | Margin on PoS Order
[pos_order_mgmt](pos_order_mgmt/) | 11.0.1.0.4 | | Manage old POS Orders from the frontend
[pos_order_return](pos_order_return/) | 11.0.1.0.1 | | Point of Sale Order Return
[pos_payment_change](pos_payment_change/) | 11.0.1.0.0 | [![legalsylvain](https://github.com/legalsylvain.png?size=30px)](https://github.com/legalsylvain) | Allow cashier to change order payments, as long as the session is not closed.
[pos_payment_entries_globalization](pos_payment_entries_globalization/) | 11.0.1.0.1 | | Globalize POS Payment
[pos_picking_delayed](pos_picking_delayed/) | 11.0.1.0.1 | [![legalsylvain](https://github.com/legalsylvain.png?size=30px)](https://github.com/legalsylvain) [![chienandalu](https://github.com/chienandalu.png?size=30px)](https://github.com/chienandalu) | Delay the creation of the picking when PoS order is created
[pos_price_to_weight](pos_price_to_weight/) | 11.0.1.0.1 | | Compute weight based on barcodes with prices
Expand Down
20 changes: 10 additions & 10 deletions pos_payment_change/README.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Point Of Sale - Change Payments
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:529101d8836d4b63bf8f6d96f317785239c738c7a2458951dd0a92935856156a
!! source digest: sha256:9c7997c58f6532746d084998847f0457f5600daa521b3ef890550ce1602658d9
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
Expand All @@ -17,13 +17,13 @@ Point Of Sale - Change Payments
: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/12.0/pos_payment_change
:target: https://github.com/OCA/pos/tree/11.0/pos_payment_change
:alt: OCA/pos
.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
:target: https://translation.odoo-community.org/projects/pos-12-0/pos-12-0-pos_payment_change
:target: https://translation.odoo-community.org/projects/pos-11-0/pos-11-0-pos_payment_change
: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=12.0
:target: https://runboat.odoo-community.org/builds?repo=OCA/pos&target_branch=11.0
:alt: Try me on Runboat

|badge1| |badge2| |badge3| |badge4| |badge5|
Expand Down Expand Up @@ -55,7 +55,7 @@ Two options are available:

* 'Update Payments': Odoo will change payment lines.

.. figure:: https://raw.githubusercontent.com/OCA/pos/12.0/pos_payment_change/static/description/pos_config_form.png
.. figure:: https://raw.githubusercontent.com/OCA/pos/11.0/pos_payment_change/static/description/pos_config_form.png


**Note**
Expand All @@ -74,12 +74,12 @@ Usage

* Click on the button 'Change Payments'

.. figure:: https://raw.githubusercontent.com/OCA/pos/12.0/pos_payment_change/static/description/pos_order_form.png
.. figure:: https://raw.githubusercontent.com/OCA/pos/11.0/pos_payment_change/static/description/pos_order_form.png

* In the pop up wizard, select the real payment(s) that have been
used to pay the order

.. figure:: https://raw.githubusercontent.com/OCA/pos/12.0/pos_payment_change/static/description/pos_payment_change_wizard_form.png
.. figure:: https://raw.githubusercontent.com/OCA/pos/11.0/pos_payment_change/static/description/pos_payment_change_wizard_form.png

* Then click on the button 'Change Payments'

Expand All @@ -88,15 +88,15 @@ Usage
If the option 'Refund and Resale' is selected, changing the payments will
display the three PoS orders. the oringal one, the refund one, and the new one.

.. figure:: https://raw.githubusercontent.com/OCA/pos/12.0/pos_payment_change/static/description/pos_order_tree.png
.. figure:: https://raw.githubusercontent.com/OCA/pos/11.0/pos_payment_change/static/description/pos_order_tree.png

Bug Tracker
===========

Bugs are tracked on `GitHub Issues <https://github.com/OCA/pos/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 <https://github.com/OCA/pos/issues/new?body=module:%20pos_payment_change%0Aversion:%2012.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
`feedback <https://github.com/OCA/pos/issues/new?body=module:%20pos_payment_change%0Aversion:%2011.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 Down Expand Up @@ -143,6 +143,6 @@ Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:

|maintainer-legalsylvain|

This module is part of the `OCA/pos <https://github.com/OCA/pos/tree/12.0/pos_payment_change>`_ project on GitHub.
This module is part of the `OCA/pos <https://github.com/OCA/pos/tree/11.0/pos_payment_change>`_ project on GitHub.

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
16 changes: 8 additions & 8 deletions pos_payment_change/static/description/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -367,9 +367,9 @@ <h1 class="title">Point Of Sale - Change Payments</h1>
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:529101d8836d4b63bf8f6d96f317785239c738c7a2458951dd0a92935856156a
!! source digest: sha256:9c7997c58f6532746d084998847f0457f5600daa521b3ef890550ce1602658d9
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<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/pos/tree/12.0/pos_payment_change"><img alt="OCA/pos" src="https://img.shields.io/badge/github-OCA%2Fpos-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/pos-12-0/pos-12-0-pos_payment_change"><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/pos&amp;target_branch=12.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-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/pos/tree/11.0/pos_payment_change"><img alt="OCA/pos" src="https://img.shields.io/badge/github-OCA%2Fpos-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/pos-11-0/pos-11-0-pos_payment_change"><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/pos&amp;target_branch=11.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
<p>This module extends the functionnality of the Odoo Point of Sale to
allow the cashier to change the payments of a PoS order.</p>
<p>This feature is usefull when the user realized that he did a mistake,
Expand Down Expand Up @@ -405,7 +405,7 @@ <h1><a class="toc-backref" href="#toc-entry-1">Configuration</a></h1>
<li>‘Update Payments’: Odoo will change payment lines.</li>
</ul>
<div class="figure">
<img alt="https://raw.githubusercontent.com/OCA/pos/12.0/pos_payment_change/static/description/pos_config_form.png" src="https://raw.githubusercontent.com/OCA/pos/12.0/pos_payment_change/static/description/pos_config_form.png" />
<img alt="https://raw.githubusercontent.com/OCA/pos/11.0/pos_payment_change/static/description/pos_config_form.png" src="https://raw.githubusercontent.com/OCA/pos/11.0/pos_payment_change/static/description/pos_config_form.png" />
</div>
<p><strong>Note</strong>
In some countries the ‘Update Payments’ Option
Expand All @@ -422,14 +422,14 @@ <h1><a class="toc-backref" href="#toc-entry-2">Usage</a></h1>
<li>Click on the button ‘Change Payments’</li>
</ul>
<div class="figure">
<img alt="https://raw.githubusercontent.com/OCA/pos/12.0/pos_payment_change/static/description/pos_order_form.png" src="https://raw.githubusercontent.com/OCA/pos/12.0/pos_payment_change/static/description/pos_order_form.png" />
<img alt="https://raw.githubusercontent.com/OCA/pos/11.0/pos_payment_change/static/description/pos_order_form.png" src="https://raw.githubusercontent.com/OCA/pos/11.0/pos_payment_change/static/description/pos_order_form.png" />
</div>
<ul class="simple">
<li>In the pop up wizard, select the real payment(s) that have been
used to pay the order</li>
</ul>
<div class="figure">
<img alt="https://raw.githubusercontent.com/OCA/pos/12.0/pos_payment_change/static/description/pos_payment_change_wizard_form.png" src="https://raw.githubusercontent.com/OCA/pos/12.0/pos_payment_change/static/description/pos_payment_change_wizard_form.png" />
<img alt="https://raw.githubusercontent.com/OCA/pos/11.0/pos_payment_change/static/description/pos_payment_change_wizard_form.png" src="https://raw.githubusercontent.com/OCA/pos/11.0/pos_payment_change/static/description/pos_payment_change_wizard_form.png" />
</div>
<ul class="simple">
<li>Then click on the button ‘Change Payments’</li>
Expand All @@ -438,15 +438,15 @@ <h1><a class="toc-backref" href="#toc-entry-2">Usage</a></h1>
<p>If the option ‘Refund and Resale’ is selected, changing the payments will
display the three PoS orders. the oringal one, the refund one, and the new one.</p>
<div class="figure">
<img alt="https://raw.githubusercontent.com/OCA/pos/12.0/pos_payment_change/static/description/pos_order_tree.png" src="https://raw.githubusercontent.com/OCA/pos/12.0/pos_payment_change/static/description/pos_order_tree.png" />
<img alt="https://raw.githubusercontent.com/OCA/pos/11.0/pos_payment_change/static/description/pos_order_tree.png" src="https://raw.githubusercontent.com/OCA/pos/11.0/pos_payment_change/static/description/pos_order_tree.png" />
</div>
</div>
<div class="section" id="bug-tracker">
<h1><a class="toc-backref" href="#toc-entry-3">Bug Tracker</a></h1>
<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/pos/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 to smash it by providing a detailed and welcomed
<a class="reference external" href="https://github.com/OCA/pos/issues/new?body=module:%20pos_payment_change%0Aversion:%2012.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
<a class="reference external" href="https://github.com/OCA/pos/issues/new?body=module:%20pos_payment_change%0Aversion:%2011.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">
Expand Down Expand Up @@ -481,7 +481,7 @@ <h2><a class="toc-backref" href="#toc-entry-8">Maintainers</a></h2>
promote its widespread use.</p>
<p>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainer</a>:</p>
<p><a class="reference external image-reference" href="https://github.com/legalsylvain"><img alt="legalsylvain" src="https://github.com/legalsylvain.png?size=40px" /></a></p>
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/pos/tree/12.0/pos_payment_change">OCA/pos</a> project on GitHub.</p>
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/pos/tree/11.0/pos_payment_change">OCA/pos</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 @@
11.0.20211108.0
11.0.20231106.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 @@ -17,6 +17,7 @@
'odoo11-addon-pos_margin',
'odoo11-addon-pos_order_mgmt',
'odoo11-addon-pos_order_return',
'odoo11-addon-pos_payment_change',
'odoo11-addon-pos_payment_entries_globalization',
'odoo11-addon-pos_picking_delayed',
'odoo11-addon-pos_price_to_weight',
Expand Down

0 comments on commit 2a0dff2

Please sign in to comment.