Pr journal subtype allowed journals

account_journal_subtype/__init__.py

@@ -0,0 +1,3 @@
+# Copyright 2023 Onestein (<http://www.onestein.eu>)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+from . import models

account_journal_subtype/__manifest__.py

@@ -0,0 +1,17 @@
+# Copyright 2023 Onestein (<http://www.onestein.eu>)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+{
+    "name": "Account Journal Subtype",
+    "version": "16.0.1.0.0",
+    "category": "Accounting & Finance",
+    "author": "Onestein",
+    "website": "https://www.onestein.nl",
+    "depends": [
+        "account",
+    ],
+    "data": [
+        "views/account_journal_views.xml",
+    ],
+    "license": "LGPL-3",
+}

account_journal_subtype/models/__init__.py

@@ -0,0 +1,3 @@
+# Copyright 2023 Onestein (<http://www.onestein.eu>)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+from . import account_journal

account_journal_subtype/models/account_journal.py

@@ -0,0 +1,21 @@
+# Copyright 2023 Onestein (<http://www.onestein.eu>)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo import fields, models
+
+
+class AccountJournal(models.Model):
+    _inherit = "account.journal"
+
+    subtype = fields.Selection(
+        selection=[
+            ("general_misc", "Miscellaneous"),
+            ("general_depr", "Deprecation"),
+            ("general_accr", "Accrual"),
+            ("general_tax", "Taxes"),
+            ("general_wag", "Wages"),
+            ("general_stj", "Inventory revaluation"),
+            ("general_fcr", "Foreign currency revaluation"),
+            ("general_exch", "Exchange difference"),
+        ]
+    )

account_journal_subtype/views/account_journal_views.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record model="ir.ui.view" id="view_account_journal_form">
+        <field name="model">account.journal</field>
+        <field name="inherit_id" ref="account.view_account_journal_form" />
+        <field name="arch" type="xml">
+            <field name="type" position="after">
+                <field name="subtype" attrs="{'invisible': [('type','!=','general')], 'required':[('type','=','general')]}"/>
+            </field>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="view_account_journal_tree">
+        <field name="model">account.journal</field>
+        <field name="inherit_id" ref="account.view_account_journal_tree" />
+        <field name="arch" type="xml">
+            <field name="type" position="after">
+                <field name="subtype" optional="hide"/>
+            </field>
+        </field>
+    </record>
+
+</odoo>

l10n_nl_rgs/__manifest__.py

@@ -8,7 +8,7 @@
     "category": "Accounting/Localizations/Account Charts",
     "author": "Onestein",
     "website": "https://www.onestein.nl",
