Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Syncing from upstream OCA/account-reconcile (17.0) #211

Merged
merged 12 commits into from
Oct 5, 2024
Merged

Syncing from upstream OCA/account-reconcile (17.0) #211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
40b890d
[IMP] account_reconcile_oca: Fix multicurrency journal management
etobella Jun 17, 2024
26c2b53
[IMP] account_reconcile_oca: Fix amount_currency_format field
etobella Jun 19, 2024
5c9e90c
[IMP] account_reconcile_oca: Fix multi currency computation
etobella Jun 19, 2024
1dd39fc
[IMP] account_reconcile_oca: Compute the exchange rate properly
etobella Jul 4, 2024
78bcf45
[IMP] account_reconcile_oca: Avoid change of page when deleting a line
etobella Jul 10, 2024
65f62d2
[FIX] account_reconcile_oca: Fix wrong display on reconciled moves
etobella Sep 9, 2024
a465401
Merge PR #691 into 17.0
OCA-git-bot Oct 4, 2024
cbdbff2
[UPD] Update account_reconcile_oca.pot
Oct 4, 2024
e5336a2
[BOT] post-merge updates
OCA-git-bot Oct 4, 2024
6cb8fce
Translated using Weblate (Italian)
mymage Oct 4, 2024
7746678
Update translation files
weblate Oct 4, 2024
e6897a8
Translated using Weblate (Italian)
mymage Oct 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ addon | version | maintainers | summary
--- | --- | --- | ---
[account_mass_reconcile](account_mass_reconcile/) | 17.0.1.0.1 | | Account Mass Reconcile
[account_reconcile_model_oca](account_reconcile_model_oca/) | 17.0.1.0.1 | | This includes the logic moved from Odoo Community to Odoo Enterprise
[account_reconcile_oca](account_reconcile_oca/) | 17.0.1.2.6 | [![etobella](https://github.com/etobella.png?size=30px)](https://github.com/etobella) | Reconcile addons for Odoo CE accounting
[account_reconcile_oca](account_reconcile_oca/) | 17.0.1.3.0 | [![etobella](https://github.com/etobella.png?size=30px)](https://github.com/etobella) | Reconcile addons for Odoo CE accounting
[account_statement_base](account_statement_base/) | 17.0.1.3.0 | [![alexis-via](https://github.com/alexis-via.png?size=30px)](https://github.com/alexis-via) | Base module for Bank Statements

[//]: # (end addons)
Expand Down
2 changes: 1 addition & 1 deletion account_reconcile_oca/README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Account Reconcile Oca
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:223a415f11a6e89566fdec656377f5e439236dc333a3207f5a3290d8699bf39c
!! source digest: sha256:88b6b066ad75c60faa27b6558ead2c5bf920b1e5f1baf6e5b1414a4361cd5d63
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
Expand Down
2 changes: 1 addition & 1 deletion account_reconcile_oca/__manifest__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"name": "Account Reconcile Oca",
"summary": """
Reconcile addons for Odoo CE accounting""",
"version": "17.0.1.2.6",
"version": "17.0.1.3.0",
"license": "AGPL-3",
"author": "CreuBlanca,Dixmit,Odoo Community Association (OCA)",
"maintainers": ["etobella"],
Expand Down
21 changes: 21 additions & 0 deletions account_reconcile_oca/i18n/account_reconcile_oca.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,11 @@ msgstr ""
msgid "Amount"
msgstr ""

#. module: account_reconcile_oca
#: model_terms:ir.ui.view,arch_db:account_reconcile_oca.bank_statement_line_form_reconcile_view
msgid "Amount in Currency"
msgstr ""

#. module: account_reconcile_oca
#. odoo-javascript
#: code:addons/account_reconcile_oca/static/src/xml/reconcile.xml:0
Expand Down Expand Up @@ -338,6 +343,11 @@ msgstr ""
msgid "Manual Amount"
msgstr ""

#. module: account_reconcile_oca
#: model:ir.model.fields,field_description:account_reconcile_oca.field_account_bank_statement_line__manual_amount_in_currency
msgid "Manual Amount In Currency"
msgstr ""

#. module: account_reconcile_oca
#: model:ir.model.fields,field_description:account_reconcile_oca.field_account_bank_statement_line__manual_currency_id
msgid "Manual Currency"
Expand All @@ -350,6 +360,17 @@ msgstr ""
msgid "Manual Delete"
msgstr ""

#. module: account_reconcile_oca
#: model:ir.model.fields,field_description:account_reconcile_oca.field_account_bank_statement_line__manual_exchange_counterpart
msgid "Manual Exchange Counterpart"
msgstr ""

#. module: account_reconcile_oca
#: model:ir.model.fields,field_description:account_reconcile_oca.field_account_bank_statement_line__manual_in_currency
#: model:ir.model.fields,field_description:account_reconcile_oca.field_account_bank_statement_line__manual_in_currency_id
msgid "Manual In Currency"
msgstr ""

#. module: account_reconcile_oca
#: model:ir.model.fields,field_description:account_reconcile_oca.field_account_bank_statement_line__manual_kind
msgid "Manual Kind"
Expand Down
21 changes: 21 additions & 0 deletions account_reconcile_oca/i18n/ca.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,11 @@ msgstr ""
msgid "Amount"
msgstr "Import"

#. module: account_reconcile_oca
#: model_terms:ir.ui.view,arch_db:account_reconcile_oca.bank_statement_line_form_reconcile_view
msgid "Amount in Currency"
msgstr ""

#. module: account_reconcile_oca
#. odoo-javascript
#: code:addons/account_reconcile_oca/static/src/xml/reconcile.xml:0
Expand Down Expand Up @@ -344,6 +349,11 @@ msgstr "Compte manual"
msgid "Manual Amount"
msgstr "Import manual"

#. module: account_reconcile_oca
#: model:ir.model.fields,field_description:account_reconcile_oca.field_account_bank_statement_line__manual_amount_in_currency
msgid "Manual Amount In Currency"
msgstr ""

#. module: account_reconcile_oca
#: model:ir.model.fields,field_description:account_reconcile_oca.field_account_bank_statement_line__manual_currency_id
msgid "Manual Currency"
Expand All @@ -356,6 +366,17 @@ msgstr "Divisa manual"
msgid "Manual Delete"
msgstr "Esborrat manual"

#. module: account_reconcile_oca
#: model:ir.model.fields,field_description:account_reconcile_oca.field_account_bank_statement_line__manual_exchange_counterpart
msgid "Manual Exchange Counterpart"
msgstr ""

#. module: account_reconcile_oca
#: model:ir.model.fields,field_description:account_reconcile_oca.field_account_bank_statement_line__manual_in_currency
#: model:ir.model.fields,field_description:account_reconcile_oca.field_account_bank_statement_line__manual_in_currency_id
msgid "Manual In Currency"
msgstr ""

#. module: account_reconcile_oca
#: model:ir.model.fields,field_description:account_reconcile_oca.field_account_bank_statement_line__manual_kind
msgid "Manual Kind"
Expand Down
21 changes: 21 additions & 0 deletions account_reconcile_oca/i18n/es.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,11 @@ msgstr "Agregación para usar en la vista de conciliación"
msgid "Amount"
msgstr "Importe"

#. module: account_reconcile_oca
#: model_terms:ir.ui.view,arch_db:account_reconcile_oca.bank_statement_line_form_reconcile_view
msgid "Amount in Currency"
msgstr ""

#. module: account_reconcile_oca
#. odoo-javascript
#: code:addons/account_reconcile_oca/static/src/xml/reconcile.xml:0
Expand Down Expand Up @@ -344,6 +349,11 @@ msgstr "Cuenta manual"
msgid "Manual Amount"
msgstr "Importe manual"

#. module: account_reconcile_oca
#: model:ir.model.fields,field_description:account_reconcile_oca.field_account_bank_statement_line__manual_amount_in_currency
msgid "Manual Amount In Currency"
msgstr ""

#. module: account_reconcile_oca
#: model:ir.model.fields,field_description:account_reconcile_oca.field_account_bank_statement_line__manual_currency_id
msgid "Manual Currency"
Expand All @@ -356,6 +366,17 @@ msgstr "Divisa manual"
msgid "Manual Delete"
msgstr "Borrado manual"

#. module: account_reconcile_oca
#: model:ir.model.fields,field_description:account_reconcile_oca.field_account_bank_statement_line__manual_exchange_counterpart
msgid "Manual Exchange Counterpart"
msgstr ""

#. module: account_reconcile_oca
#: model:ir.model.fields,field_description:account_reconcile_oca.field_account_bank_statement_line__manual_in_currency
#: model:ir.model.fields,field_description:account_reconcile_oca.field_account_bank_statement_line__manual_in_currency_id
msgid "Manual In Currency"
msgstr ""

#. module: account_reconcile_oca
#: model:ir.model.fields,field_description:account_reconcile_oca.field_account_bank_statement_line__manual_kind
msgid "Manual Kind"
Expand Down
21 changes: 21 additions & 0 deletions account_reconcile_oca/i18n/fr.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,11 @@ msgstr ""
msgid "Amount"
msgstr "Montant"

#. module: account_reconcile_oca
#: model_terms:ir.ui.view,arch_db:account_reconcile_oca.bank_statement_line_form_reconcile_view
msgid "Amount in Currency"
msgstr ""

#. module: account_reconcile_oca
#. odoo-javascript
#: code:addons/account_reconcile_oca/static/src/xml/reconcile.xml:0
Expand Down Expand Up @@ -344,6 +349,11 @@ msgstr "Compte manuel"
msgid "Manual Amount"
msgstr "Montant manuel"

#. module: account_reconcile_oca
#: model:ir.model.fields,field_description:account_reconcile_oca.field_account_bank_statement_line__manual_amount_in_currency
msgid "Manual Amount In Currency"
msgstr ""

#. module: account_reconcile_oca
#: model:ir.model.fields,field_description:account_reconcile_oca.field_account_bank_statement_line__manual_currency_id
msgid "Manual Currency"
Expand All @@ -356,6 +366,17 @@ msgstr "Devise manuelle"
msgid "Manual Delete"
msgstr "Suppression manuelle"

#. module: account_reconcile_oca
#: model:ir.model.fields,field_description:account_reconcile_oca.field_account_bank_statement_line__manual_exchange_counterpart
msgid "Manual Exchange Counterpart"
msgstr ""

#. module: account_reconcile_oca
#: model:ir.model.fields,field_description:account_reconcile_oca.field_account_bank_statement_line__manual_in_currency
#: model:ir.model.fields,field_description:account_reconcile_oca.field_account_bank_statement_line__manual_in_currency_id
msgid "Manual In Currency"
msgstr ""

#. module: account_reconcile_oca
#: model:ir.model.fields,field_description:account_reconcile_oca.field_account_bank_statement_line__manual_kind
msgid "Manual Kind"
Expand Down
21 changes: 21 additions & 0 deletions account_reconcile_oca/i18n/hr.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,11 @@ msgstr ""
msgid "Amount"
msgstr "Iznos"

#. module: account_reconcile_oca
#: model_terms:ir.ui.view,arch_db:account_reconcile_oca.bank_statement_line_form_reconcile_view
msgid "Amount in Currency"
msgstr ""

#. module: account_reconcile_oca
#. odoo-javascript
#: code:addons/account_reconcile_oca/static/src/xml/reconcile.xml:0
Expand Down Expand Up @@ -345,6 +350,11 @@ msgstr "Ručni konto"
msgid "Manual Amount"
msgstr "Ručni iznos"

#. module: account_reconcile_oca
#: model:ir.model.fields,field_description:account_reconcile_oca.field_account_bank_statement_line__manual_amount_in_currency
msgid "Manual Amount In Currency"
msgstr ""

#. module: account_reconcile_oca
#: model:ir.model.fields,field_description:account_reconcile_oca.field_account_bank_statement_line__manual_currency_id
msgid "Manual Currency"
Expand All @@ -357,6 +367,17 @@ msgstr ""
msgid "Manual Delete"
msgstr "Ručno brisanje"

#. module: account_reconcile_oca
#: model:ir.model.fields,field_description:account_reconcile_oca.field_account_bank_statement_line__manual_exchange_counterpart
msgid "Manual Exchange Counterpart"
msgstr ""

#. module: account_reconcile_oca
#: model:ir.model.fields,field_description:account_reconcile_oca.field_account_bank_statement_line__manual_in_currency
#: model:ir.model.fields,field_description:account_reconcile_oca.field_account_bank_statement_line__manual_in_currency_id
msgid "Manual In Currency"
msgstr ""

#. module: account_reconcile_oca
#: model:ir.model.fields,field_description:account_reconcile_oca.field_account_bank_statement_line__manual_kind
msgid "Manual Kind"
Expand Down
23 changes: 22 additions & 1 deletion account_reconcile_oca/i18n/it.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 17.0\n"
"Report-Msgid-Bugs-To: \n"
"PO-Revision-Date: 2024-08-26 09:06+0000\n"
"PO-Revision-Date: 2024-10-05 17:06+0000\n"
"Last-Translator: mymage <[email protected]>\n"
"Language-Team: none\n"
"Language: it\n"
Expand Down Expand Up @@ -78,6 +78,11 @@ msgstr "Aggregazione da utilizzare nella vista riconciliazione"
msgid "Amount"
msgstr "Importo"

#. module: account_reconcile_oca
#: model_terms:ir.ui.view,arch_db:account_reconcile_oca.bank_statement_line_form_reconcile_view
msgid "Amount in Currency"
msgstr "Importo in valuta"

#. module: account_reconcile_oca
#. odoo-javascript
#: code:addons/account_reconcile_oca/static/src/xml/reconcile.xml:0
Expand Down Expand Up @@ -344,6 +349,11 @@ msgstr "Conto Manuale"
msgid "Manual Amount"
msgstr "Importo manuale"

#. module: account_reconcile_oca
#: model:ir.model.fields,field_description:account_reconcile_oca.field_account_bank_statement_line__manual_amount_in_currency
msgid "Manual Amount In Currency"
msgstr "Acconto manuale in valuta"

#. module: account_reconcile_oca
#: model:ir.model.fields,field_description:account_reconcile_oca.field_account_bank_statement_line__manual_currency_id
msgid "Manual Currency"
Expand All @@ -356,6 +366,17 @@ msgstr "Valuta manuale"
msgid "Manual Delete"
msgstr "Cancellazione manuale"

#. module: account_reconcile_oca
#: model:ir.model.fields,field_description:account_reconcile_oca.field_account_bank_statement_line__manual_exchange_counterpart
msgid "Manual Exchange Counterpart"
msgstr "Controparte scambio manuale"

#. module: account_reconcile_oca
#: model:ir.model.fields,field_description:account_reconcile_oca.field_account_bank_statement_line__manual_in_currency
#: model:ir.model.fields,field_description:account_reconcile_oca.field_account_bank_statement_line__manual_in_currency_id
msgid "Manual In Currency"
msgstr "Manuale in valuta"

#. module: account_reconcile_oca
#: model:ir.model.fields,field_description:account_reconcile_oca.field_account_bank_statement_line__manual_kind
msgid "Manual Kind"
Expand Down
21 changes: 21 additions & 0 deletions account_reconcile_oca/i18n/nl.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,11 @@ msgstr ""
msgid "Amount"
msgstr "Bedrag"

#. module: account_reconcile_oca
#: model_terms:ir.ui.view,arch_db:account_reconcile_oca.bank_statement_line_form_reconcile_view
msgid "Amount in Currency"
msgstr ""

#. module: account_reconcile_oca
#. odoo-javascript
#: code:addons/account_reconcile_oca/static/src/xml/reconcile.xml:0
Expand Down Expand Up @@ -344,6 +349,11 @@ msgstr "Handmatige Rekening"
msgid "Manual Amount"
msgstr "Handmatige Bedrag"

#. module: account_reconcile_oca
#: model:ir.model.fields,field_description:account_reconcile_oca.field_account_bank_statement_line__manual_amount_in_currency
msgid "Manual Amount In Currency"
msgstr ""

#. module: account_reconcile_oca
#: model:ir.model.fields,field_description:account_reconcile_oca.field_account_bank_statement_line__manual_currency_id
msgid "Manual Currency"
Expand All @@ -356,6 +366,17 @@ msgstr "Handmatige Valuta"
msgid "Manual Delete"
msgstr "Handmatig Verwijderen"

#. module: account_reconcile_oca
#: model:ir.model.fields,field_description:account_reconcile_oca.field_account_bank_statement_line__manual_exchange_counterpart
msgid "Manual Exchange Counterpart"
msgstr ""

#. module: account_reconcile_oca
#: model:ir.model.fields,field_description:account_reconcile_oca.field_account_bank_statement_line__manual_in_currency
#: model:ir.model.fields,field_description:account_reconcile_oca.field_account_bank_statement_line__manual_in_currency_id
msgid "Manual In Currency"
msgstr ""

#. module: account_reconcile_oca
#: model:ir.model.fields,field_description:account_reconcile_oca.field_account_bank_statement_line__manual_kind
msgid "Manual Kind"
Expand Down
21 changes: 21 additions & 0 deletions account_reconcile_oca/i18n/pt.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,11 @@ msgstr "Agregação a ser usada na visualização de reconciliação"
msgid "Amount"
msgstr "Valor"

#. module: account_reconcile_oca
#: model_terms:ir.ui.view,arch_db:account_reconcile_oca.bank_statement_line_form_reconcile_view
msgid "Amount in Currency"
msgstr ""

#. module: account_reconcile_oca
#. odoo-javascript
#: code:addons/account_reconcile_oca/static/src/xml/reconcile.xml:0
Expand Down Expand Up @@ -344,6 +349,11 @@ msgstr "Conta Manual"
msgid "Manual Amount"
msgstr "Valor Manual"

#. module: account_reconcile_oca
#: model:ir.model.fields,field_description:account_reconcile_oca.field_account_bank_statement_line__manual_amount_in_currency
msgid "Manual Amount In Currency"
msgstr ""

#. module: account_reconcile_oca
#: model:ir.model.fields,field_description:account_reconcile_oca.field_account_bank_statement_line__manual_currency_id
msgid "Manual Currency"
Expand All @@ -356,6 +366,17 @@ msgstr "Moeda Manual"
msgid "Manual Delete"
msgstr "Exclusão Manual"

#. module: account_reconcile_oca
#: model:ir.model.fields,field_description:account_reconcile_oca.field_account_bank_statement_line__manual_exchange_counterpart
msgid "Manual Exchange Counterpart"
msgstr ""

#. module: account_reconcile_oca
#: model:ir.model.fields,field_description:account_reconcile_oca.field_account_bank_statement_line__manual_in_currency
#: model:ir.model.fields,field_description:account_reconcile_oca.field_account_bank_statement_line__manual_in_currency_id
msgid "Manual In Currency"
msgstr ""

#. module: account_reconcile_oca
#: model:ir.model.fields,field_description:account_reconcile_oca.field_account_bank_statement_line__manual_kind
msgid "Manual Kind"
Expand Down
Loading
Loading