diff --git a/l10n_de_tax_statement_zm/README.rst b/l10n_de_tax_statement_zm/README.rst index 8c6e96a75..c3b0157d4 100644 --- a/l10n_de_tax_statement_zm/README.rst +++ b/l10n_de_tax_statement_zm/README.rst @@ -7,7 +7,7 @@ German VAT Statement Extension !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - !! source digest: sha256:ac26ca0edd784edb0d827464759335d4bfe125eca3e1879a1f2c143a89582683 + !! source digest: sha256:78ceadb26e4f34d0c7ca2d967bdce742ab163cfe2ccb0f5548d0185e4bc9b36d !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png @@ -17,13 +17,13 @@ German VAT Statement Extension :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fl10n--germany-lightgray.png?logo=github - :target: https://github.com/OCA/l10n-germany/tree/14.0/l10n_de_tax_statement_zm + :target: https://github.com/OCA/l10n-germany/tree/16.0/l10n_de_tax_statement_zm :alt: OCA/l10n-germany .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/l10n-germany-14-0/l10n-germany-14-0-l10n_de_tax_statement_zm + :target: https://translation.odoo-community.org/projects/l10n-germany-16-0/l10n-germany-16-0-l10n_de_tax_statement_zm :alt: Translate me on Weblate .. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png - :target: https://runboat.odoo-community.org/builds?repo=OCA/l10n-germany&target_branch=14.0 + :target: https://runboat.odoo-community.org/builds?repo=OCA/l10n-germany&target_branch=16.0 :alt: Try me on Runboat |badge1| |badge2| |badge3| |badge4| |badge5| @@ -86,7 +86,7 @@ Bug Tracker Bugs are tracked on `GitHub Issues `_. In case of trouble, please check there if your issue has already been reported. If you spotted it first, help us to smash it by providing a detailed and welcomed -`feedback `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -121,6 +121,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use. -This module is part of the `OCA/l10n-germany `_ project on GitHub. +This module is part of the `OCA/l10n-germany `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/l10n_de_tax_statement_zm/__manifest__.py b/l10n_de_tax_statement_zm/__manifest__.py index 95b376119..e3c0d488b 100644 --- a/l10n_de_tax_statement_zm/__manifest__.py +++ b/l10n_de_tax_statement_zm/__manifest__.py @@ -5,7 +5,7 @@ { "name": "German VAT Statement Extension", - "version": "15.0.1.0.0", + "version": "16.0.1.0.0", "category": "Localization", "license": "AGPL-3", "author": "OpenBIG.org, Onestein, sewisoft, Odoo Community Association (OCA)", diff --git a/l10n_de_tax_statement_zm/i18n/de.po b/l10n_de_tax_statement_zm/i18n/de.po index 8f5b8688b..afcc27f91 100644 --- a/l10n_de_tax_statement_zm/i18n/de.po +++ b/l10n_de_tax_statement_zm/i18n/de.po @@ -4,13 +4,12 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 14.0\n" +"Project-Id-Version: Odoo Server 16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-01-21 10:14+0000\n" -"PO-Revision-Date: 2022-01-21 10:14+0000\n" +"POT-Creation-Date: 2024-01-23 05:06+0000\n" +"PO-Revision-Date: 2024-01-23 05:06+0000\n" "Last-Translator: \n" "Language-Team: \n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" @@ -64,14 +63,13 @@ msgid "Currency" msgstr "Währung" #. module: l10n_de_tax_statement_zm -#: model:ir.model.fields,field_description:l10n_de_tax_statement_zm.field_l10n_de_tax_statement__display_name #: model:ir.model.fields,field_description:l10n_de_tax_statement_zm.field_l10n_de_tax_statement_zm_line__display_name msgid "Display Name" msgstr "Bezeichnung" #. module: l10n_de_tax_statement_zm #: model_terms:ir.ui.view,arch_db:l10n_de_tax_statement_zm.view_l10n_de_tax_report_form -msgid "Download.CSV" +msgid "Download CSV" msgstr "Download als CSV" #. module: l10n_de_tax_statement_zm @@ -90,7 +88,6 @@ msgid "German Vat Statement" msgstr "Zusammenfassende Meldung" #. module: l10n_de_tax_statement_zm -#: model:ir.model.fields,field_description:l10n_de_tax_statement_zm.field_l10n_de_tax_statement__id #: model:ir.model.fields,field_description:l10n_de_tax_statement_zm.field_l10n_de_tax_statement_zm_line__id msgid "ID" msgstr "" @@ -101,7 +98,6 @@ msgid "Intra-Community transactions (ZM) line" msgstr "Zusmammenfassende Meldung Positionen" #. module: l10n_de_tax_statement_zm -#: model:ir.model.fields,field_description:l10n_de_tax_statement_zm.field_l10n_de_tax_statement____last_update #: model:ir.model.fields,field_description:l10n_de_tax_statement_zm.field_l10n_de_tax_statement_zm_line____last_update msgid "Last Modified on" msgstr "Geändert am" @@ -120,7 +116,7 @@ msgstr "Aktualisiert am" #: model:ir.model.fields,field_description:l10n_de_tax_statement_zm.field_l10n_de_tax_statement_zm_line__partner_id #: model_terms:ir.ui.view,arch_db:l10n_de_tax_statement_zm.report_tax_statement_zm msgid "Partner" -msgstr "Partner" +msgstr "" #. module: l10n_de_tax_statement_zm #: code:addons/l10n_de_tax_statement_zm/models/l10n_de_tax_statement.py:0 @@ -130,8 +126,11 @@ msgstr "Partner {} hat keine USt-IdNr." #. module: l10n_de_tax_statement_zm #: model_terms:ir.ui.view,arch_db:l10n_de_tax_statement_zm.view_l10n_de_tax_report_form -msgid "Press the Update button in order to recompute the lines!" -msgstr "Für eine Neuberechnung der Positionen klicken Sie auf Aktualisieren !" +msgid "" +"Press the " +"Update button in order to recompute the statement lines!" +msgstr "Für eine Neuberechnung der Positionen klicken Sie auf " +"Aktualisieren !" #. module: l10n_de_tax_statement_zm #: model:ir.model.fields,field_description:l10n_de_tax_statement_zm.field_l10n_de_tax_statement_zm_line__statement_id @@ -159,12 +158,17 @@ msgid "Update" msgstr "Aktualisieren" #. module: l10n_de_tax_statement_zm -#: model:ir.model.fields,field_description:l10n_de_tax_statement_zm.field_l10n_de_tax_statement_zm_line__vat #: model_terms:ir.ui.view,arch_db:l10n_de_tax_statement_zm.report_tax_statement_zm msgid "VAT" msgstr "USt-IdNr. (EU-Erwerber)" #. module: l10n_de_tax_statement_zm +#: model:ir.model.fields,field_description:l10n_de_tax_statement_zm.field_l10n_de_tax_statement_zm_line__vat +msgid "Vat" +msgstr "USt-IdNr. (EU-Erwerber)" + +#. module: l10n_de_tax_statement_zm +#. odoo-python #: code:addons/l10n_de_tax_statement_zm/models/l10n_de_tax_statement_zm_line.py:0 #, python-format msgid "" @@ -195,7 +199,7 @@ msgstr "" #. module: l10n_de_tax_statement_zm #: model_terms:ir.ui.view,arch_db:l10n_de_tax_statement_zm.report_tax_statement_zm msgid "ZM" -msgstr "ZM" +msgstr "" #. module: l10n_de_tax_statement_zm #: model:ir.model.fields,field_description:l10n_de_tax_statement_zm.field_l10n_de_tax_statement__zm_line_ids diff --git a/l10n_de_tax_statement_zm/i18n/l10n_de_tax_statement_zm.pot b/l10n_de_tax_statement_zm/i18n/l10n_de_tax_statement_zm.pot index bb7f9ca9b..b84f19927 100644 --- a/l10n_de_tax_statement_zm/i18n/l10n_de_tax_statement_zm.pot +++ b/l10n_de_tax_statement_zm/i18n/l10n_de_tax_statement_zm.pot @@ -4,8 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 14.0\n" +"Project-Id-Version: Odoo Server 16.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2024-01-23 05:03+0000\n" +"PO-Revision-Date: 2024-01-23 05:03+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -61,14 +63,13 @@ msgid "Currency" msgstr "" #. module: l10n_de_tax_statement_zm -#: model:ir.model.fields,field_description:l10n_de_tax_statement_zm.field_l10n_de_tax_statement__display_name #: model:ir.model.fields,field_description:l10n_de_tax_statement_zm.field_l10n_de_tax_statement_zm_line__display_name msgid "Display Name" msgstr "" #. module: l10n_de_tax_statement_zm #: model_terms:ir.ui.view,arch_db:l10n_de_tax_statement_zm.view_l10n_de_tax_report_form -msgid "Download.CSV" +msgid "Download CSV" msgstr "" #. module: l10n_de_tax_statement_zm @@ -87,7 +88,6 @@ msgid "German Vat Statement" msgstr "" #. module: l10n_de_tax_statement_zm -#: model:ir.model.fields,field_description:l10n_de_tax_statement_zm.field_l10n_de_tax_statement__id #: model:ir.model.fields,field_description:l10n_de_tax_statement_zm.field_l10n_de_tax_statement_zm_line__id msgid "ID" msgstr "" @@ -98,7 +98,6 @@ msgid "Intra-Community transactions (ZM) line" msgstr "" #. module: l10n_de_tax_statement_zm -#: model:ir.model.fields,field_description:l10n_de_tax_statement_zm.field_l10n_de_tax_statement____last_update #: model:ir.model.fields,field_description:l10n_de_tax_statement_zm.field_l10n_de_tax_statement_zm_line____last_update msgid "Last Modified on" msgstr "" @@ -127,7 +126,9 @@ msgstr "" #. module: l10n_de_tax_statement_zm #: model_terms:ir.ui.view,arch_db:l10n_de_tax_statement_zm.view_l10n_de_tax_report_form -msgid "Press the Update button in order to recompute the lines!" +msgid "" +"Press the " +"Update button in order to recompute the statement lines!" msgstr "" #. module: l10n_de_tax_statement_zm @@ -156,12 +157,17 @@ msgid "Update" msgstr "" #. module: l10n_de_tax_statement_zm -#: model:ir.model.fields,field_description:l10n_de_tax_statement_zm.field_l10n_de_tax_statement_zm_line__vat #: model_terms:ir.ui.view,arch_db:l10n_de_tax_statement_zm.report_tax_statement_zm msgid "VAT" msgstr "" #. module: l10n_de_tax_statement_zm +#: model:ir.model.fields,field_description:l10n_de_tax_statement_zm.field_l10n_de_tax_statement_zm_line__vat +msgid "Vat" +msgstr "" + +#. module: l10n_de_tax_statement_zm +#. odoo-python #: code:addons/l10n_de_tax_statement_zm/models/l10n_de_tax_statement_zm_line.py:0 #, python-format msgid "" diff --git a/l10n_de_tax_statement_zm/models/l10n_de_tax_statement_zm_line.py b/l10n_de_tax_statement_zm/models/l10n_de_tax_statement_zm_line.py index 155a76c42..27e0ebd29 100644 --- a/l10n_de_tax_statement_zm/models/l10n_de_tax_statement_zm_line.py +++ b/l10n_de_tax_statement_zm/models/l10n_de_tax_statement_zm_line.py @@ -17,18 +17,16 @@ class VatStatementZmLine(models.Model): ) partner_id = fields.Many2one( "res.partner", - string="Partner", readonly=True, required=True, ) vat = fields.Char( - string="VAT", readonly=True, ) country_code = fields.Char( readonly=True, ) - currency_id = fields.Many2one("res.currency", string="Currency", readonly=True) + currency_id = fields.Many2one("res.currency", readonly=True) amount_products = fields.Monetary(readonly=True) format_amount_products = fields.Char(compute="_compute_zm_amount_format") amount_services = fields.Monetary(readonly=True) diff --git a/l10n_de_tax_statement_zm/static/description/index.html b/l10n_de_tax_statement_zm/static/description/index.html index 5e363461f..1f3fa4e55 100755 --- a/l10n_de_tax_statement_zm/static/description/index.html +++ b/l10n_de_tax_statement_zm/static/description/index.html @@ -367,9 +367,9 @@

