From f22258e4e5063737bc8dd1836173c07530c55d19 Mon Sep 17 00:00:00 2001
From: Frederik Jaeckel <frederik.jaeckel@m-ds.de>
Date: Thu, 20 Oct 2022 14:48:31 +0200
Subject: [PATCH 01/25] setup.py

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index d50543f..665fe3e 100644
--- a/setup.py
+++ b/setup.py
@@ -97,7 +97,7 @@ setup(name='%s_%s' % (PREFIX, MODULE),
     package_data={
         'trytond.modules.%s' % MODULE: (info.get('xml', [])
             + ['tryton.cfg', 'locale/*.po', 'tests/*.py',
-                'versiondep.txt', 'README.rst']),
+               'report/*.fodt', 'versiondep.txt', 'README.rst']),
         },
 
     install_requires=requires,

From 264bd66040686271254ab74d1477ab85ff9199b5 Mon Sep 17 00:00:00 2001
From: Frederik Jaeckel <frederik.jaeckel@m-ds.de>
Date: Thu, 20 Oct 2022 14:54:01 +0200
Subject: [PATCH 02/25] versiondep

---
 versiondep.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versiondep.txt b/versiondep.txt
index 8b13789..2d4cc49 100644
--- a/versiondep.txt
+++ b/versiondep.txt
@@ -1 +1 @@
-
+edocument_xrechnung;6.0.0;6.0.999;mds

From 150174f455a4f699bf6d465ce1b5a1bb66fca343 Mon Sep 17 00:00:00 2001
From: Frederik Jaeckel <frederik.jaeckel@m-ds.de>
Date: Thu, 20 Oct 2022 15:13:13 +0200
Subject: [PATCH 03/25] SETUP

---
 setup.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setup.py b/setup.py
index 665fe3e..01dbafc 100644
--- a/setup.py
+++ b/setup.py
@@ -97,6 +97,7 @@ setup(name='%s_%s' % (PREFIX, MODULE),
     package_data={
         'trytond.modules.%s' % MODULE: (info.get('xml', [])
             + ['tryton.cfg', 'locale/*.po', 'tests/*.py',
+                'view/*.xml',
                'report/*.fodt', 'versiondep.txt', 'README.rst']),
         },
 

From 2c6102054fe6036b99e7e0ee26e551beff45360d Mon Sep 17 00:00:00 2001
From: Frederik Jaeckel <frederik.jaeckel@m-ds.de>
Date: Thu, 20 Oct 2022 15:42:55 +0200
Subject: [PATCH 04/25] info bei nicht-festgeschriebener rechnung

---
 locale/en.po         |  4 ++++
 message.xml          | 13 +++++++++++++
 tryton.cfg           |  1 +
 view/wizard_form.xml |  1 +
 wizard_runreport.py  | 13 ++++++++++++-
 5 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 message.xml

diff --git a/locale/en.po b/locale/en.po
index 3e16682..5d9a36b 100644
--- a/locale/en.po
+++ b/locale/en.po
@@ -22,6 +22,10 @@ msgctxt "field:account_invoice_xrechnung.runrep.start,edocument:"
 msgid "Type"
 msgstr "Type"
 
+msgctxt "field:account_invoice_xrechnung.runrep.start,as_zip:"
+msgid "ZIP-File"
+msgstr "ZIP-File"
+
 msgctxt "model:account_invoice_xrechnung.runrep,name:"
 msgid "eDocument Export"
 msgstr "eDocument Export"
diff --git a/message.xml b/message.xml
new file mode 100644
index 0000000..6df4deb
--- /dev/null
+++ b/message.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!-- This file is part of the cashbook-module from m-ds for Tryton.
+The COPYRIGHT file at the top level of this repository contains the
+full copyright notices and license terms. -->
+<tryton>
+    <data>
+
+        <record model="ir.message" id="msg_invoice_must_posted">
+            <field name="text">Invoice '%(invname)s' must be posted.</field>
+        </record>
+
+    </data>
+</tryton>
diff --git a/tryton.cfg b/tryton.cfg
index ffc3e07..27e058c 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -5,5 +5,6 @@ depends:
     bank
     edocument_xrechnung
 xml:
+    message.xml
     wizard_runreport.xml
     xreport.xml
diff --git a/view/wizard_form.xml b/view/wizard_form.xml
index 10295d1..9ed0b0c 100644
--- a/view/wizard_form.xml
+++ b/view/wizard_form.xml
@@ -10,5 +10,6 @@ full copyright notices and license terms. -->
 
     <label name="as_zip"/>
     <field name="as_zip"/>
+    <field name="state"/>
 
 </form>
diff --git a/wizard_runreport.py b/wizard_runreport.py
index dc86ac7..a821963 100644
--- a/wizard_runreport.py
+++ b/wizard_runreport.py
@@ -6,6 +6,8 @@
 from trytond.model import ModelView, fields
 from trytond.wizard import Wizard, StateView, StateReport, Button
 from trytond.pool import Pool
+from trytond.exceptions import UserError
+from trytond.i18n import gettext
 from trytond.transaction import Transaction
 
 
@@ -20,13 +22,14 @@ edoc_versions = {
     }
 
 
-
 class RunXRechnungReportStart(ModelView):
     'eDocument Export'
     __name__ = 'account_invoice_xrechnung.runrep.start'
 
     invoice = fields.Many2One(string='Invoice', readonly=True,
         model_name='account.invoice', required=True)
+    state = fields.Char(string='State', readonly=True,
+        states={'invisible': True})
     edocument = fields.Selection(string='Type', required=True,
         selection=sel_edocument)
     as_zip = fields.Boolean(string='ZIP-File')
@@ -65,16 +68,24 @@ class RunXRechnungReport(Wizard):
         """ set defaults
         """
         context = Transaction().context
+        Invoice = Pool().get('account.invoice')
 
+        invoice = Invoice.browse([context.get('active_id', -1)])
         result = {
             'edocument': 'edocument.xrechnung.invoice',
             'invoice': context.get('active_id', -1),
+            'state': invoice[0].state if len(invoice) > 0 else '',
             }
         return result
 
     def do_export(self, action):
         """ run export
         """
+        if self.start.state != 'posted':
+            raise UserError(gettext(
+                'account_invoice_xrechnung.msg_invoice_must_posted',
+                invname = self.start.invoice.rec_name,
+                ))
         return action, {
             'invoice': self.start.invoice.id,
             'edocument': self.start.edocument,

From 605a36842676ab11880f1b4282ba28628ef4337b Mon Sep 17 00:00:00 2001
From: Frederik Jaeckel <frederik.jaeckel@m-ds.de>
Date: Tue, 4 Apr 2023 13:08:09 +0200
Subject: [PATCH 05/25] upgrade Tryton 6.6

---
 invoice.py            | 3 ++-
 tests/test_invoice.py | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/invoice.py b/invoice.py
index 05b5e6c..b2ae950 100644
--- a/invoice.py
+++ b/invoice.py
@@ -20,6 +20,7 @@ class InvoiceLine(metaclass=PoolMeta):
                 Eval('quantity', None) != None,
                 ),
             )
-        cls.unit.depends.extend(['type', 'quantity'])
+        cls.unit.depends.add('type')
+        cls.unit.depends.add('quantity')
 
 # end Invoice
diff --git a/tests/test_invoice.py b/tests/test_invoice.py
index 811b717..55b6051 100644
--- a/tests/test_invoice.py
+++ b/tests/test_invoice.py
@@ -17,3 +17,5 @@ class InvoiceTestCase(ModuleTestCase):
         pass
 
 # end InvoiceTestCase
+
+del ModuleTestCase

From 78f0c6e4e18ecf3c555a80f88c3eb3badfd084a7 Mon Sep 17 00:00:00 2001
From: Frederik Jaeckel <frederik.jaeckel@m-ds.de>
Date: Tue, 4 Apr 2023 13:08:53 +0200
Subject: [PATCH 06/25] versiondep

---
 versiondep.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versiondep.txt b/versiondep.txt
index 2d4cc49..7e6131c 100644
--- a/versiondep.txt
+++ b/versiondep.txt
@@ -1 +1 @@
-edocument_xrechnung;6.0.0;6.0.999;mds
+edocument_xrechnung;6.6.1;6.6.999;mds

From 7667a9b9b9bbda0b3f8771d5dbfbeac67dde1ac3 Mon Sep 17 00:00:00 2001
From: Frederik Jaeckel <frederik.jaeckel@m-ds.de>
Date: Fri, 30 Jun 2023 11:21:48 +0200
Subject: [PATCH 07/25] formatting

---
 __init__.py           |  7 ++---
 invoice.py            |  6 ++---
 setup.py              | 62 +++++++++++++++++++++++--------------------
 tests/__init__.py     | 17 +++++-------
 tests/test_invoice.py |  7 ++---
 wizard_runreport.py   | 13 ++++-----
 xreport.py            | 10 +++----
 7 files changed, 62 insertions(+), 60 deletions(-)

diff --git a/__init__.py b/__init__.py
index 8676653..cb86728 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,13 +1,14 @@
 # -*- coding: utf-8 -*-
-# This file is part of Tryton.
-# The COPYRIGHT file at the top level of this repository contains the
-# full copyright notices and license terms.
+# This file is part of the account-invoice-xrechnung-module
+# from m-ds for Tryton. The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
 
 from trytond.pool import Pool
 from .wizard_runreport import RunXRechnungReport, RunXRechnungReportStart
 from .invoice import InvoiceLine
 from .xreport import XReport
 
