From 4b4621de0eb3512d450e1629aaaf99400d324b79 Mon Sep 17 00:00:00 2001 From: Daniel Reis Date: Sun, 26 May 2024 15:48:28 +0100 Subject: [PATCH] [REF] account_factoring_receivable_balance: merge base_factor in this module --- .../__manifest__.py | 5 +- .../models/account_journal.py | 2 +- .../views/account_journal.xml | 39 +- .../views/company.xml | 19 +- .../views/company_demo.xml | 2 +- .../views/partner.xml | 0 .../views/subrogation_receipt.xml | 2 +- base_factoring/README.rst | 67 --- base_factoring/__init__.py | 1 - base_factoring/__manifest__.py | 25 -- base_factoring/i18n/base_factoring.pot | 38 -- base_factoring/i18n/fr.po | 42 -- base_factoring/models/__init__.py | 1 - base_factoring/models/account_journal.py | 11 - base_factoring/pyproject.toml | 3 - base_factoring/readme/DESCRIPTION.md | 2 - base_factoring/static/description/index.html | 413 ------------------ base_factoring/views/account.xml | 26 -- base_factoring/views/company.xml | 17 - base_factoring/views/config.xml | 14 - 20 files changed, 45 insertions(+), 684 deletions(-) rename {base_factoring => account_factoring_receivable_balance}/views/partner.xml (100%) delete mode 100644 base_factoring/README.rst delete mode 100644 base_factoring/__init__.py delete mode 100644 base_factoring/__manifest__.py delete mode 100644 base_factoring/i18n/base_factoring.pot delete mode 100644 base_factoring/i18n/fr.po delete mode 100644 base_factoring/models/__init__.py delete mode 100644 base_factoring/models/account_journal.py delete mode 100644 base_factoring/pyproject.toml delete mode 100644 base_factoring/readme/DESCRIPTION.md delete mode 100644 base_factoring/static/description/index.html delete mode 100644 base_factoring/views/account.xml delete mode 100644 base_factoring/views/company.xml delete mode 100644 base_factoring/views/config.xml diff --git a/account_factoring_receivable_balance/__manifest__.py b/account_factoring_receivable_balance/__manifest__.py index 7e71dab8e..f8ac95982 100644 --- a/account_factoring_receivable_balance/__manifest__.py +++ b/account_factoring_receivable_balance/__manifest__.py @@ -13,14 +13,15 @@ "alexis-via", ], "depends": [ - "base_factoring", + "account", ], "data": [ "security/ir.model.access.csv", "security/misc.xml", - "views/subrogation_receipt.xml", "views/account_journal.xml", "views/company.xml", + "views/partner.xml", + "views/subrogation_receipt.xml", ], "demo": [ "views/company_demo.xml", diff --git a/account_factoring_receivable_balance/models/account_journal.py b/account_factoring_receivable_balance/models/account_journal.py index 742adee3c..510155f08 100644 --- a/account_factoring_receivable_balance/models/account_journal.py +++ b/account_factoring_receivable_balance/models/account_journal.py @@ -8,7 +8,7 @@ class AccountJournal(models.Model): _inherit = "account.journal" - factor_type = fields.Selection(string="Factor", selection_add=[("", "")]) + factor_type = fields.Selection(string="Factor", selection=[("", "")]) factoring_receivable_account_id = fields.Many2one( comodel_name="account.account", string="Receivable Account" ) diff --git a/account_factoring_receivable_balance/views/account_journal.xml b/account_factoring_receivable_balance/views/account_journal.xml index 229c90eb8..f92a570a1 100644 --- a/account_factoring_receivable_balance/views/account_journal.xml +++ b/account_factoring_receivable_balance/views/account_journal.xml @@ -1,21 +1,36 @@ + + account.journal - + - - - - - - - - - - + + + + + + + + + + + + + + + - + diff --git a/account_factoring_receivable_balance/views/company.xml b/account_factoring_receivable_balance/views/company.xml index 39709fcfc..68ad8f1ac 100644 --- a/account_factoring_receivable_balance/views/company.xml +++ b/account_factoring_receivable_balance/views/company.xml @@ -2,14 +2,19 @@ res.company - + - - - + + + + + + + + + + + diff --git a/account_factoring_receivable_balance/views/company_demo.xml b/account_factoring_receivable_balance/views/company_demo.xml index d7374a7fc..e1a98a4db 100644 --- a/account_factoring_receivable_balance/views/company_demo.xml +++ b/account_factoring_receivable_balance/views/company_demo.xml @@ -2,7 +2,7 @@ res.company - + diff --git a/base_factoring/README.rst b/base_factoring/README.rst deleted file mode 100644 index 938565d5c..000000000 --- a/base_factoring/README.rst +++ /dev/null @@ -1,67 +0,0 @@ -============== -Base Factoring -============== - -.. - !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - !! This file is generated by oca-gen-addon-readme !! - !! changes will be overwritten. !! - !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - !! source digest: sha256:d4d7bff38a84622953eb4f1f843fc91849df577f7b95211af5c9105846d1ef18 - !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - -.. |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-Akretion%2Fhttps://github.com/akretion/odoo--factoring/tree/16.0-lightgray.png?logo=github - :target: https://github.com/Akretion/https://github.com/akretion/odoo-factoring/tree/16.0/tree/17.0/base_factoring - :alt: Akretion/https://github.com/akretion/odoo-factoring/tree/16.0 - -|badge1| |badge2| |badge3| - -- Add factor_type on journal -- Define base xml views for factor - -**Table of contents** - -.. contents:: - :local: - -Bug Tracker -=========== - -Bugs are tracked on `GitHub 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 `_. - -Do not contact contributors directly about support or help with technical issues. - -Credits -======= - -Authors -------- - -* Akretion - -Maintainers ------------ - -.. |maintainer-bealdav| image:: https://github.com/bealdav.png?size=40px - :target: https://github.com/bealdav - :alt: bealdav -.. |maintainer-alexis-via| image:: https://github.com/alexis-via.png?size=40px - :target: https://github.com/alexis-via - :alt: alexis-via - -Current maintainers: - -|maintainer-bealdav| |maintainer-alexis-via| - -This module is part of the `Akretion/https://github.com/akretion/odoo-factoring/tree/16.0 `_ project on GitHub. - -You are welcome to contribute. diff --git a/base_factoring/__init__.py b/base_factoring/__init__.py deleted file mode 100644 index 0650744f6..000000000 --- a/base_factoring/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from . import models diff --git a/base_factoring/__manifest__.py b/base_factoring/__manifest__.py deleted file mode 100644 index d6cb8019e..000000000 --- a/base_factoring/__manifest__.py +++ /dev/null @@ -1,25 +0,0 @@ -# © 2022 David BEAL @ Akretion -# © 2022 Alexis DE LATTRE @ Akretion - -{ - "name": "Base Factoring", - "version": "17.0.1.0.0", - "category": "Accounting", - "license": "AGPL-3", - "author": "Akretion", - "website": "https://github.com/akretion/odoo-factoring", - "maintainers": [ - "bealdav", - "alexis-via", - ], - "depends": [ - "account", - ], - "data": [ - "views/account.xml", - "views/partner.xml", - "views/company.xml", - "views/config.xml", - ], - "demo": [], -} diff --git a/base_factoring/i18n/base_factoring.pot b/base_factoring/i18n/base_factoring.pot deleted file mode 100644 index 0d155d5d8..000000000 --- a/base_factoring/i18n/base_factoring.pot +++ /dev/null @@ -1,38 +0,0 @@ -# Translation of Odoo Server. -# This file contains the translation of the following modules: -# * base_factoring -# -msgid "" -msgstr "" -"Project-Id-Version: Odoo Server 15.0+e\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: base_factoring -#: model_terms:ir.ui.view,arch_db:base_factoring.view_company_form -msgid "Configuration" -msgstr "" - -#. module: base_factoring -#: model:ir.model.fields,field_description:base_factoring.field_account_journal__factor_type -#: model_terms:ir.ui.view,arch_db:base_factoring.res_config_settings_factor -#: model_terms:ir.ui.view,arch_db:base_factoring.view_account_journal_form -#: model_terms:ir.ui.view,arch_db:base_factoring.view_company_form -msgid "Factor" -msgstr "" - -#. module: base_factoring -#: model:ir.ui.menu,name:base_factoring.factoring_menu -#: model_terms:ir.ui.view,arch_db:base_factoring.view_partner_property_form -msgid "Factoring" -msgstr "" - -#. module: base_factoring -#: model:ir.model,name:base_factoring.model_account_journal -msgid "Journal" -msgstr "" diff --git a/base_factoring/i18n/fr.po b/base_factoring/i18n/fr.po deleted file mode 100644 index df3d9abda..000000000 --- a/base_factoring/i18n/fr.po +++ /dev/null @@ -1,42 +0,0 @@ -# Translation of Odoo Server. -# This file contains the translation of the following modules: -# * base_factoring -# -msgid "" -msgstr "" -"Project-Id-Version: Odoo Server 15.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: \n" -"PO-Revision-Date: \n" -"Last-Translator: \n" -"Language-Team: \n" -"Language: fr_FR\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Poedit 3.0.1\n" - -#. module: base_factoring -#: model_terms:ir.ui.view,arch_db:base_factoring.view_company_form -msgid "Configuration" -msgstr "Configuration" - -#. module: base_factoring -#: model:ir.model.fields,field_description:base_factoring.field_account_journal__factor_type -#: model_terms:ir.ui.view,arch_db:base_factoring.view_account_journal_form -#: model_terms:ir.ui.view,arch_db:base_factoring.view_company_form -msgid "Factor" -msgstr "Factor" - -#. module: base_factoring -#: model:ir.ui.menu,name:base_factoring.factoring_menu -#: model_terms:ir.ui.view,arch_db:base_factoring.view_partner_property_form -msgid "Factoring" -msgstr "Factoring" - -#. module: base_factoring -#: model:ir.model,name:base_factoring.model_account_journal -msgid "Journal" -msgstr "Journal" - diff --git a/base_factoring/models/__init__.py b/base_factoring/models/__init__.py deleted file mode 100644 index 2388e1196..000000000 --- a/base_factoring/models/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from . import account_journal diff --git a/base_factoring/models/account_journal.py b/base_factoring/models/account_journal.py deleted file mode 100644 index fd6a180ef..000000000 --- a/base_factoring/models/account_journal.py +++ /dev/null @@ -1,11 +0,0 @@ -# © 2022 David BEAL @ Akretion -# © 2022 Alexis DE LATTRE @ Akretion -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). - -from odoo import fields, models - - -class AccountJournal(models.Model): - _inherit = "account.journal" - - factor_type = fields.Selection(selection=[]) diff --git a/base_factoring/pyproject.toml b/base_factoring/pyproject.toml deleted file mode 100644 index 4231d0ccc..000000000 --- a/base_factoring/pyproject.toml +++ /dev/null @@ -1,3 +0,0 @@ -[build-system] -requires = ["whool"] -build-backend = "whool.buildapi" diff --git a/base_factoring/readme/DESCRIPTION.md b/base_factoring/readme/DESCRIPTION.md deleted file mode 100644 index a5ee81cbf..000000000 --- a/base_factoring/readme/DESCRIPTION.md +++ /dev/null @@ -1,2 +0,0 @@ -- Add factor_type on journal -- Define base xml views for factor diff --git a/base_factoring/static/description/index.html b/base_factoring/static/description/index.html deleted file mode 100644 index 045780752..000000000 --- a/base_factoring/static/description/index.html +++ /dev/null @@ -1,413 +0,0 @@ - - - - - -Base Factoring - - - -
-

Base Factoring

- - -

Beta License: AGPL-3 Akretion/https://github.com/akretion/odoo-factoring/tree/16.0

-
    -
  • Add factor_type on journal
    • -
  • Define base xml views for factor
    • -
-

Table of contents

- -
-

Bug Tracker

-

Bugs are tracked on GitHub 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.

-

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

-
-
-

Credits

-
-

Authors

-
    -
  • Akretion
    • -
-
-
-

Maintainers

-

Current maintainers:

-

bealdav alexis-via

-

This module is part of the Akretion/https://github.com/akretion/odoo-factoring/tree/16.0 project on GitHub.

-

You are welcome to contribute.

-
-
-
- - diff --git a/base_factoring/views/account.xml b/base_factoring/views/account.xml deleted file mode 100644 index df07f9def..000000000 --- a/base_factoring/views/account.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - account.journal - - - - - - - - - - - - diff --git a/base_factoring/views/company.xml b/base_factoring/views/company.xml deleted file mode 100644 index 87acf066c..000000000 --- a/base_factoring/views/company.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - res.company - - - - - - - - - - - - - diff --git a/base_factoring/views/config.xml b/base_factoring/views/config.xml deleted file mode 100644 index 48d1b8693..000000000 --- a/base_factoring/views/config.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - res.config.settings - - - -

Factor

-
- - - - -