[MIG] datev_export_dtvf: Migration to 18.0

hbrunn · hbrunn · commit 875dff48bb3c · 2026-01-19T17:32:25.000+01:00
diff --git a/datev_export_dtvf/__manifest__.py b/datev_export_dtvf/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "DATEV",
     "summary": "Export Data for DATEV (dtvf)",
-    "version": "15.0.2.0.0",
+    "version": "18.0.1.0.0",
     "development_status": "Beta",
     "category": "Accounting",
     "website": "https://github.com/OCA/l10n-germany",
@@ -20,6 +20,7 @@
         "security/ir.model.access.csv",
         "views/account_account.xml",
         "views/datev_export_dtvf.xml",
+        "views/res_config_settings.xml",
         "views/res_partner.xml",
     ],
 }
diff --git a/datev_export_dtvf/data/ir_cron.xml b/datev_export_dtvf/data/ir_cron.xml
@@ -3,7 +3,6 @@
         <field name="name">Monthly DATEV export via mail (dtvf)</field>
         <field name="interval_number">1</field>
         <field name="interval_type">months</field>
-        <field name="numbercall">-1</field>
         <field name="model_id" ref="model_datev_export_dtvf_export" />
         <field name="active" eval="False" />
         <field name="code">
diff --git a/datev_export_dtvf/datev.py b/datev_export_dtvf/datev.py
@@ -128,7 +128,7 @@ def _coerce_value(self, field, value):
         if field.length:
             value = str(value)[: field.length]
         if field.quote:
-            value = '"%s"' % str(value).replace('"', '""')
+            value = f'''"{str(value).replace('"', '""')}"'''
         return str(value)
 
     def writerow(self, row):