+
 def register():
     Pool.register(
         InvoiceLine,
diff --git a/invoice.py b/invoice.py
index b2ae950..108d7b0 100644
--- a/invoice.py
+++ b/invoice.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
-# This file is part of the cashbook-module from m-ds for Tryton.
-# The COPYRIGHT file at the top level of this repository contains the
-# full copyright notices and license terms.
+# This file is part of the account-invoice-xrechnung-module
+# from m-ds for Tryton. The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
 
 from trytond.pool import PoolMeta
 from trytond.pyson import Eval, And, Or
diff --git a/setup.py b/setup.py
index 01dbafc..a58ed01 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@
 """
 
 # Always prefer setuptools over distutils
-from setuptools import setup, find_packages
+from setuptools import setup
 # To use a consistent encoding
 from codecs import open
 from os import path
@@ -36,7 +36,7 @@ with open(path.join(here, 'versiondep.txt'), encoding='utf-8') as f:
         l2 = i.strip().split(';')
         if len(l2) < 4:
             continue
-        modversion[l2[0]] = {'min':l2[1], 'max':l2[2], 'prefix':l2[3]}
+        modversion[l2[0]] = {'min': l2[1], 'max': l2[2], 'prefix': l2[3]}
 
 # tryton-version
 major_version = 6
@@ -51,19 +51,21 @@ for dep in info.get('depends', []):
                 prefix = modversion[dep]['prefix']
 
             if len(modversion[dep]['max']) > 0:
-                requires.append('%s_%s >= %s, <= %s' %
-                    (prefix, dep, modversion[dep]['min'], modversion[dep]['max']))
-            else :
-                requires.append('%s_%s >= %s' %
-                    (prefix, dep, modversion[dep]['min']))
-        else :
-          requires.append('%s_%s >= %s.%s, < %s.%s' %
-                ('trytond', dep, major_version, minor_version,
+                requires.append('%s_%s >= %s, <= %s' % (
+                    prefix, dep, modversion[dep]['min'],
+                    modversion[dep]['max']))
+            else:
+                requires.append('%s_%s >= %s' % (
+                    prefix, dep, modversion[dep]['min']))
+        else:
+            requires.append('%s_%s >= %s.%s, < %s.%s' % (
+                'trytond', dep, major_version, minor_version,
                 major_version, minor_version + 1))
-requires.append('trytond >= %s.%s, < %s.%s' %
-        (major_version, minor_version, major_version, minor_version + 1))
+requires.append('trytond >= %s.%s, < %s.%s' % (
+    major_version, minor_version, major_version, minor_version + 1))
 
-setup(name='%s_%s' % (PREFIX, MODULE),
+setup(
+    name='%s_%s' % (PREFIX, MODULE),
     version=info.get('version', '0.0.1'),
     description='Tryton module to add xrechnung-export to invoice.',
     long_description=long_description,
@@ -72,21 +74,22 @@ setup(name='%s_%s' % (PREFIX, MODULE),
     author_email='service@m-ds.de',
     license='GPL-3',
     classifiers=[
-    'Development Status :: 5 - Production/Stable',
-    'Environment :: Plugins',
-    'Framework :: Tryton',
-    'Intended Audience :: Developers',
-    'Intended Audience :: Customer Service',
-    'Intended Audience :: Information Technology',
-    'Intended Audience :: Financial and Insurance Industry',
-    'Topic :: Office/Business',
-    'Topic :: Office/Business :: Financial :: Accounting',
-    'Natural Language :: German',
-    'Natural Language :: English',
-    'Operating System :: OS Independent',
-    'License :: OSI Approved :: GNU General Public License (GPL)',
-    'Programming Language :: Python :: 3.7',
-    'Programming Language :: Python :: 3.8',
+        'Development Status :: 5 - Production/Stable',
+        'Environment :: Plugins',
+        'Framework :: Tryton',
+        'Intended Audience :: Developers',
+        'Intended Audience :: Customer Service',
+        'Intended Audience :: Information Technology',
+        'Intended Audience :: Financial and Insurance Industry',
+        'Topic :: Office/Business',
+        'Topic :: Office/Business :: Financial :: Accounting',
+        'Natural Language :: German',
+        'Natural Language :: English',
+        'Operating System :: OS Independent',
+        'License :: OSI Approved :: GNU General Public License (GPL)',
+        'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
     ],
 
     keywords='tryton account invoice xrechnung edocument',
@@ -95,7 +98,8 @@ setup(name='%s_%s' % (PREFIX, MODULE),
         'trytond.modules.%s' % MODULE,
         ],
     package_data={
-        'trytond.modules.%s' % MODULE: (info.get('xml', [])
+        'trytond.modules.%s' % MODULE: (
+            info.get('xml', [])
             + ['tryton.cfg', 'locale/*.po', 'tests/*.py',
                 'view/*.xml',
                'report/*.fodt', 'versiondep.txt', 'README.rst']),
diff --git a/tests/__init__.py b/tests/__init__.py
index b936445..171049f 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,24 +1,19 @@
-# This file is part of Tryton.  The COPYRIGHT file at the top level of
+# -*- coding: utf-8 -*-
+# This file is part of the account-invoice-xrechnung-module
+# from m-ds for Tryton. The COPYRIGHT file at the top level of
 # this repository contains the full copyright notices and license terms.
 
 import trytond.tests.test_tryton
 import unittest
 
-from trytond.modules.account_invoice_xrechnung.tests.test_invoice import InvoiceTestCase
+from .test_invoice import InvoiceTestCase
 
 
 __all__ = ['suite']
 
 
-class XRechnungTestCase(\
-    InvoiceTestCase,\
-    ):
-    'Test xrechnung module'
-    module = 'account_invoice_xrechnung'
-
-# end XRechnungTestCase
-
 def suite():
     suite = trytond.tests.test_tryton.suite()
-    suite.addTests(unittest.TestLoader().loadTestsFromTestCase(XRechnungTestCase))
+    suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
+        InvoiceTestCase))
     return suite
diff --git a/tests/test_invoice.py b/tests/test_invoice.py
index 55b6051..a30b98f 100644
--- a/tests/test_invoice.py
+++ b/tests/test_invoice.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
-# This file is part of the cashbook-module from m-ds for Tryton.
-# The COPYRIGHT file at the top level of this repository contains the
-# full copyright notices and license terms.
+# This file is part of the account-invoice-xrechnung-module
+# from m-ds for Tryton. The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
 
 from trytond.tests.test_tryton import ModuleTestCase, with_transaction
 
@@ -18,4 +18,5 @@ class InvoiceTestCase(ModuleTestCase):
 
 # end InvoiceTestCase
 
+
 del ModuleTestCase
diff --git a/wizard_runreport.py b/wizard_runreport.py
index a821963..fb88f54 100644
--- a/wizard_runreport.py
+++ b/wizard_runreport.py
@@ -26,12 +26,13 @@ class RunXRechnungReportStart(ModelView):
     'eDocument Export'
     __name__ = 'account_invoice_xrechnung.runrep.start'
 
-    invoice = fields.Many2One(string='Invoice', readonly=True,
+    invoice = fields.Many2One(
+        string='Invoice', readonly=True,
         model_name='account.invoice', required=True)
-    state = fields.Char(string='State', readonly=True,
-        states={'invisible': True})
-    edocument = fields.Selection(string='Type', required=True,
-        selection=sel_edocument)
+    state = fields.Char(
+        string='State', readonly=True, states={'invisible': True})
+    edocument = fields.Selection(
+        string='Type', required=True, selection=sel_edocument)
     as_zip = fields.Boolean(string='ZIP-File')
 
     @classmethod
@@ -84,7 +85,7 @@ class RunXRechnungReport(Wizard):
         if self.start.state != 'posted':
             raise UserError(gettext(
                 'account_invoice_xrechnung.msg_invoice_must_posted',
-                invname = self.start.invoice.rec_name,
+                invname=self.start.invoice.rec_name,
                 ))
         return action, {
             'invoice': self.start.invoice.id,
diff --git a/xreport.py b/xreport.py
index fa129b2..7a17b06 100644
--- a/xreport.py
+++ b/xreport.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
-# This file is part of the cashbook-module from m-ds for Tryton.
-# The COPYRIGHT file at the top level of this repository contains the
-# full copyright notices and license terms.
+# This file is part of the account-invoice-xrechnung-module
+# from m-ds for Tryton. The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
 
 import zipfile
 from io import BytesIO
@@ -43,7 +43,7 @@ class XReport(Report):
                 },
                 max_length=100, word_boundary=True, save_order=True)
 
-        if data['as_zip'] == True:
+        if data['as_zip'] is True:
             return (
                 'zip',
                 cls.compress_as_zip('%(fname)s.%(ext)s' % {
@@ -52,7 +52,7 @@ class XReport(Report):
                     }, invoice_string),
                 False,
                 file_name)
-        else :
+        else:
             return ('xml', invoice_string, False, file_name)
 
 # end XReport

From b43135989cba0f844938f6caaa58094b6ac5253b Mon Sep 17 00:00:00 2001
From: Frederik Jaeckel <frederik.jaeckel@m-ds.de>
Date: Fri, 30 Jun 2023 11:29:53 +0200
Subject: [PATCH 08/25] formatting

---
 message.xml          | 6 +++---
 view/wizard_form.xml | 6 +++---
 wizard_runreport.py  | 6 +++---
 wizard_runreport.xml | 6 +++---
 xreport.xml          | 6 +++---
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/message.xml b/message.xml
index 6df4deb..25b841f 100644
--- a/message.xml
+++ b/message.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
-<!-- This file is part of the cashbook-module from m-ds for Tryton.
-The COPYRIGHT file at the top level of this repository contains the
-full copyright notices and license terms. -->
+<!-- This file is part of the account-invoice-xrechnung-module
+ from m-ds for Tryton. The COPYRIGHT file at the top level of
+ this repository contains the full copyright notices and license terms. -->
 <tryton>
     <data>
 
diff --git a/view/wizard_form.xml b/view/wizard_form.xml
index 9ed0b0c..684a77f 100644
--- a/view/wizard_form.xml
+++ b/view/wizard_form.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
-<!-- This file is part of the cashbook-module from m-ds for Tryton.
-The COPYRIGHT file at the top level of this repository contains the
-full copyright notices and license terms. -->
+<!-- This file is part of the account-invoice-xrechnung-module
+ from m-ds for Tryton. The COPYRIGHT file at the top level of
+ this repository contains the full copyright notices and license terms. -->
 <form col="4">
     <label name="invoice"/>
     <field name="invoice"/>
diff --git a/wizard_runreport.py b/wizard_runreport.py
index fb88f54..f1876a8 100644
--- a/wizard_runreport.py
+++ b/wizard_runreport.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
-# This file is part of the cashbook-module from m-ds for Tryton.
-# The COPYRIGHT file at the top level of this repository contains the
-# full copyright notices and license terms.
+# This file is part of the account-invoice-xrechnung-module
+# from m-ds for Tryton. The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
 
 from trytond.model import ModelView, fields
 from trytond.wizard import Wizard, StateView, StateReport, Button
diff --git a/wizard_runreport.xml b/wizard_runreport.xml
index ab92501..d279fdd 100644
--- a/wizard_runreport.xml
+++ b/wizard_runreport.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
-<!-- This file is part of the cashbook-module from m-ds for Tryton.
-The COPYRIGHT file at the top level of this repository contains the
-full copyright notices and license terms. -->
+<!-- This file is part of the account-invoice-xrechnung-module
+ from m-ds for Tryton. The COPYRIGHT file at the top level of
+ this repository contains the full copyright notices and license terms. -->
 <tryton>
     <data>
 
diff --git a/xreport.xml b/xreport.xml
index 07082c9..ded745c 100644
--- a/xreport.xml
+++ b/xreport.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
-<!-- This file is part of the cashbook-module from m-ds for Tryton.
-The COPYRIGHT file at the top level of this repository contains the
-full copyright notices and license terms. -->
+<!-- This file is part of the account-invoice-xrechnung-module
+ from m-ds for Tryton. The COPYRIGHT file at the top level of
+ this repository contains the full copyright notices and license terms. -->
 <tryton>
     <data>
 

From 1b66b0540bd0a00151f5c896e1f7fd7d469ab950 Mon Sep 17 00:00:00 2001
From: Frederik Jaeckel <frederik.jaeckel@m-ds.de>
Date: Fri, 30 Jun 2023 16:09:44 +0200
Subject: [PATCH 09/25] test: > 6.0

---
 tests/__init__.py | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/tests/__init__.py b/tests/__init__.py
index 171049f..5256907 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -2,18 +2,3 @@
 # This file is part of the account-invoice-xrechnung-module
 # from m-ds for Tryton. The COPYRIGHT file at the top level of
 # this repository contains the full copyright notices and license terms.
-
-import trytond.tests.test_tryton
-import unittest
-
-from .test_invoice import InvoiceTestCase
-
-
-__all__ = ['suite']
-
-
-def suite():
-    suite = trytond.tests.test_tryton.suite()
-    suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
-        InvoiceTestCase))
-    return suite

From 9306155e0506e307dd9a654da4e93e4a07195da0 Mon Sep 17 00:00:00 2001
From: Frederik Jaeckel <frederik.jaeckel@m-ds.de>
Date: Fri, 30 Jun 2023 16:13:07 +0200
Subject: [PATCH 10/25] Tryton 6.8: infos

---
 README.rst     | 7 ++++---
 setup.py       | 2 +-
 tryton.cfg     | 2 +-
 versiondep.txt | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/README.rst b/README.rst
index 0b8f8f0..03c97fa 100644
--- a/README.rst
+++ b/README.rst
@@ -9,11 +9,12 @@ pip install mds-account-invoice-xrechnung
 
 Requires
 ========
-- Tryton 6.0
+- Tryton 6.8
 
 Changes
 =======
 
-*6.0.0 - 18.10.2022*
+*6.8.3 - 30.06.2023*
 
-- init
+- compatiblity to Tryton 6.8
+- code optimized
diff --git a/setup.py b/setup.py
index a58ed01..fce9670 100644
--- a/setup.py
+++ b/setup.py
@@ -40,7 +40,7 @@ with open(path.join(here, 'versiondep.txt'), encoding='utf-8') as f:
 
 # tryton-version
 major_version = 6
-minor_version = 0
+minor_version = 8
 
 requires = ['python-slugify']
 for dep in info.get('depends', []):
diff --git a/tryton.cfg b/tryton.cfg
index 27e058c..93c8304 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=6.0.0
+version=6.8.3
 depends:
     account_invoice
     bank
diff --git a/versiondep.txt b/versiondep.txt
index 7e6131c..0785719 100644
--- a/versiondep.txt
+++ b/versiondep.txt
@@ -1 +1 @@
-edocument_xrechnung;6.6.1;6.6.999;mds
+edocument_xrechnung;6.8.2;6.8.999;mds

From c0bfe61f9211cffbb8284c1f19f7d21250234e56 Mon Sep 17 00:00:00 2001
From: Frederik Jaeckel <frederik.jaeckel@m-ds.de>
Date: Fri, 22 Dec 2023 15:12:39 +0100
Subject: [PATCH 11/25] Tryton 7.0

---
 README.rst     | 7 +++----
 setup.py       | 4 ++--
 tryton.cfg     | 2 +-
 versiondep.txt | 2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/README.rst b/README.rst
index 03c97fa..0aac6c8 100644
--- a/README.rst
+++ b/README.rst
@@ -9,12 +9,11 @@ pip install mds-account-invoice-xrechnung
 
 Requires
 ========
-- Tryton 6.8
+- Tryton 7.0
 
 Changes
 =======
 
-*6.8.3 - 30.06.2023*
+*7.0.0 - 22.12.2023*
 
-- compatiblity to Tryton 6.8
-- code optimized
+- compatiblity to Tryton 7.0
diff --git a/setup.py b/setup.py
index fce9670..d97bb36 100644
--- a/setup.py
+++ b/setup.py
@@ -39,8 +39,8 @@ with open(path.join(here, 'versiondep.txt'), encoding='utf-8') as f:
         modversion[l2[0]] = {'min': l2[1], 'max': l2[2], 'prefix': l2[3]}
 
 # tryton-version
-major_version = 6
-minor_version = 8
+major_version = 7
+minor_version = 0
 
 requires = ['python-slugify']
 for dep in info.get('depends', []):
diff --git a/tryton.cfg b/tryton.cfg
index 93c8304..8e71a4a 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=6.8.3
+version=7.0.0
 depends:
     account_invoice
     bank
diff --git a/versiondep.txt b/versiondep.txt
index 0785719..32b59fc 100644
--- a/versiondep.txt
+++ b/versiondep.txt
@@ -1 +1 @@
-edocument_xrechnung;6.8.2;6.8.999;mds
+edocument_xrechnung;7.0.3;7.0.999;mds

From 3ed35309838d4bdf621a709d4eeafbd1401ab9c5 Mon Sep 17 00:00:00 2001
From: Frederik Jaeckel <frederik.jaeckel@m-ds.de>
Date: Thu, 21 Nov 2024 14:25:46 +0100
Subject: [PATCH 12/25] update gitignore

---
 .env                    | 1 +
 .hgignore => .gitignore | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 .env
 rename .hgignore => .gitignore (87%)

diff --git a/.env b/.env
new file mode 100644
index 0000000..d0efcdf
--- /dev/null
+++ b/.env
@@ -0,0 +1 @@
+PYTHONPATH=~/Projekte/tr70/lib/python3.10/site-packages
\ No newline at end of file
diff --git a/.hgignore b/.gitignore
similarity index 87%
rename from .hgignore
rename to .gitignore
index 796d378..e349607 100644
--- a/.hgignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-syntax: glob
+*.pyc
 build/*
 dist/*
 mds_account_invoice_xrechnung.egg-info/*

From 38295dec3573a7ac932edb10e5adf987b1a92ebe Mon Sep 17 00:00:00 2001
From: Frederik Jaeckel <frederik.jaeckel@m-ds.de>
Date: Thu, 21 Nov 2024 14:34:10 +0100
Subject: [PATCH 13/25] file info

---
 setup.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/setup.py b/setup.py
index d97bb36..3d2ee45 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,8 @@
-""" Tryton module to add xrechnung-export to invoice
-"""
+# -*- coding: utf-8 -*-
+# This file is part of the account-invoice-xrechnung-module
+# from m-ds for Tryton. The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
 
-# Always prefer setuptools over distutils
 from setuptools import setup
 # To use a consistent encoding
 from codecs import open

From 2dac79debe15513e3a1fc95e4c626262b1c49a51 Mon Sep 17 00:00:00 2001
From: Frederik Jaeckel <frederik.jaeckel@m-ds.de>
Date: Thu, 21 Nov 2024 14:34:17 +0100
Subject: [PATCH 14/25] formatting

---
 invoice.py          |  9 +++------
 setup.py            |  9 ++-------
 wizard_runreport.py | 15 +++++----------
 xreport.py          |  7 +++----
 4 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/invoice.py b/invoice.py
index 108d7b0..bbdeca2 100644
--- a/invoice.py
+++ b/invoice.py
@@ -4,7 +4,7 @@
 # this repository contains the full copyright notices and license terms.
 
 from trytond.pool import PoolMeta
-from trytond.pyson import Eval, And, Or
+from trytond.pyson import Eval, And, Or, Bool
 
 
 class InvoiceLine(metaclass=PoolMeta):
@@ -17,10 +17,7 @@ class InvoiceLine(metaclass=PoolMeta):
             cls.unit.states['required'],
             And(
                 Eval('type') == 'line',
-                Eval('quantity', None) != None,
-                ),
-            )
-        cls.unit.depends.add('type')
-        cls.unit.depends.add('quantity')
+                Bool(Eval('quantity'))))
+        cls.unit.depends.update(['type', 'quantity'])
 
 # end Invoice
diff --git a/setup.py b/setup.py
index 3d2ee45..fa92fb4 100644
--- a/setup.py
+++ b/setup.py
@@ -4,14 +4,10 @@
 # this repository contains the full copyright notices and license terms.
 
 from setuptools import setup
-# To use a consistent encoding
 from codecs import open
 from os import path
 import re
-try:
-    from configparser import ConfigParser
-except ImportError:
-    from ConfigParser import ConfigParser
+from configparser import ConfigParser
 
 here = path.abspath(path.dirname(__file__))
 MODULE = 'account_invoice_xrechnung'
@@ -21,7 +17,6 @@ PREFIX = 'mds'
 with open(path.join(here, 'README.rst'), encoding='utf-8') as f:
     long_description = f.read()
 
-# tryton.cfg einlesen
 config = ConfigParser()
 config.readfp(open('tryton.cfg'))
 info = dict(config.items('tryton'))
@@ -88,9 +83,9 @@ setup(
         'Natural Language :: English',
         'Operating System :: OS Independent',
         'License :: OSI Approved :: GNU General Public License (GPL)',
-        'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
     ],
 
     keywords='tryton account invoice xrechnung edocument',
diff --git a/wizard_runreport.py b/wizard_runreport.py
index f1876a8..79977f4 100644
--- a/wizard_runreport.py
+++ b/wizard_runreport.py
@@ -18,8 +18,7 @@ sel_edocument = [
 
 edoc_versions = {
     'edocument.xrechnung.invoice': 'XRechnung-2.2',
-    'edocument.uncefact.invoice': '16B-CII',
-    }
+    'edocument.uncefact.invoice': '16B-CII'}
 
 
 class RunXRechnungReportStart(ModelView):
@@ -62,8 +61,7 @@ class RunXRechnungReport(Wizard):
         buttons=[
             Button(string='Cancel', state='end', icon='tryton-cancel'),
             Button(string='Export', state='export', icon='tryton-export'),
-            ],
-        )
+            ])
 
     def default_start(self, fields):
         """ set defaults
@@ -75,8 +73,7 @@ class RunXRechnungReport(Wizard):
         result = {
             'edocument': 'edocument.xrechnung.invoice',
             'invoice': context.get('active_id', -1),
-            'state': invoice[0].state if len(invoice) > 0 else '',
-            }
+            'state': invoice[0].state if invoice else ''}
         return result
 
     def do_export(self, action):
