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 committed Jan 13, 2025
1 parent f45e67e commit 235da18
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 36 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ Available addons
addon | version | maintainers | summary
--- | --- | --- | ---
[pos_cash_control_extension](pos_cash_control_extension/) | 17.0.1.0.0 | [![peluko00](https://github.com/peluko00.png?size=30px)](https://github.com/peluko00) | This module extends the cash in/out control
[pos_cash_move_reason](pos_cash_move_reason/) | 17.0.1.0.0 | | POS cash in-out reason
[pos_hide_cost_price_and_margin](pos_hide_cost_price_and_margin/) | 17.0.1.0.0 | | Hide Cost and Margin on PoS
[pos_lot_barcode](pos_lot_barcode/) | 17.0.1.0.2 | | Scan barcode to enter lot/serial numbers
[pos_lot_selection](pos_lot_selection/) | 17.0.1.0.1 | | POS Lot Selection
Expand Down
60 changes: 30 additions & 30 deletions pos_cash_move_reason/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ POS cash in-out reason
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:9be2d1beeded5d8b52824fb2442f7c89f0db512626cb33386044d8c060115f83
!! source digest: sha256:78abd03bec155b6afd47226cb5bf574d4728d7e1da329bcfac6b03faaf9f5575
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
Expand Down Expand Up @@ -37,11 +37,11 @@ according accounting entries.

**Typical Use Case (not exhaustive)**

- You want to track **Bank deposit** moves, using an intermediate bank
account named 'Cash Awaiting Bank Deposit'. (In France, for instance,
"581 - Espèce en attente d'encaissement")
- You want to allow payments from Cash Journal to pay recurring little
expenses. (Gasoline, parking meter, etc.)
- You want to track **Bank deposit** moves, using an intermediate bank
account named 'Cash Awaiting Bank Deposit'. (In France, for instance,
"581 - Espèce en attente d'encaissement")
- You want to allow payments from Cash Journal to pay recurring little
expenses. (Gasoline, parking meter, etc.)

**Table of contents**

Expand All @@ -51,14 +51,14 @@ according accounting entries.
Configuration
=============

- Go to 'Point of Sale' / 'Configuration' / 'Move Reason'
- Go to 'Point of Sale' / 'Configuration' / 'Move Reason'

|pos_cash_move_tree|

- Create or update your PoS move Reasons.
- for each reason, you can mention the concerned journal(s), (Generally
the Cash Journal), and if it is a reason to 'put in' and / or to
'take out' Money.
- Create or update your PoS move Reasons.
- for each reason, you can mention the concerned journal(s), (Generally
the Cash Journal), and if it is a reason to 'put in' and / or to 'take
out' Money.

|pos_cash_move_form|

Expand All @@ -73,19 +73,19 @@ you want to enable the feature.
Usage
=====

- Go to your current session
- Click on the button "Put Money In" or "Take Money Out"
- Go to your current session
- Click on the button "Put Money In" or "Take Money Out"

|image1|

- Select the reason, the journal, the amount, and optionaly an extra
description
- Select the reason, the journal, the amount, and optionaly an extra
description

|image2|

- When closing the session, an account move will be created, with two
lines, one with the default journal account, and one with the expense
/ income reason account.
- When closing the session, an account move will be created, with two
lines, one with the default journal account, and one with the expense
/ income reason account.

|image3|

Expand All @@ -107,23 +107,23 @@ Changelog
12.0.3.0.0 (2019-08-13)
-----------------------

- [MIG] Port module to version 12.0.
- [REF] Don't use ``product.product`` model for Reasons, because Odoo
remove the fields ``expense_pdt`` ``and income_pdt`` from the model.
Use instead a new model ``pos.move.reason`` for this purpose.
- [REF] Doesn't inherit from ``cash.box.in`` and ``cash.box.out``
model, as there are bad designed and doesn't allow clean inheritance.
Instead, use new transient model ``wizard.pos.move.reason``.
- [MIG] Port module to version 12.0.
- [REF] Don't use ``product.product`` model for Reasons, because Odoo
remove the fields ``expense_pdt`` ``and income_pdt`` from the model.
Use instead a new model ``pos.move.reason`` for this purpose.
- [REF] Doesn't inherit from ``cash.box.in`` and ``cash.box.out`` model,
as there are bad designed and doesn't allow clean inheritance.
Instead, use new transient model ``wizard.pos.move.reason``.

8.0.2.0.0 (2018-06-25)
----------------------

- [REF] Minor code refactoring.
- [REF] Minor code refactoring.

8.0.1.0.0 (2017-06-08)
----------------------

- First Version of the module.
- First Version of the module.

Bug Tracker
===========
Expand All @@ -147,9 +147,9 @@ Authors
Contributors
------------

- Sylvain LE GAL <https://twitter.com/legalsylvain>
- Dhara Solanki <[email protected]>
- Tran Thanh Trai <[email protected]>
- Sylvain LE GAL <https://twitter.com/legalsylvain>
- Dhara Solanki <[email protected]>
- Tran Thanh Trai <[email protected]>

Maintainers
-----------
Expand Down
10 changes: 5 additions & 5 deletions pos_cash_move_reason/static/description/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ <h1 class="title">POS cash in-out reason</h1>
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:9be2d1beeded5d8b52824fb2442f7c89f0db512626cb33386044d8c060115f83
!! source digest: sha256:78abd03bec155b6afd47226cb5bf574d4728d7e1da329bcfac6b03faaf9f5575
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<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/17.0/pos_cash_move_reason"><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-17-0/pos-17-0-pos_cash_move_reason"><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=17.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
<p>This module allow to define some reasons for the functionality of “Put
Expand Down Expand Up @@ -413,8 +413,8 @@ <h1><a class="toc-backref" href="#toc-entry-1">Configuration</a></h1>
<ul class="simple">
<li>Create or update your PoS move Reasons.</li>
<li>for each reason, you can mention the concerned journal(s), (Generally
the Cash Journal), and if it is a reason to ‘put in’ and / or to
‘take out’ Money.</li>
the Cash Journal), and if it is a reason to ‘put in’ and / or to ‘take
out’ Money.</li>
</ul>
<p><img alt="pos_cash_move_form" src="https://raw.githubusercontent.com/OCA/pos/17.0/pos_cash_move_reason/static/description/pos_cash_move_form.png" /></p>
<p><strong>Note</strong></p>
Expand Down Expand Up @@ -456,8 +456,8 @@ <h2><a class="toc-backref" href="#toc-entry-5">12.0.3.0.0 (2019-08-13)</a></h2>
<li>[REF] Don’t use <tt class="docutils literal">product.product</tt> model for Reasons, because Odoo
remove the fields <tt class="docutils literal">expense_pdt</tt> <tt class="docutils literal">and income_pdt</tt> from the model.
Use instead a new model <tt class="docutils literal">pos.move.reason</tt> for this purpose.</li>
<li>[REF] Doesn’t inherit from <tt class="docutils literal">cash.box.in</tt> and <tt class="docutils literal">cash.box.out</tt>
model, as there are bad designed and doesn’t allow clean inheritance.
<li>[REF] Doesn’t inherit from <tt class="docutils literal">cash.box.in</tt> and <tt class="docutils literal">cash.box.out</tt> model,
as there are bad designed and doesn’t allow clean inheritance.
Instead, use new transient model <tt class="docutils literal">wizard.pos.move.reason</tt>.</li>
</ul>
</div>
Expand Down
3 changes: 2 additions & 1 deletion setup/_metapackage/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
[project]
name = "odoo-addons-oca-pos"
version = "17.0.20241227.1"
version = "17.0.20250113.0"
dependencies = [
"odoo-addon-pos_cash_control_extension>=17.0dev,<17.1dev",
"odoo-addon-pos_cash_move_reason>=17.0dev,<17.1dev",
"odoo-addon-pos_hide_cost_price_and_margin>=17.0dev,<17.1dev",
"odoo-addon-pos_lot_barcode>=17.0dev,<17.1dev",
"odoo-addon-pos_lot_selection>=17.0dev,<17.1dev",
Expand Down

0 comments on commit 235da18

Please sign in to comment.