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 Nov 27, 2024
1 parent 8d9be93 commit 56ffa60
Show file tree
Hide file tree
Showing 10 changed files with 54 additions and 51 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ Available addons
----------------
addon | version | maintainers | summary
--- | --- | --- | ---
[hr_expense_cancel](hr_expense_cancel/) | 17.0.1.0.2 | | Hr expense cancel
[hr_expense_cancel](hr_expense_cancel/) | 17.0.1.0.3 | | Hr expense cancel
[hr_expense_employee_analytic_default](hr_expense_employee_analytic_default/) | 17.0.1.0.0 | [![victoralmau](https://github.com/victoralmau.png?size=30px)](https://github.com/victoralmau) | Expense Employee Analytic Default
[hr_expense_invoice](hr_expense_invoice/) | 17.0.1.0.0 | | Supplier invoices on HR expenses
[hr_expense_payment](hr_expense_payment/) | 17.0.1.0.0 | | HR Expense Payment
[hr_expense_invoice](hr_expense_invoice/) | 17.0.1.0.1 | | Supplier invoices on HR expenses
[hr_expense_payment](hr_expense_payment/) | 17.0.1.0.1 | | HR Expense Payment

[//]: # (end addons)

Expand Down
18 changes: 9 additions & 9 deletions hr_expense_cancel/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Hr expense cancel
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:33354bbac2fe7f2f76e1fd239d91948850c11e90e289f70e91d3e1ed3ae4e838
!! source digest: sha256:659127f8c6e5f2db749db28e1d7681511ae898c25356a3293ea5094ba6c89b88
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
Expand Down Expand Up @@ -87,16 +87,16 @@ Authors
Contributors
------------

- `Tecnativa <https://www.tecnativa.com>`__:
- `Tecnativa <https://www.tecnativa.com>`__:

- Pedro M. Baeza
- Ernesto Tejeda
- Stefan Ungureanu
- Pedro M. Baeza
- Ernesto Tejeda
- Stefan Ungureanu

- Danh Vo <https://github.com/danhvophuong>
- Saran Lim. <[email protected]>
- Manuel Regidor <[email protected]>
- Italo LOPES <[email protected]>
- Danh Vo <https://github.com/danhvophuong>
- Saran Lim. <[email protected]>
- Manuel Regidor <[email protected]>
- Italo LOPES <[email protected]>

Maintainers
-----------
Expand Down
2 changes: 1 addition & 1 deletion hr_expense_cancel/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

{
"name": "Hr expense cancel",
"version": "17.0.1.0.2",
"version": "17.0.1.0.3",
"author": "Tecnativa, Odoo Community Association (OCA)",
"website": "https://github.com/OCA/hr-expense",
"license": "AGPL-3",
Expand Down
2 changes: 1 addition & 1 deletion hr_expense_cancel/static/description/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ <h1 class="title">Hr expense cancel</h1>
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:33354bbac2fe7f2f76e1fd239d91948850c11e90e289f70e91d3e1ed3ae4e838
!! source digest: sha256:659127f8c6e5f2db749db28e1d7681511ae898c25356a3293ea5094ba6c89b88
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<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/hr-expense/tree/17.0/hr_expense_cancel"><img alt="OCA/hr-expense" src="https://img.shields.io/badge/github-OCA%2Fhr--expense-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/hr-expense-17-0/hr-expense-17-0-hr_expense_cancel"><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/hr-expense&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 allows you to cancel and correct expenses. It adds a cancel
Expand Down
44 changes: 22 additions & 22 deletions hr_expense_invoice/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Supplier invoices on HR expenses
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:4d1693cd87b2441295e43eeb618d44f2125d6b9fafa1085112ec9031d8532e48
!! source digest: sha256:bfbb07aaf33d921d6ad81883efbe43a396ec393d040862a93c572b39f88872d5
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
Expand Down Expand Up @@ -49,27 +49,27 @@ Usage

**Reference one invoice to an expense**

- Create an expense sheet.
- Add an expense line to sheet with an invoice_id selected or create
one new.
- Process expense sheet.
- On paying expense sheet, you are reconciling supplier invoice too.
- Create an expense sheet.
- Add an expense line to sheet with an invoice_id selected or create one
new.
- Process expense sheet.
- On paying expense sheet, you are reconciling supplier invoice too.

**Create one invoice to multiple expenses**

- Create an expense sheet with one or multiple expense lines
- After approved, click button "Create Vendor Bill"
- Select multiple expense to create an invoice, and process it.
- New invoice will be create and link to the selected expense lines.
- Validate newly create invoice.
- On paying expense sheet, you are reconciling supplier invoice(s) too.
- Create an expense sheet with one or multiple expense lines
- After approved, click button "Create Vendor Bill"
- Select multiple expense to create an invoice, and process it.
- New invoice will be create and link to the selected expense lines.
- Validate newly create invoice.
- On paying expense sheet, you are reconciling supplier invoice(s) too.

Known issues / Roadmap
======================

- Multiple payment terms for a supplier invoice are not handled
correctly.
- Partial reconcile supplier invoices are also not correctly handled.
- Multiple payment terms for a supplier invoice are not handled
correctly.
- Partial reconcile supplier invoices are also not correctly handled.

Bug Tracker
===========
Expand All @@ -92,15 +92,15 @@ Authors
Contributors
------------

- `Tecnativa <https://www.tecnativa.com>`__:
- `Tecnativa <https://www.tecnativa.com>`__:

- Pedro M. Baeza
- Vicent Cubells
- Víctor Martínez
- Pedro M. Baeza
- Vicent Cubells
- Víctor Martínez

- Kitti Upariphutthiphong <[email protected]>
- Rattapong Chokmasermkul <[email protected]>
- Saran Lim. <[email protected]>
- Kitti Upariphutthiphong <[email protected]>
- Rattapong Chokmasermkul <[email protected]>
- Saran Lim. <[email protected]>

Maintainers
-----------
Expand Down
2 changes: 1 addition & 1 deletion hr_expense_invoice/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

{
"name": "Supplier invoices on HR expenses",
"version": "17.0.1.0.0",
"version": "17.0.1.0.1",
"category": "Human Resources",
"author": "Tecnativa, Odoo Community Association (OCA)",
"license": "AGPL-3",
Expand Down
6 changes: 3 additions & 3 deletions hr_expense_invoice/static/description/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ <h1 class="title">Supplier invoices on HR expenses</h1>
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:4d1693cd87b2441295e43eeb618d44f2125d6b9fafa1085112ec9031d8532e48
!! source digest: sha256:bfbb07aaf33d921d6ad81883efbe43a396ec393d040862a93c572b39f88872d5
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<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/hr-expense/tree/17.0/hr_expense_invoice"><img alt="OCA/hr-expense" src="https://img.shields.io/badge/github-OCA%2Fhr--expense-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/hr-expense-17-0/hr-expense-17-0-hr_expense_invoice"><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/hr-expense&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 should be used when a supplier invoice is paid by an
Expand Down Expand Up @@ -399,8 +399,8 @@ <h1><a class="toc-backref" href="#toc-entry-1">Usage</a></h1>
<p><strong>Reference one invoice to an expense</strong></p>
<ul class="simple">
<li>Create an expense sheet.</li>
<li>Add an expense line to sheet with an invoice_id selected or create
one new.</li>
<li>Add an expense line to sheet with an invoice_id selected or create one
new.</li>
<li>Process expense sheet.</li>
<li>On paying expense sheet, you are reconciling supplier invoice too.</li>
</ul>
Expand Down
10 changes: 5 additions & 5 deletions hr_expense_payment/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ HR Expense Payment
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:e988ec70c2c94d8ed3ab8467996d975021f8a4a9ce5cb3912611e58c93df7eb9
!! source digest: sha256:7ae568d53f95d5b826ffe0feb3e191fbe8ac980927e6639e90d3021b4ad60d36
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
Expand Down Expand Up @@ -58,11 +58,11 @@ Authors
Contributors
------------

- Saran Lim. <[email protected]>
- Manuel Regidor <[email protected]>
- ``APSL <https://apsl.tech>``\ \_\_:
- Saran Lim. <[email protected]>
- Manuel Regidor <[email protected]>
- ``APSL <https://apsl.tech>``\ \_\_:

- Antoni Marroig <[email protected]>
- Antoni Marroig <[email protected]>

Maintainers
-----------
Expand Down
2 changes: 1 addition & 1 deletion hr_expense_payment/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

{
"name": "HR Expense Payment",
"version": "17.0.1.0.0",
"version": "17.0.1.0.1",
"category": "Human Resources",
"author": "Tecnativa, Ecosoft, Odoo Community Association (OCA)",
"license": "AGPL-3",
Expand Down
13 changes: 8 additions & 5 deletions hr_expense_payment/static/description/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@

/*
:Author: David Goodger ([email protected])
:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
:Copyright: This stylesheet has been placed in the public domain.
Default cascading style sheet for the HTML output of Docutils.
Despite the name, some widely supported CSS2 features are used.
See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
customize this style sheet.
Expand Down Expand Up @@ -274,7 +275,7 @@
margin-left: 2em ;
margin-right: 2em }

pre.code .ln { color: grey; } /* line numbers */
pre.code .ln { color: gray; } /* line numbers */
pre.code, code { background-color: #eeeeee }
pre.code .comment, code .comment { color: #5C6576 }
pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
Expand All @@ -300,7 +301,7 @@
span.pre {
white-space: pre }

span.problematic {
span.problematic, pre.problematic {
color: red }

span.section-subtitle {
Expand Down Expand Up @@ -366,7 +367,7 @@ <h1 class="title">HR Expense Payment</h1>
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:e988ec70c2c94d8ed3ab8467996d975021f8a4a9ce5cb3912611e58c93df7eb9
!! source digest: sha256:7ae568d53f95d5b826ffe0feb3e191fbe8ac980927e6639e90d3021b4ad60d36
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<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/hr-expense/tree/17.0/hr_expense_payment"><img alt="OCA/hr-expense" src="https://img.shields.io/badge/github-OCA%2Fhr--expense-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/hr-expense-17-0/hr-expense-17-0-hr_expense_payment"><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/hr-expense&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 payment link to expense. After you register payment on
Expand Down Expand Up @@ -414,7 +415,9 @@ <h2><a class="toc-backref" href="#toc-entry-4">Contributors</a></h2>
<div class="section" id="maintainers">
<h2><a class="toc-backref" href="#toc-entry-5">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>
<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>
Expand Down

0 comments on commit 56ffa60

Please sign in to comment.