@@ -85,12 +82,10 @@ class RunXRechnungReport(Wizard):
         if self.start.state != 'posted':
             raise UserError(gettext(
                 'account_invoice_xrechnung.msg_invoice_must_posted',
-                invname=self.start.invoice.rec_name,
-                ))
+                invname=self.start.invoice.rec_name))
         return action, {
             'invoice': self.start.invoice.id,
             'edocument': self.start.edocument,
-            'as_zip': self.start.as_zip,
-            }
+            'as_zip': self.start.as_zip}
 
 # end RunXRechnungReport
diff --git a/xreport.py b/xreport.py
index 7a17b06..a62acbc 100644
--- a/xreport.py
+++ b/xreport.py
@@ -38,10 +38,9 @@ class XReport(Report):
         invoice_string = template.render(edoc_versions[data['edocument']])
 
         file_name = slugify('%(date)s-%(descr)s' % {
-                'date': IrDate.today().isoformat().replace('-', ''),
-                'descr': invoice.rec_name,
-                },
-                max_length=100, word_boundary=True, save_order=True)
+            'date': IrDate.today().isoformat().replace('-', ''),
+            'descr': invoice.rec_name},
+            max_length=100, word_boundary=True, save_order=True)
 
         if data['as_zip'] is True:
             return (

From eda721690701cd23e7f1a69e9e15495ee67d0007 Mon Sep 17 00:00:00 2001
From: Frederik Jaeckel <frederik.jaeckel@m-ds.de>
Date: Thu, 5 Dec 2024 11:28:44 +0100
Subject: [PATCH 15/25] export of xrechnung 2.2 + 2.3 + 3.0

---
 locale/de.po        | 16 ++++++++++++++++
 locale/en.po        | 20 ++++++++++++++++++++
 wizard_runreport.py | 16 +++++++++++-----
 xreport.py          |  2 +-
 4 files changed, 48 insertions(+), 6 deletions(-)

diff --git a/locale/de.po b/locale/de.po
index e877610..92b2ed1 100644
--- a/locale/de.po
+++ b/locale/de.po
@@ -30,6 +30,22 @@ msgctxt "field:account_invoice_xrechnung.runrep.start,edocument:"
 msgid "Type"
 msgstr "Typ"
 
+msgctxt "selection:account_invoice_xrechnung.runrep.start,edocument:"
+msgid "XRechnung UBL Invoice 2.2"
+msgstr "XRechnung UBL Invoice 2.2"
+
+msgctxt "selection:account_invoice_xrechnung.runrep.start,edocument:"
+msgid "XRechnung UBL Invoice 2.3"
+msgstr "XRechnung UBL Invoice 2.3"
+
+msgctxt "selection:account_invoice_xrechnung.runrep.start,edocument:"
+msgid "XRechnung UBL Invoice 3.0"
+msgstr "XRechnung UBL Invoice 3.0"
+
+msgctxt "selection:account_invoice_xrechnung.runrep.start,edocument:"
+msgid "CII CrossIndustryInvoice D16B"
+msgstr "CII CrossIndustryInvoice D16B"
+
 msgctxt "field:account_invoice_xrechnung.runrep.start,as_zip:"
 msgid "ZIP-File"
 msgstr "ZIP-Datei"
diff --git a/locale/en.po b/locale/en.po
index 5d9a36b..cd77d2b 100644
--- a/locale/en.po
+++ b/locale/en.po
@@ -22,6 +22,22 @@ msgctxt "field:account_invoice_xrechnung.runrep.start,edocument:"
 msgid "Type"
 msgstr "Type"
 
+msgctxt "selection:account_invoice_xrechnung.runrep.start,edocument:"
+msgid "XRechnung UBL Invoice 2.2"
+msgstr "XRechnung UBL Invoice 2.2"
+
+msgctxt "selection:account_invoice_xrechnung.runrep.start,edocument:"
+msgid "XRechnung UBL Invoice 2.3"
+msgstr "XRechnung UBL Invoice 2.3"
+
+msgctxt "selection:account_invoice_xrechnung.runrep.start,edocument:"
+msgid "XRechnung UBL Invoice 3.0"
+msgstr "XRechnung UBL Invoice 3.0"
+
+msgctxt "selection:account_invoice_xrechnung.runrep.start,edocument:"
+msgid "CII CrossIndustryInvoice D16B"
+msgstr "CII CrossIndustryInvoice D16B"
+
 msgctxt "field:account_invoice_xrechnung.runrep.start,as_zip:"
 msgid "ZIP-File"
 msgstr "ZIP-File"
@@ -38,3 +54,7 @@ msgctxt "wizard_button:account_invoice_xrechnung.runrep,start,export:"
 msgid "Export"
 msgstr "Export"
 
+msgctxt "model:account_invoice_xrechnung.export,name:"
+msgid "eDocument Export"
+msgstr "eDocument Export"
+
diff --git a/wizard_runreport.py b/wizard_runreport.py
index 79977f4..d182832 100644
--- a/wizard_runreport.py
+++ b/wizard_runreport.py
@@ -12,12 +12,16 @@ from trytond.transaction import Transaction
 
 
 sel_edocument = [
-    ('edocument.xrechnung.invoice', 'XRechnung UBL Invoice 2.1.1'),
+    ('edocument.xrechnung.invoice-2.2', 'XRechnung UBL Invoice 2.2'),
+    ('edocument.xrechnung.invoice-2.3', 'XRechnung UBL Invoice 2.3'),
+    ('edocument.xrechnung.invoice-3.0', 'XRechnung UBL Invoice 3.0'),
     ('edocument.uncefact.invoice', 'CII CrossIndustryInvoice D16B'),
     ]
 
 edoc_versions = {
-    'edocument.xrechnung.invoice': 'XRechnung-2.2',
+    'edocument.xrechnung.invoice-2.2': 'XRechnung-2.2',
+    'edocument.xrechnung.invoice-2.3': 'XRechnung-2.3',
+    'edocument.xrechnung.invoice-3.0': 'XRechnung-3.0',
     'edocument.uncefact.invoice': '16B-CII'}
 
 
@@ -44,7 +48,7 @@ class RunXRechnungReportStart(ModelView):
     def default_edocument(cls):
         """ default xrechnung
         """
-        return 'edocument.xrechnung.invoice'
+        return 'edocument.xrechnung.invoice-3.0'
 
 # end RunXRechnungReportStart
 
@@ -67,11 +71,13 @@ class RunXRechnungReport(Wizard):
         """ set defaults
         """
         context = Transaction().context
-        Invoice = Pool().get('account.invoice')
+        pool = Pool()
+        Invoice = pool.get('account.invoice')
+        WizRepStart = pool.get('account_invoice_xrechnung.runrep.start')
 
         invoice = Invoice.browse([context.get('active_id', -1)])
         result = {
-            'edocument': 'edocument.xrechnung.invoice',
+            'edocument': WizRepStart.default_edocument(),
             'invoice': context.get('active_id', -1),
             'state': invoice[0].state if invoice else ''}
         return result
diff --git a/xreport.py b/xreport.py
index a62acbc..4d68e82 100644
--- a/xreport.py
+++ b/xreport.py
@@ -31,7 +31,7 @@ class XReport(Report):
         pool = Pool()
         IrDate = pool.get('ir.date')
         Invoice = pool.get('account.invoice')
-        EDocument = pool.get(data['edocument'])
+        EDocument = pool.get(data['edocument'].split('-')[0])
 
         invoice, = Invoice.browse([data['invoice']])
         template = EDocument(invoice)

From 4cceb26875bbba0999a5206ee4b07c3f01f4ac9a Mon Sep 17 00:00:00 2001
From: Frederik Jaeckel <frederik.jaeckel@m-ds.de>
Date: Thu, 5 Dec 2024 17:31:45 +0100
Subject: [PATCH 16/25] configuration for pdf-invoice

---
 __init__.py                 |  3 +++
 configuration.py            | 48 +++++++++++++++++++++++++++++++++++++
 configuration.xml           | 15 ++++++++++++
 locale/de.po                | 32 +++++++++++++++++++++++++
 locale/en.po                | 23 ++++++++++++++++++
 tryton.cfg                  |  1 +
 view/configuration_form.xml | 16 +++++++++++++
 7 files changed, 138 insertions(+)
 create mode 100644 configuration.py
 create mode 100644 configuration.xml
 create mode 100644 view/configuration_form.xml

diff --git a/__init__.py b/__init__.py
index cb86728..f5712e6 100644
--- a/__init__.py
+++ b/__init__.py
@@ -7,10 +7,13 @@ from trytond.pool import Pool
 from .wizard_runreport import RunXRechnungReport, RunXRechnungReportStart
 from .invoice import InvoiceLine
 from .xreport import XReport
+from .configuration import ConfigurationXRechnungexport, Configuration
 
 
 def register():
     Pool.register(
+        Configuration,
+        ConfigurationXRechnungexport,
         InvoiceLine,
         RunXRechnungReportStart,
         module='account_invoice_xrechnung', type_='model')
diff --git a/configuration.py b/configuration.py
new file mode 100644
index 0000000..b308c5e
--- /dev/null
+++ b/configuration.py
@@ -0,0 +1,48 @@
+# -*- coding: utf-8 -*-
+# This file is part of the account-invoice-xrechnung-module
+# from m-ds for Tryton. The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
+
+
+from trytond.pool import PoolMeta, Pool
+from trytond.model import ModelSQL, fields
+from trytond.modules.company.model import CompanyValueMixin
+
+
+class Configuration(metaclass=PoolMeta):
+    __name__ = 'account.configuration'
+
+    xrechn_zugferd_report = fields.MultiValue(fields.Many2One(
+        model_name='ir.action.report',
+        domain=[
+            ('model', '=', 'account.invoice'),
+            ('extension', '=', 'pdf')],
+        string='ZUGFeRD-Report',
+        help='Report that is to be used to generate the ZUGFeRD PDF.'))
+
+    @classmethod
+    def multivalue_model(cls, field):
+        """ select table
+        """
+        pool = Pool()
+        if field in {
+                'xrechn_zugferd_report'}:
+            return pool.get('account_invoice_xrechnung.configuration')
+        return super(Configuration, cls).multivalue_model(field)
+
+# end Configuration
+
+
+class ConfigurationXRechnungexport(ModelSQL, CompanyValueMixin):
+    "Account Configuration XRechnung Export"
+    __name__ = 'account_invoice_xrechnung.configuration'
+
+    xrechn_zugferd_report = fields.Many2One(
+        model_name='ir.action.report',
+        string='ZUGFeRD-Report',
+        domain=[
+            ('model', '=', 'account.invoice'),
+            ('extension', '=', 'pdf')],
+        help='Report that is to be used to generate the ZUGFeRD PDF.')
+
+# end ConfigurationXRechnungexport
diff --git a/configuration.xml b/configuration.xml
new file mode 100644
index 0000000..fdcbe15
--- /dev/null
+++ b/configuration.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!-- This file is part of the account-invoice-xrechnung-module
+ from m-ds for Tryton. The COPYRIGHT file at the top level of
+ this repository contains the full copyright notices and license terms. -->
+<tryton>
+    <data>
+
+        <record model="ir.ui.view" id="configuration_view_form">
+            <field name="model">account.configuration</field>
+            <field name="inherit" ref="account.configuration_view_form"/>
+            <field name="name">configuration_form</field>
+        </record>
+
+    </data>
+</tryton>
diff --git a/locale/de.po b/locale/de.po
index 92b2ed1..00f6e09 100644
--- a/locale/de.po
+++ b/locale/de.po
@@ -73,3 +73,35 @@ msgstr "Export"
 msgctxt "model:account_invoice_xrechnung.export,name:"
 msgid "eDocument Export"
 msgstr "eDocument Export"
+
+
+#########################
+# account.configuration #
+#########################
+msgctxt "view:account.configuration:"
+msgid "ZUGFeRD - e-Invoice"
+msgstr "ZUGFeRD - e-Rechnung"
+
+msgctxt "field:account.configuration,xrechn_zugferd_report:"
+msgid "ZUGFeRD-Report"
+msgstr "ZUGFeRD-Report"
+
+msgctxt "help:account.configuration,xrechn_zugferd_report:"
+msgid "Report that is to be used to generate the ZUGFeRD PDF."
+msgstr "Report, welcher zum erzeugen der ZUGFeRD-PDF verwendet werden soll."
+
+
+###########################################
+# account_invoice_xrechnung.configuration #
+###########################################
+msgctxt "model:account_invoice_xrechnung.configuration:"
+msgid "Account Configuration XRechnung Export"
+msgstr "Buchhaltung Konfiguration XRechnung Export"
+
+msgctxt "field:account_invoice_xrechnung.configuration,xrechn_zugferd_report:"
+msgid "ZUGFeRD-Report"
+msgstr "ZUGFeRD-Report"
+
+msgctxt "help:account_invoice_xrechnung.configuration,xrechn_zugferd_report:"
+msgid "Report that is to be used to generate the ZUGFeRD PDF."
+msgstr "Report, welcher zum erzeugen der ZUGFeRD-PDF verwendet werden soll."
diff --git a/locale/en.po b/locale/en.po
index cd77d2b..c6ad0ce 100644
--- a/locale/en.po
+++ b/locale/en.po
@@ -58,3 +58,26 @@ msgctxt "model:account_invoice_xrechnung.export,name:"
 msgid "eDocument Export"
 msgstr "eDocument Export"
 
+msgctxt "view:account.configuration:"
+msgid "ZUGFeRD - e-Invoice"
+msgstr "ZUGFeRD - e-Invoice"
+
+msgctxt "field:account.configuration,xrechn_zugferd_report:"
+msgid "ZUGFeRD-Report"
+msgstr "ZUGFeRD-Report"
+
+msgctxt "help:account.configuration,xrechn_zugferd_report:"
+msgid "Report that is to be used to generate the ZUGFeRD PDF."
+msgstr "Report that is to be used to generate the ZUGFeRD PDF."
+
+msgctxt "model:account_invoice_xrechnung.configuration:"
+msgid "Account Configuration XRechnung Export"
+msgstr "Account Configuration XRechnung Export"
+
+msgctxt "field:account_invoice_xrechnung.configuration,xrechn_zugferd_report:"
+msgid "ZUGFeRD-Report"
+msgstr "ZUGFeRD-Report"
+
+msgctxt "help:account_invoice_xrechnung.configuration,xrechn_zugferd_report:"
+msgid "Report that is to be used to generate the ZUGFeRD PDF."
+msgstr "Report that is to be used to generate the ZUGFeRD PDF."
diff --git a/tryton.cfg b/tryton.cfg
index 8e71a4a..272e243 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -6,5 +6,6 @@ depends:
     edocument_xrechnung
 xml:
     message.xml
+    configuration.xml
     wizard_runreport.xml
     xreport.xml
diff --git a/view/configuration_form.xml b/view/configuration_form.xml
new file mode 100644
index 0000000..94b22b3
--- /dev/null
+++ b/view/configuration_form.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!-- This file is part of the account-datev-module from m-ds for Tryton.
+ The COPYRIGHT file at the top level of this repository contains the
+ full copyright notices and license terms. -->
+<data>
+
+    <xpath expr="/form/separator[@id='currency_exchange']" position="before">
+
+        <separator id="xrechnung" colspan="4" string="ZUGFeRD - e-Invoice"/>
+        <label name="xrechn_zugferd_report"/>
+        <field name="xrechn_zugferd_report"/>
+        <newline/>
+
+    </xpath>
+
+</data>

From 3385e55c639a7ca5f32fb55c494140a19207948f Mon Sep 17 00:00:00 2001
From: Frederik Jaeckel <frederik.jaeckel@m-ds.de>
Date: Thu, 5 Dec 2024 17:32:40 +0100
Subject: [PATCH 17/25] add selection for factur-x

---
 locale/de.po        | 8 ++++++++
 locale/en.po        | 8 ++++++++
 setup.py            | 2 +-
 versiondep.txt      | 2 +-
 wizard_runreport.py | 4 ++++
 5 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/locale/de.po b/locale/de.po
index 00f6e09..ff22ba4 100644
--- a/locale/de.po
+++ b/locale/de.po
@@ -46,6 +46,14 @@ msgctxt "selection:account_invoice_xrechnung.runrep.start,edocument:"
 msgid "CII CrossIndustryInvoice D16B"
 msgstr "CII CrossIndustryInvoice D16B"
 
+msgctxt "selection:account_invoice_xrechnung.runrep.start,edocument:"
+msgid "Factur-X Extended"
+msgstr "Factur-X Extended"
+
+msgctxt "selection:account_invoice_xrechnung.runrep.start,edocument:"
+msgid "ZUGFeRD 2.3.2"
+msgstr "ZUGFeRD 2.3.2"
+
 msgctxt "field:account_invoice_xrechnung.runrep.start,as_zip:"
 msgid "ZIP-File"
 msgstr "ZIP-Datei"
diff --git a/locale/en.po b/locale/en.po
index c6ad0ce..ad72eda 100644
--- a/locale/en.po
+++ b/locale/en.po
@@ -38,6 +38,14 @@ msgctxt "selection:account_invoice_xrechnung.runrep.start,edocument:"
 msgid "CII CrossIndustryInvoice D16B"
 msgstr "CII CrossIndustryInvoice D16B"
 
+msgctxt "selection:account_invoice_xrechnung.runrep.start,edocument:"
+msgid "Factur-X Extended"
+msgstr "Factur-X Extended"
+
+msgctxt "selection:account_invoice_xrechnung.runrep.start,edocument:"
+msgid "ZUGFeRD 2.3.2"
+msgstr "ZUGFeRD 2.3.2"
+
 msgctxt "field:account_invoice_xrechnung.runrep.start,as_zip:"
 msgid "ZIP-File"
 msgstr "ZIP-File"
diff --git a/setup.py b/setup.py
index fa92fb4..645635e 100644
--- a/setup.py
+++ b/setup.py
@@ -38,7 +38,7 @@ with open(path.join(here, 'versiondep.txt'), encoding='utf-8') as f:
 major_version = 7
 minor_version = 0
 
-requires = ['python-slugify']
+requires = ['python-slugify', 'pypdf', 'factur-x']
 for dep in info.get('depends', []):
     if not re.match(r'(ir|res|webdav)(\W|$)', dep):
         if dep in modversion.keys():
diff --git a/versiondep.txt b/versiondep.txt
index 32b59fc..258b3ff 100644
--- a/versiondep.txt
+++ b/versiondep.txt
@@ -1 +1 @@
-edocument_xrechnung;7.0.3;7.0.999;mds
+edocument_xrechnung;7.0.5;7.0.999;mds
diff --git a/wizard_runreport.py b/wizard_runreport.py
index d182832..f84f2a8 100644
--- a/wizard_runreport.py
+++ b/wizard_runreport.py
@@ -15,6 +15,8 @@ sel_edocument = [
     ('edocument.xrechnung.invoice-2.2', 'XRechnung UBL Invoice 2.2'),
     ('edocument.xrechnung.invoice-2.3', 'XRechnung UBL Invoice 2.3'),
     ('edocument.xrechnung.invoice-3.0', 'XRechnung UBL Invoice 3.0'),
+    ('edocument.facturxext.invoice', 'Factur-X Extended'),
+    ('edocument.facturxext.invoice-ferd', 'ZUGFeRD 2.3.2'),
     ('edocument.uncefact.invoice', 'CII CrossIndustryInvoice D16B'),
     ]
 
@@ -22,6 +24,8 @@ edoc_versions = {
     'edocument.xrechnung.invoice-2.2': 'XRechnung-2.2',
     'edocument.xrechnung.invoice-2.3': 'XRechnung-2.3',
     'edocument.xrechnung.invoice-3.0': 'XRechnung-3.0',
+    'edocument.facturxext.invoice': 'Factur-X-1.07.2-extended',
+    'edocument.facturxext.invoice-ferd': 'Factur-X-1.07.2-extended',
     'edocument.uncefact.invoice': '16B-CII'}
 
 

From 34f3922a44bfe27d787e50b4ef71dddc7a9907cd Mon Sep 17 00:00:00 2001
From: Frederik Jaeckel <frederik.jaeckel@m-ds.de>
Date: Thu, 5 Dec 2024 17:32:56 +0100
Subject: [PATCH 18/25] prepare zugferd

---
 tests/test_invoice.py | 136 ++++++++++++++++++++++++++++++++++++++++--
 xreport.py            |  27 +++++++--
 2 files changed, 155 insertions(+), 8 deletions(-)

diff --git a/tests/test_invoice.py b/tests/test_invoice.py
index a30b98f..9ecaf34 100644
--- a/tests/test_invoice.py
+++ b/tests/test_invoice.py
@@ -3,18 +3,146 @@
 # from m-ds for Tryton. The COPYRIGHT file at the top level of
 # this repository contains the full copyright notices and license terms.
 
+from decimal import Decimal
+from datetime import date
 from trytond.tests.test_tryton import ModuleTestCase, with_transaction
+from trytond.pool import Pool
+from trytond.transaction import Transaction
+from trytond.modules.company.tests import create_company, set_company
+from trytond.modules.account.tests import create_chart, get_fiscalyear
+
+
+def set_invoice_sequences(fiscalyear):
+    pool = Pool()
+    Sequence = pool.get('ir.sequence.strict')
+    SequenceType = pool.get('ir.sequence.type')
+    InvoiceSequence = pool.get('account.fiscalyear.invoice_sequence')
+    ModelData = pool.get('ir.model.data')
+
+    sequence = Sequence(
+        name=fiscalyear.name,
+        sequence_type=SequenceType(ModelData.get_id(
+            'account_invoice', 'sequence_type_account_invoice')),
+        company=fiscalyear.company,
+        )
+    sequence.save()
+    fiscalyear.invoice_sequences = []
+    invoice_sequence = InvoiceSequence()
+    invoice_sequence.fiscalyear = fiscalyear
+    invoice_sequence.in_invoice_sequence = sequence
+    invoice_sequence.in_credit_note_sequence = sequence
+    invoice_sequence.out_invoice_sequence = sequence
+    invoice_sequence.out_credit_note_sequence = sequence
+    invoice_sequence.save()
+    return fiscalyear
 
 
 class InvoiceTestCase(ModuleTestCase):
     'Test invoice module'
     module = 'account_invoice_xrechnung'
 
-    @with_transaction()
-    def test_xrechnung(self):
-        """ run default tests
+    def prep_fiscalyear(self, company1):
+        """ prepare fiscal year, sequences...
         """
-        pass
+        pool = Pool()
+        FiscalYear = pool.get('account.fiscalyear')
+
+        fisc_year = get_fiscalyear(company1, today=date(2024, 1, 15))
+        set_invoice_sequences(fisc_year)
+        self.assertEqual(len(fisc_year.invoice_sequences), 1)
+        FiscalYear.create_period([fisc_year])
+
+    def prep_invoice(self, party_customer):
+        """ add invoice
+        """
+        pool = Pool()
+        Invoice = pool.get('account.invoice')
+        Taxes = pool.get('account.tax')
+        Account = pool.get('account.account')
+        Journal = pool.get('account.journal')
+        Currency = pool.get('currency.currency')
+        Uom = pool.get('product.uom')
+
+        currency1, = Currency.search([('code', '=', 'usd')])
+
+        tax_lst = Taxes.search([('name', '=', '20% VAT')])
+        self.assertEqual(len(tax_lst), 1)
+
+        account_lst = Account.search([
+            ('name', 'in', ['Main Revenue', 'Main Receivable'])
+            ], order=[('name', 'ASC')])
+        self.assertEqual(len(account_lst), 2)
+        self.assertEqual(account_lst[0].name, 'Main Receivable')
+
+        journ_lst = Journal.search([('name', '=', 'Revenue')])
+        self.assertEqual(len(journ_lst), 1)
+
+        to_create_invoice = [{
+            'type': 'out',
+            'description': 'Parts',
+            'invoice_date': date(2024, 7, 1),
+            'party': party_customer.id,
+            'invoice_address': party_customer.addresses[0].id,
+            'account': account_lst[0].id,
+            'journal': journ_lst[0].id,
+            'currency': currency1.id,
+            'lines': [('create', [{
+                'type': 'line',
+                'quantity': 2.0,
+                'unit': Uom.search([('symbol', '=', 'u')])[0].id,
+                'unit_price': Decimal('50.0'),
+                'taxes': [('add', [tax_lst[0].id])],
+                'account': account_lst[1].id,
+                'currency': currency1.id,
+                }])],
+            }]
+        inv_lst, = Invoice.create(to_create_invoice)
+        inv_lst.on_change_lines()
+        inv_lst.save()
+        Invoice.validate_invoice([inv_lst])
+        Invoice.post([inv_lst])
+        self.assertEqual(inv_lst.currency.code, 'usd')
+        self.assertEqual(len(inv_lst.move.lines), 3)
+        return inv_lst
+
+    @with_transaction()
+    def test_xrechnung_configuration(self):
+        """ test configuration
+        """
+        pool = Pool()
+        Configuration = pool.get('account.configuration')
+        Party = pool.get('party.party')
+        ActionReport = pool.get('ir.action.report')
+
+        pty1, = Party.create([{
+            'name': 'Payee',
+            'addresses': [('create', [{
+                'invoice': True,
+                'street': 'Applicant Street 1',
+                'postal_code': '12345',
+                'city': 'Usertown',
+                }])],
+            }])
+
+        company1 = create_company('m-ds')
+        with set_company(company1):
+            with Transaction().set_context({'company': company1.id}):
+
+                # update report to 'pdf'
+                inv_report, = ActionReport.search([
+                    ('model', '=', 'account.invoice'),
+                    ('report_name', '=', 'account.invoice')])
+                self.assertEqual(inv_report.extension, '')
+                ActionReport.write(*[
+                    [inv_report], {'extension': 'pdf'}])
+
+                cfg1 = Configuration(xrechn_zugferd_report=inv_report)
+                cfg1.save()
+                self.assertEqual(cfg1.xrechn_zugferd_report.name, 'Invoice')
+                create_chart(company=company1, tax=True)
+                self.prep_fiscalyear(company1)
+                invoice = self.prep_invoice(pty1)
+
 
 # end InvoiceTestCase
 
diff --git a/xreport.py b/xreport.py
index 4d68e82..77715ad 100644
--- a/xreport.py
+++ b/xreport.py
@@ -4,6 +4,7 @@
 # this repository contains the full copyright notices and license terms.
 
 import zipfile
+from facturx import generate_from_binary
 from io import BytesIO
 from trytond.report import Report
 from trytond.pool import Pool
@@ -31,27 +32,45 @@ class XReport(Report):
         pool = Pool()
         IrDate = pool.get('ir.date')
         Invoice = pool.get('account.invoice')
-        EDocument = pool.get(data['edocument'].split('-')[0])
+        document_para = pool.get(data['edocument'].split('-')[0])
+
+        EDocument = document_para[0]
+        document_var = document_para[1] if len(document_para) > 1 else None
 
         invoice, = Invoice.browse([data['invoice']])
         template = EDocument(invoice)
-        invoice_string = template.render(edoc_versions[data['edocument']])
+        invoice_xml = template.render(edoc_versions[data['edocument']])
 
         file_name = slugify('%(date)s-%(descr)s' % {
             'date': IrDate.today().isoformat().replace('-', ''),
             'descr': invoice.rec_name},
             max_length=100, word_boundary=True, save_order=True)
 
+        # if document_var and (
+        #         document_var == 'ferd') and (
+        #         EDocument.__name__ == 'edocument.facturxext.invoice'):
+        #     # convert to zugferd
+        #     pdf_data = generate_from_binary(
+        #         pdf_file='pdf_content',
+        #         xml=invoice_xml,
+        #         check_xsd=True,
+        #         pdf_metadata={
+        #             'author': invoice.company.rec_name,
+        #             'keywords': 'Factur-X, Invoice',
+        #             'title': invoice.number,
+        #             'subject': invoice.description},
+        #         lang='de-DE')
+
         if data['as_zip'] is True:
             return (
                 'zip',
                 cls.compress_as_zip('%(fname)s.%(ext)s' % {
                     'fname': file_name,
                     'ext': 'xml',
-                    }, invoice_string),
+                    }, invoice_xml),
                 False,
                 file_name)
         else:
-            return ('xml', invoice_string, False, file_name)
+            return ('xml', invoice_xml, False, file_name)
 
 # end XReport

From 26388d3816716aff85292af49d52392ff38a0ffa Mon Sep 17 00:00:00 2001
From: Frederik Jaeckel <frederik.jaeckel@m-ds.de>
Date: Fri, 6 Dec 2024 14:03:51 +0100
Subject: [PATCH 19/25] configuration - add erechnung default report

---
 configuration.py            | 18 +++++++++--
 locale/de.po                | 64 +++++++++++++++++++++++++++++++++++++
 locale/en.po                | 64 +++++++++++++++++++++++++++++++++++++
 view/configuration_form.xml |  3 +-
 4 files changed, 146 insertions(+), 3 deletions(-)

diff --git a/configuration.py b/configuration.py
index b308c5e..f4bedb2 100644
--- a/configuration.py
+++ b/configuration.py
@@ -7,11 +7,15 @@
 from trytond.pool import PoolMeta, Pool
 from trytond.model import ModelSQL, fields
 from trytond.modules.company.model import CompanyValueMixin
+from .wizard_runreport import sel_edocument
 
 
 class Configuration(metaclass=PoolMeta):
     __name__ = 'account.configuration'
 
+    xrechn_default = fields.MultiValue(fields.Selection(
+        string='Export mode', selection=sel_edocument,
+        help='Pre-set export format for e-invoices.'))
     xrechn_zugferd_report = fields.MultiValue(fields.Many2One(
         model_name='ir.action.report',
         domain=[
@@ -25,11 +29,14 @@ class Configuration(metaclass=PoolMeta):
         """ select table
         """
         pool = Pool()
-        if field in {
-                'xrechn_zugferd_report'}:
+        if field in {'xrechn_zugferd_report', 'xrechn_default'}:
             return pool.get('account_invoice_xrechnung.configuration')
         return super(Configuration, cls).multivalue_model(field)
 
+    @classmethod
+    def default_xrechn_default(cls, **pattern):
+        return cls.multivalue_model('xrechn_default').default_xrechn_default()
+
 # end Configuration
 
 
@@ -37,6 +44,9 @@ class ConfigurationXRechnungexport(ModelSQL, CompanyValueMixin):
     "Account Configuration XRechnung Export"
     __name__ = 'account_invoice_xrechnung.configuration'
 
+    xrechn_default = fields.Selection(
+        string='Export mode', selection=sel_edocument,
+        help='Pre-set export format for e-invoices.')
     xrechn_zugferd_report = fields.Many2One(
         model_name='ir.action.report',
         string='ZUGFeRD-Report',
@@ -45,4 +55,8 @@ class ConfigurationXRechnungexport(ModelSQL, CompanyValueMixin):
             ('extension', '=', 'pdf')],
         help='Report that is to be used to generate the ZUGFeRD PDF.')
 
+    @classmethod
+    def default_xrechn_default(cls, **pattern):
+        return 'edocument.facturxext.invoice-ferd'
+
 # end ConfigurationXRechnungexport
diff --git a/locale/de.po b/locale/de.po
index ff22ba4..ee1a86c 100644
--- a/locale/de.po
+++ b/locale/de.po
@@ -98,6 +98,38 @@ msgctxt "help:account.configuration,xrechn_zugferd_report:"
 msgid "Report that is to be used to generate the ZUGFeRD PDF."
 msgstr "Report, welcher zum erzeugen der ZUGFeRD-PDF verwendet werden soll."
 
+msgctxt "field:account.configuration,xrechn_default:"
+msgid "Export mode"
+msgstr "Exportformat"
+
+msgctxt "help:account.configuration,xrechn_default:"
+msgid "Pre-set export format for e-invoices."
+msgstr "Voreingstelltes Exportformat für die eRechnung."
+
+msgctxt "selection:account.configuration,xrechn_default:"
+msgid "XRechnung UBL Invoice 2.2"
+msgstr "XRechnung UBL Invoice 2.2"
+
+msgctxt "selection:account.configuration,xrechn_default:"
+msgid "XRechnung UBL Invoice 2.3"
+msgstr "XRechnung UBL Invoice 2.3"
+
+msgctxt "selection:account.configuration,xrechn_default:"
+msgid "XRechnung UBL Invoice 3.0"
+msgstr "XRechnung UBL Invoice 3.0"
+
+msgctxt "selection:account.configuration,xrechn_default:"
+msgid "Factur-X Extended"
+msgstr "Factur-X Extended"
+
+msgctxt "selection:account.configuration,xrechn_default:"
+msgid "ZUGFeRD 2.3.2"
+msgstr "ZUGFeRD 2.3.2"
+
+msgctxt "selection:account.configuration,xrechn_default:"
+msgid "CII CrossIndustryInvoice D16B"
+msgstr "CII CrossIndustryInvoice D16B"
+
 
 ###########################################
 # account_invoice_xrechnung.configuration #
@@ -113,3 +145,35 @@ msgstr "ZUGFeRD-Report"
 msgctxt "help:account_invoice_xrechnung.configuration,xrechn_zugferd_report:"
 msgid "Report that is to be used to generate the ZUGFeRD PDF."
 msgstr "Report, welcher zum erzeugen der ZUGFeRD-PDF verwendet werden soll."
+
+msgctxt "field:account_invoice_xrechnung.configuration,xrechn_default:"
+msgid "Export mode"
+msgstr "Exportformat"
+
+msgctxt "help:account_invoice_xrechnung.configuration,xrechn_default:"
+msgid "Pre-set export format for e-invoices."
+msgstr "Voreingstelltes Exportformat für die eRechnung."
+
+msgctxt "selection:account_invoice_xrechnung.configuration,xrechn_default:"
+msgid "XRechnung UBL Invoice 2.2"
+msgstr "XRechnung UBL Invoice 2.2"
+
+msgctxt "selection:account_invoice_xrechnung.configuration,xrechn_default:"
+msgid "XRechnung UBL Invoice 2.3"
+msgstr "XRechnung UBL Invoice 2.3"
+
+msgctxt "selection:account_invoice_xrechnung.configuration,xrechn_default:"
+msgid "XRechnung UBL Invoice 3.0"
+msgstr "XRechnung UBL Invoice 3.0"
+
+msgctxt "selection:account_invoice_xrechnung.configuration,xrechn_default:"
+msgid "Factur-X Extended"
+msgstr "Factur-X Extended"
+
+msgctxt "selection:account_invoice_xrechnung.configuration,xrechn_default:"
+msgid "ZUGFeRD 2.3.2"
+msgstr "ZUGFeRD 2.3.2"
+
+msgctxt "selection:account_invoice_xrechnung.configuration,xrechn_default:"
+msgid "CII CrossIndustryInvoice D16B"
+msgstr "CII CrossIndustryInvoice D16B"
diff --git a/locale/en.po b/locale/en.po
index ad72eda..305b6db 100644
--- a/locale/en.po
+++ b/locale/en.po
@@ -78,6 +78,38 @@ msgctxt "help:account.configuration,xrechn_zugferd_report:"
 msgid "Report that is to be used to generate the ZUGFeRD PDF."
 msgstr "Report that is to be used to generate the ZUGFeRD PDF."
 
+msgctxt "field:account.configuration,xrechn_default:"
+msgid "Export mode"
+msgstr "Export mode"
+
+msgctxt "help:account.configuration,xrechn_default:"
+msgid "Pre-set export format for e-invoices."
+msgstr "Pre-set export format for e-invoices."
+
+msgctxt "selection:account.configuration,xrechn_default:"
+msgid "XRechnung UBL Invoice 2.2"
+msgstr "XRechnung UBL Invoice 2.2"
+
+msgctxt "selection:account.configuration,xrechn_default:"
+msgid "XRechnung UBL Invoice 2.3"
+msgstr "XRechnung UBL Invoice 2.3"
+
+msgctxt "selection:account.configuration,xrechn_default:"
+msgid "XRechnung UBL Invoice 3.0"
+msgstr "XRechnung UBL Invoice 3.0"
+
+msgctxt "selection:account.configuration,xrechn_default:"
+msgid "Factur-X Extended"
+msgstr "Factur-X Extended"
+
+msgctxt "selection:account.configuration,xrechn_default:"
+msgid "ZUGFeRD 2.3.2"
+msgstr "ZUGFeRD 2.3.2"
+
+msgctxt "selection:account.configuration,xrechn_default:"
+msgid "CII CrossIndustryInvoice D16B"
+msgstr "CII CrossIndustryInvoice D16B"
+
 msgctxt "model:account_invoice_xrechnung.configuration:"
 msgid "Account Configuration XRechnung Export"
 msgstr "Account Configuration XRechnung Export"
@@ -89,3 +121,35 @@ msgstr "ZUGFeRD-Report"
 msgctxt "help:account_invoice_xrechnung.configuration,xrechn_zugferd_report:"
 msgid "Report that is to be used to generate the ZUGFeRD PDF."
 msgstr "Report that is to be used to generate the ZUGFeRD PDF."
+
+msgctxt "field:account_invoice_xrechnung.configuration,xrechn_default:"
+msgid "Export mode"
+msgstr "Export mode"
+
+msgctxt "help:account_invoice_xrechnung.configuration,xrechn_default:"
+msgid "Pre-set export format for e-invoices."
+msgstr "Pre-set export format for e-invoices."
+
+msgctxt "selection:account_invoice_xrechnung.configuration,xrechn_default:"
+msgid "XRechnung UBL Invoice 2.2"
+msgstr "XRechnung UBL Invoice 2.2"
+
+msgctxt "selection:account_invoice_xrechnung.configuration,xrechn_default:"
+msgid "XRechnung UBL Invoice 2.3"
+msgstr "XRechnung UBL Invoice 2.3"
+
+msgctxt "selection:account_invoice_xrechnung.configuration,xrechn_default:"
+msgid "XRechnung UBL Invoice 3.0"
+msgstr "XRechnung UBL Invoice 3.0"
+
+msgctxt "selection:account_invoice_xrechnung.configuration,xrechn_default:"
+msgid "Factur-X Extended"
+msgstr "Factur-X Extended"
+
+msgctxt "selection:account_invoice_xrechnung.configuration,xrechn_default:"
+msgid "ZUGFeRD 2.3.2"
+msgstr "ZUGFeRD 2.3.2"
+
+msgctxt "selection:account_invoice_xrechnung.configuration,xrechn_default:"
+msgid "CII CrossIndustryInvoice D16B"
+msgstr "CII CrossIndustryInvoice D16B"
diff --git a/view/configuration_form.xml b/view/configuration_form.xml
index 94b22b3..9e4b01f 100644
--- a/view/configuration_form.xml
+++ b/view/configuration_form.xml
@@ -9,7 +9,8 @@
         <separator id="xrechnung" colspan="4" string="ZUGFeRD - e-Invoice"/>
         <label name="xrechn_zugferd_report"/>
         <field name="xrechn_zugferd_report"/>
-        <newline/>
+        <label name="xrechn_default"/>
+        <field name="xrechn_default"/>
 
     </xpath>
 

From 7f433d9b80a41f6d87ca04dab0885429502f1667 Mon Sep 17 00:00:00 2001
From: Frederik Jaeckel <frederik.jaeckel@m-ds.de>
Date: Fri, 6 Dec 2024 14:04:35 +0100
Subject: [PATCH 20/25] generate zugferd-pdf

---
 locale/de.po        |  16 ++++++
 locale/en.po        |  12 +++++
 message.xml         |   6 +++
 wizard_runreport.py |  44 +++++++++++++++-
 xreport.py          | 122 ++++++++++++++++++++++++++++++++++----------
 5 files changed, 171 insertions(+), 29 deletions(-)

diff --git a/locale/de.po b/locale/de.po
index ee1a86c..c09de26 100644
--- a/locale/de.po
+++ b/locale/de.po
@@ -3,6 +3,22 @@ msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
 
+##############
+# ir.message #
+##############
+msgctxt "model:ir.message,text:msg_invoice_must_posted"
+msgid "Invoice '%(invname)s' must be posted."
+msgstr "Rechnung '%(invname)s' muß festgeschrieben sein."
+
+msgctxt "model:ir.message,text:msg_no_report_found"
+msgid "No report found for invoices in PDF format."
+msgstr "Kein Report für Rechnungen im PDF-Format gefunden."
+
+msgctxt "model:ir.message,text:msg_invalid_cachecontent"
+msgid "No PDF has yet been generated for the invoice '%(invoice_name)s' or the saved document has an incorrect format."
+msgstr "Für die Rechnung '%(invoice_name)s' wurde noch keine PDF erzeugt oder das gespeicherte Dokument hat ein falsches Format."
+
+
 #############
 # ir.action #
 #############
diff --git a/locale/en.po b/locale/en.po
index 305b6db..d6ec74c 100644
--- a/locale/en.po
+++ b/locale/en.po
@@ -2,6 +2,18 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
+msgctxt "model:ir.message,text:msg_invoice_must_posted"
+msgid "Invoice '%(invname)s' must be posted."
+msgstr "Invoice '%(invname)s' must be posted."
+
+msgctxt "model:ir.message,text:msg_no_report_found"
+msgid "No report found for invoices in PDF format."
+msgstr "No report found for invoices in PDF format."
+
+msgctxt "model:ir.message,text:msg_invalid_cachecontent"
+msgid "No PDF has yet been generated for the invoice '%(invoice_name)s' or the saved document has an incorrect format."
+msgstr "No PDF has yet been generated for the invoice '%(invoice_name)s' or the saved document has an incorrect format."
+
 msgctxt "model:ir.action,name:act_wizard_report"
 msgid "eDocument Export"
 msgstr "eDocument Export"
diff --git a/message.xml b/message.xml
index 25b841f..4437b59 100644
--- a/message.xml
+++ b/message.xml
@@ -8,6 +8,12 @@
         <record model="ir.message" id="msg_invoice_must_posted">
             <field name="text">Invoice '%(invname)s' must be posted.</field>
         </record>
+        <record model="ir.message" id="msg_no_report_found">
+            <field name="text">No report found for invoices in PDF format.</field>
+        </record>
+        <record model="ir.message" id="msg_invalid_cachecontent">
+            <field name="text">No PDF has yet been generated for the invoice '%(invoice_name)s' or the saved document has an incorrect format.</field>
+        </record>
 
     </data>
 </tryton>
diff --git a/wizard_runreport.py b/wizard_runreport.py
index f84f2a8..621c7d7 100644
--- a/wizard_runreport.py
+++ b/wizard_runreport.py
@@ -78,14 +78,48 @@ class RunXRechnungReport(Wizard):
         pool = Pool()
         Invoice = pool.get('account.invoice')
         WizRepStart = pool.get('account_invoice_xrechnung.runrep.start')
+        Configuration = pool.get('account.configuration')
 
+        cfg1 = Configuration.get_singleton()
         invoice = Invoice.browse([context.get('active_id', -1)])
         result = {
             'edocument': WizRepStart.default_edocument(),
             'invoice': context.get('active_id', -1),
             'state': invoice[0].state if invoice else ''}
+        if cfg1 and cfg1.xrechn_default:
+            result['edocument'] = cfg1.xrechn_default
         return result
 
+    def generate_invoice_reports(self, data):
+        """ generate missing reports and store to db
+
+        Args:
+            data (dict): report-data
+        """
+        pool = Pool()
+        Invoice = pool.get('account.invoice')
+        XReport = pool.get('account_invoice_xrechnung.export', type='report')
+
+        invoices = Invoice.search([
+            ('id', '=', data['invoice']),
+            ('type', '=', 'out')])
+        to_generate = [x.id for x in invoices if not x.invoice_report_cache]
+
+        if to_generate:
+            report_action = XReport.get_used_report()
+
+            # run selected report on invoices w/o stored report-data
+            data2 = {}
+            data2.update(data)
+            data2['action_id'] = report_action.id
+            data2['model'] = report_action.model
+            data2['id'] = to_generate[0]
+            data2['ids'] = to_generate
+
+            RepInvoice = pool.get(report_action.report_name, type='report')
+            with Transaction().set_context({'with_rec_name': False}):
+                RepInvoice.execute(to_generate, data2)
+
     def do_export(self, action):
         """ run export
         """
@@ -93,9 +127,17 @@ class RunXRechnungReport(Wizard):
             raise UserError(gettext(
                 'account_invoice_xrechnung.msg_invoice_must_posted',
                 invname=self.start.invoice.rec_name))
-        return action, {
+
+        data = {
             'invoice': self.start.invoice.id,
             'edocument': self.start.edocument,
             'as_zip': self.start.as_zip}
 
+        # if zugferd - generate missing report-cache-items
+        if data['edocument'] == 'edocument.facturxext.invoice-ferd':
+            # pdf is stored to db
+            self.generate_invoice_reports(data)
+
+        return action, data
+
 # end RunXRechnungReport
diff --git a/xreport.py b/xreport.py
index 77715ad..596afc4 100644
--- a/xreport.py
+++ b/xreport.py
@@ -6,9 +6,11 @@
 import zipfile
 from facturx import generate_from_binary
 from io import BytesIO
+from slugify import slugify
 from trytond.report import Report
 from trytond.pool import Pool
-from slugify import slugify
+from trytond.exceptions import UserError
+from trytond.i18n import gettext
 from .wizard_runreport import edoc_versions
 
 
@@ -29,12 +31,37 @@ class XReport(Report):
     def execute(cls, ids, data):
         """ skip export-engine, run edocument-xml-convert
         """
+        def export_data(exp_content, fname, ext, data2):
+            """ get tuple to return from report.execute,
+
+
+            Args:
+                exp_content (bytes or str): result data of report
+                fname (str): file name
+                ext (str): extension
+                data2 (dict): data
+
+            Returns:
+                tuple: return value of report
+            """
+            if data2['as_zip'] is True:
+                return (
+                    'zip',
+                    cls.compress_as_zip(
+                        '%(fname)s.%(ext)s' % {
+                            'fname': fname, 'ext': ext},
+                        exp_content),
+                    False,
+                    file_name)
+            else:
+                return (ext, exp_content, False, fname)
+
         pool = Pool()
         IrDate = pool.get('ir.date')
         Invoice = pool.get('account.invoice')
-        document_para = pool.get(data['edocument'].split('-')[0])
 
-        EDocument = document_para[0]
+        document_para = data['edocument'].split('-')
+        EDocument = pool.get(document_para[0])
         document_var = document_para[1] if len(document_para) > 1 else None
 
         invoice, = Invoice.browse([data['invoice']])
@@ -46,31 +73,70 @@ class XReport(Report):
             'descr': invoice.rec_name},
             max_length=100, word_boundary=True, save_order=True)
 
-        # if document_var and (
-        #         document_var == 'ferd') and (
-        #         EDocument.__name__ == 'edocument.facturxext.invoice'):
-        #     # convert to zugferd
-        #     pdf_data = generate_from_binary(
-        #         pdf_file='pdf_content',
-        #         xml=invoice_xml,
-        #         check_xsd=True,
-        #         pdf_metadata={
-        #             'author': invoice.company.rec_name,
-        #             'keywords': 'Factur-X, Invoice',
-        #             'title': invoice.number,
-        #             'subject': invoice.description},
-        #         lang='de-DE')
-
-        if data['as_zip'] is True:
-            return (
-                'zip',
-                cls.compress_as_zip('%(fname)s.%(ext)s' % {
-                    'fname': file_name,
-                    'ext': 'xml',
-                    }, invoice_xml),
-                False,
-                file_name)
+        if document_var and (
+                document_var == 'ferd') and (
+                EDocument.__name__ == 'edocument.facturxext.invoice'):
+            # convert to zugferd
+            invoice_pdf = cls.get_zugferd_pdf(invoice, invoice_xml)
+            return export_data(invoice_pdf, file_name, 'pdf', data)
         else:
-            return ('xml', invoice_xml, False, file_name)
+            return export_data(invoice_xml, file_name, 'xml', data)
+
+    @classmethod
+    def get_used_report(cls):
+        """ get report to use from config
+
+        Raises:
+            UserError: if not report was found
+
+        Returns:
+            record: ir.action.report
+        """
+        pool = Pool()
+        Configuration = pool.get('account.configuration')
+        ActionReport = pool.get('ir.action.report')
+
+        cfg1 = Configuration.get_singleton()
+        act_report = None
+        if cfg1 and cfg1.xrechn_zugferd_report:
+            act_report = cfg1.xrechn_zugferd_report
+        else:
+            # no report defined, use 1st found
+            act_report = ActionReport.search([
+                ('model', '=', 'account.invoice'),
+                ('extension', '=', 'pdf')], count=1)
+            if act_report:
+                act_report = act_report[0]
+        if not act_report:
+            raise UserError(gettext(
+                'account_invoice_xrechnung.msg_no_report_found'))
+        return act_report
+
+    @classmethod
+    def get_zugferd_pdf(cls, invoice, invoice_xml):
+        """ generate ZugFeRD-PDF
+
+        Args:
+            invoice (record): model account.invoice
+            invoice_xml (str): xml-data
+        """
+        # pdf was already stored to db
+        if not (invoice.invoice_report_cache and (
+                invoice.invoice_report_format == 'pdf')):
+            raise UserError(gettext(
+                'account_invoice_xrechnung.msg_invalid_cachecontent',
+                invoice_name=invoice.rec_name))
+
+        zugferd_pdf = generate_from_binary(
+            pdf_file=invoice.invoice_report_cache,
+            xml=invoice_xml,
+            check_xsd=True,
+            pdf_metadata={
+                'author': invoice.company.rec_name,
+                'keywords': 'Factur-X, Invoice, Tryton',
+                'title': invoice.number,
+                'subject': invoice.description},
+            lang='de-DE')
+        return zugferd_pdf
 
 # end XReport

From bd39ae228a2cef45d251f044cec1bf7be40a0e44 Mon Sep 17 00:00:00 2001
From: Frederik Jaeckel <frederik.jaeckel@m-ds.de>
Date: Mon, 9 Dec 2024 15:46:18 +0100
Subject: [PATCH 21/25] update tests to check generated xml-data

---
 tests/test_invoice.py |  89 ++++++++++++++++++++++++++++++++++++
 tests/xml_data.py     | 104 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 193 insertions(+)
 create mode 100644 tests/xml_data.py

diff --git a/tests/test_invoice.py b/tests/test_invoice.py
index 9ecaf34..621995b 100644
--- a/tests/test_invoice.py
+++ b/tests/test_invoice.py
@@ -5,11 +5,14 @@
 
 from decimal import Decimal
 from datetime import date
+from facturx import get_facturx_xml_from_pdf
+
 from trytond.tests.test_tryton import ModuleTestCase, with_transaction
 from trytond.pool import Pool
 from trytond.transaction import Transaction
 from trytond.modules.company.tests import create_company, set_company
 from trytond.modules.account.tests import create_chart, get_fiscalyear
+from .xml_data import xml_from_pdf
 
 
 def set_invoice_sequences(fiscalyear):
@@ -89,6 +92,7 @@ class InvoiceTestCase(ModuleTestCase):
             'lines': [('create', [{
                 'type': 'line',
                 'quantity': 2.0,
+                'description': 'Product 1',
                 'unit': Uom.search([('symbol', '=', 'u')])[0].id,
                 'unit_price': Decimal('50.0'),
                 'taxes': [('add', [tax_lst[0].id])],
@@ -112,8 +116,15 @@ class InvoiceTestCase(ModuleTestCase):
         pool = Pool()
         Configuration = pool.get('account.configuration')
         Party = pool.get('party.party')
+        Country = pool.get('country.country')
         ActionReport = pool.get('ir.action.report')
+        ExportWiz = pool.get('account_invoice_xrechnung.runrep', type='wizard')
+        Tax = pool.get('account.tax')
 
+        country_de, = Country.create([{
+            'name': 'Germany',
+            'code': 'DE',
+            'code3': 'DEU'}])
         pty1, = Party.create([{
             'name': 'Payee',
             'addresses': [('create', [{
@@ -121,10 +132,18 @@ class InvoiceTestCase(ModuleTestCase):
                 'street': 'Applicant Street 1',
                 'postal_code': '12345',
                 'city': 'Usertown',
+                'country': country_de.id,
                 }])],
             }])
 
         company1 = create_company('m-ds')
+        Party.write(*[
+            [company1.party],
+            {'addresses': [(
+                'write',
+                [company1.party.addresses[0]],
+                {'country': country_de.id})]}])
+
         with set_company(company1):
             with Transaction().set_context({'company': company1.id}):
 
@@ -141,8 +160,78 @@ class InvoiceTestCase(ModuleTestCase):
                 self.assertEqual(cfg1.xrechn_zugferd_report.name, 'Invoice')
                 create_chart(company=company1, tax=True)
                 self.prep_fiscalyear(company1)
+
+                tax, = Tax.search([('name', '=', '20% VAT')])
+                Tax.write(*[
+                    [tax],
+                    {'unece_code': 'GST', 'unece_category_code': 'S'}])
                 invoice = self.prep_invoice(pty1)
 
+                # start wizard with two selected records
+                with Transaction().set_context({
+                        'active_ids': [invoice.id],
+                        'active_id': invoice.id,
+                        'active_model': 'account.invoice'}):
+
+                    (sess_id, start_state, end_state) = ExportWiz.create()
+                    w_obj = ExportWiz(sess_id)
+                    self.assertEqual(start_state, 'start')
+                    self.assertEqual(end_state, 'end')
+                    result = ExportWiz.execute(sess_id, {}, start_state)
+
+                    self.assertEqual(
+                        list(result['view']['defaults'].keys()), [
+                            'as_zip', 'edocument', 'invoice', 'state',
+                            'invoice.'])
+
+                    data = {}
+                    for x in result['view']['defaults'].keys():
+                        if '.' in x:
+                            continue
+                        data[x] = result['view']['defaults'][x]
+                        setattr(w_obj.start, x, data[x])
+                    self.assertEqual(
+                        w_obj.start.edocument,
+                        'edocument.facturxext.invoice-ferd')
+                    self.assertEqual(w_obj.start.invoice, invoice)
+                    self.assertEqual(w_obj.start.as_zip, True)
+                    w_obj.start.as_zip = False
+                    data['as_zip'] = False
+
+                    # (action, data)
+                    result = ExportWiz.execute(
+                        sess_id, {'start': data}, 'export')
+                    self.assertEqual(len(result['actions']), 1)
+                    (action, data) = result['actions'][0]
+
+                    self.assertEqual(
+                        action['report_name'],
+                        'account_invoice_xrechnung.export')
+                    self.assertEqual(action['type'], 'ir.action.report')
+                    self.assertEqual(action['records'], 'selected')
+
+                    # 2nd step, wizard told us which report we must execute
+                    ReportExport = pool.get(
+                        'account_invoice_xrechnung.export',
+                        type='report')
+                    data2 = {}
+                    data2.update(data)
+                    data2['action_id'] = action['id']
+                    data2['model'] = 'account.invoice'
+
+                    (ext, pdfdata, dprint, fname) = ReportExport.execute(
+                        [data['invoice']], data2)
+
+                    # extract xml
+                    (xml_fname, xml_frompdf) = get_facturx_xml_from_pdf(
+                        pdfdata)
+
+                    self.assertEqual(xml_fname, 'factur-x.xml')
+                    self.assertEqual(
+                        xml_frompdf.decode('utf8'),
+                        xml_from_pdf % {
+                            'datetoday': date.today().strftime('%Y%m%d')})
+                    ExportWiz.delete(sess_id)
 
 # end InvoiceTestCase
 
diff --git a/tests/xml_data.py b/tests/xml_data.py
new file mode 100644
index 0000000..0c0eed9
--- /dev/null
+++ b/tests/xml_data.py
@@ -0,0 +1,104 @@
+# -*- coding: utf-8 -*-
+# This file is part of the account-invoice-xrechnung-module
+# from m-ds for Tryton. The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
+
+
+xml_from_pdf = """<?xml version="1.0" encoding="UTF-8"?>
+<rsm:CrossIndustryInvoice xmlns:rsm="urn:un:unece:uncefact:data:standard:CrossIndustryInvoice:100" xmlns:qdt="urn:un:unece:uncefact:data:standard:QualifiedDataType:100" xmlns:ram="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100" xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <rsm:ExchangedDocumentContext>
+        <ram:GuidelineSpecifiedDocumentContextParameter>
+            <ram:ID>urn:cen.eu:en16931:2017#conformant#urn:factur-x.eu:1p0:extended</ram:ID>
+        </ram:GuidelineSpecifiedDocumentContextParameter>
+    </rsm:ExchangedDocumentContext>
+    <rsm:ExchangedDocument>
+        <ram:ID>1</ram:ID>
+        <ram:Name>Parts</ram:Name>
+        <ram:TypeCode>380</ram:TypeCode>
+        <ram:IssueDateTime>
+        <udt:DateTimeString format="102">20240701</udt:DateTimeString>
+        </ram:IssueDateTime>
+    </rsm:ExchangedDocument>
+    <rsm:SupplyChainTradeTransaction>
+        <ram:IncludedSupplyChainTradeLineItem>
+            <ram:AssociatedDocumentLineDocument>
+                <ram:LineID>1</ram:LineID>
+            </ram:AssociatedDocumentLineDocument>
+            <ram:SpecifiedTradeProduct>
+                <ram:Name></ram:Name>
+                <ram:Description>Product 1</ram:Description>
+            </ram:SpecifiedTradeProduct>
+            <ram:SpecifiedLineTradeAgreement>
+                <ram:NetPriceProductTradePrice>
+                    <ram:ChargeAmount currencyID="usd">50.00</ram:ChargeAmount>
+                </ram:NetPriceProductTradePrice>
+            </ram:SpecifiedLineTradeAgreement>
+            <ram:SpecifiedLineTradeDelivery>
+                <ram:BilledQuantity unitCode="C62">2.0</ram:BilledQuantity>
+            </ram:SpecifiedLineTradeDelivery>
+            <ram:SpecifiedLineTradeSettlement>
+        <ram:ApplicableTradeTax>
+            <ram:TypeCode>GST</ram:TypeCode>
+            <ram:CategoryCode>S</ram:CategoryCode>
+            <ram:RateApplicablePercent>20.0</ram:RateApplicablePercent>
+        </ram:ApplicableTradeTax>
+                <ram:SpecifiedTradeSettlementLineMonetarySummation>
+                    <ram:LineTotalAmount currencyID="usd">100.00</ram:LineTotalAmount>
+                </ram:SpecifiedTradeSettlementLineMonetarySummation>
+            </ram:SpecifiedLineTradeSettlement>
+        </ram:IncludedSupplyChainTradeLineItem>
+        <ram:ApplicableHeaderTradeAgreement>
+            <ram:SellerTradeParty>
+        <ram:Name>m-ds</ram:Name>
+        <ram:SpecifiedLegalOrganization>
+        </ram:SpecifiedLegalOrganization>
+        <ram:PostalTradeAddress>
+        <ram:CountryID>DE</ram:CountryID>
+    </ram:PostalTradeAddress>
+            </ram:SellerTradeParty>
+            <ram:BuyerTradeParty>
+        <ram:Name>Payee</ram:Name>
+        <ram:SpecifiedLegalOrganization>
+        </ram:SpecifiedLegalOrganization>
+        <ram:PostalTradeAddress>
+        <ram:PostcodeCode>12345</ram:PostcodeCode>
+            <ram:LineOne>Applicant Street 1</ram:LineOne>
+        <ram:CityName>Usertown</ram:CityName>
+        <ram:CountryID>DE</ram:CountryID>
+    </ram:PostalTradeAddress>
+            </ram:BuyerTradeParty>
+            <ram:BuyerOrderReferencedDocument>
+                <ram:IssuerAssignedID/>
+            </ram:BuyerOrderReferencedDocument>
+        </ram:ApplicableHeaderTradeAgreement>
+        <ram:ApplicableHeaderTradeDelivery>
+        </ram:ApplicableHeaderTradeDelivery>
+        <ram:ApplicableHeaderTradeSettlement>
+            <ram:PaymentReference>1</ram:PaymentReference>
+            <ram:InvoiceCurrencyCode>usd</ram:InvoiceCurrencyCode>
+            <ram:SpecifiedTradeSettlementPaymentMeans>
+                <ram:TypeCode>1</ram:TypeCode>
+            </ram:SpecifiedTradeSettlementPaymentMeans>
+        <ram:ApplicableTradeTax>
+            <ram:CalculatedAmount currencyID="usd">20.00</ram:CalculatedAmount>
+            <ram:TypeCode>GST</ram:TypeCode>
+            <ram:BasisAmount>100.00</ram:BasisAmount>
+            <ram:CategoryCode>S</ram:CategoryCode>
+            <ram:RateApplicablePercent>20.0</ram:RateApplicablePercent>
+        </ram:ApplicableTradeTax>
+            <ram:SpecifiedTradePaymentTerms>
+                <ram:DueDateDateTime>
+        <udt:DateTimeString format="102">%(datetoday)s</udt:DateTimeString>
+                </ram:DueDateDateTime>
+                <ram:PartialPaymentAmount currencyID="usd">120.00</ram:PartialPaymentAmount>
+            </ram:SpecifiedTradePaymentTerms>
+            <ram:SpecifiedTradeSettlementHeaderMonetarySummation>
+                <ram:LineTotalAmount currencyID="usd">100.00</ram:LineTotalAmount>
+                <ram:TaxBasisTotalAmount currencyID="usd">100.00</ram:TaxBasisTotalAmount>
+                <ram:TaxTotalAmount currencyID="usd">20.00</ram:TaxTotalAmount>
+                <ram:GrandTotalAmount currencyID="usd">120.00</ram:GrandTotalAmount>
+                <ram:DuePayableAmount currencyID="usd">120.00</ram:DuePayableAmount>
+            </ram:SpecifiedTradeSettlementHeaderMonetarySummation>
+        </ram:ApplicableHeaderTradeSettlement>
+    </rsm:SupplyChainTradeTransaction>
+</rsm:CrossIndustryInvoice>"""

From e0cd1a08f167c83a8e68be70e48ce9ccd97267d1 Mon Sep 17 00:00:00 2001
From: Frederik Jaeckel <frederik.jaeckel@m-ds.de>
Date: Tue, 10 Dec 2024 13:56:40 +0100
Subject: [PATCH 22/25] add iban to tests

---
 tests/test_invoice.py | 19 ++++++++++++++++++-
 tests/xml_data.py     | 16 ++++++++++++----
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/tests/test_invoice.py b/tests/test_invoice.py
index 621995b..d502547 100644
--- a/tests/test_invoice.py
+++ b/tests/test_invoice.py
@@ -120,6 +120,8 @@ class InvoiceTestCase(ModuleTestCase):
         ActionReport = pool.get('ir.action.report')
         ExportWiz = pool.get('account_invoice_xrechnung.runrep', type='wizard')
         Tax = pool.get('account.tax')
+        BankAccount = pool.get('bank.account')
+        Bank = pool.get('bank')
 
         country_de, = Country.create([{
             'name': 'Germany',
@@ -147,6 +149,19 @@ class InvoiceTestCase(ModuleTestCase):
         with set_company(company1):
             with Transaction().set_context({'company': company1.id}):
 
+                bank_party, = Party.create([{
+                    'name': 'Bank 123',
+                    'addresses': [('create', [{}])]}])
+                bank, = Bank.create([{'party': bank_party.id}])
+
+                acc_company, = BankAccount.create([
+                    {
+                        'bank': bank.id,
+                        'owners': [('add', [company1.party.id])],
+                        'numbers': [('create', [{
+                            'type': 'iban',
+                            'number': 'DE02300209000106531065'}])]}])
+
                 # update report to 'pdf'
                 inv_report, = ActionReport.search([
                     ('model', '=', 'account.invoice'),
@@ -155,7 +170,9 @@ class InvoiceTestCase(ModuleTestCase):
                 ActionReport.write(*[
                     [inv_report], {'extension': 'pdf'}])
 
-                cfg1 = Configuration(xrechn_zugferd_report=inv_report)
+                cfg1 = Configuration(
+                    xrechn_zugferd_report=inv_report,
+                    edocument_bank=list(acc_company.numbers))
                 cfg1.save()
                 self.assertEqual(cfg1.xrechn_zugferd_report.name, 'Invoice')
                 create_chart(company=company1, tax=True)
diff --git a/tests/xml_data.py b/tests/xml_data.py
index 0c0eed9..2f9f1c6 100644
--- a/tests/xml_data.py
+++ b/tests/xml_data.py
@@ -25,7 +25,7 @@ xml_from_pdf = """<?xml version="1.0" encoding="UTF-8"?>
                 <ram:LineID>1</ram:LineID>
             </ram:AssociatedDocumentLineDocument>
             <ram:SpecifiedTradeProduct>
-                <ram:Name></ram:Name>
+                <ram:Name/>
                 <ram:Description>Product 1</ram:Description>
             </ram:SpecifiedTradeProduct>
             <ram:SpecifiedLineTradeAgreement>
@@ -76,9 +76,17 @@ xml_from_pdf = """<?xml version="1.0" encoding="UTF-8"?>
         <ram:ApplicableHeaderTradeSettlement>
             <ram:PaymentReference>1</ram:PaymentReference>
             <ram:InvoiceCurrencyCode>usd</ram:InvoiceCurrencyCode>
-            <ram:SpecifiedTradeSettlementPaymentMeans>
-                <ram:TypeCode>1</ram:TypeCode>
-            </ram:SpecifiedTradeSettlementPaymentMeans>
+                <ram:SpecifiedTradeSettlementPaymentMeans>
+                    <ram:TypeCode>30</ram:TypeCode>
+                    <ram:Information>Wire transfer</ram:Information>
+                    <ram:PayeePartyCreditorFinancialAccount>
+                        <ram:IBANID>DE02300209000106531065</ram:IBANID>
+                        <ram:AccountName>Bank 123</ram:AccountName>
+                    </ram:PayeePartyCreditorFinancialAccount>
+                    <ram:PayeeSpecifiedCreditorFinancialInstitution>
+                        <ram:BICID/>
+                    </ram:PayeeSpecifiedCreditorFinancialInstitution>
+                </ram:SpecifiedTradeSettlementPaymentMeans>
         <ram:ApplicableTradeTax>
             <ram:CalculatedAmount currencyID="usd">20.00</ram:CalculatedAmount>
             <ram:TypeCode>GST</ram:TypeCode>

From ba824215c1e31c29eb336472d3ee7e7c16c70bb1 Mon Sep 17 00:00:00 2001
From: Frederik Jaeckel <frederik.jaeckel@m-ds.de>
Date: Wed, 11 Dec 2024 16:50:02 +0100
Subject: [PATCH 23/25] delete invoice-report if type != pdf

---
 wizard_runreport.py | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/wizard_runreport.py b/wizard_runreport.py
index 621c7d7..183126b 100644
--- a/wizard_runreport.py
+++ b/wizard_runreport.py
@@ -103,8 +103,22 @@ class RunXRechnungReport(Wizard):
         invoices = Invoice.search([
             ('id', '=', data['invoice']),
             ('type', '=', 'out')])
-        to_generate = [x.id for x in invoices if not x.invoice_report_cache]
 
+        # check if stored report is pdf
+        to_delete_report = [
+            x
+            for x in invoices
+            if x.invoice_report_cache and (x.invoice_report_format != 'pdf')]
+
+        # delete reports
+        if to_delete_report:
+            Invoice.write(*[
+                to_delete_report, {
+                    'invoice_report_cache': None,
+                    'invoice_report_cache_id': None,
+                    'invoice_report_format': None}])
+
+        to_generate = [x.id for x in invoices if not x.invoice_report_cache]
         if to_generate:
             report_action = XReport.get_used_report()
 

From 23bace99bb7d49e8f81fb2c8c8986f7f0fd2bd0d Mon Sep 17 00:00:00 2001
From: Frederik Jaeckel <frederik.jaeckel@m-ds.de>
Date: Thu, 12 Dec 2024 12:37:56 +0100
Subject: [PATCH 24/25] optimize generation of pdf if its not stored to db

---
 wizard_runreport.py | 18 +++-------------
 xreport.py          | 52 +++++++++++++++++++++++++++++++++++++++------
 2 files changed, 48 insertions(+), 22 deletions(-)

diff --git a/wizard_runreport.py b/wizard_runreport.py
index 183126b..dd5b0bf 100644
--- a/wizard_runreport.py
+++ b/wizard_runreport.py
@@ -118,21 +118,10 @@ class RunXRechnungReport(Wizard):
                     'invoice_report_cache_id': None,
                     'invoice_report_format': None}])
 
-        to_generate = [x.id for x in invoices if not x.invoice_report_cache]
+        to_generate = [x for x in invoices if not x.invoice_report_cache]
         if to_generate:
-            report_action = XReport.get_used_report()
-
-            # run selected report on invoices w/o stored report-data
-            data2 = {}
-            data2.update(data)
-            data2['action_id'] = report_action.id
-            data2['model'] = report_action.model
-            data2['id'] = to_generate[0]
-            data2['ids'] = to_generate
-
-            RepInvoice = pool.get(report_action.report_name, type='report')
-            with Transaction().set_context({'with_rec_name': False}):
-                RepInvoice.execute(to_generate, data2)
+            # the pdf should be stored in db...
+            XReport.generate_pdf_data(to_generate)
 
     def do_export(self, action):
         """ run export
@@ -151,7 +140,6 @@ class RunXRechnungReport(Wizard):
         if data['edocument'] == 'edocument.facturxext.invoice-ferd':
             # pdf is stored to db
             self.generate_invoice_reports(data)
-
         return action, data
 
 # end RunXRechnungReport
diff --git a/xreport.py b/xreport.py
index 596afc4..d104558 100644
--- a/xreport.py
+++ b/xreport.py
@@ -11,6 +11,7 @@ from trytond.report import Report
 from trytond.pool import Pool
 from trytond.exceptions import UserError
 from trytond.i18n import gettext
+from trytond.transaction import Transaction
 from .wizard_runreport import edoc_versions
 
 
@@ -112,6 +113,36 @@ class XReport(Report):
                 'account_invoice_xrechnung.msg_no_report_found'))
         return act_report
 
