From 56ffa603642fd7a519553d7375233e779f7dc0ce Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Wed, 27 Nov 2024 11:19:44 +0000 Subject: [PATCH] [BOT] post-merge updates --- README.md | 6 +-- hr_expense_cancel/README.rst | 18 ++++---- hr_expense_cancel/__manifest__.py | 2 +- .../static/description/index.html | 2 +- hr_expense_invoice/README.rst | 44 +++++++++---------- hr_expense_invoice/__manifest__.py | 2 +- .../static/description/index.html | 6 +-- hr_expense_payment/README.rst | 10 ++--- hr_expense_payment/__manifest__.py | 2 +- .../static/description/index.html | 13 +++--- 10 files changed, 54 insertions(+), 51 deletions(-) diff --git a/README.md b/README.md index 018a702e7..98690705b 100644 --- a/README.md +++ b/README.md @@ -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) diff --git a/hr_expense_cancel/README.rst b/hr_expense_cancel/README.rst index 1e966932a..d98925629 100644 --- a/hr_expense_cancel/README.rst +++ b/hr_expense_cancel/README.rst @@ -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 @@ -87,16 +87,16 @@ Authors Contributors ------------ -- `Tecnativa `__: +- `Tecnativa `__: - - Pedro M. Baeza - - Ernesto Tejeda - - Stefan Ungureanu + - Pedro M. Baeza + - Ernesto Tejeda + - Stefan Ungureanu -- Danh Vo -- Saran Lim. -- Manuel Regidor -- Italo LOPES +- Danh Vo +- Saran Lim. +- Manuel Regidor +- Italo LOPES Maintainers ----------- diff --git a/hr_expense_cancel/__manifest__.py b/hr_expense_cancel/__manifest__.py index 882bce9ab..6f0c00997 100644 --- a/hr_expense_cancel/__manifest__.py +++ b/hr_expense_cancel/__manifest__.py @@ -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", diff --git a/hr_expense_cancel/static/description/index.html b/hr_expense_cancel/static/description/index.html index 60f9788bf..88a87bcbe 100644 --- a/hr_expense_cancel/static/description/index.html +++ b/hr_expense_cancel/static/description/index.html @@ -367,7 +367,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 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->

Beta License: AGPL-3 OCA/hr-expense Translate me on Weblate Try me on Runboat

This module allows you to cancel and correct expenses. It adds a cancel diff --git a/hr_expense_invoice/README.rst b/hr_expense_invoice/README.rst index 69d5b9bd5..0d1c186ae 100644 --- a/hr_expense_invoice/README.rst +++ b/hr_expense_invoice/README.rst @@ -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 @@ -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 =========== @@ -92,15 +92,15 @@ Authors Contributors ------------ -- `Tecnativa `__: +- `Tecnativa `__: - - Pedro M. Baeza - - Vicent Cubells - - Víctor Martínez + - Pedro M. Baeza + - Vicent Cubells + - Víctor Martínez -- Kitti Upariphutthiphong -- Rattapong Chokmasermkul -- Saran Lim. +- Kitti Upariphutthiphong +- Rattapong Chokmasermkul +- Saran Lim. Maintainers ----------- diff --git a/hr_expense_invoice/__manifest__.py b/hr_expense_invoice/__manifest__.py index 295b5e4ef..c42f7db97 100644 --- a/hr_expense_invoice/__manifest__.py +++ b/hr_expense_invoice/__manifest__.py @@ -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", diff --git a/hr_expense_invoice/static/description/index.html b/hr_expense_invoice/static/description/index.html index b4cfb8828..ab20f0701 100644 --- a/hr_expense_invoice/static/description/index.html +++ b/hr_expense_invoice/static/description/index.html @@ -367,7 +367,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 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->

Beta License: AGPL-3 OCA/hr-expense Translate me on Weblate Try me on Runboat

This module should be used when a supplier invoice is paid by an @@ -399,8 +399,8 @@

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.
    • +
  • 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.
diff --git a/hr_expense_payment/README.rst b/hr_expense_payment/README.rst index 99c5d122f..bc8ae504c 100644 --- a/hr_expense_payment/README.rst +++ b/hr_expense_payment/README.rst @@ -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 @@ -58,11 +58,11 @@ Authors Contributors ------------ -- Saran Lim. -- Manuel Regidor -- ``APSL ``\ \_\_: +- Saran Lim. +- Manuel Regidor +- ``APSL ``\ \_\_: - - Antoni Marroig + - Antoni Marroig Maintainers ----------- diff --git a/hr_expense_payment/__manifest__.py b/hr_expense_payment/__manifest__.py index dac4b953e..62f878f04 100644 --- a/hr_expense_payment/__manifest__.py +++ b/hr_expense_payment/__manifest__.py @@ -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", diff --git a/hr_expense_payment/static/description/index.html b/hr_expense_payment/static/description/index.html index 73e9d29f9..8256ead53 100644 --- a/hr_expense_payment/static/description/index.html +++ b/hr_expense_payment/static/description/index.html @@ -8,10 +8,11 @@ /* :Author: David Goodger (goodger@python.org) -: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. @@ -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 } @@ -300,7 +301,7 @@ span.pre { white-space: pre } -span.problematic { +span.problematic, pre.problematic { color: red } span.section-subtitle { @@ -366,7 +367,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 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->

Beta License: AGPL-3 OCA/hr-expense Translate me on Weblate Try me on Runboat

This module allow payment link to expense. After you register payment on @@ -414,7 +415,9 @@

Contributors

Maintainers

This module is maintained by the OCA.

-Odoo Community Association + +Odoo Community Association +

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.