German VAT Statement Extension

!! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -!! source digest: sha256:ac26ca0edd784edb0d827464759335d4bfe125eca3e1879a1f2c143a89582683 +!! source digest: sha256:78ceadb26e4f34d0c7ca2d967bdce742ab163cfe2ccb0f5548d0185e4bc9b36d !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

Beta License: AGPL-3 OCA/l10n-germany Translate me on Weblate Try me on Runboat

+

Beta License: AGPL-3 OCA/l10n-germany Translate me on Weblate Try me on Runboat

This module extends the German VAT Statement module (Umsatzsteuervoranmeldung), by adding the statement for the Intra-Community transactions declaration (Zusammenfassende Meldung).

This report is based on the line Steuerfr. Umsätze mit Vorsteuerabz. innerg. Lieferungen (§4 Nr. 1b) an Abnehmer mit USt-ID (41) and Nicht steuerb. sonst. Leist. gem. § 18b S. 1 Nr. 2 (21) of the German VAT Statement report. The period is also the same as the one selected in the VAT statement report.

@@ -437,7 +437,7 @@

Bug Tracker

Bugs are tracked on GitHub Issues. In case of trouble, please check there if your issue has already been reported. If you spotted it first, help us to smash it by providing a detailed and welcomed -feedback.

+feedback.

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