@@ -165,7 +165,7 @@ def __init__(
             account_code_length,
             period_start,
             period_end,
-            "Buchungsstapel %s" % period_start,
+            f"Buchungsstapel {period_start}",
             user_initials,
             currency,
             [
diff --git a/datev_export_dtvf/models/__init__.py b/datev_export_dtvf/models/__init__.py
@@ -2,4 +2,6 @@
 
 from . import account_account
 from . import datev_export_dtvf
+from . import res_company
+from . import res_config_settings
 from . import res_partner
diff --git a/datev_export_dtvf/models/account_account.py b/datev_export_dtvf/models/account_account.py
@@ -13,5 +13,6 @@ class AccountAccount(models.Model):
         "in DATEV.",
     )
     datev_code = fields.Char(
-        help="In case your COA codes don't work for DATEV, fill in an alternative code here"
+        help="In case your COA codes don't work for DATEV, fill in an alternative code "
+        "here"
     )
diff --git a/datev_export_dtvf/models/datev_export_dtvf.py b/datev_export_dtvf/models/datev_export_dtvf.py
@@ -22,26 +22,17 @@ class DatevExportDtvfExport(models.Model):
     fiscalyear_id = fields.Many2one(
         "date.range",
         string="Fiscal year",
-        states={"draft": [("required", True), ("readonly", False)]},
-        readonly=True,
-    )
-    name = fields.Char(
-        states={"draft": [("required", True), ("readonly", False)]},
-        readonly=True,
     )
+    name = fields.Char()
     fiscalyear_start = fields.Date(related="fiscalyear_id.date_start")
     fiscalyear_end = fields.Date(related="fiscalyear_id.date_end")
     period_ids = fields.Many2many(
         "date.range",
         string="Periods",
-        states={"draft": [("required", True), ("readonly", False)]},
-        readonly=True,
     )
     journal_ids = fields.Many2many(
         "account.journal",
         string="Journals",
-        states={"draft": [("readonly", False)]},
-        readonly=True,
     )
     date_generated = fields.Datetime("Generated at", readonly=True, copy=False)
     file_data = fields.Binary("Data", readonly=True, copy=False)
@@ -123,9 +114,8 @@ def action_generate(self):
                 for move in moves:
                     writer.writerows(this._get_data_transaction(move))
 
-                filename = (
-                    "EXTF_Buchungsstapel_%s.csv"
-                    % date_range.date_start.strftime("%Y%m%d")
+                filename = "EXTF_Buchungsstapel_{}.csv".format(
+                    date_range.date_start.strftime("%Y%m%d")
                 )
                 zip_file.writestr(filename, writer.buffer.getvalue())
 
@@ -146,7 +136,7 @@ def action_generate(self):
 
             accounts = self.env["account.account"].search(
                 [
-                    ("company_id", "=", this.company_id.id),
+                    ("company_ids", "=", this.company_id.id),
                 ]
             )
             writer = DatevAccountWriter(
@@ -178,7 +168,8 @@ def _get_data_transaction(self, move):
         move_line2amount = {
             move_line: move_line.credit or move_line.debit
             for move_line in move.line_ids
-            if not move_line.display_type and (move_line.debit or move_line.credit)
+            if not move_line.display_type.startswith("line_")
+            and (move_line.debit or move_line.credit)
         }
         currency = move.currency_id or move.company_id.currency_id
         code_length = move.company_id.datev_account_code_length
@@ -199,10 +190,13 @@ def _get_data_transaction(self, move):
                     if currency.is_zero(move_line2amount[move_line2]):
                         move_line2amount.pop(move_line2)
                     break
-            if move_line.account_id.internal_type not in (
-                "receivable",
-                "payable",
-            ) and move_line2.account_id.internal_type in ("receivable", "payable"):
+            if move_line.account_id.account_type not in (
+                "asset_receivable",
+                "liability_payable",
+            ) and move_line2.account_id.account_type in (
+                "asset_receivable",
+                "liability_payable",
+            ):
                 move_line, move_line2 = move_line2, move_line
             if move_line.account_id.datev_export_nonautomatic:
                 move_line, move_line2 = move_line2, move_line
@@ -215,10 +209,10 @@ def _get_data_transaction(self, move):
                     )
                     number_type = (
                         "customer"
-                        if ml.account_id.internal_type == "receivable"
+                        if ml.account_id.account_type == "asset_receivable"
                         else (
                             "supplier"
-                            if ml.account_id.internal_type == "payable"
+                            if ml.account_id.account_type == "liability_payable"
                             else None
                         )
                     )
@@ -231,7 +225,7 @@ def _get_data_transaction(self, move):
                     else:
                         offset_account_number = number
             data = {
-                "Umsatz (ohne Soll/Haben-Kz)": ("%.2f" % abs(amount)).replace(".", ","),
+                "Umsatz (ohne Soll/Haben-Kz)": f"{abs(amount):.2f}".replace(".", ","),
                 "Soll/Haben-Kennzeichen": move_line.debit and "S" or "H",
                 "Konto": account_number,
                 "Gegenkonto (ohne BU-Schlüssel)": offset_account_number,
@@ -259,33 +253,28 @@ def _get_data_transaction(self, move):
                 )[:1].name
                 or move.name,
                 "Belegfeld 2": move_line2.name,
-                "KOST1 - Kostenstelle": move_line.analytic_account_id.code
-                or move_line.analytic_account_id.name
-                or move_line2.analytic_account_id.code
-                or move_line2.analytic_account_id.name,
+                "KOST1 - Kostenstelle": move_line.analytic_line_ids[:1].account_id.code
+                or move_line.analytic_line_ids[:1].account_id.name
+                or move_line2.analytic_line_ids[:1].account_id.code
+                or move_line2.analytic_line_ids[:1].account_id.name,
                 "KOST-Datum": move.date.strftime("%d%m%Y"),
             }
             if move_line.amount_currency:
                 factor = abs(amount / (move_line.debit or move_line.credit))
+                rate = 1 / currency._get_conversion_rate(
+                    move_line.currency_id,
+                    currency,
+                    move.company_id,
+                    move.date,
+                )
                 data.update(
                     {
                         "Umsatz (ohne Soll/Haben-Kz)": (
-                            "%.2f" % abs(move_line.amount_currency * factor)
+                            f"{abs(move_line.amount_currency * factor):.2f}"
                         ).replace(".", ","),
                         "WKZ Umsatz": move_line.currency_id.name,
-                        "Kurs": (
-                            "%.6f"
-                            % (
-                                1
-                                / currency._get_conversion_rate(
-                                    move_line.currency_id,
-                                    currency,
-                                    move.company_id,
-                                    move.date,
-                                )
-                            )
-                        ).replace(".", ","),
-                        "Basis-Umsatz": ("%.2f" % abs(amount)).replace(".", ","),
+                        "Kurs": f"{rate:.6f}".replace(".", ","),
+                        "Basis-Umsatz": f"{abs(amount):.2f}".replace(".", ","),
                         "WKZ Basis-Umsatz": currency.name,
                     }
                 )
@@ -337,26 +326,27 @@ def _get_data_partner(self, partner):
     def _get_data_account(self, account):
         yield {
             "Konto": account.datev_code
-            or account.code[-account.company_id.datev_account_code_length :],
+            or account.code[-self.company_id.datev_account_code_length :],
             "Kontobeschriftung": account.name,
             "SprachId": self.env.user.lang.replace("_", "-"),
             "Kontenbeschriftung lang": account.name,
         }
 
     def _get_partner_number(self, partner, number_type, generate=False):
         if self.company_id.datev_partner_numbering == "sequence":
-            field_name = "l10n_de_datev_export_identifier_%s" % number_type
+            field_name = f"l10n_de_datev_export_identifier_{number_type}"
             if not partner[field_name] and generate:
                 getattr(
                     partner,
-                    "action_l10n_de_datev_export_identifier_%s" % number_type,
+                    f"action_l10n_de_datev_export_identifier_{number_type}",
                 )()
             return partner[field_name]
         elif self.company_id.datev_partner_numbering == "ee":
             account_length = self.env["account.general.ledger"]._get_account_length()
             return partner[
-                "l10n_de_datev_identifier%s"
-                % ("_customer" if number_type == "customer" else "")
+                "l10n_de_datev_identifier{}".format(
+                    "_customer" if number_type == "customer" else ""
+                )
             ] or str(
                 (1 if number_type == "customer" else 7) * 10**account_length
                 + partner.id
diff --git a/datev_export_dtvf/models/res_company.py b/datev_export_dtvf/models/res_company.py
@@ -0,0 +1,36 @@
+# Copyright 2026 Hunki Enterprises BV
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+from odoo import fields, models
+
+
+class ResCompany(models.Model):
+    _inherit = "res.company"
+
+    datev_account_code_length = fields.Integer(
+        "DATEV account code length",
+        default=5,
+    )
+
+    datev_partner_numbering = fields.Selection(
+        string="DATEV Partner numbering",
+        selection="_selection_datev_partner_numbering",
+        default="none",
+    )
+
+    datev_customer_sequence_id = fields.Many2one(
+        "ir.sequence", "DATEV sequence for customers"
+    )
+
+    datev_supplier_sequence_id = fields.Many2one(
+        "ir.sequence", "DATEV sequence for suppliers"
+    )
+
+    def _selection_datev_partner_numbering(self):
+        reports_installed = (
+            "l10n_de_datev_reports" in self.env["ir.module.module"]._installed()
+        )
+        return (
+            [("none", "None")]
+            + ([("ee", "Enterprises Edition")] if reports_installed else [])
+            + [("sequence", "Sequence")]
+        )
diff --git a/datev_export_dtvf/models/res_config_settings.py b/datev_export_dtvf/models/res_config_settings.py
@@ -0,0 +1,27 @@
+# Copyright 2026 Hunki Enterprises BV
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+from odoo import fields, models
+
+
+class ResConfigSettings(models.TransientModel):
+    _inherit = "res.config.settings"
+
+    datev_account_code_length = fields.Integer(
+        related="company_id.datev_account_code_length",
+        readonly=False,
+    )
+
+    datev_partner_numbering = fields.Selection(
+        related="company_id.datev_partner_numbering",
+        readonly=False,
+    )
+
+    datev_customer_sequence_id = fields.Many2one(
+        related="company_id.datev_customer_sequence_id",
+        readonly=False,
+    )
+
+    datev_supplier_sequence_id = fields.Many2one(
+        related="company_id.datev_supplier_sequence_id",
+        readonly=False,
+    )
diff --git a/datev_export_dtvf/tests/test_datev_export_dtvf.py b/datev_export_dtvf/tests/test_datev_export_dtvf.py
@@ -6,8 +6,11 @@
 import unittest
 import zipfile
 
+from dateutil.relativedelta import relativedelta
+
 from odoo.exceptions import ValidationError
-from odoo.tests.common import Form, TransactionCase, can_import
+from odoo.tests import Form
+from odoo.tests.common import TransactionCase, can_import
 
 
 class TestDatevExportDtvf(TransactionCase):
@@ -49,14 +52,14 @@ def setUp(self):
             {
                 "name": "Revenue",
                 "code": "424242",
-                "user_type_id": self.env.ref("account.data_account_type_revenue").id,
+                "account_type": "income",
             }
         )
         self.account2 = self.env["account.account"].create(
             {
                 "name": "Receivable",
                 "code": "424243",
-                "user_type_id": self.env.ref("account.data_account_type_receivable").id,
+                "account_type": "asset_receivable",
                 "reconcile": True,
             }
         )
@@ -134,7 +137,9 @@ def test_nonautomatic_flag(self):
                 self.assertIn('"40"', move_line)
 
     def test_move_line_without_account(self):
-        """Test that non-accounting (display_type!=False) lines don't crash the export"""
+        """
+        Test that non-accounting (display_type!=False) lines don't crash the export
+        """
         self.move.write(
             {
                 "line_ids": [
@@ -152,7 +157,7 @@ def test_move_line_without_account(self):
         self.move.action_post()
         self.wizard.action_generate()
 
-    def test_sequence(self):
+    def test_partner_numbering_sequence(self):
         """Test datev_partner_numbering = sequence"""
         self.wizard.company_id.datev_partner_numbering = "sequence"
         self.wizard.company_id.datev_customer_sequence_id = self.env[
@@ -187,3 +192,42 @@ def test_ee(self):
         self.customer.l10n_de_datev_identifier_customer = "424242"
         self.move.action_post()
         self.wizard.action_generate()
+
+    def test_cron(self):
+        """Test the cronjob"""
+        last_month = self.env["date.range"].create(
+            {
+                "name": "month range",
+                "type_id": self.env["date.range.type"]
+                .create(
+                    {
+                        "name": "test month type",
+                    }
+                )
+                .id,
+                "date_start": datetime.date.today() - relativedelta(months=1, day=1),
+                "date_end": datetime.date.today()
+                - relativedelta(months=1, day=1)
+                + relativedelta(months=1, days=-1),
+            }
+        )
+        self.env["date.range"].create(
+            {
+                "name": "year range",
+                "type_id": self.env["date.range.type"]
+                .create(
+                    {
+                        "name": "test year type",
+                    }
+                )
+                .id,
+                "date_start": last_month.date_start + relativedelta(month=1, day=1),
+                "date_end": last_month.date_start + relativedelta(month=12, day=31),
+            }
+        )
+        cronjob = self.env.ref("datev_export_dtvf.cron_export")
+
+        mails_before = self.env["mail.mail"].search([])
+        cronjob.ir_actions_server_id.run()
+        new_mail = self.env["mail.mail"].search([]) - mails_before
+        self.assertTrue(new_mail)
diff --git a/datev_export_dtvf/views/datev_export_dtvf.xml b/datev_export_dtvf/views/datev_export_dtvf.xml
diff --git a/datev_export_dtvf/views/res_config_settings.xml b/datev_export_dtvf/views/res_config_settings.xml
diff --git a/datev_export_dtvf/views/res_partner.xml b/datev_export_dtvf/views/res_partner.xml

Original file line number	Diff line number	Diff line change
`@@ -13,5 +13,6 @@ class AccountAccount(models.Model):`
`13`	`13`	`"in DATEV.",`
`14`	`14`	`)`
`15`	`15`	`datev_code = fields.Char(`
`16`		`- help="In case your COA codes don't work for DATEV, fill in an alternative code here"`
	`16`	`+ help="In case your COA codes don't work for DATEV, fill in an alternative code "`
	`17`	`+ "here"`
`17`	`18`	`)`