-    "depends": ["account", "l10n_nl", "l10n_multilang"],
+    "depends": ["account", "l10n_nl", "l10n_multilang", "account_journal_subtype"],
     "data": [
         "data/account_account_tag.xml",
         "data/account_chart_template.xml",

l10n_nl_rgs/data/account_group_template.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <data noupdate="0">
+   <data noupdate="0">
 
         <record id="account_group_B" model="account.group.template">
             <field name="name">BALANS</field>
@@ -73,7 +73,7 @@
             <field name="rgs_basic">1</field>
             <field name="rgs_extended">1</field>
             <field name="rgs_ez">1</field>
-            <field name="rgs_zzp"></field>
+            <field name="rgs_zzp"> </field>
             <field name="rgs_bv"></field>
             <field name="rgs_allowed_journals_code">MISC</field>
             <field name="rgs_allowed_journals_type"></field>
@@ -233,7 +233,7 @@
             <field name="rgs_basic">1</field>
             <field name="rgs_extended">1</field>
             <field name="rgs_ez">1</field>
-            <field name="rgs_zzp"></field>
+            <field name="rgs_zzp"> </field>
             <field name="rgs_bv"></field>
             <field name="rgs_allowed_journals_code">MISC</field>
             <field name="rgs_allowed_journals_type"></field>
@@ -730,7 +730,7 @@
             <field name="rgs_basic">1</field>
             <field name="rgs_extended">1</field>
             <field name="rgs_ez">1</field>
-            <field name="rgs_zzp"></field>
+            <field name="rgs_zzp"> </field>
             <field name="rgs_bv"></field>
             <field name="rgs_allowed_journals_code"></field>
             <field name="rgs_allowed_journals_type"></field>
@@ -1000,7 +1000,7 @@
             <field name="rgs_basic"></field>
             <field name="rgs_extended">1</field>
             <field name="rgs_ez"></field>
-            <field name="rgs_zzp"></field>
+            <field name="rgs_zzp"> </field>
             <field name="rgs_bv"></field>
             <field name="rgs_allowed_journals_code"></field>
             <field name="rgs_allowed_journals_type"></field>
@@ -1486,7 +1486,7 @@
             <field name="rgs_basic">1</field>
             <field name="rgs_extended">1</field>
             <field name="rgs_ez"></field>
-            <field name="rgs_zzp"></field>
+            <field name="rgs_zzp"> </field>
             <field name="rgs_bv"></field>
             <field name="rgs_allowed_journals_code"></field>
             <field name="rgs_allowed_journals_type">purchase,bank</field>
@@ -1522,7 +1522,7 @@
             <field name="rgs_basic">1</field>
             <field name="rgs_extended">1</field>
             <field name="rgs_ez">1</field>
-            <field name="rgs_zzp"></field>
+            <field name="rgs_zzp"> </field>
             <field name="rgs_bv"></field>
             <field name="rgs_allowed_journals_code"></field>
             <field name="rgs_allowed_journals_type">purchase,bank</field>
@@ -1612,7 +1612,7 @@
             <field name="rgs_basic">1</field>
             <field name="rgs_extended">1</field>
             <field name="rgs_ez">1</field>
-            <field name="rgs_zzp"></field>
+            <field name="rgs_zzp"> </field>
             <field name="rgs_bv"></field>
             <field name="rgs_allowed_journals_code"></field>
             <field name="rgs_allowed_journals_type"></field>
@@ -2134,7 +2134,7 @@
             <field name="rgs_basic">1</field>
             <field name="rgs_extended">1</field>
             <field name="rgs_ez">1</field>
-            <field name="rgs_zzp"></field>
+            <field name="rgs_zzp"> </field>
             <field name="rgs_bv"></field>
             <field name="rgs_allowed_journals_code"></field>
             <field name="rgs_allowed_journals_type"></field>
@@ -2188,7 +2188,7 @@
             <field name="rgs_basic">1</field>
             <field name="rgs_extended">1</field>
             <field name="rgs_ez">1</field>
-            <field name="rgs_zzp"></field>
+            <field name="rgs_zzp"> </field>
             <field name="rgs_bv"></field>
             <field name="rgs_allowed_journals_code"></field>
             <field name="rgs_allowed_journals_type"></field>
@@ -2206,7 +2206,7 @@
             <field name="rgs_basic">1</field>
             <field name="rgs_extended">1</field>
             <field name="rgs_ez">1</field>
-            <field name="rgs_zzp"></field>
+            <field name="rgs_zzp"> </field>
             <field name="rgs_bv"></field>
             <field name="rgs_allowed_journals_code"></field>
             <field name="rgs_allowed_journals_type"></field>
@@ -2242,7 +2242,7 @@
             <field name="rgs_basic">1</field>
             <field name="rgs_extended">1</field>
             <field name="rgs_ez">1</field>
-            <field name="rgs_zzp"></field>
+            <field name="rgs_zzp"> </field>
             <field name="rgs_bv"></field>
             <field name="rgs_allowed_journals_code"></field>
             <field name="rgs_allowed_journals_type"></field>
@@ -2296,7 +2296,7 @@
             <field name="rgs_basic">1</field>
             <field name="rgs_extended">1</field>
             <field name="rgs_ez"></field>
-            <field name="rgs_zzp"></field>
+            <field name="rgs_zzp"> </field>
             <field name="rgs_bv"></field>
             <field name="rgs_allowed_journals_code"></field>
             <field name="rgs_allowed_journals_type"></field>
@@ -2530,7 +2530,7 @@
             <field name="rgs_basic"></field>
             <field name="rgs_extended">1</field>
             <field name="rgs_ez"></field>
-            <field name="rgs_zzp"></field>
+            <field name="rgs_zzp"> </field>
             <field name="rgs_bv"></field>
             <field name="rgs_allowed_journals_code"></field>
             <field name="rgs_allowed_journals_type"></field>
@@ -2602,9 +2602,9 @@
             <field name="rgs_basic">1</field>
             <field name="rgs_extended">1</field>
             <field name="rgs_ez">1</field>
-            <field name="rgs_zzp"></field>
+            <field name="rgs_zzp"> </field>
             <field name="rgs_bv"></field>
-            <field name="rgs_allowed_journals_code">MISC,WAG</field>
+            <field name="rgs_allowed_journals_code">MISC,WAG,TAX</field>
             <field name="rgs_allowed_journals_type">sale,purchase,bank</field>
             <field name="code_prefix_start">11020</field>
             <field name="code_prefix_end">11020</field>
@@ -2818,7 +2818,7 @@
             <field name="rgs_basic">1</field>
             <field name="rgs_extended">1</field>
             <field name="rgs_ez">1</field>
-            <field name="rgs_zzp"></field>
+            <field name="rgs_zzp"> </field>
             <field name="rgs_bv"></field>
             <field name="rgs_allowed_journals_code">MISC</field>
             <field name="rgs_allowed_journals_type">sale,purchase,bank</field>
@@ -2874,7 +2874,7 @@
             <field name="rgs_ez">1</field>
             <field name="rgs_zzp">1</field>
             <field name="rgs_bv"></field>
-            <field name="rgs_allowed_journals_code">MISC</field>
+            <field name="rgs_allowed_journals_code">MISC,EXCH</field>
             <field name="rgs_allowed_journals_type">purchase,bank</field>
             <field name="code_prefix_start">12030</field>
             <field name="code_prefix_end">12030</field>
@@ -2928,7 +2928,7 @@
             <field name="rgs_ez">1</field>
             <field name="rgs_zzp">1</field>
             <field name="rgs_bv"></field>
-            <field name="rgs_allowed_journals_code">MISC,WAG</field>
+            <field name="rgs_allowed_journals_code">MISC,WAG,TAX</field>
             <field name="rgs_allowed_journals_type">sale,purchase,bank</field>
             <field name="code_prefix_start">120501</field>
             <field name="code_prefix_end">120800</field>
@@ -2962,7 +2962,7 @@
             <field name="rgs_basic">1</field>
             <field name="rgs_extended">1</field>
             <field name="rgs_ez"></field>
-            <field name="rgs_zzp"></field>
+            <field name="rgs_zzp"> </field>
             <field name="rgs_bv"></field>
             <field name="rgs_allowed_journals_code">MISC</field>
             <field name="rgs_allowed_journals_type">sale,purchase,bank</field>
@@ -3361,7 +3361,7 @@
             <field name="rgs_zzp"></field>
             <field name="rgs_bv"></field>
             <field name="rgs_allowed_journals_code">WAG</field>
-            <field name="rgs_allowed_journals_type"></field>
+            <field name="rgs_allowed_journals_type">purchase</field>
             <field name="code_prefix_start">40040</field>
             <field name="code_prefix_end">40040</field>
             <field name="chart_template_id" ref="l10n_nl_rgs.l10nnl_rgs_chart_template"/>
@@ -3484,7 +3484,7 @@
             <field name="rgs_basic">1</field>
             <field name="rgs_extended">1</field>
             <field name="rgs_ez">1</field>
-            <field name="rgs_zzp"></field>
+            <field name="rgs_zzp"> </field>
             <field name="rgs_bv"></field>
             <field name="rgs_allowed_journals_code">DEPR,ACCR</field>
             <field name="rgs_allowed_journals_type"></field>
@@ -3684,7 +3684,7 @@
             <field name="rgs_ez">1</field>
             <field name="rgs_zzp">1</field>
             <field name="rgs_bv"></field>
-            <field name="rgs_allowed_journals_code">MISC,ACCR</field>
+            <field name="rgs_allowed_journals_code">MISC,ACCR,WAG</field>
             <field name="rgs_allowed_journals_type">purchase</field>
             <field name="code_prefix_start">4204</field>
             <field name="code_prefix_end">4204</field>
@@ -3702,7 +3702,7 @@
             <field name="rgs_ez">1</field>
             <field name="rgs_zzp"></field>
             <field name="rgs_bv"></field>
-            <field name="rgs_allowed_journals_code">MISC,ACCR</field>
+            <field name="rgs_allowed_journals_code">MISC,ACCR,WAG</field>
             <field name="rgs_allowed_journals_type">purchase</field>
             <field name="code_prefix_start">4205</field>
             <field name="code_prefix_end">4205</field>
@@ -3756,7 +3756,7 @@
             <field name="rgs_ez">1</field>
             <field name="rgs_zzp"></field>
             <field name="rgs_bv"></field>
-            <field name="rgs_allowed_journals_code">MISC,ACCR</field>
+            <field name="rgs_allowed_journals_code">MISC,ACCR,WAG</field>
             <field name="rgs_allowed_journals_type">purchase</field>
             <field name="code_prefix_start">4208</field>
             <field name="code_prefix_end">4208</field>
@@ -3792,7 +3792,7 @@
             <field name="rgs_ez">1</field>
             <field name="rgs_zzp">1</field>
             <field name="rgs_bv"></field>
-            <field name="rgs_allowed_journals_code">MISC,FCR,ACCR</field>
+            <field name="rgs_allowed_journals_code">MISC,FCR,ACCR,EXCH</field>
             <field name="rgs_allowed_journals_type">purchase,bank</field>
             <field name="code_prefix_start">4210</field>
             <field name="code_prefix_end">4210</field>
@@ -3882,7 +3882,7 @@
             <field name="rgs_ez">1</field>
             <field name="rgs_zzp">1</field>
             <field name="rgs_bv"></field>
-            <field name="rgs_allowed_journals_code">MISC,ACCR</field>
+            <field name="rgs_allowed_journals_code">MISC,ACCR,TAX</field>
             <field name="rgs_allowed_journals_type">purchase</field>
             <field name="code_prefix_start">4215</field>
             <field name="code_prefix_end">4215</field>
@@ -4384,7 +4384,7 @@
             <field name="rgs_basic">1</field>
             <field name="rgs_extended">1</field>
             <field name="rgs_ez">1</field>
-            <field name="rgs_zzp"></field>
+            <field name="rgs_zzp"> </field>
             <field name="rgs_bv"></field>
             <field name="rgs_allowed_journals_code">ACCR</field>
             <field name="rgs_allowed_journals_type"></field>
@@ -5484,7 +5484,7 @@
             <field name="rgs_ez">1</field>
             <field name="rgs_zzp"></field>
             <field name="rgs_bv"></field>
-            <field name="rgs_allowed_journals_code"></field>
+            <field name="rgs_allowed_journals_code">EXCH</field>
             <field name="rgs_allowed_journals_type"></field>
             <field name="code_prefix_start">8407</field>
             <field name="code_prefix_end">8407</field>
@@ -5940,6 +5940,5 @@
             <field name="code_prefix_end">99991</field>
             <field name="chart_template_id" ref="l10n_nl_rgs.l10nnl_rgs_chart_template"/>
             <field name="parent_id" ref="l10n_nl_rgs.account_group_90"/>
-        </record>
-    </data>
+        </record>   </data>
 </odoo>

l10n_nl_rgs/models/account_account.py

@@ -1,7 +1,7 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 # Copyright (C) 2016 Onestein (<http://www.onestein.eu>).
-from odoo import fields, models
+from odoo import api, fields, models
 
 
 class AccountAccount(models.Model):
@@ -13,13 +13,28 @@ class AccountAccount(models.Model):
     sort_code = fields.Char(string="Sorting code")
 
     def write(self, vals):
-        resp = super(AccountAccount, self).write(vals)
+        resp = super().write(vals)
 
         for rec in self.filtered(
             lambda acc: not acc.referentiecode
             and acc.group_id
             and acc.group_id.referentiecode
         ):
             rec.referentiecode = rec.group_id.referentiecode
-
+        if not self._context.get("group_allowed_journal_change"):
+            self.group_set_allowed_journals()
         return resp
+
+    def group_set_allowed_journals(self):
+        for rec in self:
+            if rec.group_id and rec.group_id.auto_allowed_journals:
+                rec.with_context(
+                    group_allowed_journal_change=True
+                ).allowed_journal_ids = rec.group_id.active_allowed_journal_ids
+
+    @api.model_create_multi
+    def create(self, vals_list):
+        records = super().create(vals_list)
+        if not self._context.get("group_allowed_journal_change"):
+            records.group_set_allowed_journals()
+        return records