Skip to content

Commit

Permalink
Merge pull request #568 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 Apr 3, 2024
2 parents 91d003d + 8bfbdf4 commit 9eba72b
Show file tree
Hide file tree
Showing 22 changed files with 961 additions and 14 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +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_move_so_import](account_move_so_import/) | 16.0.1.0.0 | | Journal Entry Sale Order completion
[account_reconcile_oca](account_reconcile_oca/) | 16.0.1.2.12 | [![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.1 | [![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
28 changes: 15 additions & 13 deletions account_mass_reconcile/i18n/nl.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ msgstr ""
"Project-Id-Version: bank-statement-reconcile (9.0)\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-12-24 00:38+0000\n"
"PO-Revision-Date: 2020-12-14 00:28+0000\n"
"Last-Translator: Bosd <c5e2fd43-d292-4c90-9d1f-74ff3436329a@anonaddy.me>\n"
"Language-Team: Dutch (http://www.transifex.com/oca/OCA-bank-statement-"
"reconcile-9-0/language/nl/)\n"
"PO-Revision-Date: 2024-04-02 15:06+0000\n"
"Last-Translator: Thijs van Oers <thijsvanoers@yahoo.com>\n"
"Language-Team: Dutch (http://www.transifex.com/oca/"
"OCA-bank-statement-reconcile-9-0/language/nl/)\n"
"Language: nl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 4.3.2\n"
"X-Generator: Weblate 4.17\n"

#. module: account_mass_reconcile
#. odoo-python
Expand All @@ -26,6 +26,8 @@ msgstr ""
msgid ""
"A mass reconcile is already ongoing for this account, please try again later."
msgstr ""
"Er is al een massa aflettering gaande voor deze grootboekrekening. Probeer "
"het later nog eens."

#. module: account_mass_reconcile
#. odoo-python
Expand Down Expand Up @@ -113,13 +115,13 @@ msgstr "Aantal bijlagen"
#. module: account_mass_reconcile
#: model_terms:ir.ui.view,arch_db:account_mass_reconcile.account_mass_reconcile_form
msgid "Automatic Mass Reconcile"
msgstr ""
msgstr "Automatische bulk aflettering"

#. module: account_mass_reconcile
#: model_terms:ir.ui.view,arch_db:account_mass_reconcile.mass_reconcile_history_form
#: model_terms:ir.ui.view,arch_db:account_mass_reconcile.view_mass_reconcile_history_search
msgid "Automatic Mass Reconcile History"
msgstr ""
msgstr "Automatische bulk aflettering geschiedenis"

#. module: account_mass_reconcile
#. odoo-python
Expand All @@ -133,7 +135,7 @@ msgstr "Automatisch afschrijven"
#: code:addons/account_mass_reconcile/models/base_reconciliation.py:0
#, python-format
msgid "Automatic writeoff"
msgstr ""
msgstr "Automatische afschrijving"

#. module: account_mass_reconcile
#: model_terms:ir.actions.act_window,help:account_mass_reconcile.action_account_mass_reconcile
Expand All @@ -143,7 +145,7 @@ msgstr "Klik om een afletteringsprofiel toe te voegen."
#. module: account_mass_reconcile
#: model_terms:ir.ui.view,arch_db:account_mass_reconcile.view_account_config
msgid "Commit frequency"
msgstr ""
msgstr "Frequentie vastleggen"

#. module: account_mass_reconcile
#: model:ir.model,name:account_mass_reconcile.model_res_company
Expand All @@ -160,7 +162,7 @@ msgstr "Bedrijf"
#. module: account_mass_reconcile
#: model:ir.model,name:account_mass_reconcile.model_res_config_settings
msgid "Config Settings"
msgstr ""
msgstr "Configuratie instellingen"

#. module: account_mass_reconcile
#: model_terms:ir.ui.view,arch_db:account_mass_reconcile.account_mass_reconcile_form
Expand Down Expand Up @@ -268,7 +270,7 @@ msgstr "Ga naar afgeletterde items"
#. module: account_mass_reconcile
#: model_terms:ir.ui.view,arch_db:account_mass_reconcile.account_mass_reconcile_form
msgid "Go to unreconciled items"
msgstr ""
msgstr "Ga naar niet afgeletterde regels"

#. module: account_mass_reconcile
#: model_terms:ir.ui.view,arch_db:account_mass_reconcile.view_mass_reconcile_history_search
Expand All @@ -278,7 +280,7 @@ msgstr "Groeperen op..."
#. module: account_mass_reconcile
#: model:ir.model.fields,field_description:account_mass_reconcile.field_account_mass_reconcile__has_message
msgid "Has Message"
msgstr ""
msgstr "Heeft een bericht"

#. module: account_mass_reconcile
#: model:ir.model.fields,field_description:account_mass_reconcile.field_account_mass_reconcile__history_ids
Expand All @@ -290,7 +292,7 @@ msgstr "Historie"
#: model:ir.model.fields,field_description:account_mass_reconcile.field_res_company__reconciliation_commit_every
#: model:ir.model.fields,field_description:account_mass_reconcile.field_res_config_settings__reconciliation_commit_every
msgid "How often to commit when performing automatic reconciliation."
msgstr ""
msgstr "Hoe vaak vastleggen bij automatische aflettering."

#. module: account_mass_reconcile
#: model_terms:ir.ui.view,arch_db:account_mass_reconcile.view_account_config
Expand Down
81 changes: 81 additions & 0 deletions account_move_so_import/README.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
===================================
Journal Entry Sale Order completion
===================================

..
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:b908437dbdf6d9e1284ff6d521333a844e99a805f1b28925f28c6d5398ac77df
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
:target: https://odoo-community.org/page/development-status
:alt: Beta
.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
:target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
:alt: License: AGPL-3
.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Faccount--reconcile-lightgray.png?logo=github
:target: https://github.com/OCA/account-reconcile/tree/16.0/account_move_so_import
:alt: OCA/account-reconcile
.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
:target: https://translation.odoo-community.org/projects/account-reconcile-16-0/account-reconcile-16-0-account_move_so_import
:alt: Translate me on Weblate
.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
:target: https://runboat.odoo-community.org/builds?repo=OCA/account-reconcile&target_branch=16.0
:alt: Try me on Runboat

|badge1| |badge2| |badge3| |badge4| |badge5|

This module extends the functionality of account_move_base_import
to add support for completion rules based on Sale Orders. This was initially
part of the module account_statement_base_completion, but is now separate to
keep dependencies separate.

**Table of contents**

.. contents::
:local:

Bug Tracker
===========

Bugs are tracked on `GitHub Issues <https://github.com/OCA/account-reconcile/issues>`_.
In case of trouble, please check there if your issue has already been reported.
If you spotted it first, help us to smash it by providing a detailed and welcomed
`feedback <https://github.com/OCA/account-reconcile/issues/new?body=module:%20account_move_so_import%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.

Do not contact contributors directly about support or help with technical issues.

Credits
=======

Authors
~~~~~~~

* Camptocamp

Contributors
~~~~~~~~~~~~

* Joël Grand-Guillaume <joel.grandguillaume@camptocamp.com>
* Leonardo Pistone <leonardo.pistone@camptocamp.com>
* Matthieu Dietrich <matthieu.dietrich@camptocamp.com>

Maintainers
~~~~~~~~~~~

This module is maintained by the OCA.

.. image:: https://odoo-community.org/logo.png
:alt: Odoo Community Association
:target: https://odoo-community.org

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.

This module is part of the `OCA/account-reconcile <https://github.com/OCA/account-reconcile/tree/16.0/account_move_so_import>`_ project on GitHub.

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
1 change: 1 addition & 0 deletions account_move_so_import/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
from . import models
18 changes: 18 additions & 0 deletions account_move_so_import/__manifest__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Copyright 2011-2019 Camptocamp SA
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html)
{
"name": "Journal Entry Sale Order completion",
"version": "16.0.1.0.0",
"author": "Camptocamp,Odoo Community Association (OCA)",
"maintainer": "Camptocamp",
"category": "Finance",
"complexity": "easy",
"depends": ["account_move_base_import", "sale"],
"website": "https://github.com/OCA/account-reconcile",
"data": [
"data/completion_rule_data.xml",
],
"installable": True,
"auto_install": False,
"license": "AGPL-3",
}
16 changes: 16 additions & 0 deletions account_move_so_import/data/completion_rule_data.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8" ?>
<odoo noupdate="1">

<record id="bank_statement_completion_rule_1" model="account.move.completion.rule">
<field name="name">Match from line name (based on SO number)</field>
<field name="sequence">50</field>
<field name="function_to_call">get_from_name_and_so</field>
</record>

<record id="bank_statement_completion_rule_2" model="account.move.completion.rule">
<field name="name">Match from line name (based on SO payment reference)</field>
<field name="sequence">55</field>
<field name="function_to_call">get_from_name_and_so_payment_ref</field>
</record>

</odoo>
43 changes: 43 additions & 0 deletions account_move_so_import/i18n/account_move_so_import.pot
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * account_move_so_import
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 16.0\n"
"Report-Msgid-Bugs-To: \n"
"Last-Translator: \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"

#. module: account_move_so_import
#: model:ir.model,name:account_move_so_import.model_account_move_completion_rule
msgid "Account move completion method"
msgstr ""

#. module: account_move_so_import
#: model:ir.model.fields.selection,name:account_move_so_import.selection__account_move_completion_rule__function_to_call__get_from_name_and_so
msgid "From line name (based on SO number)"
msgstr ""

#. module: account_move_so_import
#: model:ir.model.fields.selection,name:account_move_so_import.selection__account_move_completion_rule__function_to_call__get_from_name_and_so_payment_ref
msgid "From line name (based on SO payment ref)"
msgstr ""

#. module: account_move_so_import
#. odoo-python
#: code:addons/account_move_so_import/models/account_move.py:0
#, python-format
msgid ""
"Line named \"%s\" was matched by more than one partner while looking on SO "
"by ref."
msgstr ""

#. module: account_move_so_import
#: model:ir.model.fields,field_description:account_move_so_import.field_account_move_completion_rule__function_to_call
msgid "Method"
msgstr ""
49 changes: 49 additions & 0 deletions account_move_so_import/i18n/es.po
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
# Spanish translation for banking-addons
# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
# This file is distributed under the same license as the banking-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
#
msgid ""
msgstr ""
"Project-Id-Version: banking-addons\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-01-21 12:04+0000\n"
"PO-Revision-Date: 2014-06-05 22:41+0000\n"
"Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
"Language-Team: Spanish <es@li.org>\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-06-06 06:36+0000\n"
"X-Generator: Launchpad (build 17031)\n"

#. module: account_move_so_import
#: model:ir.model,name:account_move_so_import.model_account_move_completion_rule
#, fuzzy
msgid "Account move completion method"
msgstr "account.statement.completion.rule"

#. module: account_move_so_import
#: model:ir.model.fields.selection,name:account_move_so_import.selection__account_move_completion_rule__function_to_call__get_from_name_and_so
msgid "From line name (based on SO number)"
msgstr ""

#. module: account_move_so_import
#: model:ir.model.fields.selection,name:account_move_so_import.selection__account_move_completion_rule__function_to_call__get_from_name_and_so_payment_ref
msgid "From line name (based on SO payment ref)"
msgstr ""

#. module: account_move_so_import
#. odoo-python
#: code:addons/account_move_so_import/models/account_move.py:0
#, python-format
msgid ""
"Line named \"%s\" was matched by more than one partner while looking on SO "
"by ref."
msgstr ""

#. module: account_move_so_import
#: model:ir.model.fields,field_description:account_move_so_import.field_account_move_completion_rule__function_to_call
msgid "Method"
msgstr ""
45 changes: 45 additions & 0 deletions account_move_so_import/i18n/hr.po
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * account_move_so_import
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 12.0\n"
"Report-Msgid-Bugs-To: \n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"Language: hr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"

#. module: account_move_so_import
#: model:ir.model,name:account_move_so_import.model_account_move_completion_rule
msgid "Account move completion method"
msgstr ""

#. module: account_move_so_import
#: model:ir.model.fields.selection,name:account_move_so_import.selection__account_move_completion_rule__function_to_call__get_from_name_and_so
msgid "From line name (based on SO number)"
msgstr ""

#. module: account_move_so_import
#: model:ir.model.fields.selection,name:account_move_so_import.selection__account_move_completion_rule__function_to_call__get_from_name_and_so_payment_ref
msgid "From line name (based on SO payment ref)"
msgstr ""

#. module: account_move_so_import
#. odoo-python
#: code:addons/account_move_so_import/models/account_move.py:0
#, python-format
msgid ""
"Line named \"%s\" was matched by more than one partner while looking on SO "
"by ref."
msgstr ""

#. module: account_move_so_import
#: model:ir.model.fields,field_description:account_move_so_import.field_account_move_completion_rule__function_to_call
msgid "Method"
msgstr ""
Loading

0 comments on commit 9eba72b

Please sign in to comment.