Skip to content

Commit

Permalink
[MIG] 16.0 l10n_de_tax_statement_zm - Migration to 16.0
Browse files Browse the repository at this point in the history
  • Loading branch information
MrGigSolutions committed Apr 30, 2024
1 parent 5707251 commit 9b6bba2
Show file tree
Hide file tree
Showing 10 changed files with 88 additions and 64 deletions.
12 changes: 6 additions & 6 deletions l10n_de_tax_statement_zm/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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|
Expand Down Expand Up @@ -86,7 +86,7 @@ Bug Tracker
Bugs are tracked on `GitHub Issues <https://github.com/OCA/l10n-germany/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 <https://github.com/OCA/l10n-germany/issues/new?body=module:%20l10n_de_tax_statement_zm%0Aversion:%2014.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
`feedback <https://github.com/OCA/l10n-germany/issues/new?body=module:%20l10n_de_tax_statement_zm%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.

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

Expand Down Expand Up @@ -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 <https://github.com/OCA/l10n-germany/tree/14.0/l10n_de_tax_statement_zm>`_ project on GitHub.
This module is part of the `OCA/l10n-germany <https://github.com/OCA/l10n-germany/tree/16.0/l10n_de_tax_statement_zm>`_ project on GitHub.

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
2 changes: 1 addition & 1 deletion l10n_de_tax_statement_zm/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)",
Expand Down
30 changes: 17 additions & 13 deletions l10n_de_tax_statement_zm/i18n/de.po
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand All @@ -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 ""
Expand All @@ -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"
Expand All @@ -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
Expand All @@ -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 <span class=\"text-uppercase\"><i class=\"fa fa-repeat\"/> "
"Update</span> button in order to recompute the statement lines!"
msgstr "Für eine Neuberechnung der Positionen klicken Sie auf <span class=\"text-uppercase\"><i class=\"fa fa-repeat\"/> "
"Aktualisieren</span> !"

#. 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
Expand Down Expand Up @@ -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 ""
Expand Down Expand Up @@ -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
Expand Down
20 changes: 13 additions & 7 deletions l10n_de_tax_statement_zm/i18n/l10n_de_tax_statement_zm.pot
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand All @@ -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 ""
Expand All @@ -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 ""
Expand Down Expand Up @@ -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 <span class=\"text-uppercase\"><i class=\"fa fa-repeat\"/> "
"Update</span> button in order to recompute the statement lines!"
msgstr ""

#. module: l10n_de_tax_statement_zm
Expand Down Expand Up @@ -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 ""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions l10n_de_tax_statement_zm/static/description/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -367,9 +367,9 @@ <h1 class="title">German VAT Statement Extension</h1>
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:ac26ca0edd784edb0d827464759335d4bfe125eca3e1879a1f2c143a89582683
!! source digest: sha256:78ceadb26e4f34d0c7ca2d967bdce742ab163cfe2ccb0f5548d0185e4bc9b36d
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/l10n-germany/tree/14.0/l10n_de_tax_statement_zm"><img alt="OCA/l10n-germany" src="https://img.shields.io/badge/github-OCA%2Fl10n--germany-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/l10n-germany-14-0/l10n-germany-14-0-l10n_de_tax_statement_zm"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/l10n-germany&amp;target_branch=14.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/l10n-germany/tree/16.0/l10n_de_tax_statement_zm"><img alt="OCA/l10n-germany" src="https://img.shields.io/badge/github-OCA%2Fl10n--germany-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/l10n-germany-16-0/l10n-germany-16-0-l10n_de_tax_statement_zm"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/l10n-germany&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
<p>This module extends the <em>German VAT Statement</em> module (Umsatzsteuervoranmeldung), by adding the statement for the <em>Intra-Community transactions declaration</em> (Zusammenfassende Meldung).</p>
<p>This report is based on the line <em>Steuerfr. Umsätze mit Vorsteuerabz. innerg. Lieferungen (§4 Nr. 1b) an Abnehmer mit USt-ID (41)</em> and <em>Nicht steuerb. sonst. Leist. gem. § 18b S. 1 Nr. 2 (21)</em> of the German VAT Statement report.
The period is also the same as the one selected in the VAT statement report.</p>
Expand Down Expand Up @@ -437,7 +437,7 @@ <h1><a class="toc-backref" href="#toc-entry-5">Bug Tracker</a></h1>
<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/l10n-germany/issues">GitHub Issues</a>.
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
<a class="reference external" href="https://github.com/OCA/l10n-germany/issues/new?body=module:%20l10n_de_tax_statement_zm%0Aversion:%2014.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
<a class="reference external" href="https://github.com/OCA/l10n-germany/issues/new?body=module:%20l10n_de_tax_statement_zm%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
<p>Do not contact contributors directly about support or help with technical issues.</p>
</div>
<div class="section" id="credits">
Expand Down Expand Up @@ -466,7 +466,7 @@ <h2><a class="toc-backref" href="#toc-entry-9">Maintainers</a></h2>
<p>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.</p>
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/l10n-germany/tree/14.0/l10n_de_tax_statement_zm">OCA/l10n-germany</a> project on GitHub.</p>
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/l10n-germany/tree/16.0/l10n_de_tax_statement_zm">OCA/l10n-germany</a> project on GitHub.</p>
<p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
</div>
</div>
Expand Down
29 changes: 16 additions & 13 deletions l10n_de_tax_statement_zm/tests/test_l10n_de_tax_statement_zm.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,42 +68,43 @@ 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)
if services:
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)
Expand All @@ -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):
Expand Down Expand Up @@ -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()

Expand Down
Loading

0 comments on commit 9b6bba2

Please sign in to comment.