From 6e960b04c03d1a2fbae3a69c6dd85407744329fd Mon Sep 17 00:00:00 2001 From: Fekete Mihai Date: Wed, 14 Mar 2018 19:14:32 +0200 Subject: [PATCH 1/4] Add account_tag_menu --- account_tag_menu/README.rst | 48 ++++++++++++++++++++++++++ account_tag_menu/__init__.py | 0 account_tag_menu/__manifest__.py | 15 ++++++++ account_tag_menu/views/account_tag.xml | 9 +++++ 4 files changed, 72 insertions(+) create mode 100644 account_tag_menu/README.rst create mode 100644 account_tag_menu/__init__.py create mode 100644 account_tag_menu/__manifest__.py create mode 100644 account_tag_menu/views/account_tag.xml diff --git a/account_tag_menu/README.rst b/account_tag_menu/README.rst new file mode 100644 index 000000000..d4094d543 --- /dev/null +++ b/account_tag_menu/README.rst @@ -0,0 +1,48 @@ +.. image:: https://img.shields.io/badge/license-AGPL--3-blue.png + :target: https://www.gnu.org/licenses/agpl + :alt: License: AGPL-3 + +================= +Account Tags Menu +================= + +This module adds a menu entry *Account Tags* under *Accounting > Configuration > Accounting*, +because this menu entry doesn't exists in the official *account* module of Odoo 11. + +Usage +===== + +.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas + :alt: Try me on Runbot + :target: https://runbot.odoo-community.org/runbot/92/11.0 + +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 smashing it by providing a detailed and welcomed feedback. + +Credits +======= + +Contributors +------------ + +* Fekete Mihai + +Maintainer +---------- + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +This module is maintained by the OCA. + +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. + +To contribute to this module, please visit https://odoo-community.org. diff --git a/account_tag_menu/__init__.py b/account_tag_menu/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/account_tag_menu/__manifest__.py b/account_tag_menu/__manifest__.py new file mode 100644 index 000000000..8e4ee46c1 --- /dev/null +++ b/account_tag_menu/__manifest__.py @@ -0,0 +1,15 @@ +# Copyright 2018 Forest and Biomass Romania +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +{ + 'name': 'Account Tag Menu', + 'version': '11.0.1.0.0', + 'category': 'Accounting', + 'license': 'AGPL-3', + 'summary': "Adds a menu entry for Account Tags", + 'author': "Forest and Biomass Romania, Odoo Community Association (OCA)", + 'website': 'https://github.com/OCA/account-financial-tools', + 'depends': ['account'], + 'data': ['views/account_tag.xml'], + 'installable': True, +} diff --git a/account_tag_menu/views/account_tag.xml b/account_tag_menu/views/account_tag.xml new file mode 100644 index 000000000..d7c995d94 --- /dev/null +++ b/account_tag_menu/views/account_tag.xml @@ -0,0 +1,9 @@ + + + + + + From 1c84174064b2a3d7004df795dd79d6ed0fb3c1fa Mon Sep 17 00:00:00 2001 From: Fekete Mihai Date: Wed, 14 Mar 2018 19:41:10 +0200 Subject: [PATCH 2/4] Add links with accounts and taxes for easier assignation. --- account_tag_menu/__init__.py | 1 + account_tag_menu/models/__init__.py | 1 + account_tag_menu/models/account_tag.py | 17 +++++++++++++ account_tag_menu/views/account_tag.xml | 35 +++++++++++++++++++++++--- 4 files changed, 50 insertions(+), 4 deletions(-) create mode 100644 account_tag_menu/models/__init__.py create mode 100644 account_tag_menu/models/account_tag.py diff --git a/account_tag_menu/__init__.py b/account_tag_menu/__init__.py index e69de29bb..0650744f6 100644 --- a/account_tag_menu/__init__.py +++ b/account_tag_menu/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/account_tag_menu/models/__init__.py b/account_tag_menu/models/__init__.py new file mode 100644 index 000000000..b1a763604 --- /dev/null +++ b/account_tag_menu/models/__init__.py @@ -0,0 +1 @@ +from . import account_tag diff --git a/account_tag_menu/models/account_tag.py b/account_tag_menu/models/account_tag.py new file mode 100644 index 000000000..53b29f52d --- /dev/null +++ b/account_tag_menu/models/account_tag.py @@ -0,0 +1,17 @@ +# Copyright (C) 2017 FOREST AND BIOMASS ROMANIA SA +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from odoo import fields, models + + +class AccountAccountTag(models.Model): + _inherit = 'account.account.tag' + + account_ids = fields.Many2many( + 'account.account', 'account_account_account_tag', + string='Accounts', + help="Assigned accounts for custom reporting") + tax_ids = fields.Many2many( + 'account.account.tag', 'account_tax_account_tag', + string='Taxes', + help="Assigned taxes for custom reporting") diff --git a/account_tag_menu/views/account_tag.xml b/account_tag_menu/views/account_tag.xml index d7c995d94..cb0f33361 100644 --- a/account_tag_menu/views/account_tag.xml +++ b/account_tag_menu/views/account_tag.xml @@ -1,9 +1,36 @@ - + + tag_addd_accounts_taxes + account.account.tag + + + + + + + + + + + + + + + + + From bb14ca1ecfd7afb7f67deae2b8bf4c358a5b6cb6 Mon Sep 17 00:00:00 2001 From: Fekete Mihai Date: Thu, 15 Mar 2018 08:05:15 +0200 Subject: [PATCH 3/4] Update copyright year, add demo data for taxes, for accounts there are already in Minimal Chart of Accounts. --- account_tag_menu/__manifest__.py | 4 +- account_tag_menu/demo/account_tax_data.xml | 88 ++++++++++++++++++++++ account_tag_menu/demo/account_tax_tags.xml | 40 ++++++++++ account_tag_menu/models/account_tag.py | 2 +- 4 files changed, 132 insertions(+), 2 deletions(-) create mode 100644 account_tag_menu/demo/account_tax_data.xml create mode 100644 account_tag_menu/demo/account_tax_tags.xml diff --git a/account_tag_menu/__manifest__.py b/account_tag_menu/__manifest__.py index 8e4ee46c1..d22817ec5 100644 --- a/account_tag_menu/__manifest__.py +++ b/account_tag_menu/__manifest__.py @@ -1,4 +1,4 @@ -# Copyright 2018 Forest and Biomass Romania +# Copyright 2018 Forest and Biomass Romania # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). { @@ -11,5 +11,7 @@ 'website': 'https://github.com/OCA/account-financial-tools', 'depends': ['account'], 'data': ['views/account_tag.xml'], + 'demo': ['demo/account_tax_tags.xml', + 'demo/account_tax_data.xml'], 'installable': True, } diff --git a/account_tag_menu/demo/account_tax_data.xml b/account_tag_menu/demo/account_tax_data.xml new file mode 100644 index 000000000..f94552c5a --- /dev/null +++ b/account_tag_menu/demo/account_tax_data.xml @@ -0,0 +1,88 @@ + + + + + VAT Colected + vatc + + + + VAT Colected Cash-Basis + vatccb + + + + + 11 + VAT Colected 5% + VAT Colected 5% + 5 + percent + sale + + + + + + 12 + VAT Colected 9% + VAT Colected 9% + 9 + percent + sale + + + + + + 13 + VAT Colected 19% + VAT Colected 19% + 19 + percent + sale + + + + + + + 21 + VAT Colected Cash-Basis 5% + VAT Colected Cash-Basis 5% + 5 + percent + sale + on_payment + + + + + + + 22 + VAT Colected Cash-Basis 9% + VAT Colected Cash-Basis 9% + 9 + percent + sale + on_payment + + + + + + + 23 + VAT Colected Cash-Basis 19% + VAT Colected Cash-Basis 19% + 19 + percent + sale + on_payment + + + + + + diff --git a/account_tag_menu/demo/account_tax_tags.xml b/account_tag_menu/demo/account_tax_tags.xml new file mode 100644 index 000000000..845970267 --- /dev/null +++ b/account_tag_menu/demo/account_tax_tags.xml @@ -0,0 +1,40 @@ + + + + VAT + taxes + + + VAT Colected + taxes + + + VAT Colected 5% + taxes + + + VAT Colected 9% + taxes + + + VAT Colected 19% + taxes + + + VAT Colected Cash-Basis + taxes + + + VAT Colected Cash-Basis 5% + taxes + + + VAT Colected Cash-Basis 9% + taxes + + + VAT Colected Cash-Basis 19% + taxes + + + diff --git a/account_tag_menu/models/account_tag.py b/account_tag_menu/models/account_tag.py index 53b29f52d..42bf4d1ce 100644 --- a/account_tag_menu/models/account_tag.py +++ b/account_tag_menu/models/account_tag.py @@ -1,4 +1,4 @@ -# Copyright (C) 2017 FOREST AND BIOMASS ROMANIA SA +# Copyright 2018 FOREST AND BIOMASS ROMANIA SA # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from odoo import fields, models From fd21d505d844cb4a2ab8b09b47087d2bc85c8995 Mon Sep 17 00:00:00 2001 From: Fekete Mihai Date: Thu, 15 Mar 2018 12:37:30 +0200 Subject: [PATCH 4/4] Update account_tag.py --- account_tag_menu/models/account_tag.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/account_tag_menu/models/account_tag.py b/account_tag_menu/models/account_tag.py index 42bf4d1ce..b341ebc70 100644 --- a/account_tag_menu/models/account_tag.py +++ b/account_tag_menu/models/account_tag.py @@ -12,6 +12,6 @@ class AccountAccountTag(models.Model): string='Accounts', help="Assigned accounts for custom reporting") tax_ids = fields.Many2many( - 'account.account.tag', 'account_tax_account_tag', + 'account.tax', 'account_tax_account_tag', string='Taxes', help="Assigned taxes for custom reporting")