+    @classmethod
+    def generate_pdf_data(cls, records):
+        """ generate pdf of invoice using defined report
+
+        Args:
+            records (list): records of account.invoice
+
+        Returns:
+            list: dicts - {'content': <pdf-data>, 'fname': 'file-name'}
+        """
+        report_action = cls.get_used_report()
+        RepInvoice = Pool().get(report_action.report_name, type='report')
+
+        # run selected report on invoices w/o stored report-data
+        data2 = {}
+        data2['action_id'] = report_action.id
+        data2['model'] = report_action.model
+        result = []
+        for record in records:
+            data2['id'] = record.id
+            data2['ids'] = [record.id]
+
+            with Transaction().set_context({'with_rec_name': False}):
+                (ext, content, print1, fname) = RepInvoice.execute(
+                    [record.id], data2)
+                result.append({
+                    'content': content,
+                    'fname': fname})
+        return result
+
     @classmethod
     def get_zugferd_pdf(cls, invoice, invoice_xml):
         """ generate ZugFeRD-PDF
@@ -120,15 +151,22 @@ class XReport(Report):
             invoice (record): model account.invoice
             invoice_xml (str): xml-data
         """
-        # pdf was already stored to db
-        if not (invoice.invoice_report_cache and (
-                invoice.invoice_report_format == 'pdf')):
-            raise UserError(gettext(
-                'account_invoice_xrechnung.msg_invalid_cachecontent',
-                invoice_name=invoice.rec_name))
+        # pdf was already stored to db, must be pdf
+        if invoice.invoice_report_cache:
+            if invoice.invoice_report_format != 'pdf':
+                raise UserError(gettext(
+                    'account_invoice_xrechnung.msg_invalid_cachecontent',
+                    invoice_name=invoice.rec_name))
+            pdf_data = invoice.invoice_report_cache
+        else:
+            # run report, could fail because we are in
+            # readonly-transaction
+            report_data = cls.generate_pdf_data([invoice])
+            if report_data:
+                pdf_data = report_data[0]['content']
 
         zugferd_pdf = generate_from_binary(
-            pdf_file=invoice.invoice_report_cache,
+            pdf_file=pdf_data,
             xml=invoice_xml,
             check_xsd=True,
             pdf_metadata={

From ea2d84282eb1d25b6ea81c7a0b102a83610880d7 Mon Sep 17 00:00:00 2001
From: Mathias Behrle <mathiasb@m9s.biz>
Date: Mon, 27 Jan 2025 08:35:30 +0100
Subject: [PATCH 25/25] Correct typo: Use limit instead of count.

count returns the number of found reports, but we search for the first
ActionReport instance.
---
 xreport.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xreport.py b/xreport.py
index d104558..88d58f6 100644
--- a/xreport.py
+++ b/xreport.py
@@ -105,7 +105,7 @@ class XReport(Report):
             # no report defined, use 1st found
             act_report = ActionReport.search([
                 ('model', '=', 'account.invoice'),
-                ('extension', '=', 'pdf')], count=1)
+                ('extension', '=', 'pdf')], limit=1)
             if act_report:
                 act_report = act_report[0]
         if not act_report: