Merge f1cb35b into 49157e5

OCA · Apr 11, 2019 · 3cf722b · 3cf722b
2 parents 49157e5 + f1cb35b
commit 3cf722b
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 9 deletions.
diff --git a/l10n_de_tax_statement/__manifest__.py b/l10n_de_tax_statement/__manifest__.py
@@ -4,7 +4,7 @@
 
 {
     'name': 'German VAT Statement',
-    'version': '11.0.1.0.0',
+    'version': '11.0.1.0.1',
     'category': 'Localization',
     'license': 'AGPL-3',
     'author': 'OpenBIG.org, Onestein, Odoo Community Association (OCA)',

diff --git a/l10n_de_tax_statement/models/l10n_de_tax_statement.py b/l10n_de_tax_statement/models/l10n_de_tax_statement.py
@@ -13,6 +13,7 @@
 
 class VatStatement(models.Model):
     _name = 'l10n.de.tax.statement'
+    _description = 'German Vat Statement'
 
     name = fields.Char(
         string='Tax Statement',
@@ -67,7 +68,7 @@ class VatStatement(models.Model):
     )
     format_tax_total = fields.Char(
         compute='_compute_amount_format_tax_total',
-        string='Verbl. Ust.-Vorauszahlung (66 - 67)'
+        string='Verbl. Ust.-Vorauszahlung'
     )
     move_line_ids = fields.One2many(
         'account.move.line',

diff --git a/l10n_de_tax_statement/models/l10n_de_tax_statement_config.py b/l10n_de_tax_statement/models/l10n_de_tax_statement_config.py
@@ -7,6 +7,7 @@
 
 class VatStatementConfig(models.Model):
     _name = 'l10n.de.tax.statement.config'
+    _description = 'German Vat Statement Configuration'
 
     company_id = fields.Many2one(
         'res.company',

diff --git a/l10n_de_tax_statement/models/l10n_de_tax_statement_line.py b/l10n_de_tax_statement/models/l10n_de_tax_statement_line.py
@@ -163,8 +163,8 @@ def _get_domain_draft(self, taxes, tax_or_base):
         ctx.update({
             'l10n_de_statement_tax_ids': taxes.ids
         })
-        accounttax = self.env['account.tax'].with_context(ctx)
-        return accounttax.get_move_lines_domain(tax_or_base=tax_or_base)
+        AccountTax = self.env['account.tax'].with_context(ctx)
+        return AccountTax.get_move_lines_domain(tax_or_base=tax_or_base)
 
     def _get_domain_posted(self, taxes, tax_or_base):
         self.ensure_one()

diff --git a/l10n_de_tax_statement/readme/DESCRIPTION.rst b/l10n_de_tax_statement/readme/DESCRIPTION.rst
@@ -1,2 +1,2 @@
-This module provides the  *German VAT Statement* (Umsatzsteuervoranmeldung). 
+This module provides the *German VAT Statement* (Umsatzsteuervoranmeldung).
 You can use the *German VAT Statement* report to declare your taxes on www.elster.de.
diff --git a/l10n_de_tax_statement/readme/ROADMAP.rst b/l10n_de_tax_statement/readme/ROADMAP.rst
@@ -1,3 +1,3 @@
 * Add checks to avoid errors in the report, e.g. no VAT code, tax-code not matching fiscal position, etc..
 * Re-formatting of tax base values from float format to integer. Currently in the official tax forms we need to enter integer format for some of the base tax values (f.e. instead of 250,52 € -> 251 €). The non writable tax calculation is based on the integer format. We propose to do that change manually in the www.elster.de tax declaration forms. It should be easy to adopt.
-* Report in .xml format in order to import the vat statement on www.elster.de portal in order to avoid manuall transmission of the values. 
+* Report in .xml format in order to import the vat statement on www.elster.de portal in order to avoid manuall transmission of the values.
diff --git a/l10n_de_tax_statement/readme/USAGE.rst b/l10n_de_tax_statement/readme/USAGE.rst
@@ -21,4 +21,4 @@ Extra info about the workflow:
 
 Printing a PDF report:
 
-#. If you need to print the report in PDF, open a statement form and click: `Print -> German Tax Statement`
+#. If you need to print the report in PDF, open a statement form and click: `Print -> German Tax Statement`
diff --git a/l10n_de_tax_statement/views/l10n_de_tax_statement_view.xml b/l10n_de_tax_statement/views/l10n_de_tax_statement_view.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright 2019 OpenBIG (<http://www.openbig.org>)
-     Copyright 2019 Onestein (<https://www.onestein.eu>)     
+     Copyright 2019 Onestein (<https://www.onestein.eu>)
      License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
 
 <odoo>

diff --git a/l10n_de_tax_statement/wizard/l10n_de_tax_statement_config_wizard.xml b/l10n_de_tax_statement/wizard/l10n_de_tax_statement_config_wizard.xml
@@ -248,7 +248,7 @@
     </record>
 
     <record id="action_account_tax_statement_de_config" model="ir.actions.act_window">
-        <field name="name">Ust-Voranmeldung</field>
+        <field name="name">German Tax Tags</field>
         <field name="res_model">l10n.de.tax.statement.config.wizard</field>
         <field name="view_mode">form</field>
         <field name="target">inline</field>