Skip to content

Commit

Permalink
Merge pull request #535 from OCA/16.0
Browse files Browse the repository at this point in the history
Syncing from upstream OCA/account-reconcile (16.0)
  • Loading branch information
bt-admin authored Dec 29, 2023
2 parents 108019c + 12febd6 commit 836361e
Show file tree
Hide file tree
Showing 25 changed files with 162 additions and 27 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ addon | version | maintainers | summary
[account_move_base_import](account_move_base_import/) | 16.0.1.0.1 | | Journal Entry base import
[account_move_line_reconcile_manual](account_move_line_reconcile_manual/) | 16.0.2.0.0 | [![alexis-via](https://github.com/alexis-via.png?size=30px)](https://github.com/alexis-via) | Manually reconcile Journal Items
[account_move_reconcile_forbid_cancel](account_move_reconcile_forbid_cancel/) | 16.0.1.0.1 | | Account Move Reconcile Forbid Cancel
[account_reconcile_oca](account_reconcile_oca/) | 16.0.1.2.5 | [![etobella](https://github.com/etobella.png?size=30px)](https://github.com/etobella) | Reconcile addons for Odoo CE accounting
[account_reconcile_oca](account_reconcile_oca/) | 16.0.1.2.6 | [![etobella](https://github.com/etobella.png?size=30px)](https://github.com/etobella) | Reconcile addons for Odoo CE accounting
[account_statement_base](account_statement_base/) | 16.0.1.3.0 | [![alexis-via](https://github.com/alexis-via.png?size=30px)](https://github.com/alexis-via) | Base module for Bank Statements
[base_transaction_id](base_transaction_id/) | 16.0.1.0.0 | | Base transaction ID for financial institutes

Expand Down
3 changes: 2 additions & 1 deletion account_reconcile_oca/README.rst
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:bc5ac758c54a958b23fe3962f890d737b6949c7054be36b79002f62095cfeffc
!! source digest: sha256:99d4304782b11cd6200d261b4a3d8c4a4f3265b798b224919ac7655affa33dfa
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
Expand Down Expand Up @@ -75,6 +75,7 @@ Authors
~~~~~~~

* CreuBlanca
* Dixmit

Contributors
~~~~~~~~~~~~
Expand Down
6 changes: 3 additions & 3 deletions account_reconcile_oca/__manifest__.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# Copyright 2022 CreuBlanca
# Copyright 2023 Dixmit
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).

{
"name": "Account Reconcile Oca",
"summary": """
Reconcile addons for Odoo CE accounting""",
"version": "16.0.1.2.5",
"version": "16.0.1.2.6",
"license": "AGPL-3",
"author": "CreuBlanca,Odoo Community Association (OCA)",
"author": "CreuBlanca,Dixmit,Odoo Community Association (OCA)",
"maintainers": ["etobella"],
"website": "https://github.com/OCA/account-reconcile",
"depends": [
Expand Down
9 changes: 9 additions & 0 deletions account_reconcile_oca/i18n/account_reconcile_oca.pot
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,7 @@ msgid "Journal Entry"
msgstr ""

#. module: account_reconcile_oca
#: model:ir.model,name:account_reconcile_oca.model_account_move_line
#: model_terms:ir.ui.view,arch_db:account_reconcile_oca.account_move_line_search_reconcile_view
msgid "Journal Item"
msgstr ""
Expand Down Expand Up @@ -424,6 +425,7 @@ msgstr ""
#: model:ir.actions.act_window,name:account_reconcile_oca.account_account_account_account_reconcile_act_window
#: model:ir.actions.act_window,name:account_reconcile_oca.account_account_reconcile_act_window
#: model:ir.actions.act_window,name:account_reconcile_oca.res_partner_account_account_reconcile_act_window
#: model:ir.actions.server,name:account_reconcile_oca.action_reconcile
#: model:ir.model.fields,field_description:account_reconcile_oca.field_account_account_reconcile_data__reconcile_id
#: model:ir.ui.menu,name:account_reconcile_oca.account_account_reconcile_menu
#: model_terms:ir.ui.view,arch_db:account_reconcile_oca.account_account_reconcile_form_view
Expand Down Expand Up @@ -553,6 +555,13 @@ msgstr ""
msgid "Well done! Everything has been reconciled"
msgstr ""

#. module: account_reconcile_oca
#. odoo-python
#: code:addons/account_reconcile_oca/models/account_move_line.py:0
#, python-format
msgid "You must reconcile information on the same partner"
msgstr ""

#. module: account_reconcile_oca
#: model_terms:ir.ui.view,arch_db:account_reconcile_oca.bank_statement_line_form_reconcile_view
msgid "fully paid"
Expand Down
12 changes: 11 additions & 1 deletion account_reconcile_oca/i18n/ca.po
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,7 @@ msgid "Journal Entry"
msgstr "Entrada del diari"

#. module: account_reconcile_oca
#: model:ir.model,name:account_reconcile_oca.model_account_move_line
#: model_terms:ir.ui.view,arch_db:account_reconcile_oca.account_move_line_search_reconcile_view
msgid "Journal Item"
msgstr "Element del diari"
Expand Down Expand Up @@ -430,6 +431,7 @@ msgstr "A cobrar"
#: model:ir.actions.act_window,name:account_reconcile_oca.account_account_account_account_reconcile_act_window
#: model:ir.actions.act_window,name:account_reconcile_oca.account_account_reconcile_act_window
#: model:ir.actions.act_window,name:account_reconcile_oca.res_partner_account_account_reconcile_act_window
#: model:ir.actions.server,name:account_reconcile_oca.action_reconcile
#: model:ir.model.fields,field_description:account_reconcile_oca.field_account_account_reconcile_data__reconcile_id
#: model:ir.ui.menu,name:account_reconcile_oca.account_account_reconcile_menu
#: model_terms:ir.ui.view,arch_db:account_reconcile_oca.account_account_reconcile_form_view
Expand Down Expand Up @@ -468,7 +470,8 @@ msgstr "Conciliar líneas d'extracte bancari"
#. module: account_reconcile_oca
#: model:ir.model,name:account_reconcile_oca.model_account_account_reconcile_data
msgid "Reconcile data model to store user info"
msgstr "Model de dades per emmagatzemar dades de concilicació a nivell d'usuari"
msgstr ""
"Model de dades per emmagatzemar dades de concilicació a nivell d'usuari"

#. module: account_reconcile_oca
#: model_terms:ir.ui.view,arch_db:account_reconcile_oca.bank_statement_line_reconcile_view
Expand Down Expand Up @@ -559,6 +562,13 @@ msgstr "Veure assentament"
msgid "Well done! Everything has been reconciled"
msgstr "Ben fet! Tot s'ha conciliat"

#. module: account_reconcile_oca
#. odoo-python
#: code:addons/account_reconcile_oca/models/account_move_line.py:0
#, python-format
msgid "You must reconcile information on the same partner"
msgstr ""

#. module: account_reconcile_oca
#: model_terms:ir.ui.view,arch_db:account_reconcile_oca.bank_statement_line_form_reconcile_view
msgid "fully paid"
Expand Down
13 changes: 11 additions & 2 deletions account_reconcile_oca/i18n/es.po
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 16.0\n"
"Report-Msgid-Bugs-To: \n"
"PO-Revision-Date: 2023-11-20 17:34+0000\n"
"Last-Translator: Enric Tobella <etobella@creublanca.es>\n"
"PO-Revision-Date: 2023-12-28 20:35+0000\n"
"Last-Translator: Ivorra78 <informatica@totmaterial.es>\n"
"Language-Team: none\n"
"Language: es\n"
"MIME-Version: 1.0\n"
Expand Down Expand Up @@ -254,6 +254,7 @@ msgid "Journal Entry"
msgstr "Entrada de diario"

#. module: account_reconcile_oca
#: model:ir.model,name:account_reconcile_oca.model_account_move_line
#: model_terms:ir.ui.view,arch_db:account_reconcile_oca.account_move_line_search_reconcile_view
msgid "Journal Item"
msgstr "Elemento de diario"
Expand Down Expand Up @@ -430,6 +431,7 @@ msgstr "A cobrar"
#: model:ir.actions.act_window,name:account_reconcile_oca.account_account_account_account_reconcile_act_window
#: model:ir.actions.act_window,name:account_reconcile_oca.account_account_reconcile_act_window
#: model:ir.actions.act_window,name:account_reconcile_oca.res_partner_account_account_reconcile_act_window
#: model:ir.actions.server,name:account_reconcile_oca.action_reconcile
#: model:ir.model.fields,field_description:account_reconcile_oca.field_account_account_reconcile_data__reconcile_id
#: model:ir.ui.menu,name:account_reconcile_oca.account_account_reconcile_menu
#: model_terms:ir.ui.view,arch_db:account_reconcile_oca.account_account_reconcile_form_view
Expand Down Expand Up @@ -559,6 +561,13 @@ msgstr "Ver asiento"
msgid "Well done! Everything has been reconciled"
msgstr "¡Bien hecho! Todo ha sido conciliado"

#. module: account_reconcile_oca
#. odoo-python
#: code:addons/account_reconcile_oca/models/account_move_line.py:0
#, python-format
msgid "You must reconcile information on the same partner"
msgstr "Debe conciliar la información sobre el mismo socio"

#. module: account_reconcile_oca
#: model_terms:ir.ui.view,arch_db:account_reconcile_oca.bank_statement_line_form_reconcile_view
msgid "fully paid"
Expand Down
9 changes: 9 additions & 0 deletions account_reconcile_oca/i18n/fr.po
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,7 @@ msgid "Journal Entry"
msgstr "Pièce comptable"

#. module: account_reconcile_oca
#: model:ir.model,name:account_reconcile_oca.model_account_move_line
#: model_terms:ir.ui.view,arch_db:account_reconcile_oca.account_move_line_search_reconcile_view
msgid "Journal Item"
msgstr "Écriture comptable"
Expand Down Expand Up @@ -432,6 +433,7 @@ msgstr "Compte client"
#: model:ir.actions.act_window,name:account_reconcile_oca.account_account_account_account_reconcile_act_window
#: model:ir.actions.act_window,name:account_reconcile_oca.account_account_reconcile_act_window
#: model:ir.actions.act_window,name:account_reconcile_oca.res_partner_account_account_reconcile_act_window
#: model:ir.actions.server,name:account_reconcile_oca.action_reconcile
#: model:ir.model.fields,field_description:account_reconcile_oca.field_account_account_reconcile_data__reconcile_id
#: model:ir.ui.menu,name:account_reconcile_oca.account_account_reconcile_menu
#: model_terms:ir.ui.view,arch_db:account_reconcile_oca.account_account_reconcile_form_view
Expand Down Expand Up @@ -563,6 +565,13 @@ msgstr "Voir la pièce"
msgid "Well done! Everything has been reconciled"
msgstr "Bravo ! Tout a été lettré"

#. module: account_reconcile_oca
#. odoo-python
#: code:addons/account_reconcile_oca/models/account_move_line.py:0
#, python-format
msgid "You must reconcile information on the same partner"
msgstr ""

#. module: account_reconcile_oca
#: model_terms:ir.ui.view,arch_db:account_reconcile_oca.bank_statement_line_form_reconcile_view
msgid "fully paid"
Expand Down
9 changes: 9 additions & 0 deletions account_reconcile_oca/i18n/hr.po
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,7 @@ msgid "Journal Entry"
msgstr "Zapis dnevnika"

#. module: account_reconcile_oca
#: model:ir.model,name:account_reconcile_oca.model_account_move_line
#: model_terms:ir.ui.view,arch_db:account_reconcile_oca.account_move_line_search_reconcile_view
msgid "Journal Item"
msgstr "Stavka dnevnika"
Expand Down Expand Up @@ -431,6 +432,7 @@ msgstr "Za naplatu"
#: model:ir.actions.act_window,name:account_reconcile_oca.account_account_account_account_reconcile_act_window
#: model:ir.actions.act_window,name:account_reconcile_oca.account_account_reconcile_act_window
#: model:ir.actions.act_window,name:account_reconcile_oca.res_partner_account_account_reconcile_act_window
#: model:ir.actions.server,name:account_reconcile_oca.action_reconcile
#: model:ir.model.fields,field_description:account_reconcile_oca.field_account_account_reconcile_data__reconcile_id
#: model:ir.ui.menu,name:account_reconcile_oca.account_account_reconcile_menu
#: model_terms:ir.ui.view,arch_db:account_reconcile_oca.account_account_reconcile_form_view
Expand Down Expand Up @@ -560,6 +562,13 @@ msgstr "Pregledaj temeljnicu"
msgid "Well done! Everything has been reconciled"
msgstr "Odlično! Sve je pozatvarano"

#. module: account_reconcile_oca
#. odoo-python
#: code:addons/account_reconcile_oca/models/account_move_line.py:0
#, python-format
msgid "You must reconcile information on the same partner"
msgstr ""

#. module: account_reconcile_oca
#: model_terms:ir.ui.view,arch_db:account_reconcile_oca.bank_statement_line_form_reconcile_view
msgid "fully paid"
Expand Down
9 changes: 9 additions & 0 deletions account_reconcile_oca/i18n/nl.po
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,7 @@ msgid "Journal Entry"
msgstr "Boeking"

#. module: account_reconcile_oca
#: model:ir.model,name:account_reconcile_oca.model_account_move_line
#: model_terms:ir.ui.view,arch_db:account_reconcile_oca.account_move_line_search_reconcile_view
msgid "Journal Item"
msgstr "Boekingsregel"
Expand Down Expand Up @@ -432,6 +433,7 @@ msgstr "Debiteuren"
#: model:ir.actions.act_window,name:account_reconcile_oca.account_account_account_account_reconcile_act_window
#: model:ir.actions.act_window,name:account_reconcile_oca.account_account_reconcile_act_window
#: model:ir.actions.act_window,name:account_reconcile_oca.res_partner_account_account_reconcile_act_window
#: model:ir.actions.server,name:account_reconcile_oca.action_reconcile
#: model:ir.model.fields,field_description:account_reconcile_oca.field_account_account_reconcile_data__reconcile_id
#: model:ir.ui.menu,name:account_reconcile_oca.account_account_reconcile_menu
#: model_terms:ir.ui.view,arch_db:account_reconcile_oca.account_account_reconcile_form_view
Expand Down Expand Up @@ -561,6 +563,13 @@ msgstr "Boeking weergeven"
msgid "Well done! Everything has been reconciled"
msgstr "Goed gedaan! Alles is afgeletterd"

#. module: account_reconcile_oca
#. odoo-python
#: code:addons/account_reconcile_oca/models/account_move_line.py:0
#, python-format
msgid "You must reconcile information on the same partner"
msgstr ""

#. module: account_reconcile_oca
#: model_terms:ir.ui.view,arch_db:account_reconcile_oca.bank_statement_line_form_reconcile_view
msgid "fully paid"
Expand Down
25 changes: 17 additions & 8 deletions account_reconcile_oca/i18n/pt_BR.po
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 16.0\n"
"Report-Msgid-Bugs-To: \n"
"PO-Revision-Date: 2023-10-28 13:19+0000\n"
"PO-Revision-Date: 2023-12-28 23:54+0000\n"
"Last-Translator: Adriano Prado <adrianojprado@gmail.com>\n"
"Language-Team: none\n"
"Language: pt_BR\n"
Expand Down Expand Up @@ -68,7 +68,7 @@ msgstr "Valor"
#: code:addons/account_reconcile_oca/static/src/xml/reconcile.xml:0
#, python-format
msgid "Amount in currency"
msgstr "Valor em moeda"
msgstr "Valor na moeda"

#. module: account_reconcile_oca
#: model:ir.model.fields,field_description:account_reconcile_oca.field_account_bank_statement_line__analytic_distribution
Expand Down Expand Up @@ -210,12 +210,12 @@ msgstr "Moeda Estrangeira"
#. module: account_reconcile_oca
#: model_terms:ir.ui.view,arch_db:account_reconcile_oca.account_move_line_search_reconcile_view
msgid "From Trade Payable accounts"
msgstr "De contas a pagar comerciais"
msgstr "De contas a Pagar comerciais"

#. module: account_reconcile_oca
#: model_terms:ir.ui.view,arch_db:account_reconcile_oca.account_move_line_search_reconcile_view
msgid "From Trade Receivable accounts"
msgstr "De contas a pagar comerciais"
msgstr "De contas a Receber comerciais"

#. module: account_reconcile_oca
#: model:ir.model.fields,field_description:account_reconcile_oca.field_account_account_reconcile__id
Expand Down Expand Up @@ -254,6 +254,7 @@ msgid "Journal Entry"
msgstr "Entrada Diário"

#. module: account_reconcile_oca
#: model:ir.model,name:account_reconcile_oca.model_account_move_line
#: model_terms:ir.ui.view,arch_db:account_reconcile_oca.account_move_line_search_reconcile_view
msgid "Journal Item"
msgstr "Item Diário"
Expand Down Expand Up @@ -296,7 +297,7 @@ msgstr "Última atualização em"
#. module: account_reconcile_oca
#: model:ir.model.fields,field_description:account_reconcile_oca.field_account_bank_statement_line__manual_account_id
msgid "Manual Account"
msgstr "Conta manual"
msgstr "Conta Manual"

#. module: account_reconcile_oca
#: model:ir.model.fields,field_description:account_reconcile_oca.field_account_bank_statement_line__manual_amount
Expand All @@ -313,7 +314,7 @@ msgstr "Moeda Manual"
#: model:ir.model.fields,field_description:account_reconcile_oca.field_account_bank_statement_line__manual_delete
#: model:ir.model.fields,field_description:account_reconcile_oca.field_account_reconcile_abstract__manual_delete
msgid "Manual Delete"
msgstr "Exclusão manual"
msgstr "Exclusão Manual"

#. module: account_reconcile_oca
#: model:ir.model.fields,field_description:account_reconcile_oca.field_account_bank_statement_line__manual_kind
Expand All @@ -328,7 +329,7 @@ msgstr "Linha Manual"
#. module: account_reconcile_oca
#: model:ir.model.fields,field_description:account_reconcile_oca.field_account_bank_statement_line__manual_model_id
msgid "Manual Model"
msgstr "Modelo manual"
msgstr "Modelo Manual"

#. module: account_reconcile_oca
#: model:ir.model.fields,field_description:account_reconcile_oca.field_account_bank_statement_line__manual_move_id
Expand All @@ -348,7 +349,7 @@ msgstr "Nome Manual"
#. module: account_reconcile_oca
#: model:ir.model.fields,field_description:account_reconcile_oca.field_account_bank_statement_line__manual_original_amount
msgid "Manual Original Amount"
msgstr "Valor original manual"
msgstr "Valor Original Manual"

#. module: account_reconcile_oca
#: model:ir.model.fields,field_description:account_reconcile_oca.field_account_bank_statement_line__manual_partner_id
Expand Down Expand Up @@ -430,6 +431,7 @@ msgstr "Recebíveis"
#: model:ir.actions.act_window,name:account_reconcile_oca.account_account_account_account_reconcile_act_window
#: model:ir.actions.act_window,name:account_reconcile_oca.account_account_reconcile_act_window
#: model:ir.actions.act_window,name:account_reconcile_oca.res_partner_account_account_reconcile_act_window
#: model:ir.actions.server,name:account_reconcile_oca.action_reconcile
#: model:ir.model.fields,field_description:account_reconcile_oca.field_account_account_reconcile_data__reconcile_id
#: model:ir.ui.menu,name:account_reconcile_oca.account_account_reconcile_menu
#: model_terms:ir.ui.view,arch_db:account_reconcile_oca.account_account_reconcile_form_view
Expand Down Expand Up @@ -559,6 +561,13 @@ msgstr "Ver movimento"
msgid "Well done! Everything has been reconciled"
msgstr "Bom trabalho! Tudo foi reconciliado"

#. module: account_reconcile_oca
#. odoo-python
#: code:addons/account_reconcile_oca/models/account_move_line.py:0
#, python-format
msgid "You must reconcile information on the same partner"
msgstr "Você deve reconciliar informações sobre o mesmo parceiro"

#. module: account_reconcile_oca
#: model_terms:ir.ui.view,arch_db:account_reconcile_oca.bank_statement_line_form_reconcile_view
msgid "fully paid"
Expand Down
9 changes: 9 additions & 0 deletions account_reconcile_oca/i18n/sv.po
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,7 @@ msgid "Journal Entry"
msgstr "Dagboksanteckning"

#. module: account_reconcile_oca
#: model:ir.model,name:account_reconcile_oca.model_account_move_line
#: model_terms:ir.ui.view,arch_db:account_reconcile_oca.account_move_line_search_reconcile_view
msgid "Journal Item"
msgstr "Dagboksanteckning"
Expand Down Expand Up @@ -430,6 +431,7 @@ msgstr "Mottagningsbar"
#: model:ir.actions.act_window,name:account_reconcile_oca.account_account_account_account_reconcile_act_window
#: model:ir.actions.act_window,name:account_reconcile_oca.account_account_reconcile_act_window
#: model:ir.actions.act_window,name:account_reconcile_oca.res_partner_account_account_reconcile_act_window
#: model:ir.actions.server,name:account_reconcile_oca.action_reconcile
#: model:ir.model.fields,field_description:account_reconcile_oca.field_account_account_reconcile_data__reconcile_id
#: model:ir.ui.menu,name:account_reconcile_oca.account_account_reconcile_menu
#: model_terms:ir.ui.view,arch_db:account_reconcile_oca.account_account_reconcile_form_view
Expand Down Expand Up @@ -559,6 +561,13 @@ msgstr "Visa move"
msgid "Well done! Everything has been reconciled"
msgstr "Bra gjort! Allt har blivit avstämmt"

#. module: account_reconcile_oca
#. odoo-python
#: code:addons/account_reconcile_oca/models/account_move_line.py:0
#, python-format
msgid "You must reconcile information on the same partner"
msgstr ""

#. module: account_reconcile_oca
#: model_terms:ir.ui.view,arch_db:account_reconcile_oca.bank_statement_line_form_reconcile_view
msgid "fully paid"
Expand Down
Loading

0 comments on commit 836361e

Please sign in to comment.