@@ -466,7 +466,7 @@

Maintainers

OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use.

-

This module is part of the OCA/l10n-germany project on GitHub.

+

This module is part of the OCA/l10n-germany project on GitHub.

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

diff --git a/l10n_de_tax_statement_zm/tests/test_l10n_de_tax_statement_zm.py b/l10n_de_tax_statement_zm/tests/test_l10n_de_tax_statement_zm.py index ac1ad8362..1b13a44ea 100644 --- a/l10n_de_tax_statement_zm/tests/test_l10n_de_tax_statement_zm.py +++ b/l10n_de_tax_statement_zm/tests/test_l10n_de_tax_statement_zm.py @@ -68,34 +68,36 @@ def setUpClass(cls): ) def _create_test_invoice(self, products=True, services=True): + account_receivable = self.env["account.account"].create( + { + "account_type": "expense", + "code": "EXPTEST", + "name": "Test expense account", + } + ) self.journal_1 = self.env["account.journal"].create( { "name": "Journal 1", "code": "Jou1", "type": "sale", + "default_account_id": account_receivable.id, } ) self.partner = self.env["res.partner"].create({"name": "Test partner"}) - account_receivable = self.env["account.account"].create( - { - "user_type_id": self.env.ref("account.data_account_type_expenses").id, - "code": "EXPTEST", - "name": "Test expense account", - } - ) - invoice_form = Form( - self.env["account.move"].with_context(default_move_type="out_invoice"), + self.env["account.move"].with_context( + default_move_type="out_invoice", + default_journal_id=self.journal_1.id, + ), ) invoice_form.partner_id = self.partner - invoice_form.journal_id = self.journal_1 + self.assertEqual(self.journal_1, invoice_form.journal_id) invoice_form.invoice_date = fields.Date.today() if products: with invoice_form.invoice_line_ids.new() as line: line.name = "Test line 1" line.quantity = 1.0 - line.account_id = account_receivable line.price_unit = 100.0 line.tax_ids.clear() line.tax_ids.add(self.tax_1) @@ -103,7 +105,6 @@ def _create_test_invoice(self, products=True, services=True): with invoice_form.invoice_line_ids.new() as line: line.name = "Test line 2" line.quantity = 1.0 - line.account_id = account_receivable line.price_unit = 50.0 line.tax_ids.clear() line.tax_ids.add(self.tax_2) @@ -115,6 +116,9 @@ def _create_test_invoice(self, products=True, services=True): else: self.assertFalse(len(invoice.line_ids)) + for line in invoice.invoice_line_ids: + self.assertEqual(account_receivable, line.account_id) + return invoice def test_01_post_final(self): @@ -191,7 +195,6 @@ def test_03_zm_invoice_service(self): for tax_line in invoice_line.tax_ids: for rep_line in tax_line.invoice_repartition_line_ids: rep_line.tag_ids = self.tag_4 - invoice._onchange_invoice_line_ids() invoice.action_post() self.statement_with_zm.statement_update() diff --git a/l10n_de_tax_statement_zm/views/l10n_de_vat_statement_view.xml b/l10n_de_tax_statement_zm/views/l10n_de_vat_statement_view.xml index a036a5cda..3e2218af9 100644 --- a/l10n_de_tax_statement_zm/views/l10n_de_vat_statement_view.xml +++ b/l10n_de_tax_statement_zm/views/l10n_de_vat_statement_view.xml @@ -11,6 +11,24 @@ ref="l10n_de_tax_statement.view_l10n_de_tax_report_form" /> +
Press the Update button in order to recompute the lines!
-