From ec5164510cf23c9ac648309c008e976fcbcc4711 Mon Sep 17 00:00:00 2001 From: Laurent Smet Date: Tue, 29 Aug 2017 08:47:11 +0200 Subject: [PATCH] [IMP] l10n_no: Create tags and assign them to taxes task: https://www.odoo.com/web#id=22597&view_type=form&model=project.task&action=333&active_id=131&menu_id=4720 PR: #19104 --- addons/l10n_no/__openerp__.py | 2 +- addons/l10n_no/account_tax.xml | 279 ++++++++++-------- .../2.0/post-migrate_tags_on_taxes.py | 7 + .../2.0/pre-set_tags_and_taxes_updatable.py | 7 + 4 files changed, 169 insertions(+), 126 deletions(-) create mode 100644 addons/l10n_no/migrations/2.0/post-migrate_tags_on_taxes.py create mode 100644 addons/l10n_no/migrations/2.0/pre-set_tags_and_taxes_updatable.py diff --git a/addons/l10n_no/__openerp__.py b/addons/l10n_no/__openerp__.py index 28b05ec1bad..7ec28b9783d 100644 --- a/addons/l10n_no/__openerp__.py +++ b/addons/l10n_no/__openerp__.py @@ -3,7 +3,7 @@ { "name" : "Norway - Accounting", - "version" : "1.1", + "version" : "2.0", "author" : "Rolv Råen", 'category': 'Localization', "description": """This is the module to manage the accounting chart for Norway in Odoo. diff --git a/addons/l10n_no/account_tax.xml b/addons/l10n_no/account_tax.xml index 2336d769095..e70dd59e375 100644 --- a/addons/l10n_no/account_tax.xml +++ b/addons/l10n_no/account_tax.xml @@ -1,134 +1,163 @@  - - - + + - - Utgående 25% mva - taxes - - - Utgående 15% mva - taxes - - - Utgående 10% mva - taxes - - - Inngående 25% mva - taxes - - - Inngående 15% mva - taxes - - - Inngående 10% mva - taxes - + + + Sum avgiftsgrunnlag + taxes + + + Sum innkjøp + taxes + + + Ikke momspliktig omsetning + taxes + + + Grunnlag for utgående avgift, høy sats + taxes + + + Grunnlag for utgående avgift, mellom sats + taxes + + + Grunnlag for utgående avgift, lav sats + taxes + + + Grunnlag for inngående avgift, høy sats + taxes + + + Grunnlag for inngående avgift, mellom sats + taxes + + + Grunnlag for inngående avgift, lav sats + taxes + + + Netto beregnet avgift + taxes + + + Beregnet inngående avgift, høy sats + taxes + + + Beregnet inngående avgift, lav sats + taxes + + + Beregnet inngående avgift, mellom sats + taxes + + + Beregnet utgående avgift, høy sats + taxes + + + Beregnet utgående avgift, lav sats + taxes + + + Beregnet utgående avgift, mellom sats + taxes + - + + + + Utgående 25% mva + Utgående 25% mva + 25 + percent + sale + + + + + + + Utgående 15% mva + Utgående 15% mva + 15 + percent + sale + + + + + + + Utgående 10% mva + Utgående 10% mva + 10 + percent + sale + + + + + + + Inngående 25% mva + Inngående 25% mva + 25 + percent + purchase + + + + + + + Inngående 15% mva + Inngående 15% mva + 15 + percent + purchase + + + + + + + Inngående 10% mva + Inngående 10% mva + 10 + percent + purchase + + + + + + + Inngående 0% mva - taxes + Inngående 0% mva + 0 + percent + purchase + + - + + Utgående 0% mva - taxes + Utgående 0% mva + 0 + percent + sale + + + - - - - Utgående 25% mva - Utgående 25% mva - 25 - percent - sale - - - - - - - Utgående 15% mva - Utgående 15% mva - 15 - percent - sale - - - - - - - Utgående 10% mva - Utgående 10% mva - 10 - percent - sale - - - - - - - Inngående 25% mva - Inngående 25% mva - 25 - percent - purchase - - - - - - - Inngående 15% mva - Inngående 15% mva - 15 - percent - purchase - - - - - - - Inngående 10% mva - Inngående 10% mva - 10 - percent - purchase - - - - - - - - Inngående 0% mva - Inngående 0% mva - 0 - percent - purchase - - - - - - - - Utgående 0% mva - Utgående 0% mva - 0 - percent - sale - - - - - - - + + diff --git a/addons/l10n_no/migrations/2.0/post-migrate_tags_on_taxes.py b/addons/l10n_no/migrations/2.0/post-migrate_tags_on_taxes.py new file mode 100644 index 00000000000..a37770d2c1c --- /dev/null +++ b/addons/l10n_no/migrations/2.0/post-migrate_tags_on_taxes.py @@ -0,0 +1,7 @@ +from openerp.modules.registry import RegistryManager + + +def migrate(cr, version): + registry = RegistryManager.get(cr.dbname) + from openerp.addons.account.models.chart_template import migrate_tags_on_taxes + migrate_tags_on_taxes(cr, registry) diff --git a/addons/l10n_no/migrations/2.0/pre-set_tags_and_taxes_updatable.py b/addons/l10n_no/migrations/2.0/pre-set_tags_and_taxes_updatable.py new file mode 100644 index 00000000000..fa1694f229a --- /dev/null +++ b/addons/l10n_no/migrations/2.0/pre-set_tags_and_taxes_updatable.py @@ -0,0 +1,7 @@ +from openerp.modules.registry import RegistryManager + + +def migrate(cr, version): + registry = RegistryManager.get(cr.dbname) + from openerp.addons.account.models.chart_template import migrate_set_tags_and_taxes_updatable + migrate_set_tags_and_taxes_updatable(cr, registry, 'l10n_no')