From edc471ca1ae1237a0fbb09942b6375908ab7e059 Mon Sep 17 00:00:00 2001 From: Parthiv Patel Date: Fri, 24 Nov 2023 08:35:17 +0000 Subject: [PATCH] [PATCH] Upstream patch - 24112023 --- .../models/account_edi_common.py | 5 + .../models/account_edi_xml_cii_facturx.py | 23 +- .../models/account_edi_xml_ubl_20.py | 101 +--- addons/auth_signup/models/res_users.py | 9 +- addons/fleet/models/fleet_vehicle.py | 19 +- addons/fleet/tests/test_access_rights.py | 3 +- addons/gamification/tests/__init__.py | 1 + addons/gamification/tests/common.py | 19 + addons/gamification/tests/test_challenge.py | 4 +- .../hr_holidays/models/hr_leave_allocation.py | 2 + .../static/src/legacy/public_livechat.js | 9 +- .../l10n_ch/data/account_tax_report_data.xml | 385 +++++++++------- addons/l10n_ch/i18n_extra/de.po | 413 ++++++++++++----- addons/l10n_ch/i18n_extra/en.po | 426 ++++++++++++----- addons/l10n_ch/i18n_extra/fr.po | 355 ++++++++++---- addons/l10n_ch/i18n_extra/it.po | 435 +++++++++++++----- addons/l10n_ch/i18n_extra/l10n_ch.pot | 325 ++++++++++--- addons/mail/tests/common.py | 35 +- addons/mass_mailing/tests/common.py | 72 ++- addons/mrp/models/product.py | 2 +- addons/point_of_sale/wizard/pos_details.py | 2 +- addons/portal/views/portal_templates.xml | 8 +- addons/stock_account/models/product.py | 5 + .../tests/test_stockvaluationlayer.py | 36 ++ addons/website/models/res_users.py | 5 + .../tests/test_website_reset_password.py | 23 + .../models/event_track.py | 2 +- .../website_forum/tests/test_forum_process.py | 4 +- addons/website_sale/controllers/main.py | 2 +- .../website_slides/tests/test_ui_wslides.py | 8 +- 30 files changed, 1893 insertions(+), 845 deletions(-) create mode 100644 addons/gamification/tests/common.py diff --git a/addons/account_edi_ubl_cii/models/account_edi_common.py b/addons/account_edi_ubl_cii/models/account_edi_common.py index 10148aeaee..51751ffff6 100644 --- a/addons/account_edi_ubl_cii/models/account_edi_common.py +++ b/addons/account_edi_ubl_cii/models/account_edi_common.py @@ -110,6 +110,11 @@ class AccountEdiCommon(models.AbstractModel): return UOM_TO_UNECE_CODE.get(xmlid[line.product_uom_id.id], 'C62') return 'C62' + def _find_value(self, xpath, tree): + # avoid 'TypeError: empty namespace prefix is not supported in XPath' + nsmap = {k: v for k, v in tree.nsmap.items() if k is not None} + return self.env['account.edi.format']._find_value(xpath=xpath, xml_element=tree, namespaces=nsmap) + # ------------------------------------------------------------------------- # TAXES # ------------------------------------------------------------------------- diff --git a/addons/account_edi_ubl_cii/models/account_edi_xml_cii_facturx.py b/addons/account_edi_ubl_cii/models/account_edi_xml_cii_facturx.py index 0861d0bb5b..16a81a7595 100644 --- a/addons/account_edi_ubl_cii/models/account_edi_xml_cii_facturx.py +++ b/addons/account_edi_ubl_cii/models/account_edi_xml_cii_facturx.py @@ -246,10 +246,6 @@ class AccountEdiXmlCII(models.AbstractModel): # ------------------------------------------------------------------------- def _import_fill_invoice_form(self, journal, tree, invoice_form, qty_factor): - - def _find_value(xpath, element=tree): - return self.env['account.edi.format']._find_value(xpath, element, tree.nsmap) - logs = [] if qty_factor == -1: @@ -258,10 +254,10 @@ class AccountEdiXmlCII(models.AbstractModel): # ==== partner_id ==== role = invoice_form.journal_id.type == 'purchase' and 'SellerTradeParty' or 'BuyerTradeParty' - name = _find_value(f"//ram:{role}/ram:Name") - mail = _find_value(f"//ram:{role}//ram:URIID[@schemeID='SMTP']") - vat = _find_value(f"//ram:{role}/ram:SpecifiedTaxRegistration/ram:ID") - phone = _find_value(f"//ram:{role}/ram:DefinedTradeContact/ram:TelephoneUniversalCommunication/ram:CompleteNumber") + name = self._find_value(f"//ram:{role}/ram:Name", tree) + mail = self._find_value(f"//ram:{role}//ram:URIID[@schemeID='SMTP']", tree) + vat = self._find_value(f"//ram:{role}/ram:SpecifiedTaxRegistration/ram:ID", tree) + phone = self._find_value(f"//ram:{role}/ram:DefinedTradeContact/ram:TelephoneUniversalCommunication/ram:CompleteNumber", tree) self._import_retrieve_and_fill_partner(invoice_form, name=name, phone=phone, mail=mail, vat=vat) # ==== currency_id ==== @@ -345,15 +341,12 @@ class AccountEdiXmlCII(models.AbstractModel): def _import_fill_invoice_line_form(self, journal, tree, invoice_form, invoice_line_form, qty_factor): logs = [] - def _find_value(xpath, element=tree): - return self.env['account.edi.format']._find_value(xpath, element, tree.nsmap) - # Product. - name = _find_value('.//ram:SpecifiedTradeProduct/ram:Name', tree) + name = self._find_value('.//ram:SpecifiedTradeProduct/ram:Name', tree) invoice_line_form.product_id = self.env['account.edi.format']._retrieve_product( - default_code=_find_value('.//ram:SpecifiedTradeProduct/ram:SellerAssignedID', tree), - name=_find_value('.//ram:SpecifiedTradeProduct/ram:Name', tree), - barcode=_find_value('.//ram:SpecifiedTradeProduct/ram:GlobalID', tree) + default_code=self._find_value('.//ram:SpecifiedTradeProduct/ram:SellerAssignedID', tree), + name=name, + barcode=self._find_value('.//ram:SpecifiedTradeProduct/ram:GlobalID', tree) ) # force original line description instead of the one copied from product's Sales Description if name: diff --git a/addons/account_edi_ubl_cii/models/account_edi_xml_ubl_20.py b/addons/account_edi_ubl_cii/models/account_edi_xml_ubl_20.py index 23debfbd81..1371f43bd0 100644 --- a/addons/account_edi_ubl_cii/models/account_edi_xml_ubl_20.py +++ b/addons/account_edi_ubl_cii/models/account_edi_xml_ubl_20.py @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- from flectra import models, _ -from flectra.osv import expression from flectra.tools import html2plaintext, cleanup_xml_node from lxml import etree @@ -487,12 +486,6 @@ class AccountEdiXmlUBL20(models.AbstractModel): # ------------------------------------------------------------------------- def _import_fill_invoice_form(self, journal, tree, invoice_form, qty_factor): - - def _find_value(xpath, element=tree): - # avoid 'TypeError: empty namespace prefix is not supported in XPath' - nsmap = {k: v for k, v in tree.nsmap.items() if k is not None} - return self.env['account.edi.format']._find_value(xpath, element, nsmap) - logs = [] if qty_factor == -1: @@ -501,10 +494,10 @@ class AccountEdiXmlUBL20(models.AbstractModel): # ==== partner_id ==== role = "Customer" if invoice_form.journal_id.type == 'sale' else "Supplier" - vat = _find_value(f'//cac:Accounting{role}Party/cac:Party//cbc:CompanyID') - phone = _find_value(f'//cac:Accounting{role}Party/cac:Party//cbc:Telephone') - mail = _find_value(f'//cac:Accounting{role}Party/cac:Party//cbc:ElectronicMail') - name = _find_value(f'//cac:Accounting{role}Party/cac:Party//cbc:Name') + vat = self._find_value(f'//cac:Accounting{role}Party/cac:Party//cbc:CompanyID', tree) + phone = self._find_value(f'//cac:Accounting{role}Party/cac:Party//cbc:Telephone', tree) + mail = self._find_value(f'//cac:Accounting{role}Party/cac:Party//cbc:ElectronicMail', tree) + name = self._find_value(f'//cac:Accounting{role}Party/cac:Party//cbc:Name', tree) self._import_retrieve_and_fill_partner(invoice_form, name=name, phone=phone, mail=mail, vat=vat) # ==== currency_id ==== @@ -592,13 +585,16 @@ class AccountEdiXmlUBL20(models.AbstractModel): def _import_fill_invoice_line_form(self, journal, tree, invoice_form, invoice_line_form, qty_factor): logs = [] - # Product - product = self._import_retrieve_info_from_map( - tree, - self._import_retrieve_product_map(journal), + # Product. + name = self._find_value('./cac:Item/cbc:Name', tree) + invoice_line_form.product_id = self.env['account.edi.format']._retrieve_product( + default_code=self._find_value('./cac:Item/cac:SellersItemIdentification/cbc:ID', tree), + name=name, + barcode=self._find_value("./cac:Item/cac:StandardItemIdentification/cbc:ID[@schemeID='0160']", tree), ) - if product is not None: - invoice_line_form.product_id = product + # force original line description instead of the one copied from product's Sales Description + if name: + invoice_line_form.name = name # Description description_node = tree.find('./{*}Item/{*}Description') @@ -649,74 +645,3 @@ class AccountEdiXmlUBL20(models.AbstractModel): if tree.tag == '{urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2}CreditNote': return ('in_refund', 'out_refund'), 1 return None, None - - def _import_retrieve_partner_map(self, company, move_type='purchase'): - role = "Customer" if move_type == 'sale' else "Supplier" - - def with_vat(tree, extra_domain): - vat_node = tree.find(f'.//{{*}}Accounting{role}Party/{{*}}Party//{{*}}CompanyID') - vat = None if vat_node is None else vat_node.text - return self.env['account.edi.format']._retrieve_partner_with_vat(vat, extra_domain) - - def with_phone_mail(tree, extra_domain): - phone_node = tree.find(f'.//{{*}}Accounting{role}Party/{{*}}Party//{{*}}Telephone') - mail_node = tree.find(f'.//{{*}}Accounting{role}Party/{{*}}Party//{{*}}ElectronicMail') - - phone = None if phone_node is None else phone_node.text - mail = None if mail_node is None else mail_node.text - return self.env['account.edi.format']._retrieve_partner_with_phone_mail(phone, mail, extra_domain) - - def with_name(tree, extra_domain): - name_node = tree.find(f'.//{{*}}Accounting{role}Party/{{*}}Party//{{*}}Name') - name = None if name_node is None else name_node.text - return self.env['account.edi.format']._retrieve_partner_with_name(name, extra_domain) - - return { - 10: lambda tree: with_vat(tree, [('company_id', '=', company.id)]), - 20: lambda tree: with_vat(tree, []), - 30: lambda tree: with_phone_mail(tree, [('company_id', '=', company.id)]), - 40: lambda tree: with_phone_mail(tree, []), - 50: lambda tree: with_name(tree, [('company_id', '=', company.id)]), - 60: lambda tree: with_name(tree, []), - } - - def _import_retrieve_product_map(self, company): - - def with_code_barcode(tree, extra_domain): - domains = [] - - default_code_node = tree.find('./{*}Item/{*}SellersItemIdentification/{*}ID') - if default_code_node is not None: - domains.append([('default_code', '=', default_code_node.text)]) - - barcode_node = tree.find("./{*}Item/{*}StandardItemIdentification/{*}ID[@schemeID='0160']") - if barcode_node is not None: - domains.append([('barcode', '=', barcode_node.text)]) - - if not domains: - return None - - return self.env['product.product'].search(extra_domain + expression.OR(domains), limit=1) - - def with_name(tree, extra_domain): - name_node = tree.find('./{*}Item/{*}Name') - - if name_node is None: - return None - - return self.env['product.product'].search(extra_domain + [('name', 'ilike', name_node.text)], limit=1) - - return { - 10: lambda tree: with_code_barcode(tree, [('company_id', '=', company.id)]), - 20: lambda tree: with_code_barcode(tree, []), - 30: lambda tree: with_name(tree, [('company_id', '=', company.id)]), - 40: lambda tree: with_name(tree, []), - } - - def _import_retrieve_info_from_map(self, tree, import_method_map): - for key in sorted(import_method_map.keys()): - record = import_method_map[key](tree) - if record: - return record - - return None diff --git a/addons/auth_signup/models/res_users.py b/addons/auth_signup/models/res_users.py index 1480b06238..f9ecc19191 100644 --- a/addons/auth_signup/models/res_users.py +++ b/addons/auth_signup/models/res_users.py @@ -155,11 +155,14 @@ class ResUsers(models.Model): """ retrieve the user corresponding to login (login or email), and reset their password """ - users = self.search([('login', '=', login)]) + users = self.search(self._get_login_domain(login)) + if not users: + users = self.search(self._get_email_domain(login)) + if not users: - users = self.search([('email', '=', login)]) - if len(users) != 1: raise Exception(_('Reset password: invalid username or email')) + if len(users) > 1: + raise Exception(_('Multiple accounts found for this email')) return users.action_reset_password() def action_reset_password(self): diff --git a/addons/fleet/models/fleet_vehicle.py b/addons/fleet/models/fleet_vehicle.py index 2d9c3b72c9..2e6c5b2b8d 100644 --- a/addons/fleet/models/fleet_vehicle.py +++ b/addons/fleet/models/fleet_vehicle.py @@ -199,11 +199,20 @@ class FleetVehicle(models.Model): res.append(('id', search_operator, res_ids)) return res + def _clean_vals_internal_user(self, vals): + # Fleet administrator may not have rights to write on partner + # related fields when the driver_id is a res.user. + # This trick is used to prevent access right error. + su_vals = {} + if self.env.su: + return su_vals + if 'plan_to_change_car' in vals: + su_vals['plan_to_change_car'] = vals.pop('plan_to_change_car') + return su_vals + @api.model def create(self, vals): - # Fleet administrator may not have rights to create the plan_to_change_car value when the driver_id is a res.user - # This trick is used to prevent access right error. - ptc_value = 'plan_to_change_car' in vals.keys() and {'plan_to_change_car': vals.pop('plan_to_change_car')} + ptc_value = self._clean_vals_internal_user(vals) res = super(FleetVehicle, self).create(vals) if ptc_value: res.sudo().write(ptc_value) @@ -228,7 +237,9 @@ class FleetVehicle(models.Model): if not state_waiting_list or state_waiting_list.id not in states: future_driver = self.env['res.partner'].browse(vals['future_driver_id']) future_driver.sudo().write({'plan_to_change_car': True}) - + su_vals = self._clean_vals_internal_user(vals) + if su_vals: + self.sudo().write(su_vals) res = super(FleetVehicle, self).write(vals) if 'active' in vals and not vals['active']: self.mapped('log_contracts').write({'active': False}) diff --git a/addons/fleet/tests/test_access_rights.py b/addons/fleet/tests/test_access_rights.py index e69403fc5e..f4921eab0b 100644 --- a/addons/fleet/tests/test_access_rights.py +++ b/addons/fleet/tests/test_access_rights.py @@ -15,8 +15,9 @@ class TestFleet(common.SavepointCase): "brand_id": brand.id, "name": "A3", }) - self.env["fleet.vehicle"].with_user(manager).create({ + car = self.env["fleet.vehicle"].with_user(manager).create({ "model_id": model.id, "driver_id": user.partner_id.id, "plan_to_change_car": False }) + car.with_user(manager).plan_to_change_car = True diff --git a/addons/gamification/tests/__init__.py b/addons/gamification/tests/__init__.py index bdb5e314b0..f089b1594c 100644 --- a/addons/gamification/tests/__init__.py +++ b/addons/gamification/tests/__init__.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- # Part of Odoo, Flectra. See LICENSE file for full copyright and licensing details. +from . import common from . import test_challenge from . import test_karma_tracking diff --git a/addons/gamification/tests/common.py b/addons/gamification/tests/common.py new file mode 100644 index 0000000000..40d57a7a27 --- /dev/null +++ b/addons/gamification/tests/common.py @@ -0,0 +1,19 @@ +# Part of Odoo, Flectra. See LICENSE file for full copyright and licensing details. + +from flectra.addons.base.tests.common import HttpCaseWithUserDemo, TransactionCaseWithUserDemo + + +class HttpCaseGamification(HttpCaseWithUserDemo): + + def setUp(self): + super().setUp() + if not self.user_demo.karma: + self.user_demo.karma = 2500 + + +class TransactionCaseGamification(TransactionCaseWithUserDemo): + + def setUp(self): + super().setUp() + if not self.user_demo.karma: + self.user_demo.karma = 2500 diff --git a/addons/gamification/tests/test_challenge.py b/addons/gamification/tests/test_challenge.py index 48f7da9c17..f58d6b93e6 100644 --- a/addons/gamification/tests/test_challenge.py +++ b/addons/gamification/tests/test_challenge.py @@ -2,12 +2,12 @@ # Part of Odoo, Flectra. See LICENSE file for full copyright and licensing details. import datetime -from flectra.addons.base.tests.common import TransactionCaseWithUserDemo +from flectra.addons.gamification.tests.common import TransactionCaseGamification from flectra.exceptions import UserError from flectra.tools import mute_logger -class TestGamificationCommon(TransactionCaseWithUserDemo): +class TestGamificationCommon(TransactionCaseGamification): def setUp(self): super(TestGamificationCommon, self).setUp() diff --git a/addons/hr_holidays/models/hr_leave_allocation.py b/addons/hr_holidays/models/hr_leave_allocation.py index b0059716fb..4f6fab8d33 100644 --- a/addons/hr_holidays/models/hr_leave_allocation.py +++ b/addons/hr_holidays/models/hr_leave_allocation.py @@ -624,6 +624,8 @@ class HolidaysAllocation(models.Model): if self.validation_type == 'manager' or (self.validation_type == 'both' and self.state == 'confirm'): if self.employee_id.leave_manager_id: responsible = self.employee_id.leave_manager_id + elif self.employee_id.parent_id.user_id: + responsible = self.employee_id.parent_id.user_id elif self.validation_type == 'hr' or (self.validation_type == 'both' and self.state == 'validate1'): if self.holiday_status_id.responsible_id: responsible = self.holiday_status_id.responsible_id diff --git a/addons/im_livechat/static/src/legacy/public_livechat.js b/addons/im_livechat/static/src/legacy/public_livechat.js index 1f34832d44..6752ac1b08 100644 --- a/addons/im_livechat/static/src/legacy/public_livechat.js +++ b/addons/im_livechat/static/src/legacy/public_livechat.js @@ -90,7 +90,14 @@ var LivechatButton = Widget.extend({ self._history = history; }); } - return ready.then(this._loadQWebTemplate.bind(this)); + session.user_context = {}; + return ready + .then(this._loadQWebTemplate.bind(this)) + .then(() => { + if (!session.is_frontend) { + return session.load_translations(["im_livechat"]); + } + }); }, start: function () { this.$el.text(this.options.button_text); diff --git a/addons/l10n_ch/data/account_tax_report_data.xml b/addons/l10n_ch/data/account_tax_report_data.xml index 47dea2c2f4..4ae3ef53f8 100644 --- a/addons/l10n_ch/data/account_tax_report_data.xml +++ b/addons/l10n_ch/data/account_tax_report_data.xml @@ -1,345 +1,374 @@ - Tax Report - I - CHIFFRE D'AFFAIRES + I. CHIFFRE D'AFFAIRES None - 200 Chiffre d'affaires - tax_ch_302a + tax_ch_303a + tax_ch_312a + tax_ch_313a + tax_ch_342a + tax_ch_343a + tax_ch_289 + 200 - Total des contre-prestations convenues ou reçues, y c. de prestations imposées par option, de transferts par procédure de déclaration, de prestations à l’étranger + tax_ch_200 + tax_ch_302a + tax_ch_303a + tax_ch_312a + tax_ch_313a + tax_ch_342a + tax_ch_343a + tax_ch_382a + tax_ch_383a - - 289 Déductions (ch.220 à ch.280) + + 205 - Contre-prestations déclarées sous ch. 200 qui proviennent de prestations exclues du champ de l’impôt (art. 21) pour lesquelles il a été opté en vertu de l’art. 22 + 205 - tax_ch_289 - 220 Chiffre d'affaires imposable a 0% (export) + 220 - Prestations exonérées (p. ex. exportations, art. 23), prestations exonérées fournies à des institutions et à des personnes bénéficiaires (art. 107, al. 1, let. a) + tax_ch_220 220 - - + + - 221 Prestations fournies à l'étranger + 221 - Prestations fournies à l’étranger + tax_ch_221 221 - - + + - 225 Transfer avec la procédure de déclaration + 225 - Transferts avec la procédure de déclaration (art. 38) + tax_ch_225 225 - - + + - 230 Chiffre d'affaires non-imposable a 0% (exclu) + 230 - Prestations exclues du champ de l’impôt (art. 21) fournies sur le territoire suisse pour lesquelles il n’a pas été opté selon l’art. 22 + tax_ch_230 230 - - + + - 235 Diminution de la contre-prestation + 235 - Diminutions de la contre-prestation telles que rabais, escomptes, etc. + tax_ch_235 235 - - + + - 280 Divers (p.ex valeur du terrain) + 280 - Divers (p.ex. valeur du terrain) + tax_ch_280 280 - - + + + + + + 289 - Déductions (Total ch. 220 à 280) + tax_ch_289 + tax_ch_220 + tax_ch_221 + tax_ch_225 + tax_ch_230 + tax_ch_235 + tax_ch_280 + + + - 299 Chiffre d'affaires imposable (ch.200 moins ch.289) + 299 - Total du chiffre d’affaires imposable (ch. 200 moins ch. 289) - - tax_ch_302a + tax_ch_303a + tax_ch_312a + tax_ch_313a + tax_ch_342a + tax_ch_343a + + tax_ch_200 - tax_ch_289 + - II - CALCUL DE L'IMPOT + II. CALCUL DE L'IMPÔT None - + - - Chiffre d'affaires imposable + + Prestations CHF dès le 01.01.2024 + + None + + + + + + 303a - Taux normal (8,1%): Prestations CHF dès le 01.01.2024 + tax_ch_303a + 303a + + + + + 313a - Taux réduit (2,6%): Prestations CHF dès le 01.01.2024 + tax_ch_313a + 313a + + + + + + + 343a - Taux spécial pour l'hébergement (3,8%): Prestations CHF dès le 01.01.2024 + tax_ch_343a + 343a + + + + + + + 383a - Impôt sur les acquisitions: Prestations CHF dès le 01.01.2024 + tax_ch_383a + 383a + + + + + + + Prestations CHF jusqu'au 31.12.2023 + + None + - 302a Chiffre d'affaires imposable a 7.7% (TS) jusqu'au 31.12.2023 - 302a + 302a - Taux normal (7,7%): Prestations CHF jusqu'au 31.12.2023 tax_ch_302a + 302a - - - - - 303a Chiffre d'affaires imposable a 8.1% (TS) dès le 01.01.2024 - 303a - tax_ch_303a - - - + - 312a Chiffre d'affaires imposable a 2.5% (TR) jusqu'au 31.12.2023 - 312a + 312a - Taux réduit (2,5%): Prestations CHF jusqu'au 31.12.2023 tax_ch_312a + 312a - - - - - 313a Chiffre d'affaires imposable a 2.6% (TR) dès le 01.01.2024 - 313a - tax_ch_313a - - - + - 342a Chiffre d'affaires imposable a 3.7% (TS) jusqu'au 31.12.2023 - 342a + 342a - Taux spécial pour l'hébergement (3,7%): Prestations CHF jusqu'au 31.12.2023 tax_ch_342a + 342a - - - - - 343a Chiffre d'affaires imposable a 3.8% (TS) dès le 01.01.2024 - 343a - tax_ch_343a - - - - - - - Base Impôt sur acquisitions de services - - - - - - - 381a Impots sur les acquisitions - 381a - - - + - 382a Impots sur les acquisitions jusqu'au 31.12.2023 + 382a - Impôt sur les acquisitions: Prestations CHF jusqu'au 31.12.2023 + tax_ch_382a 382a - - + + - - 383a Impots sur les acquisitions dès le 01.01.2024 - 383a + + Impôt CHF / ct. dès le 01.01.2024 + + None + + + + + + 303b - Taux normal (8,1%): Impôt CHF / ct. dès le 01.01.2024 + tax_ch_303b + 303b + + + + + + + 313b - Taux réduit (2,6%): Impôt CHF / ct. dès le 01.01.2024 + tax_ch_313b + 313b - + - - 399 TVA Due - tax_ch_399 + + 343b - Taux spécial pour l'hébergement (3,8%): Impôt CHF / ct. dès le 01.01.2024 + tax_ch_343b + 343b + + + + + 383b - Impôt sur les acquisitions: Impôt CHF / ct. dès le 01.01.2024 + tax_ch_383b + 383b + + + + + + + Impôt CHF / ct. jusqu'au 31.12.2023 + + - 302b TVA due a 7.7% (TS) jusqu'au 31.12.2023 + 302b - Taux normal (7,7%): Impôt CHF / ct. jusqu'au 31.12.2023 + tax_ch_302b 302b - - - - - 303b TVA due a 8.1% (TS) dès le 01.01.2024 - 303b - - - + - 312b TVA due a 2.5% (TR) jusqu'au 31.12.2023 + 312b - Taux réduit (2,5%): Impôt CHF / ct. jusqu'au 31.12.2023 + tax_ch_312b 312b - - - - - 313b TVA due a 2.6% (TR) dès le 01.01.2024 - 313b - - - + - 342b TVA due a 3.7% (TS) jusqu'au 31.12.2023 + 342b - Taux spécial pour l'hébergement (3,7%): Impôt CHF / ct. jusqu'au 31.12.2023 + tax_ch_342b 342b - - - - - 343b TVA due a 3.8% (TS) dès le 01.01.2024 - 343b - - - - - - - 381b Impots sur les acquisitions - 381b - - - + - 382b Impots sur les acquisitions jusqu'au 31.12.2023 + 382b - Impôt sur les acquisitions: Impôt CHF / ct. jusqu'au 31.12.2023 + tax_ch_382b 382b - - - - - - 383b Impots sur les acquisitions dès le 01.01.2024 - 383b - - - - - - - 479 TVA préalable - - tax_ch_479 + + + + + 399 - Total de l’impôt dû + tax_ch_399 + tax_ch_302b + tax_ch_303b + tax_ch_312b + tax_ch_313b + tax_ch_342b + tax_ch_343b + tax_ch_382b + tax_ch_383b + + + - 400 TVA préalable sur biens et services + 400 - Impôt préalable grevant les coûts en matériel et en prestations de services 400 + tax_ch_400 - - + + - 405 TVA préalable sur invest. et autres ch. + 405 - Impôt préalable grevant les investissements et autres charges d’exploitation + tax_ch_405 405 - - + + - 410 Dégrèvement ultérieur de l'impot préalable + 410 - Dégrèvement ultérieur de l’impôt préalable (art. 32) + tax_ch_410 410 - - + + - 415 Correction de l'impot préalable + 415 - Corrections de l’impôt préalable: double affectation (art. 30), prestations à soi-même (art. 31) + tax_ch_415 415 - - + + - 420 Réduction de la déduction de l'impot préalable + 420 - Réductions de la déduction de l’impôt préalable: prestations n’étant pas considérées comme des contre-prestations, telles subventions, taxes touristiques (art. 33, al. 2) + tax_ch_420 420 - - + + - - SOLDE + + 479 - Total ch. 400 à 420 + tax_ch_479 + tax_ch_400 + tax_ch_405 + tax_ch_410 - tax_ch_415 - tax_ch_420 - + + - 500 Solde de TVA a payer a l'AFC - - + 500 - Montant à payer tax_ch_399 - tax_ch_479 > 0 and tax_ch_399 - tax_ch_479 or 0.0 - + + + - 510 Solde de TVA a recevoir de l'AFC - - + 510 - Solde en faveur de l’assujetti tax_ch_479 - tax_ch_399 > 0 and tax_ch_479 - tax_ch_399 or 0.0 - + + + - AUTRES MOUVEMENTS DE FONDS - + III. AUTRES MOUVEMENTS DE FONDS + - 900 Subventions, taxes touristiques + 900 - Subventions, taxes touristiques perçues par les offices du tourisme, contributions aux établissements d'élimination des déchets et d'approvisionnement en eau 900 @@ -347,7 +376,7 @@ - 910 Les dons, les dividendes, les dédommagements, ... + 910 - Les dons, les dividendes, les dédommagements, etc. 910 diff --git a/addons/l10n_ch/i18n_extra/de.po b/addons/l10n_ch/i18n_extra/de.po index 6a1d7d6471..a22977ca00 100644 --- a/addons/l10n_ch/i18n_extra/de.po +++ b/addons/l10n_ch/i18n_extra/de.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Flectra Server 2.0+e\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-02-22 08:22+0000\n" -"PO-Revision-Date: 2023-02-22 08:22+0000\n" +"POT-Creation-Date: 2023-07-19 14:03+0000\n" +"PO-Revision-Date: 2023-07-19 14:03+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -135,58 +135,111 @@ msgstr "VST 2.6% Inv.Inkl." #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_200 -msgid "200 Chiffre d'affaires" +msgid "" +"200 - Total des contre-prestations convenues ou reçues, y c. de prestations " +"imposées par option, de transferts par procédure de déclaration, de " +"prestations à l’étranger" msgstr "" -"200 Total der vereinbarten bzw. vereinnahmten Entgelte, inkl. optierte " +"200 - Total der vereinbarten bzw. vereinnahmten Entgelte, inkl. optierte " "Leistungen, Entgelte aus Übertragungen im Meldeverfahren sowie aus " -"Leistungen im Ausland (weltweiter Umsatz)" +"Leistungen im Ausland" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_205 +msgid "205" +msgstr "" + +#. module: l10n_ch +#: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_205 +msgid "" +"205 - Contre-prestations déclarées sous ch. 200 qui proviennent de " +"prestations exclues du champ de l’impôt (art. 21) pour lesquelles il a été " +"opté en vertu de l’art. 22" +msgstr "" +"205 - In Ziffer 200 enthaltene Entgelte aus von der Steuer ausgenommenen " +"Leistungen (Art. 21), für welche nach Art. 22 optiert wird" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_220_289 +msgid "220" +msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_220_289 -msgid "220 Chiffre d'affaires imposable a 0% (export)" +msgid "" +"220 - Prestations exonérées (p. ex. exportations, art. 23), prestations " +"exonérées fournies à des institutions et à des personnes bénéficiaires (art." +" 107, al. 1, let. a)" msgstr "" -"220 Von der Steuer befreite Leistungen (u.a. Exporte, Art. 23), von der " +"220 - Von der Steuer befreite Leistungen (u.a. Exporte, Art. 23), von der " "Steuer befreite Leistungen an begünstigte Einrichtungen und Personen (Art. " "107 Abs. 1 Bst. a)" +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_221 +msgid "221" +msgstr "" + #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_221 -msgid "221 Prestations fournies à l'étranger" -msgstr "221 Leistungen im Ausland (Ort der Leistung im Ausland)" +msgid "221 - Prestations fournies à l’étranger" +msgstr "221 - Leistungen im Ausland" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_225 +msgid "225" +msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_225 -msgid "225 Transfer avec la procédure de déclaration" +msgid "225 - Transferts avec la procédure de déclaration (art. 38)" +msgstr "225 - Übertragung im Meldeverfahren (Art. 38)" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_230 +msgid "230" msgstr "" -"225 Übertragung im Meldeverfahren (Art. 38, bitte zusätzlich Form. 764 " -"einreichen)" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_230 -msgid "230 Chiffre d'affaires non-imposable a 0% (exclu)" +msgid "" +"230 - Prestations exclues du champ de l’impôt (art. 21) fournies sur le " +"territoire suisse pour lesquelles il n’a pas été opté selon l’art. 22" msgstr "" -"230 Von der Steuer ausgenommene Inlandleistungen (Art. 21), für die nicht " +"230 - Von der Steuer ausgenommene Inlandleistungen (Art. 21), für die nicht " "nach Art. 22 optiert wird" +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_235 +msgid "235" +msgstr "" + #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_235 -msgid "235 Diminution de la contre-prestation" -msgstr "235 Entgeltsminderungen wie Skonti, Rabatte usw." +msgid "" +"235 - Diminutions de la contre-prestation telles que rabais, escomptes, etc." +msgstr "235 - Entgeltsminderungen wie Skonti, Rabatte usw." + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_280 +msgid "280" +msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_280 -msgid "280 Divers (p.ex valeur du terrain)" -msgstr "280 Diverses (z.B. Wert des Bodens, Ankaufspreise Margenbesteuerung)" +msgid "280 - Divers (p.ex. valeur du terrain)" +msgstr "" +"280 - Diverses (z.B. Wert des Bodens, Ankaufspreise Margenbesteuerung)" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_289 -msgid "289 Déductions (ch.220 à ch.280)" -msgstr "289 Total Ziff. 200 bis 280" +msgid "289 - Déductions (Total ch. 220 à 280)" +msgstr "289 - Abzüge (Total Ziff. 220 bis 280)" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_299 -msgid "299 Chiffre d'affaires imposable (ch.200 moins ch.289)" -msgstr "299 Steuerbarer Gesamtumsatz (Ziff. 200 abzüglich Ziff. 289)" +msgid "299 - Total du chiffre d’affaires imposable (ch. 200 moins ch. 289)" +msgstr "299 - Steuerbarer Gesamtumsatz (Ziff. 200 abzüglich Ziff. 289)" #. module: l10n_ch #: model:account.tax,description:l10n_ch.1_vat_37 @@ -260,145 +313,256 @@ msgstr "VST 3.8% Inv." msgid "3.8% invest Incl." msgstr "VST 3.8% Inv.Inkl." +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_302a +msgid "302a" +msgstr "" + #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_302a -msgid "302a Chiffre d'affaires imposable a 7.7% (TS) jusqu'au 31.12.2023" -msgstr "302a Steuerpflichtiger Umsatz von 7,7% (TS) bis 31.12.2023" +msgid "302a - Taux normal (7,7%): Prestations CHF jusqu'au 31.12.2023" +msgstr "302a - Normalsatz (7.7%): Leistungen CHF bis 31.12.2023" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_302b +msgid "302b" +msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_302b -msgid "302b TVA due a 7.7% (TS) jusqu'au 31.12.2023" -msgstr "302b Mehrwertsteuer fällig bei 7,7% (TS) bis 31.12.2023" +msgid "302b - Taux normal (7,7%): Impôt CHF / ct. jusqu'au 31.12.2023" +msgstr "302b - Normalsatz (7.7%): Steuer CHF / Rp. bis 31.12.2023" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_303a +msgid "303a" +msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_303a -msgid "303a Chiffre d'affaires imposable a 8.1% (TS) dès le 01.01.2024" -msgstr "303a Steuerpflichtiger Umsatz von 8,1% (TS) ab 01.01.2024" +msgid "303a - Taux normal (8,1%): Prestations CHF dès le 01.01.2024" +msgstr "303a - Normalsatz (8.1%): Leistungen CHF ab 01.01.2024" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_303b +msgid "303b" +msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_303b -msgid "303b TVA due a 8.1% (TS) dès le 01.01.2024" -msgstr "303b Mehrwertsteuer fällig bei 8,1% (TS) ab 01.01.2024" +msgid "303b - Taux normal (8,1%): Impôt CHF / ct. dès le 01.01.2024" +msgstr "303b - Normalsatz (8.1%): Steuer CHF / Rp. ab 01.01.2024" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_312a +msgid "312a" +msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_312a -msgid "312a Chiffre d'affaires imposable a 2.5% (TR) jusqu'au 31.12.2023" -msgstr "312a Steuerpflichtiger Umsatz von 2.5% (TR) bis 31.12.2023" +msgid "312a - Taux réduit (2,5%): Prestations CHF jusqu'au 31.12.2023" +msgstr "312a - Reduzierter Satz (2.5%): Leistungen CHF bis 31.12.2023" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_312b +msgid "312b" +msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_312b -msgid "312b TVA due a 2.5% (TR) jusqu'au 31.12.2023" -msgstr "312b Mehrwertsteuer fällig bei 2.5% (TR) bis 31.12.2023" +msgid "312b - Taux réduit (2,5%): Impôt CHF / ct. jusqu'au 31.12.2023" +msgstr "312b - Reduzierter Satz (2.5%): Steuer CHF / Rp. bis 31.12.2023" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_313a +msgid "313a" +msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_313a -msgid "313a Chiffre d'affaires imposable a 2.6% (TR) dès le 01.01.2024" -msgstr "313a Steuerpflichtiger Umsatz von 2.6% (TR) ab 01.01.2024" +msgid "313a - Taux réduit (2,6%): Prestations CHF dès le 01.01.2024" +msgstr "313a - Reduzierter Satz (2.6%): Leistungen CHF ab 01.01.2024" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_313b +msgid "313b" +msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_313b -msgid "313b TVA due a 2.6% (TR) dès le 01.01.2024" -msgstr "313b Mehrwertsteuer fällig bei 2.6% (TR) ab 01.01.2024" +msgid "313b - Taux réduit (2,6%): Impôt CHF / ct. dès le 01.01.2024" +msgstr "313b - Reduzierter Satz (2.6%): Steuer CHF / Rp. ab 01.01.2024" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_342a +msgid "342a" +msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_342a -msgid "342a Chiffre d'affaires imposable a 3.7% (TS) jusqu'au 31.12.2023" -msgstr "342a Steuerpflichtiger Umsatz von 3.7% (TS) bis 31.12.2023" +msgid "" +"342a - Taux spécial pour l'hébergement (3,7%): Prestations CHF jusqu'au " +"31.12.2023" +msgstr "342a - Beherbergungssatz (3.7%): Leistungen CHF bis 31.12.2023" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_342b +msgid "342b" +msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_342b -msgid "342b TVA due a 3.7% (TS) jusqu'au 31.12.2023" -msgstr "342b Mehrwertsteuer fällig bei 3.7% (TS) bis 31.12.2023" +msgid "" +"342b - Taux spécial pour l'hébergement (3,7%): Impôt CHF / ct. jusqu'au " +"31.12.2023" +msgstr "342b - Beherbergungssatz (3.7%): Steuer CHF / Rp. bis 31.12.2023" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_343a +msgid "343a" +msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_343a -msgid "343a Chiffre d'affaires imposable a 3.8% (TS) dès le 01.01.2024" -msgstr "343a Steuerpflichtiger Umsatz von 3.8% (TS) ab 01.01.2024" +msgid "" +"343a - Taux spécial pour l'hébergement (3,8%): Prestations CHF dès le " +"01.01.2024" +msgstr "343a - Beherbergungssatz (3.8%): Leistungen CHF ab 01.01.2024" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_343b +msgid "343b" +msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_343b -msgid "343b TVA due a 3.8% (TS) dès le 01.01.2024" -msgstr "343b Mehrwertsteuer fällig bei 3.8% (TS) ab 01.01.2024" +msgid "" +"343b - Taux spécial pour l'hébergement (3,8%): Impôt CHF / ct. dès le " +"01.01.2024" +msgstr "343b - Beherbergungssatz (3.8%): Steuer CHF / Rp. ab 01.01.2024" #. module: l10n_ch -#: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_381a -msgid "381a Impots sur les acquisitions" -msgstr "381a Steuern auf Akquisitionen" - -#. module: l10n_ch -#: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_381b -msgid "381b Impots sur les acquisitions " -msgstr "381b Steuern auf Akquisitionen" +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_382a +msgid "382a" +msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_382a -msgid "382a Impots sur les acquisitions jusqu'au 31.12.2023" -msgstr "382a Steuern auf Akquisitionen bis 31.12.2023" +msgid "382a - Impôt sur les acquisitions: Prestations CHF jusqu'au 31.12.2023" +msgstr "382a - Bezugsteuersatz: Leistungen CHF bis 31.12.2023" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_382b +msgid "382b" +msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_382b -msgid "382b Impots sur les acquisitions jusqu'au 31.12.2023" -msgstr "382b Steuern auf Akquisitionen bis 31.12.2023" +msgid "382b - Impôt sur les acquisitions: Impôt CHF / ct. jusqu'au 31.12.2023" +msgstr "382b - Bezugsteuersatz: Steuer CHF / Rp. bis 31.12.2023" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_383a +msgid "383a" +msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_383a -msgid "383a Impots sur les acquisitions dès le 01.01.2024" -msgstr "383a Steuern auf Akquisitionen ab 01.01.2024" +msgid "383a - Impôt sur les acquisitions: Prestations CHF dès le 01.01.2024" +msgstr "383a - Bezugsteuersatz: Leistungen CHF ab 01.01.2024" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_383b +msgid "383b" +msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_383b -msgid "383b Impots sur les acquisitions dès le 01.01.2024" -msgstr "383b Steuern auf Akquisitionen ab 01.01.2024" +msgid "383b - Impôt sur les acquisitions: Impôt CHF / ct. dès le 01.01.2024" +msgstr "383b - Bezugsteuersatz: Steuer CHF / Rp. ab 01.01.2024" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_399 -msgid "399 TVA Due " -msgstr "399 Total geschuldete Steuer" +msgid "399 - Total de l’impôt dû" +msgstr "399 - Total geschuldete Steuer" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_400 +msgid "400" +msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_400 -msgid "400 TVA préalable sur biens et services" -msgstr "400 Vorsteuer auf Material- und Dienstleistungsaufwand" +msgid "" +"400 - Impôt préalable grevant les coûts en matériel et en prestations de " +"services" +msgstr "400 - Vorsteuer auf Material- und Dienstleistungsaufwand" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_405 +msgid "405" +msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_405 -msgid "405 TVA préalable sur invest. et autres ch." -msgstr "405 Vorsteuer auf Material- und Dienstleistungsaufwand" +msgid "" +"405 - Impôt préalable grevant les investissements et autres charges " +"d’exploitation" +msgstr "405 - Vorsteuer auf Investitionen und übrigem Betriebsaufwand" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_410 +msgid "410" +msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_410 -msgid "410 Dégrèvement ultérieur de l'impot préalable" +msgid "410 - Dégrèvement ultérieur de l’impôt préalable (art. 32)" +msgstr "410 - Einlageentsteuerung (Art. 32)" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_415 +msgid "415" msgstr "" -"410 Einlageentsteuerung (Art. 32, bitte detaillierte Aufstellung beilegen)" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_415 -msgid "415 Correction de l'impot préalable" +msgid "" +"415 - Corrections de l’impôt préalable: double affectation (art. 30), " +"prestations à soi-même (art. 31)" msgstr "" -"415 Vorsteuerkorrekturen: gemischte Verwendung (Art. 30), Eigenverbrauch " +"415 - Vorsteuerkorrekturen: gemischte Verwendung (Art. 30), Eigenverbrauch " "(Art. 31)" #. module: l10n_ch -#: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_420 -msgid "420 Réduction de la déduction de l'impot préalable" +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_420 +msgid "420" msgstr "" -"420 Vorsteuerkürzungen: Nicht-Entgelte wie Subventionen, Tourismusabgaben " + +#. module: l10n_ch +#: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_420 +msgid "" +"420 - Réductions de la déduction de l’impôt préalable: prestations n’étant " +"pas considérées comme des contre-prestations, telles subventions, taxes " +"touristiques (art. 33, al. 2)" +msgstr "" +"420 - Vorsteuerkürzungen: Nicht-Entgelte wie Subventionen, Tourismusabgaben " "(Art. 33 Abs. 2)" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_479 -msgid "479 TVA préalable" -msgstr "479 Total Ziff. 400 bis 420" +msgid "479 - Total ch. 400 à 420" +msgstr "479 - Total Ziff. 400 bis 420" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_500 -msgid "500 Solde de TVA a payer a l'AFC" -msgstr "500 Zu bezahlender Betrag" +msgid "500 - Montant à payer" +msgstr "500 - Zu bezahlender Betrag" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_510 -msgid "510 Solde de TVA a recevoir de l'AFC" -msgstr "510 Guthaben der steuerpflichtigen Person" +msgid "510 - Solde en faveur de l’assujetti" +msgstr "510 - Guthaben der steuerpflichtigen Person" #. module: l10n_ch #: model:account.tax,description:l10n_ch.1_vat_77 @@ -489,16 +653,29 @@ msgid "8.1% invest. Incl." msgstr "VST 8.1% Inv.Inkl." #. module: l10n_ch -#: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_900 -msgid "900 Subventions, taxes touristiques" +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_900 +msgid "900" +msgstr "" + +#. module: l10n_ch +#: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_900 +msgid "" +"900 - Subventions, taxes touristiques perçues par les offices du tourisme, " +"contributions aux établissements d'élimination des déchets et " +"d'approvisionnement en eau" +msgstr "" +"900 - Subventionen, durch Kurvereine eingenommene Tourismusabgaben, " +"Entsorgungs- und Wasserwerkbeiträge (Bst. a-c)" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_910 +msgid "910" msgstr "" -"900 Subventionen, durch Kurvereine eingenommene Tourismusabgaben, " -"Entsorgungs- und Wasserwerkbeiträge (Bst. A-c)" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_910 -msgid "910 Les dons, les dividendes, les dédommagements, ..." -msgstr "910 Spenden, Dividenden, Schadenersatz usw. (Bst. D-l)" +msgid "910 - Les dons, les dividendes, les dédommagements, etc." +msgstr "910 - Spenden, Dividenden, Schadenersatz usw." #. module: l10n_ch #: model_terms:ir.ui.view,arch_db:l10n_ch.res_config_settings_view_form @@ -565,11 +742,6 @@ msgstr "Empfangsschein" msgid "Reference" msgstr "Referenz" -#. module: l10n_ch -#: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_autres_mouv -msgid "AUTRES MOUVEMENTS DE FONDS" -msgstr "ANDERE MITTELFLÜSSE (Art. 18 Abs. 2)" - #. module: l10n_ch #: model:account.account,name:l10n_ch.1_ch_coa_4200 #: model:account.account.template,name:l10n_ch.ch_coa_4200 @@ -779,11 +951,6 @@ msgstr "Bankkonten" msgid "Bank Statement Line" msgstr "Kontoauszugszeile" -#. module: l10n_ch -#: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_calc_impot_base -msgid "Base Impôt sur acquisitions de services" -msgstr "Steuerbemessungsgrundlage für Dienstleistungsakquisitionen" - #. module: l10n_ch #: model:ir.model.fields,help:l10n_ch.field_res_company__l10n_ch_isr_print_bank_location #: model:ir.model.fields,help:l10n_ch.field_res_config_settings__l10n_ch_isr_print_bank_location @@ -954,11 +1121,7 @@ msgid "Charges à payer" msgstr "Noch nicht bezahlter Aufwand" #. module: l10n_ch -#: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_calc_impot_chiffre -msgid "Chiffre d'affaires imposable" -msgstr "Steuerpflichtiger Umsatz" - -#. module: l10n_ch +#: model:ir.model.fields,field_description:l10n_ch.field_account_bank_statement_import_journal_creation__l10n_ch_postal #: model:ir.model.fields,field_description:l10n_ch.field_account_journal__l10n_ch_postal msgid "Client Number" msgstr "" @@ -976,6 +1139,7 @@ msgid "Commissions obtenues sur achats" msgstr "Einkaufsprovisionen" #. module: l10n_ch +#: model:ir.model.fields,field_description:l10n_ch.field_account_bank_statement_import_journal_creation__invoice_reference_model #: model:ir.model.fields,field_description:l10n_ch.field_account_journal__invoice_reference_model msgid "Communication Standard" msgstr "Kommunikationsstandard" @@ -1279,8 +1443,8 @@ msgstr "Hypotheken" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chiffre_af -msgid "I - CHIFFRE D'AFFAIRES" -msgstr "I – UMSATZ" +msgid "I. CHIFFRE D'AFFAIRES" +msgstr "I. UMSATZ" #. module: l10n_ch #: model:ir.model.fields,field_description:l10n_ch.field_account_bank_statement_line__id @@ -1297,8 +1461,13 @@ msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_calc_impot -msgid "II - CALCUL DE L'IMPOT" -msgstr "II – STEUERBERECHNUNG" +msgid "II. CALCUL DE L'IMPÔT" +msgstr "II. STEUERBERECHNUNG" + +#. module: l10n_ch +#: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_autres_mouv +msgid "III. AUTRES MOUVEMENTS DE FONDS" +msgstr "III. ANDERE MITTELFLÜSSE" #. module: l10n_ch #: model:ir.actions.report,name:l10n_ch.l10n_ch_isr_report @@ -1360,6 +1529,16 @@ msgstr "Geschäftsliegenschaften" msgid "Import/Export" msgstr "" +#. module: l10n_ch +#: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_tax_amount_1 +msgid "Impôt CHF / ct. dès le 01.01.2024" +msgstr "Steuer CHF / Rp. ab 01.01.2024" + +#. module: l10n_ch +#: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_tax_amount_2 +msgid "Impôt CHF / ct. jusqu'au 31.12.2023" +msgstr "Steuer CHF / Rp. bis 31.12.2023" + #. module: l10n_ch #: model:account.account,name:l10n_ch.1_ch_coa_1176 #: model:account.account.template,name:l10n_ch.ch_coa_1176 @@ -1636,17 +1815,22 @@ msgstr "" msgid "Prestations / travaux de tiers" msgstr "Aufwand für bezogene Dienstleistungen" +#. module: l10n_ch +#: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_supplies_1 +msgid "Prestations CHF dès le 01.01.2024" +msgstr "Leistungen CHF ab 01.01.2024" + +#. module: l10n_ch +#: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_supplies_2 +msgid "Prestations CHF jusqu'au 31.12.2023" +msgstr "Leistungen CHF bis 31.12.2023" + #. module: l10n_ch #: model:account.account,name:l10n_ch.1_ch_coa_3700 #: model:account.account.template,name:l10n_ch.ch_coa_3700 msgid "Prestations propres" msgstr "Eigenleistungen" -#. module: l10n_ch -#: model_terms:ir.ui.view,arch_db:l10n_ch.isr_invoice_form -msgid "Print ISR" -msgstr "" - #. module: l10n_ch #: model_terms:ir.ui.view,arch_db:l10n_ch.isr_invoice_form msgid "Print QR-bill" @@ -1801,11 +1985,6 @@ msgstr "Gesetzliche Gewinnreserve" msgid "Réserves légales issues du capital" msgstr "Gesetzliche Kapitalreserve" -#. module: l10n_ch -#: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_solde -msgid "SOLDE" -msgstr "BEZAHLBARER BETRAG" - #. module: l10n_ch #: model:account.account,name:l10n_ch.1_ch_coa_5000 #: model:account.account.template,name:l10n_ch.ch_coa_5000 @@ -2223,6 +2402,7 @@ msgid "" msgstr "" #. module: l10n_ch +#: model:ir.model.fields,help:l10n_ch.field_account_bank_statement_import_journal_creation__l10n_ch_postal #: model:ir.model.fields,help:l10n_ch.field_account_journal__l10n_ch_postal #: model:ir.model.fields,help:l10n_ch.field_account_setup_bank_manual_config__l10n_ch_postal #: model:ir.model.fields,help:l10n_ch.field_res_partner_bank__l10n_ch_postal @@ -2376,6 +2556,7 @@ msgid "" msgstr "" #. module: l10n_ch +#: model:ir.model.fields,help:l10n_ch.field_account_bank_statement_import_journal_creation__invoice_reference_model #: model:ir.model.fields,help:l10n_ch.field_account_journal__invoice_reference_model msgid "" "You can choose different models for each type of reference. The default one " diff --git a/addons/l10n_ch/i18n_extra/en.po b/addons/l10n_ch/i18n_extra/en.po index b454b215bf..e23e4218ad 100644 --- a/addons/l10n_ch/i18n_extra/en.po +++ b/addons/l10n_ch/i18n_extra/en.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Flectra Server 2.0+e\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-02-22 08:21+0000\n" -"PO-Revision-Date: 2023-02-22 08:21+0000\n" +"POT-Creation-Date: 2023-07-19 14:01+0000\n" +"PO-Revision-Date: 2023-07-19 14:01+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -135,64 +135,115 @@ msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_200 -msgid "200 Chiffre d'affaires" +msgid "" +"200 - Total des contre-prestations convenues ou reçues, y c. de prestations " +"imposées par option, de transferts par procédure de déclaration, de " +"prestations à l’étranger" msgstr "" -"200 Total amount of agreed or collected consideration incl. from supplies " +"200 - Total amount of agreed or collected consideration incl. from supplies " "opted for taxation, transfer of supplies acc. to the notification procedure " "and supplies provided abroad (worldwide turnover)" #. module: l10n_ch -#: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_220_289 -msgid "220 Chiffre d'affaires imposable a 0% (export)" +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_205 +msgid "205" msgstr "" -"220 Supplies exempt from the tax (e.g. export, art. 23) and supplies " + +#. module: l10n_ch +#: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_205 +msgid "" +"205 - Contre-prestations déclarées sous ch. 200 qui proviennent de " +"prestations exclues du champ de l’impôt (art. 21) pour lesquelles il a été " +"opté en vertu de l’art. 22" +msgstr "" +"205 - Consideration reported in Ref. 200 from supplies exempt from the tax " +"without credit (art. 21) where the option for their taxation according to " +"art. 22 has been exercised " + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_220_289 +msgid "220" +msgstr "" + +#. module: l10n_ch +#: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_220_289 +msgid "" +"220 - Prestations exonérées (p. ex. exportations, art. 23), prestations " +"exonérées fournies à des institutions et à des personnes bénéficiaires (art." +" 107, al. 1, let. a)" +msgstr "" +"220 - Supplies exempt from the tax (e.g. export, art. 23) and supplies " "provided to institutional and individual beneficiaries that are exempt from " "liability for tax (art. 107 para. 1 lit. a)" +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_221 +msgid "221" +msgstr "" + #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_221 -msgid "221 Prestations fournies à l'étranger" -msgstr "221 Supplies provided abroad (place of supply is abroad)" +msgid "221 - Prestations fournies à l’étranger" +msgstr "221 - Supplies provided abroad" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_225 +msgid "225" +msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_225 -msgid "225 Transfer avec la procédure de déclaration" +msgid "225 - Transferts avec la procédure de déclaration (art. 38)" +msgstr "" +"225 - Transfer of supplies according to the notification procedure (art. 38)" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_230 +msgid "230" msgstr "" -"225 Transfer of supplies according to the notification procedure (art. 38, " -"please submit Form 764)" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_230 -msgid "230 Chiffre d'affaires non-imposable a 0% (exclu)" +msgid "" +"230 - Prestations exclues du champ de l’impôt (art. 21) fournies sur le " +"territoire suisse pour lesquelles il n’a pas été opté selon l’art. 22" +msgstr "" +"230 - Supplies provided on Swiss territory exempt from the tax without " +"credit (art. 21) and where the option for their taxation according to art. " +"22 has not been exercised" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_235 +msgid "235" msgstr "" -"230 Supplies provided on Swiss territory exempt from the tax without credit " -"(art. 21) and where the option for their taxation according to art. 22 has " -"not been exercised" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_235 -msgid "235 Diminution de la contre-prestation" -msgstr "235 Reduction of consideration (discounts, rebates etc.)" +msgid "" +"235 - Diminutions de la contre-prestation telles que rabais, escomptes, etc." +msgstr "235 - Reduction of consideration (discounts, rebates etc.)" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_280 +msgid "280" +msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_280 -msgid "280 Divers (p.ex valeur du terrain)" +msgid "280 - Divers (p.ex. valeur du terrain)" msgstr "" -"280 Miscellaneous (e.g. land value, purchase prices in case of margin " +"280 - Miscellaneous (e.g. land value, purchase prices in case of margin " "taxation)" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_289 -msgid "289 Déductions (ch.220 à ch.280)" -msgstr "" -"289 Consideration reported in Ref. 200 from supplies exempt from the tax " -"without credit (art. 21) where the option for their taxation according to " -"art. 22 has been exercised" +msgid "289 - Déductions (Total ch. 220 à 280)" +msgstr "289 - Deductions (Total Ref. 220 to 280)" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_299 -msgid "299 Chiffre d'affaires imposable (ch.200 moins ch.289)" -msgstr "299 Taxable turnover (Ref. 200 minus Ref. 289)" +msgid "299 - Total du chiffre d’affaires imposable (ch. 200 moins ch. 289)" +msgstr "299 - Taxable turnover (Ref. 200 minus Ref. 289)" #. module: l10n_ch #: model:account.tax,description:l10n_ch.1_vat_37 @@ -266,145 +317,259 @@ msgstr "" msgid "3.8% invest Incl." msgstr "" +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_302a +msgid "302a" +msgstr "" + #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_302a -msgid "302a Chiffre d'affaires imposable a 7.7% (TS) jusqu'au 31.12.2023" -msgstr "302a Taxable turnover at 7.7% (TS) until 31.12.2023" +msgid "302a - Taux normal (7,7%): Prestations CHF jusqu'au 31.12.2023" +msgstr "302a - Standard rate (7,7%): Supplies CHF to 31.12.2023" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_302b +msgid "302b" +msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_302b -msgid "302b TVA due a 7.7% (TS) jusqu'au 31.12.2023" -msgstr "302b Tax due at 7.7% (TS) until 31.12.2023" +msgid "302b - Taux normal (7,7%): Impôt CHF / ct. jusqu'au 31.12.2023" +msgstr "302b - Standard rate (7,7%): Tax amount CHF / cent. to 31.12.2023" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_303a +msgid "303a" +msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_303a -msgid "303a Chiffre d'affaires imposable a 8.1% (TS) dès le 01.01.2024" -msgstr "303a Taxable turnover at 8.1% (TS) from 01.01.2024" +msgid "303a - Taux normal (8,1%): Prestations CHF dès le 01.01.2024" +msgstr "303a - Standard rate (8,1%): Supplies CHF from 01.01.2024" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_303b +msgid "303b" +msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_303b -msgid "303b TVA due a 8.1% (TS) dès le 01.01.2024" -msgstr "303b Tax due at 8.1% (TS) from 01.01.2024" +msgid "303b - Taux normal (8,1%): Impôt CHF / ct. dès le 01.01.2024" +msgstr "303b - Standard rate (8,1%): Tax amount CHF / cent. from 01.01.2024" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_312a +msgid "312a" +msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_312a -msgid "312a Chiffre d'affaires imposable a 2.5% (TR) jusqu'au 31.12.2023" -msgstr "312a Taxable turnover at 2.5% (TR) until 31.12.2023" +msgid "312a - Taux réduit (2,5%): Prestations CHF jusqu'au 31.12.2023" +msgstr "312a - Reduced rate (2,5%): Supplies CHF to 31.12.2023" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_312b +msgid "312b" +msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_312b -msgid "312b TVA due a 2.5% (TR) jusqu'au 31.12.2023" -msgstr "312b Tax due at 2.5% (TR) until 31.12.2023" +msgid "312b - Taux réduit (2,5%): Impôt CHF / ct. jusqu'au 31.12.2023" +msgstr "312b - Reduced rate (2,5%): Tax amount CHF / cent. to 31.12.2023" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_313a +msgid "313a" +msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_313a -msgid "313a Chiffre d'affaires imposable a 2.6% (TR) dès le 01.01.2024" -msgstr "313a Taxable turnover at 2.6% (TR) from 01.01.2024" +msgid "313a - Taux réduit (2,6%): Prestations CHF dès le 01.01.2024" +msgstr "313a - Reduced rate (2,6%): Supplies CHF from 01.01.2024" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_313b +msgid "313b" +msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_313b -msgid "313b TVA due a 2.6% (TR) dès le 01.01.2024" -msgstr "313b Tax due at 2.6% (TR) from 01.01.2024" +msgid "313b - Taux réduit (2,6%): Impôt CHF / ct. dès le 01.01.2024" +msgstr "313b - Reduced rate (2,6%): Tax amount CHF / cent. from 01.01.2024" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_342a +msgid "342a" +msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_342a -msgid "342a Chiffre d'affaires imposable a 3.7% (TS) jusqu'au 31.12.2023" -msgstr "342a Taxable turnover at 3.7% (TS) until 31.12.2023" +msgid "" +"342a - Taux spécial pour l'hébergement (3,7%): Prestations CHF jusqu'au " +"31.12.2023" +msgstr "342a - Accommodation rate (3,7%): Supplies CHF to 31.12.2023" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_342b +msgid "342b" +msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_342b -msgid "342b TVA due a 3.7% (TS) jusqu'au 31.12.2023" -msgstr "342b Tax due at 3.7% (TS) until 31.12.2023" +msgid "" +"342b - Taux spécial pour l'hébergement (3,7%): Impôt CHF / ct. jusqu'au " +"31.12.2023" +msgstr "" +"342b - Accommodation rate (3,7%): Tax amount CHF / cent. to 31.12.2023" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_343a +msgid "343a" +msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_343a -msgid "343a Chiffre d'affaires imposable a 3.8% (TS) dès le 01.01.2024" -msgstr "343a Taxable turnover at 3.8% (TS) from 01.01.2024" +msgid "" +"343a - Taux spécial pour l'hébergement (3,8%): Prestations CHF dès le " +"01.01.2024" +msgstr "343a - Accommodation rate (3,8%): Supplies CHF from 01.01.2024" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_343b +msgid "343b" +msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_343b -msgid "343b TVA due a 3.8% (TS) dès le 01.01.2024" -msgstr "343b Tax due at 3.8% (TS) from 01.01.2024" +msgid "" +"343b - Taux spécial pour l'hébergement (3,8%): Impôt CHF / ct. dès le " +"01.01.2024" +msgstr "" +"343b - Accommodation rate (3,8%): Tax amount CHF / cent. from 01.01.2024" #. module: l10n_ch -#: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_381a -msgid "381a Impots sur les acquisitions" -msgstr "381a Acquisition tax" - -#. module: l10n_ch -#: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_381b -msgid "381b Impots sur les acquisitions " -msgstr "381b Acquisition tax" +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_382a +msgid "382a" +msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_382a -msgid "382a Impots sur les acquisitions jusqu'au 31.12.2023" -msgstr "382a Acquisition tax until 31.12.2023" +msgid "382a - Impôt sur les acquisitions: Prestations CHF jusqu'au 31.12.2023" +msgstr "382a - Acquisition tax: Supplies CHF to 31.12.2023" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_382b +msgid "382b" +msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_382b -msgid "382b Impots sur les acquisitions jusqu'au 31.12.2023" -msgstr "382b Acquisition tax until 31.12.2023" +msgid "382b - Impôt sur les acquisitions: Impôt CHF / ct. jusqu'au 31.12.2023" +msgstr "382b - Acquisition tax: Tax amount CHF / cent. to 31.12.2023" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_383a +msgid "383a" +msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_383a -msgid "383a Impots sur les acquisitions dès le 01.01.2024" -msgstr "383a Acquisition tax from 01.01.2024" +msgid "383a - Impôt sur les acquisitions: Prestations CHF dès le 01.01.2024" +msgstr "383a - Acquisition tax: Supplies CHF from 01.01.2024" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_383b +msgid "383b" +msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_383b -msgid "383b Impots sur les acquisitions dès le 01.01.2024" -msgstr "383b Acquisition tax from 01.01.2024" +msgid "383b - Impôt sur les acquisitions: Impôt CHF / ct. dès le 01.01.2024" +msgstr "383b - Acquisition tax: Tax amount CHF / cent. from 01.01.2024" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_399 -msgid "399 TVA Due " -msgstr "399 Total amount of tax due" +msgid "399 - Total de l’impôt dû" +msgstr "399 - Total amount of tax due" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_400 +msgid "400" +msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_400 -msgid "400 TVA préalable sur biens et services" -msgstr "400 Input tax on cost of materials and supplies of services" +msgid "" +"400 - Impôt préalable grevant les coûts en matériel et en prestations de " +"services" +msgstr "400 - Input tax on cost of materials and supplies of services" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_405 +msgid "405" +msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_405 -msgid "405 TVA préalable sur invest. et autres ch." -msgstr "405 Input tax on investments and other operating costs" +msgid "" +"405 - Impôt préalable grevant les investissements et autres charges " +"d’exploitation" +msgstr "405 - Input tax on investments and other operating costs" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_410 +msgid "410" +msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_410 -msgid "410 Dégrèvement ultérieur de l'impot préalable" -msgstr "410 De-taxation (art. 32, please enclose a detailed list)" +msgid "410 - Dégrèvement ultérieur de l’impôt préalable (art. 32)" +msgstr "410 - De-taxation (art. 32)" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_415 +msgid "415" +msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_415 -msgid "415 Correction de l'impot préalable" +msgid "" +"415 - Corrections de l’impôt préalable: double affectation (art. 30), " +"prestations à soi-même (art. 31)" msgstr "" -"415 Correction of the input tax deduction: mixed use (art. 30), own use " +"415 - Correction of the input tax deduction: mixed use (art. 30), own use " "(art. 31)" #. module: l10n_ch -#: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_420 -msgid "420 Réduction de la déduction de l'impot préalable" +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_420 +msgid "420" msgstr "" -"420 Reduction of the input tax deduction: Flow of funds, which are not " + +#. module: l10n_ch +#: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_420 +msgid "" +"420 - Réductions de la déduction de l’impôt préalable: prestations n’étant " +"pas considérées comme des contre-prestations, telles subventions, taxes " +"touristiques (art. 33, al. 2)" +msgstr "" +"420 - Reduction of the input tax deduction: Flow of funds, which are not " "deemed to be consideration, such as subsidies, tourist charges (art. 33 " "para. 2)" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_479 -msgid "479 TVA préalable" -msgstr "" +msgid "479 - Total ch. 400 à 420" +msgstr "479 - Total Ref. 400 to 420" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_500 -msgid "500 Solde de TVA a payer a l'AFC" -msgstr "500 Amount of VAT payable to AFC" +msgid "500 - Montant à payer" +msgstr "500 - Amount payable" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_510 -msgid "510 Solde de TVA a recevoir de l'AFC" -msgstr "510 Credit in favour of the taxable person" +msgid "510 - Solde en faveur de l’assujetti" +msgstr "510 - Credit in favour of the taxable person" #. module: l10n_ch #: model:account.tax,description:l10n_ch.1_vat_77 @@ -495,18 +660,31 @@ msgid "8.1% invest. Incl." msgstr "" #. module: l10n_ch -#: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_900 -msgid "900 Subventions, taxes touristiques" +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_900 +msgid "900" msgstr "" -"900 Subsidies, tourist funds collected by tourist offices, contributions " + +#. module: l10n_ch +#: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_900 +msgid "" +"900 - Subventions, taxes touristiques perçues par les offices du tourisme, " +"contributions aux établissements d'élimination des déchets et " +"d'approvisionnement en eau" +msgstr "" +"900 - Subsidies, tourist funds collected by tourist offices, contributions " "from cantonal water, sewage or waste funds (art. 18 para. 2 lit. a to c)" #. module: l10n_ch -#: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_910 -msgid "910 Les dons, les dividendes, les dédommagements, ..." +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_910 +msgid "910" msgstr "" -"910 Donations, dividends, payments of damages etc. (art. 18 para. 2 lit. d " -"to l)" + +#. module: l10n_ch +#: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_910 +msgid "910 - Les dons, les dividendes, les dédommagements, etc." +msgstr "" +"910 - Donations, dividends, payments of damages etc. (art. 18 para. 2 lit. d" +" to l)" #. module: l10n_ch #: model_terms:ir.ui.view,arch_db:l10n_ch.res_config_settings_view_form @@ -573,11 +751,6 @@ msgstr "" msgid "Reference" msgstr "" -#. module: l10n_ch -#: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_autres_mouv -msgid "AUTRES MOUVEMENTS DE FONDS" -msgstr "OTHER CASH FLOWS (art. 18 para. 2)" - #. module: l10n_ch #: model:account.account,name:l10n_ch.1_ch_coa_4200 #: model:account.account.template,name:l10n_ch.ch_coa_4200 @@ -784,11 +957,6 @@ msgstr "" msgid "Bank Statement Line" msgstr "" -#. module: l10n_ch -#: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_calc_impot_base -msgid "Base Impôt sur acquisitions de services" -msgstr "Tax base on service acquisitions" - #. module: l10n_ch #: model:ir.model.fields,help:l10n_ch.field_res_company__l10n_ch_isr_print_bank_location #: model:ir.model.fields,help:l10n_ch.field_res_config_settings__l10n_ch_isr_print_bank_location @@ -961,11 +1129,7 @@ msgid "Charges à payer" msgstr "Deferred revenue and accrued expenses (Accounts received in advance)" #. module: l10n_ch -#: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_calc_impot_chiffre -msgid "Chiffre d'affaires imposable" -msgstr "Taxable turnover" - -#. module: l10n_ch +#: model:ir.model.fields,field_description:l10n_ch.field_account_bank_statement_import_journal_creation__l10n_ch_postal #: model:ir.model.fields,field_description:l10n_ch.field_account_journal__l10n_ch_postal msgid "Client Number" msgstr "" @@ -983,6 +1147,7 @@ msgid "Commissions obtenues sur achats" msgstr "Commissions on purchases" #. module: l10n_ch +#: model:ir.model.fields,field_description:l10n_ch.field_account_bank_statement_import_journal_creation__invoice_reference_model #: model:ir.model.fields,field_description:l10n_ch.field_account_journal__invoice_reference_model msgid "Communication Standard" msgstr "" @@ -1286,8 +1451,8 @@ msgstr "Mortgages" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chiffre_af -msgid "I - CHIFFRE D'AFFAIRES" -msgstr "I – TURNOVER" +msgid "I. CHIFFRE D'AFFAIRES" +msgstr "I. TURNOVER" #. module: l10n_ch #: model:ir.model.fields,field_description:l10n_ch.field_account_bank_statement_line__id @@ -1304,8 +1469,13 @@ msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_calc_impot -msgid "II - CALCUL DE L'IMPOT" -msgstr "II - TAX CALCULATION" +msgid "II. CALCUL DE L'IMPÔT" +msgstr "II. TAX CALCULATION" + +#. module: l10n_ch +#: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_autres_mouv +msgid "III. AUTRES MOUVEMENTS DE FONDS" +msgstr "III. OTHER CASH FLOWS" #. module: l10n_ch #: model:ir.actions.report,name:l10n_ch.l10n_ch_isr_report @@ -1367,6 +1537,16 @@ msgstr "Real Estate" msgid "Import/Export" msgstr "" +#. module: l10n_ch +#: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_tax_amount_1 +msgid "Impôt CHF / ct. dès le 01.01.2024" +msgstr "Tax amount CHF / cent. from 01.01.2024" + +#. module: l10n_ch +#: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_tax_amount_2 +msgid "Impôt CHF / ct. jusqu'au 31.12.2023" +msgstr "Tax amount CHF / cent. to 31.12.2023" + #. module: l10n_ch #: model:account.account,name:l10n_ch.1_ch_coa_1176 #: model:account.account.template,name:l10n_ch.ch_coa_1176 @@ -1643,17 +1823,22 @@ msgstr "" msgid "Prestations / travaux de tiers" msgstr "Cost of purchased services" +#. module: l10n_ch +#: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_supplies_1 +msgid "Prestations CHF dès le 01.01.2024" +msgstr "Supplies CHF from 01.01.2024" + +#. module: l10n_ch +#: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_supplies_2 +msgid "Prestations CHF jusqu'au 31.12.2023" +msgstr "Supplies CHF to 31.12.2023" + #. module: l10n_ch #: model:account.account,name:l10n_ch.1_ch_coa_3700 #: model:account.account.template,name:l10n_ch.ch_coa_3700 msgid "Prestations propres" msgstr "Own services" -#. module: l10n_ch -#: model_terms:ir.ui.view,arch_db:l10n_ch.isr_invoice_form -msgid "Print ISR" -msgstr "" - #. module: l10n_ch #: model_terms:ir.ui.view,arch_db:l10n_ch.isr_invoice_form msgid "Print QR-bill" @@ -1810,11 +1995,6 @@ msgstr "Legal retained earnings (Reserves)" msgid "Réserves légales issues du capital" msgstr "Legal capital reserves" -#. module: l10n_ch -#: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_solde -msgid "SOLDE" -msgstr "AMOUNT PAYABLE" - #. module: l10n_ch #: model:account.account,name:l10n_ch.1_ch_coa_5000 #: model:account.account.template,name:l10n_ch.ch_coa_5000 @@ -2230,6 +2410,7 @@ msgid "" msgstr "" #. module: l10n_ch +#: model:ir.model.fields,help:l10n_ch.field_account_bank_statement_import_journal_creation__l10n_ch_postal #: model:ir.model.fields,help:l10n_ch.field_account_journal__l10n_ch_postal #: model:ir.model.fields,help:l10n_ch.field_account_setup_bank_manual_config__l10n_ch_postal #: model:ir.model.fields,help:l10n_ch.field_res_partner_bank__l10n_ch_postal @@ -2383,6 +2564,7 @@ msgid "" msgstr "" #. module: l10n_ch +#: model:ir.model.fields,help:l10n_ch.field_account_bank_statement_import_journal_creation__invoice_reference_model #: model:ir.model.fields,help:l10n_ch.field_account_journal__invoice_reference_model msgid "" "You can choose different models for each type of reference. The default one " diff --git a/addons/l10n_ch/i18n_extra/fr.po b/addons/l10n_ch/i18n_extra/fr.po index 824c7e71b5..b7f85a6186 100644 --- a/addons/l10n_ch/i18n_extra/fr.po +++ b/addons/l10n_ch/i18n_extra/fr.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Flectra Server 2.0+e\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-02-22 08:20+0000\n" -"PO-Revision-Date: 2023-02-22 08:20+0000\n" +"POT-Creation-Date: 2023-07-19 14:05+0000\n" +"PO-Revision-Date: 2023-07-19 14:05+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -23,7 +23,7 @@ msgstr "" #. module: l10n_ch #: model:ir.actions.report,print_report_name:l10n_ch.l10n_ch_qr_report msgid "'QR-bill-%s' % object.name" -msgstr "'QR-facture-%s' % object.name" +msgstr "" #. module: l10n_ch #: model:account.tax,description:l10n_ch.1_vat_other_movements_910 @@ -135,47 +135,99 @@ msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_200 -msgid "200 Chiffre d'affaires" +msgid "" +"200 - Total des contre-prestations convenues ou reçues, y c. de prestations " +"imposées par option, de transferts par procédure de déclaration, de " +"prestations à l’étranger" +msgstr "" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_205 +msgid "205" +msgstr "" + +#. module: l10n_ch +#: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_205 +msgid "" +"205 - Contre-prestations déclarées sous ch. 200 qui proviennent de " +"prestations exclues du champ de l’impôt (art. 21) pour lesquelles il a été " +"opté en vertu de l’art. 22" +msgstr "" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_220_289 +msgid "220" msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_220_289 -msgid "220 Chiffre d'affaires imposable a 0% (export)" +msgid "" +"220 - Prestations exonérées (p. ex. exportations, art. 23), prestations " +"exonérées fournies à des institutions et à des personnes bénéficiaires (art." +" 107, al. 1, let. a)" +msgstr "" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_221 +msgid "221" msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_221 -msgid "221 Prestations fournies à l'étranger" +msgid "221 - Prestations fournies à l’étranger" +msgstr "" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_225 +msgid "225" msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_225 -msgid "225 Transfer avec la procédure de déclaration" +msgid "225 - Transferts avec la procédure de déclaration (art. 38)" +msgstr "" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_230 +msgid "230" msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_230 -msgid "230 Chiffre d'affaires non-imposable a 0% (exclu)" +msgid "" +"230 - Prestations exclues du champ de l’impôt (art. 21) fournies sur le " +"territoire suisse pour lesquelles il n’a pas été opté selon l’art. 22" +msgstr "" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_235 +msgid "235" msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_235 -msgid "235 Diminution de la contre-prestation" +msgid "" +"235 - Diminutions de la contre-prestation telles que rabais, escomptes, etc." +msgstr "" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_280 +msgid "280" msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_280 -msgid "280 Divers (p.ex valeur du terrain)" +msgid "280 - Divers (p.ex. valeur du terrain)" msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_289 -msgid "289 Déductions (ch.220 à ch.280)" +msgid "289 - Déductions (Total ch. 220 à 280)" msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_299 -msgid "299 Chiffre d'affaires imposable (ch.200 moins ch.289)" +msgid "299 - Total du chiffre d’affaires imposable (ch. 200 moins ch. 289)" msgstr "" #. module: l10n_ch @@ -250,139 +302,251 @@ msgstr "" msgid "3.8% invest Incl." msgstr "" +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_302a +msgid "302a" +msgstr "" + #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_302a -msgid "302a Chiffre d'affaires imposable a 7.7% (TS) jusqu'au 31.12.2023" +msgid "302a - Taux normal (7,7%): Prestations CHF jusqu'au 31.12.2023" +msgstr "" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_302b +msgid "302b" msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_302b -msgid "302b TVA due a 7.7% (TS) jusqu'au 31.12.2023" +msgid "302b - Taux normal (7,7%): Impôt CHF / ct. jusqu'au 31.12.2023" +msgstr "" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_303a +msgid "303a" msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_303a -msgid "303a Chiffre d'affaires imposable a 8.1% (TS) dès le 01.01.2024" +msgid "303a - Taux normal (8,1%): Prestations CHF dès le 01.01.2024" +msgstr "" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_303b +msgid "303b" msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_303b -msgid "303b TVA due a 8.1% (TS) dès le 01.01.2024" +msgid "303b - Taux normal (8,1%): Impôt CHF / ct. dès le 01.01.2024" +msgstr "" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_312a +msgid "312a" msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_312a -msgid "312a Chiffre d'affaires imposable a 2.5% (TR) jusqu'au 31.12.2023" +msgid "312a - Taux réduit (2,5%): Prestations CHF jusqu'au 31.12.2023" +msgstr "" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_312b +msgid "312b" msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_312b -msgid "312b TVA due a 2.5% (TR) jusqu'au 31.12.2023" +msgid "312b - Taux réduit (2,5%): Impôt CHF / ct. jusqu'au 31.12.2023" +msgstr "" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_313a +msgid "313a" msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_313a -msgid "313a Chiffre d'affaires imposable a 2.6% (TR) dès le 01.01.2024" +msgid "313a - Taux réduit (2,6%): Prestations CHF dès le 01.01.2024" +msgstr "" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_313b +msgid "313b" msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_313b -msgid "313b TVA due a 2.6% (TR) dès le 01.01.2024" +msgid "313b - Taux réduit (2,6%): Impôt CHF / ct. dès le 01.01.2024" +msgstr "" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_342a +msgid "342a" msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_342a -msgid "342a Chiffre d'affaires imposable a 3.7% (TS) jusqu'au 31.12.2023" +msgid "" +"342a - Taux spécial pour l'hébergement (3,7%): Prestations CHF jusqu'au " +"31.12.2023" +msgstr "" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_342b +msgid "342b" msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_342b -msgid "342b TVA due a 3.7% (TS) jusqu'au 31.12.2023" +msgid "" +"342b - Taux spécial pour l'hébergement (3,7%): Impôt CHF / ct. jusqu'au " +"31.12.2023" +msgstr "" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_343a +msgid "343a" msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_343a -msgid "343a Chiffre d'affaires imposable a 3.8% (TS) dès le 01.01.2024" +msgid "" +"343a - Taux spécial pour l'hébergement (3,8%): Prestations CHF dès le " +"01.01.2024" +msgstr "" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_343b +msgid "343b" msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_343b -msgid "343b TVA due a 3.8% (TS) dès le 01.01.2024" +msgid "" +"343b - Taux spécial pour l'hébergement (3,8%): Impôt CHF / ct. dès le " +"01.01.2024" msgstr "" #. module: l10n_ch -#: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_381a -msgid "381a Impots sur les acquisitions" -msgstr "" - -#. module: l10n_ch -#: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_381b -msgid "381b Impots sur les acquisitions " +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_382a +msgid "382a" msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_382a -msgid "382a Impots sur les acquisitions jusqu'au 31.12.2023" +msgid "382a - Impôt sur les acquisitions: Prestations CHF jusqu'au 31.12.2023" +msgstr "" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_382b +msgid "382b" msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_382b -msgid "382b Impots sur les acquisitions jusqu'au 31.12.2023" +msgid "382b - Impôt sur les acquisitions: Impôt CHF / ct. jusqu'au 31.12.2023" +msgstr "" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_383a +msgid "383a" msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_383a -msgid "383a Impots sur les acquisitions dès le 01.01.2024" +msgid "383a - Impôt sur les acquisitions: Prestations CHF dès le 01.01.2024" +msgstr "" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_383b +msgid "383b" msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_383b -msgid "383b Impots sur les acquisitions dès le 01.01.2024" +msgid "383b - Impôt sur les acquisitions: Impôt CHF / ct. dès le 01.01.2024" msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_399 -msgid "399 TVA Due " +msgid "399 - Total de l’impôt dû" +msgstr "" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_400 +msgid "400" msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_400 -msgid "400 TVA préalable sur biens et services" +msgid "" +"400 - Impôt préalable grevant les coûts en matériel et en prestations de " +"services" +msgstr "" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_405 +msgid "405" msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_405 -msgid "405 TVA préalable sur invest. et autres ch." +msgid "" +"405 - Impôt préalable grevant les investissements et autres charges " +"d’exploitation" +msgstr "" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_410 +msgid "410" msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_410 -msgid "410 Dégrèvement ultérieur de l'impot préalable" +msgid "410 - Dégrèvement ultérieur de l’impôt préalable (art. 32)" +msgstr "" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_415 +msgid "415" msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_415 -msgid "415 Correction de l'impot préalable" +msgid "" +"415 - Corrections de l’impôt préalable: double affectation (art. 30), " +"prestations à soi-même (art. 31)" +msgstr "" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_420 +msgid "420" msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_420 -msgid "420 Réduction de la déduction de l'impot préalable" +msgid "" +"420 - Réductions de la déduction de l’impôt préalable: prestations n’étant " +"pas considérées comme des contre-prestations, telles subventions, taxes " +"touristiques (art. 33, al. 2)" msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_479 -msgid "479 TVA préalable" +msgid "479 - Total ch. 400 à 420" msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_500 -msgid "500 Solde de TVA a payer a l'AFC" +msgid "500 - Montant à payer" msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_510 -msgid "510 Solde de TVA a recevoir de l'AFC" +msgid "510 - Solde en faveur de l’assujetti" msgstr "" #. module: l10n_ch @@ -473,14 +637,27 @@ msgstr "" msgid "8.1% invest. Incl." msgstr "" +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_900 +msgid "900" +msgstr "" + #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_900 -msgid "900 Subventions, taxes touristiques" +msgid "" +"900 - Subventions, taxes touristiques perçues par les offices du tourisme, " +"contributions aux établissements d'élimination des déchets et " +"d'approvisionnement en eau" +msgstr "" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_910 +msgid "910" msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_910 -msgid "910 Les dons, les dividendes, les dédommagements, ..." +msgid "910 - Les dons, les dividendes, les dédommagements, etc." msgstr "" #. module: l10n_ch @@ -491,66 +668,61 @@ msgstr "" #. module: l10n_ch #: model_terms:ir.ui.view,arch_db:l10n_ch.l10n_ch_swissqr_template msgid "Acceptance point" -msgstr "Point de dépôt" +msgstr "" #. module: l10n_ch #: model_terms:ir.ui.view,arch_db:l10n_ch.l10n_ch_swissqr_template msgid "Reference" -msgstr "Référence" +msgstr "" #. module: l10n_ch #: model_terms:ir.ui.view,arch_db:l10n_ch.l10n_ch_swissqr_template msgid "Account / Payable to" -msgstr "Compte / Payable à" +msgstr "" #. module: l10n_ch #: model_terms:ir.ui.view,arch_db:l10n_ch.l10n_ch_swissqr_template msgid "Account / Payable to
" -msgstr "Compte / Payable à
" +msgstr "" #. module: l10n_ch #: model_terms:ir.ui.view,arch_db:l10n_ch.l10n_ch_swissqr_template msgid "Additional information" -msgstr "Informations supplémentaires" +msgstr "" #. module: l10n_ch #: model_terms:ir.ui.view,arch_db:l10n_ch.l10n_ch_swissqr_template msgid "Amount" -msgstr "Montant" +msgstr "" #. module: l10n_ch #: model_terms:ir.ui.view,arch_db:l10n_ch.l10n_ch_swissqr_template msgid "Amount
" -msgstr "Montant
" +msgstr "" #. module: l10n_ch #: model_terms:ir.ui.view,arch_db:l10n_ch.l10n_ch_swissqr_template msgid "Currency" -msgstr "Monnaie" +msgstr "" #. module: l10n_ch #: model_terms:ir.ui.view,arch_db:l10n_ch.l10n_ch_swissqr_template msgid "Payable by" -msgstr "Payable par" +msgstr "" #. module: l10n_ch #: model_terms:ir.ui.view,arch_db:l10n_ch.l10n_ch_swissqr_template msgid "Payment part" -msgstr "Section paiement" +msgstr "" #. module: l10n_ch #: model_terms:ir.ui.view,arch_db:l10n_ch.l10n_ch_swissqr_template msgid "Receipt" -msgstr "Récépissé" +msgstr "" #. module: l10n_ch #: model_terms:ir.ui.view,arch_db:l10n_ch.l10n_ch_swissqr_template msgid "Reference" -msgstr "Référence" - -#. module: l10n_ch -#: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_autres_mouv -msgid "AUTRES MOUVEMENTS DE FONDS" msgstr "" #. module: l10n_ch @@ -759,11 +931,6 @@ msgstr "Comptes bancaires" msgid "Bank Statement Line" msgstr "Ligne de relevé bancaire" -#. module: l10n_ch -#: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_calc_impot_base -msgid "Base Impôt sur acquisitions de services" -msgstr "" - #. module: l10n_ch #: model:ir.model.fields,help:l10n_ch.field_res_company__l10n_ch_isr_print_bank_location #: model:ir.model.fields,help:l10n_ch.field_res_config_settings__l10n_ch_isr_print_bank_location @@ -934,11 +1101,7 @@ msgid "Charges à payer" msgstr "" #. module: l10n_ch -#: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_calc_impot_chiffre -msgid "Chiffre d'affaires imposable" -msgstr "" - -#. module: l10n_ch +#: model:ir.model.fields,field_description:l10n_ch.field_account_bank_statement_import_journal_creation__l10n_ch_postal #: model:ir.model.fields,field_description:l10n_ch.field_account_journal__l10n_ch_postal msgid "Client Number" msgstr "" @@ -956,6 +1119,7 @@ msgid "Commissions obtenues sur achats" msgstr "" #. module: l10n_ch +#: model:ir.model.fields,field_description:l10n_ch.field_account_bank_statement_import_journal_creation__invoice_reference_model #: model:ir.model.fields,field_description:l10n_ch.field_account_journal__invoice_reference_model msgid "Communication Standard" msgstr "Standard de communication" @@ -1070,7 +1234,7 @@ msgstr "" #: model:ir.model.fields,field_description:l10n_ch.field_res_config_settings__display_name #: model:ir.model.fields,field_description:l10n_ch.field_res_partner_bank__display_name msgid "Display Name" -msgstr "Nom affiché" +msgstr "Nom d'affichage" #. module: l10n_ch #: model:account.account,name:l10n_ch.1_ch_coa_2261 @@ -1259,7 +1423,7 @@ msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chiffre_af -msgid "I - CHIFFRE D'AFFAIRES" +msgid "I. CHIFFRE D'AFFAIRES" msgstr "" #. module: l10n_ch @@ -1277,7 +1441,12 @@ msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_calc_impot -msgid "II - CALCUL DE L'IMPOT" +msgid "II. CALCUL DE L'IMPÔT" +msgstr "" + +#. module: l10n_ch +#: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_autres_mouv +msgid "III. AUTRES MOUVEMENTS DE FONDS" msgstr "" #. module: l10n_ch @@ -1340,6 +1509,16 @@ msgstr "" msgid "Import/Export" msgstr "" +#. module: l10n_ch +#: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_tax_amount_1 +msgid "Impôt CHF / ct. dès le 01.01.2024" +msgstr "" + +#. module: l10n_ch +#: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_tax_amount_2 +msgid "Impôt CHF / ct. jusqu'au 31.12.2023" +msgstr "" + #. module: l10n_ch #: model:account.account,name:l10n_ch.1_ch_coa_1176 #: model:account.account.template,name:l10n_ch.ch_coa_1176 @@ -1616,21 +1795,26 @@ msgstr "" msgid "Prestations / travaux de tiers" msgstr "" +#. module: l10n_ch +#: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_supplies_1 +msgid "Prestations CHF dès le 01.01.2024" +msgstr "" + +#. module: l10n_ch +#: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_supplies_2 +msgid "Prestations CHF jusqu'au 31.12.2023" +msgstr "" + #. module: l10n_ch #: model:account.account,name:l10n_ch.1_ch_coa_3700 #: model:account.account.template,name:l10n_ch.ch_coa_3700 msgid "Prestations propres" msgstr "" -#. module: l10n_ch -#: model_terms:ir.ui.view,arch_db:l10n_ch.isr_invoice_form -msgid "Print ISR" -msgstr "" - #. module: l10n_ch #: model_terms:ir.ui.view,arch_db:l10n_ch.isr_invoice_form msgid "Print QR-bill" -msgstr "Imprimer QR-facture" +msgstr "" #. module: l10n_ch #: model:ir.model.fields,field_description:l10n_ch.field_res_company__l10n_ch_isr_print_bank_location @@ -1730,7 +1914,7 @@ msgstr "" #. module: l10n_ch #: model_terms:ir.ui.view,arch_db:l10n_ch.l10n_ch_swissqr_template msgid "QR-bill for invoice" -msgstr "QR-facture" +msgstr "" #. module: l10n_ch #: model:account.account,name:l10n_ch.1_ch_coa_3801 @@ -1781,11 +1965,6 @@ msgstr "" msgid "Réserves légales issues du capital" msgstr "" -#. module: l10n_ch -#: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_solde -msgid "SOLDE" -msgstr "" - #. module: l10n_ch #: model:account.account,name:l10n_ch.1_ch_coa_5000 #: model:account.account.template,name:l10n_ch.ch_coa_5000 @@ -2201,6 +2380,7 @@ msgid "" msgstr "" #. module: l10n_ch +#: model:ir.model.fields,help:l10n_ch.field_account_bank_statement_import_journal_creation__l10n_ch_postal #: model:ir.model.fields,help:l10n_ch.field_account_journal__l10n_ch_postal #: model:ir.model.fields,help:l10n_ch.field_account_setup_bank_manual_config__l10n_ch_postal #: model:ir.model.fields,help:l10n_ch.field_res_partner_bank__l10n_ch_postal @@ -2354,6 +2534,7 @@ msgid "" msgstr "" #. module: l10n_ch +#: model:ir.model.fields,help:l10n_ch.field_account_bank_statement_import_journal_creation__invoice_reference_model #: model:ir.model.fields,help:l10n_ch.field_account_journal__invoice_reference_model msgid "" "You can choose different models for each type of reference. The default one " diff --git a/addons/l10n_ch/i18n_extra/it.po b/addons/l10n_ch/i18n_extra/it.po index c43bbe5509..7a6415a926 100644 --- a/addons/l10n_ch/i18n_extra/it.po +++ b/addons/l10n_ch/i18n_extra/it.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Flectra Server 2.0+e\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-02-22 08:23+0000\n" -"PO-Revision-Date: 2023-02-22 08:23+0000\n" +"POT-Creation-Date: 2023-07-19 14:04+0000\n" +"PO-Revision-Date: 2023-07-19 14:04+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -135,48 +135,115 @@ msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_200 -msgid "200 Chiffre d'affaires" -msgstr "200 Fatturato" +msgid "" +"200 - Total des contre-prestations convenues ou reçues, y c. de prestations " +"imposées par option, de transferts par procédure de déclaration, de " +"prestations à l’étranger" +msgstr "" +"200 - Totale delle controprestazioni convenute o ricevute, incluse quelle " +"inerenti a prestazioni optate, a trasferimenti mediante procedura di " +"notifica e a prestazioni all’estero" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_205 +msgid "205" +msgstr "" + +#. module: l10n_ch +#: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_205 +msgid "" +"205 - Contre-prestations déclarées sous ch. 200 qui proviennent de " +"prestations exclues du champ de l’impôt (art. 21) pour lesquelles il a été " +"opté en vertu de l’art. 22" +msgstr "" +"205 - Controprestazioni contenute nella cifra 200 conseguite con prestazioni" +" escluse dall’imposta (art. 21) per la cui imposizione si è optato in virtù " +"dell’art. 22" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_220_289 +msgid "220" +msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_220_289 -msgid "220 Chiffre d'affaires imposable a 0% (export)" -msgstr "220 Fatturato tassabile allo 0% (esportazione)" +msgid "" +"220 - Prestations exonérées (p. ex. exportations, art. 23), prestations " +"exonérées fournies à des institutions et à des personnes bénéficiaires (art." +" 107, al. 1, let. a)" +msgstr "" +"220 - Prestazioni esenti dall’imposta (p. es. esportazioni; art. 23), " +"prestazioni esenti a beneficiari istituzionali e persone beneficiarie (art. " +"107 cpv. 1 lett. a)" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_221 +msgid "221" +msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_221 -msgid "221 Prestations fournies à l'étranger" -msgstr "221 Servizi forniti all'estero" +msgid "221 - Prestations fournies à l’étranger" +msgstr "221 - Prestazioni all’estero" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_225 +msgid "225" +msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_225 -msgid "225 Transfer avec la procédure de déclaration" -msgstr "225 Trasferimento con procedura di dichiarazione" +msgid "225 - Transferts avec la procédure de déclaration (art. 38)" +msgstr "225 - Trasferimenti mediante procedura di notifica (art. 38)" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_230 +msgid "230" +msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_230 -msgid "230 Chiffre d'affaires non-imposable a 0% (exclu)" -msgstr "230 Vendite non tassabili a 0% (escluso)" +msgid "" +"230 - Prestations exclues du champ de l’impôt (art. 21) fournies sur le " +"territoire suisse pour lesquelles il n’a pas été opté selon l’art. 22" +msgstr "" +"230 - Prestazioni escluse dall’imposta (art. 21) effettuate in territorio " +"svizzero per la cui imposizione non si è optato in virtù dell’art. 22" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_235 +msgid "235" +msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_235 -msgid "235 Diminution de la contre-prestation" -msgstr "235 Diminuzione dei benefici di contropartita" +msgid "" +"235 - Diminutions de la contre-prestation telles que rabais, escomptes, etc." +msgstr "235 - Diminuzioni della controprestazione quali sconti, ribassi, ecc." + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_280 +msgid "280" +msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_280 -msgid "280 Divers (p.ex valeur du terrain)" -msgstr "280 Varie (ad es. valore del terreno)" +msgid "280 - Divers (p.ex. valeur du terrain)" +msgstr "" +"280 - Diversi (ad.es. valore del terreno, prezzo d’acquisto in caso " +"d’imposizione dei margini)" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_289 -msgid "289 Déductions (ch.220 à ch.280)" -msgstr "289 Deduzioni (da ch.220 a ch.280)" +msgid "289 - Déductions (Total ch. 220 à 280)" +msgstr "289 - Deduzioni (Totale cifre 220-280)" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_299 -msgid "299 Chiffre d'affaires imposable (ch.200 moins ch.289)" -msgstr "299 Fatturato imponibile (ch.200 meno ch.289)" +msgid "299 - Total du chiffre d’affaires imposable (ch. 200 moins ch. 289)" +msgstr "" +"299 - Cifra d’affari imponibile complessiva (cifra 200, dedotta la cifra " +"289)" #. module: l10n_ch #: model:account.tax,description:l10n_ch.1_vat_37 @@ -250,140 +317,267 @@ msgstr "" msgid "3.8% invest Incl." msgstr "" +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_302a +msgid "302a" +msgstr "" + #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_302a -msgid "302a Chiffre d'affaires imposable a 7.7% (TS) jusqu'au 31.12.2023" -msgstr "302a Fatturato imponibile al 7,7% (TS) fino al 31.12.2023" +msgid "302a - Taux normal (7,7%): Prestations CHF jusqu'au 31.12.2023" +msgstr "302a - Aliquota normale (7,7%): Prestazioni CHF fino al 31.12.2023" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_302b +msgid "302b" +msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_302b -msgid "302b TVA due a 7.7% (TS) jusqu'au 31.12.2023" -msgstr "302b IVA dovuta al 7,7% (TS) fino al 31.12.2023" +msgid "302b - Taux normal (7,7%): Impôt CHF / ct. jusqu'au 31.12.2023" +msgstr "302b - Aliquota normale (7,7%): Imposta CHF / cts. fino al 31.12.2023" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_303a +msgid "303a" +msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_303a -msgid "303a Chiffre d'affaires imposable a 8.1% (TS) dès le 01.01.2024" -msgstr "303a Fatturato imponibile al 8,1% (TS) dal 01.01.2024" +msgid "303a - Taux normal (8,1%): Prestations CHF dès le 01.01.2024" +msgstr "303a - Aliquota normale (8,1%): Prestazioni CHF fino dal 01.01.2024" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_303b +msgid "303b" +msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_303b -msgid "303b TVA due a 8.1% (TS) dès le 01.01.2024" -msgstr "303b IVA dovuta al 8,1% (TS) dal 01.01.2024" +msgid "303b - Taux normal (8,1%): Impôt CHF / ct. dès le 01.01.2024" +msgstr "" +"303b - Aliquota normale (8,1%): Imposta CHF / cts. fino dal 01.01.2024" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_312a +msgid "312a" +msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_312a -msgid "312a Chiffre d'affaires imposable a 2.5% (TR) jusqu'au 31.12.2023" -msgstr "312a Fatturato imponibile a 2,5% (TR) fino al 31.12.2023" +msgid "312a - Taux réduit (2,5%): Prestations CHF jusqu'au 31.12.2023" +msgstr "312a - Aliquota ridotta (2,5%): Prestazioni CHF fino al 31.12.2023" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_312b +msgid "312b" +msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_312b -msgid "312b TVA due a 2.5% (TR) jusqu'au 31.12.2023" -msgstr "312b IVA dovuta al 2,5% (TR) fino al 31.12.2023" +msgid "312b - Taux réduit (2,5%): Impôt CHF / ct. jusqu'au 31.12.2023" +msgstr "312b - Aliquota ridotta (2,5%): Imposta CHF / cts. fino al 31.12.2023" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_313a +msgid "313a" +msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_313a -msgid "313a Chiffre d'affaires imposable a 2.6% (TR) dès le 01.01.2024" -msgstr "313a Fatturato imponibile a 2,6% (TR) dal 01.01.2024" +msgid "313a - Taux réduit (2,6%): Prestations CHF dès le 01.01.2024" +msgstr "313a - Aliquota ridotta (2,6%): Prestazioni CHF fino dal 01.01.2024" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_313b +msgid "313b" +msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_313b -msgid "313b TVA due a 2.6% (TR) dès le 01.01.2024" -msgstr "313b IVA dovuta al 2,6% (TR) dal 01.01.2024" +msgid "313b - Taux réduit (2,6%): Impôt CHF / ct. dès le 01.01.2024" +msgstr "" +"313b - Aliquota ridotta (2,6%): Imposta CHF / cts. fino dal 01.01.2024" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_342a +msgid "342a" +msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_342a -msgid "342a Chiffre d'affaires imposable a 3.7% (TS) jusqu'au 31.12.2023" -msgstr "342a Fatturato imponibile a 3,7% (TS) fino al 31.12.2023" +msgid "" +"342a - Taux spécial pour l'hébergement (3,7%): Prestations CHF jusqu'au " +"31.12.2023" +msgstr "" +"342a - Aliquota speciale per l’alloggio (3,7%): Prestazioni CHF fino al " +"31.12.2023" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_342b +msgid "342b" +msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_342b -msgid "342b TVA due a 3.7% (TS) jusqu'au 31.12.2023" -msgstr "342b IVA dovuta al 3,7% (TS) fino al 31.12.2023" +msgid "" +"342b - Taux spécial pour l'hébergement (3,7%): Impôt CHF / ct. jusqu'au " +"31.12.2023" +msgstr "" +"342b - Aliquota speciale per l’alloggio (3,7%): Imposta CHF / cts. fino al " +"31.12.2023" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_343a +msgid "343a" +msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_343a -msgid "343a Chiffre d'affaires imposable a 3.8% (TS) dès le 01.01.2024" -msgstr "343a Fatturato imponibile a 3,8% (TS) dal 01.01.2024" +msgid "" +"343a - Taux spécial pour l'hébergement (3,8%): Prestations CHF dès le " +"01.01.2024" +msgstr "" +"343a - Aliquota speciale per l’alloggio (3,8%): Prestazioni CHF fino dal " +"01.01.2024" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_343b +msgid "343b" +msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_343b -msgid "343b TVA due a 3.8% (TS) dès le 01.01.2024" -msgstr "343b IVA dovuta al 3,8% (TS) dal 01.01.2024" +msgid "" +"343b - Taux spécial pour l'hébergement (3,8%): Impôt CHF / ct. dès le " +"01.01.2024" +msgstr "" +"343b - Aliquota speciale per l’alloggio (3,8%): Imposta CHF / cts. fino dal " +"01.01.2024" #. module: l10n_ch -#: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_381a -msgid "381a Impots sur les acquisitions" -msgstr "381a Imposte sulle acquisizioni" - -#. module: l10n_ch -#: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_381b -msgid "381b Impots sur les acquisitions " -msgstr "381b Imposte sulle acquisizioni " +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_382a +msgid "382a" +msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_382a -msgid "382a Impots sur les acquisitions jusqu'au 31.12.2023" -msgstr "382a Imposte sulle acquisizioni fino al 31.12.2023" +msgid "382a - Impôt sur les acquisitions: Prestations CHF jusqu'au 31.12.2023" +msgstr "382a - Imposta sull’acquisto: Prestazioni CHF fino al 31.12.2023" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_382b +msgid "382b" +msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_382b -msgid "382b Impots sur les acquisitions jusqu'au 31.12.2023" -msgstr "382b Imposte sulle acquisizioni fino al 31.12.2023" +msgid "382b - Impôt sur les acquisitions: Impôt CHF / ct. jusqu'au 31.12.2023" +msgstr "382b - Imposta sull’acquisto: Imposta CHF / cts. fino al 31.12.2023" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_383a +msgid "383a" +msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_383a -msgid "383a Impots sur les acquisitions dès le 01.01.2024" -msgstr "383a Imposte sulle acquisizioni dal 01.01.2024" +msgid "383a - Impôt sur les acquisitions: Prestations CHF dès le 01.01.2024" +msgstr "383a - Imposta sull’acquisto: Prestazioni CHF fino dal 01.01.2024" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_383b +msgid "383b" +msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_383b -msgid "383b Impots sur les acquisitions dès le 01.01.2024" -msgstr "383b Imposte sulle acquisizioni dal 01.01.2024" +msgid "383b - Impôt sur les acquisitions: Impôt CHF / ct. dès le 01.01.2024" +msgstr "383b - Imposta sull’acquisto: Imposta CHF / cts. fino dal 01.01.2024" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_399 -msgid "399 TVA Due " -msgstr "399 IVA dovuta " +msgid "399 - Total de l’impôt dû" +msgstr "399 - Totale dell’imposta dovuta" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_400 +msgid "400" +msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_400 -msgid "400 TVA préalable sur biens et services" -msgstr "400 IVA anticipata su beni e servizi" +msgid "" +"400 - Impôt préalable grevant les coûts en matériel et en prestations de " +"services" +msgstr "" +"400 - Imposta precedente su costi del materiale e prestazioni di servizi" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_405 +msgid "405" +msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_405 -msgid "405 TVA préalable sur invest. et autres ch." -msgstr "405 Anticipo IVA su investimenti e altre sp." +msgid "" +"405 - Impôt préalable grevant les investissements et autres charges " +"d’exploitation" +msgstr "405 - Imposta precedente su investimenti e altri costi d’esercizio" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_410 +msgid "410" +msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_410 -msgid "410 Dégrèvement ultérieur de l'impot préalable" -msgstr "410 Sgravio successivo dall'imposta precedente" +msgid "410 - Dégrèvement ultérieur de l’impôt préalable (art. 32)" +msgstr "410 - Sgravio fiscale successivo (art. 32)" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_415 +msgid "415" +msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_415 -msgid "415 Correction de l'impot préalable" -msgstr "415 Adeguamento al lordo delle imposte" +msgid "" +"415 - Corrections de l’impôt préalable: double affectation (art. 30), " +"prestations à soi-même (art. 31)" +msgstr "" +"415 - Correzioni dell’imposta precedente: doppia utilizzazione (art. 30), " +"consumo proprio (art. 31)" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_420 +msgid "420" +msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_420 -msgid "420 Réduction de la déduction de l'impot préalable" -msgstr "420 Riduzione della deduzione dell'imposta precedente" +msgid "" +"420 - Réductions de la déduction de l’impôt préalable: prestations n’étant " +"pas considérées comme des contre-prestations, telles subventions, taxes " +"touristiques (art. 33, al. 2)" +msgstr "" +"420 - Riduzioni della deduzione dell’imposta precedente: non " +"controprestazioni come sussidi, tasse turistiche (art. 33 cpv. 2)" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_479 -msgid "479 TVA préalable" -msgstr "479 IVA a credito" +msgid "479 - Total ch. 400 à 420" +msgstr "479 - Totale cifre 400-420" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_500 -msgid "500 Solde de TVA a payer a l'AFC" -msgstr "500 Saldo IVA da versare all'AFC" +msgid "500 - Montant à payer" +msgstr "500 - Importo da versare" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_510 -msgid "510 Solde de TVA a recevoir de l'AFC" -msgstr "510 Saldo IVA da crediti verso AFC" +msgid "510 - Solde en faveur de l’assujetti" +msgstr "510 - Credito del contribuente " #. module: l10n_ch #: model:account.tax,description:l10n_ch.1_vat_77 @@ -473,15 +667,30 @@ msgstr "" msgid "8.1% invest. Incl." msgstr "" +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_900 +msgid "900" +msgstr "" + #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_900 -msgid "900 Subventions, taxes touristiques" -msgstr "900 Sovvenzioni, tasse di soggiorno" +msgid "" +"900 - Subventions, taxes touristiques perçues par les offices du tourisme, " +"contributions aux établissements d'élimination des déchets et " +"d'approvisionnement en eau" +msgstr "" +"900 - Sussidi, tasse turistiche incassate da uffici turistici, contributi " +"per lo smaltimento dei rifiuti e le aziende fornitrici d’acqua (lett. a-c)" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_910 +msgid "910" +msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_910 -msgid "910 Les dons, les dividendes, les dédommagements, ..." -msgstr "910 Donazioni, dividendi, compensi, ..." +msgid "910 - Les dons, les dividendes, les dédommagements, etc." +msgstr "910 - Doni, dividendi, risarcimenti dei danni ecc. (lett. d-l)" #. module: l10n_ch #: model_terms:ir.ui.view,arch_db:l10n_ch.res_config_settings_view_form @@ -548,11 +757,6 @@ msgstr "Ricevuta" msgid "Reference" msgstr "Riferimento" -#. module: l10n_ch -#: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_autres_mouv -msgid "AUTRES MOUVEMENTS DE FONDS" -msgstr "ALTRI MOVIMENTI DI FONDI" - #. module: l10n_ch #: model:account.account,name:l10n_ch.1_ch_coa_4200 #: model:account.account.template,name:l10n_ch.ch_coa_4200 @@ -759,11 +963,6 @@ msgstr "Conti Bancari" msgid "Bank Statement Line" msgstr "Linea Estratto conto bancario" -#. module: l10n_ch -#: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_calc_impot_base -msgid "Base Impôt sur acquisitions de services" -msgstr "Base imponibile per l'acquisizione di servizi" - #. module: l10n_ch #: model:ir.model.fields,help:l10n_ch.field_res_company__l10n_ch_isr_print_bank_location #: model:ir.model.fields,help:l10n_ch.field_res_config_settings__l10n_ch_isr_print_bank_location @@ -948,11 +1147,7 @@ msgid "Charges à payer" msgstr "Costi da pagare" #. module: l10n_ch -#: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_calc_impot_chiffre -msgid "Chiffre d'affaires imposable" -msgstr "Fatturato imponibile" - -#. module: l10n_ch +#: model:ir.model.fields,field_description:l10n_ch.field_account_bank_statement_import_journal_creation__l10n_ch_postal #: model:ir.model.fields,field_description:l10n_ch.field_account_journal__l10n_ch_postal msgid "Client Number" msgstr "Numero Cliente" @@ -970,6 +1165,7 @@ msgid "Commissions obtenues sur achats" msgstr "Commissioni sugli acquisti" #. module: l10n_ch +#: model:ir.model.fields,field_description:l10n_ch.field_account_bank_statement_import_journal_creation__invoice_reference_model #: model:ir.model.fields,field_description:l10n_ch.field_account_journal__invoice_reference_model msgid "Communication Standard" msgstr "Criterio di comunicazione" @@ -1273,8 +1469,8 @@ msgstr "Prestiti ipotecari" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chiffre_af -msgid "I - CHIFFRE D'AFFAIRES" -msgstr "I - RICAVI" +msgid "I. CHIFFRE D'AFFAIRES" +msgstr "I. CIFRA D’AFFARI" #. module: l10n_ch #: model:ir.model.fields,field_description:l10n_ch.field_account_bank_statement_line__id @@ -1291,8 +1487,13 @@ msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_calc_impot -msgid "II - CALCUL DE L'IMPOT" -msgstr "II - CALCOLO DELLE IMPOSTE" +msgid "II. CALCUL DE L'IMPÔT" +msgstr "II. CALCOLO DELL’IMPOSTA" + +#. module: l10n_ch +#: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_autres_mouv +msgid "III. AUTRES MOUVEMENTS DE FONDS" +msgstr "III. ALTRI FLUSSI DI MEZZI FINANZIARI" #. module: l10n_ch #: model:ir.actions.report,name:l10n_ch.l10n_ch_isr_report @@ -1360,6 +1561,16 @@ msgstr "Immobili aziendali" msgid "Import/Export" msgstr "" +#. module: l10n_ch +#: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_tax_amount_1 +msgid "Impôt CHF / ct. dès le 01.01.2024" +msgstr "Imposta CHF / cts. dal 01.01.2024" + +#. module: l10n_ch +#: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_tax_amount_2 +msgid "Impôt CHF / ct. jusqu'au 31.12.2023" +msgstr "Imposta CHF / cts. fino al 31.12.2023" + #. module: l10n_ch #: model:account.account,name:l10n_ch.1_ch_coa_1176 #: model:account.account.template,name:l10n_ch.ch_coa_1176 @@ -1637,17 +1848,22 @@ msgstr "Banca prestampata" msgid "Prestations / travaux de tiers" msgstr "Lavori di terzi / prestazioni di subappaltanti" +#. module: l10n_ch +#: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_supplies_1 +msgid "Prestations CHF dès le 01.01.2024" +msgstr "Prestazioni CHF dal 01.01.2024" + +#. module: l10n_ch +#: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_supplies_2 +msgid "Prestations CHF jusqu'au 31.12.2023" +msgstr "Prestazioni CHF fino al 31.12.2023" + #. module: l10n_ch #: model:account.account,name:l10n_ch.1_ch_coa_3700 #: model:account.account.template,name:l10n_ch.ch_coa_3700 msgid "Prestations propres" msgstr "Lavori interni" -#. module: l10n_ch -#: model_terms:ir.ui.view,arch_db:l10n_ch.isr_invoice_form -msgid "Print ISR" -msgstr "Stampa ISR" - #. module: l10n_ch #: model_terms:ir.ui.view,arch_db:l10n_ch.isr_invoice_form msgid "Print QR-bill" @@ -1805,11 +2021,6 @@ msgstr "Riserva legale da utili" msgid "Réserves légales issues du capital" msgstr "Riserva legale da capitale" -#. module: l10n_ch -#: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_solde -msgid "SOLDE" -msgstr "BILANCIO" - #. module: l10n_ch #: model:account.account,name:l10n_ch.1_ch_coa_5000 #: model:account.account.template,name:l10n_ch.ch_coa_5000 @@ -2229,6 +2440,7 @@ msgstr "" "identificare la banca, utilizzato per generare ISR in EUR. es. 03-162-5" #. module: l10n_ch +#: model:ir.model.fields,help:l10n_ch.field_account_bank_statement_import_journal_creation__l10n_ch_postal #: model:ir.model.fields,help:l10n_ch.field_account_journal__l10n_ch_postal #: model:ir.model.fields,help:l10n_ch.field_account_setup_bank_manual_config__l10n_ch_postal #: model:ir.model.fields,help:l10n_ch.field_res_partner_bank__l10n_ch_postal @@ -2382,6 +2594,7 @@ msgid "" msgstr "" #. module: l10n_ch +#: model:ir.model.fields,help:l10n_ch.field_account_bank_statement_import_journal_creation__invoice_reference_model #: model:ir.model.fields,help:l10n_ch.field_account_journal__invoice_reference_model msgid "" "You can choose different models for each type of reference. The default one " diff --git a/addons/l10n_ch/i18n_extra/l10n_ch.pot b/addons/l10n_ch/i18n_extra/l10n_ch.pot index 21f83384e4..037515c533 100644 --- a/addons/l10n_ch/i18n_extra/l10n_ch.pot +++ b/addons/l10n_ch/i18n_extra/l10n_ch.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Flectra Server 2.0+e\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-02-22 08:11+0000\n" -"PO-Revision-Date: 2023-02-22 08:11+0000\n" +"POT-Creation-Date: 2023-07-19 13:58+0000\n" +"PO-Revision-Date: 2023-07-19 13:58+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -135,47 +135,99 @@ msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_200 -msgid "200 Chiffre d'affaires" +msgid "" +"200 - Total des contre-prestations convenues ou reçues, y c. de prestations " +"imposées par option, de transferts par procédure de déclaration, de " +"prestations à l’étranger" +msgstr "" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_205 +msgid "205" +msgstr "" + +#. module: l10n_ch +#: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_205 +msgid "" +"205 - Contre-prestations déclarées sous ch. 200 qui proviennent de " +"prestations exclues du champ de l’impôt (art. 21) pour lesquelles il a été " +"opté en vertu de l’art. 22" +msgstr "" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_220_289 +msgid "220" msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_220_289 -msgid "220 Chiffre d'affaires imposable a 0% (export)" +msgid "" +"220 - Prestations exonérées (p. ex. exportations, art. 23), prestations " +"exonérées fournies à des institutions et à des personnes bénéficiaires (art." +" 107, al. 1, let. a)" +msgstr "" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_221 +msgid "221" msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_221 -msgid "221 Prestations fournies à l'étranger" +msgid "221 - Prestations fournies à l’étranger" +msgstr "" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_225 +msgid "225" msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_225 -msgid "225 Transfer avec la procédure de déclaration" +msgid "225 - Transferts avec la procédure de déclaration (art. 38)" +msgstr "" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_230 +msgid "230" msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_230 -msgid "230 Chiffre d'affaires non-imposable a 0% (exclu)" +msgid "" +"230 - Prestations exclues du champ de l’impôt (art. 21) fournies sur le " +"territoire suisse pour lesquelles il n’a pas été opté selon l’art. 22" +msgstr "" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_235 +msgid "235" msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_235 -msgid "235 Diminution de la contre-prestation" +msgid "" +"235 - Diminutions de la contre-prestation telles que rabais, escomptes, etc." +msgstr "" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_280 +msgid "280" msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_280 -msgid "280 Divers (p.ex valeur du terrain)" +msgid "280 - Divers (p.ex. valeur du terrain)" msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_289 -msgid "289 Déductions (ch.220 à ch.280)" +msgid "289 - Déductions (Total ch. 220 à 280)" msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_299 -msgid "299 Chiffre d'affaires imposable (ch.200 moins ch.289)" +msgid "299 - Total du chiffre d’affaires imposable (ch. 200 moins ch. 289)" msgstr "" #. module: l10n_ch @@ -250,139 +302,251 @@ msgstr "" msgid "3.8% invest Incl." msgstr "" +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_302a +msgid "302a" +msgstr "" + #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_302a -msgid "302a Chiffre d'affaires imposable a 7.7% (TS) jusqu'au 31.12.2023" +msgid "302a - Taux normal (7,7%): Prestations CHF jusqu'au 31.12.2023" +msgstr "" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_302b +msgid "302b" msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_302b -msgid "302b TVA due a 7.7% (TS) jusqu'au 31.12.2023" +msgid "302b - Taux normal (7,7%): Impôt CHF / ct. jusqu'au 31.12.2023" +msgstr "" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_303a +msgid "303a" msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_303a -msgid "303a Chiffre d'affaires imposable a 8.1% (TS) dès le 01.01.2024" +msgid "303a - Taux normal (8,1%): Prestations CHF dès le 01.01.2024" +msgstr "" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_303b +msgid "303b" msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_303b -msgid "303b TVA due a 8.1% (TS) dès le 01.01.2024" +msgid "303b - Taux normal (8,1%): Impôt CHF / ct. dès le 01.01.2024" +msgstr "" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_312a +msgid "312a" msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_312a -msgid "312a Chiffre d'affaires imposable a 2.5% (TR) jusqu'au 31.12.2023" +msgid "312a - Taux réduit (2,5%): Prestations CHF jusqu'au 31.12.2023" +msgstr "" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_312b +msgid "312b" msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_312b -msgid "312b TVA due a 2.5% (TR) jusqu'au 31.12.2023" +msgid "312b - Taux réduit (2,5%): Impôt CHF / ct. jusqu'au 31.12.2023" +msgstr "" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_313a +msgid "313a" msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_313a -msgid "313a Chiffre d'affaires imposable a 2.6% (TR) dès le 01.01.2024" +msgid "313a - Taux réduit (2,6%): Prestations CHF dès le 01.01.2024" +msgstr "" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_313b +msgid "313b" msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_313b -msgid "313b TVA due a 2.6% (TR) dès le 01.01.2024" +msgid "313b - Taux réduit (2,6%): Impôt CHF / ct. dès le 01.01.2024" +msgstr "" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_342a +msgid "342a" msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_342a -msgid "342a Chiffre d'affaires imposable a 3.7% (TS) jusqu'au 31.12.2023" +msgid "" +"342a - Taux spécial pour l'hébergement (3,7%): Prestations CHF jusqu'au " +"31.12.2023" +msgstr "" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_342b +msgid "342b" msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_342b -msgid "342b TVA due a 3.7% (TS) jusqu'au 31.12.2023" +msgid "" +"342b - Taux spécial pour l'hébergement (3,7%): Impôt CHF / ct. jusqu'au " +"31.12.2023" +msgstr "" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_343a +msgid "343a" msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_343a -msgid "343a Chiffre d'affaires imposable a 3.8% (TS) dès le 01.01.2024" +msgid "" +"343a - Taux spécial pour l'hébergement (3,8%): Prestations CHF dès le " +"01.01.2024" +msgstr "" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_343b +msgid "343b" msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_343b -msgid "343b TVA due a 3.8% (TS) dès le 01.01.2024" +msgid "" +"343b - Taux spécial pour l'hébergement (3,8%): Impôt CHF / ct. dès le " +"01.01.2024" msgstr "" #. module: l10n_ch -#: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_381a -msgid "381a Impots sur les acquisitions" -msgstr "" - -#. module: l10n_ch -#: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_381b -msgid "381b Impots sur les acquisitions " +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_382a +msgid "382a" msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_382a -msgid "382a Impots sur les acquisitions jusqu'au 31.12.2023" +msgid "382a - Impôt sur les acquisitions: Prestations CHF jusqu'au 31.12.2023" +msgstr "" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_382b +msgid "382b" msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_382b -msgid "382b Impots sur les acquisitions jusqu'au 31.12.2023" +msgid "382b - Impôt sur les acquisitions: Impôt CHF / ct. jusqu'au 31.12.2023" +msgstr "" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_383a +msgid "383a" msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_383a -msgid "383a Impots sur les acquisitions dès le 01.01.2024" +msgid "383a - Impôt sur les acquisitions: Prestations CHF dès le 01.01.2024" +msgstr "" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_383b +msgid "383b" msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_383b -msgid "383b Impots sur les acquisitions dès le 01.01.2024" +msgid "383b - Impôt sur les acquisitions: Impôt CHF / ct. dès le 01.01.2024" msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_399 -msgid "399 TVA Due " +msgid "399 - Total de l’impôt dû" +msgstr "" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_400 +msgid "400" msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_400 -msgid "400 TVA préalable sur biens et services" +msgid "" +"400 - Impôt préalable grevant les coûts en matériel et en prestations de " +"services" +msgstr "" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_405 +msgid "405" msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_405 -msgid "405 TVA préalable sur invest. et autres ch." +msgid "" +"405 - Impôt préalable grevant les investissements et autres charges " +"d’exploitation" +msgstr "" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_410 +msgid "410" msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_410 -msgid "410 Dégrèvement ultérieur de l'impot préalable" +msgid "410 - Dégrèvement ultérieur de l’impôt préalable (art. 32)" +msgstr "" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_415 +msgid "415" msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_415 -msgid "415 Correction de l'impot préalable" +msgid "" +"415 - Corrections de l’impôt préalable: double affectation (art. 30), " +"prestations à soi-même (art. 31)" +msgstr "" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_420 +msgid "420" msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_420 -msgid "420 Réduction de la déduction de l'impot préalable" +msgid "" +"420 - Réductions de la déduction de l’impôt préalable: prestations n’étant " +"pas considérées comme des contre-prestations, telles subventions, taxes " +"touristiques (art. 33, al. 2)" msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_479 -msgid "479 TVA préalable" +msgid "479 - Total ch. 400 à 420" msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_500 -msgid "500 Solde de TVA a payer a l'AFC" +msgid "500 - Montant à payer" msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_510 -msgid "510 Solde de TVA a recevoir de l'AFC" +msgid "510 - Solde en faveur de l’assujetti" msgstr "" #. module: l10n_ch @@ -473,14 +637,27 @@ msgstr "" msgid "8.1% invest. Incl." msgstr "" +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_900 +msgid "900" +msgstr "" + #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_900 -msgid "900 Subventions, taxes touristiques" +msgid "" +"900 - Subventions, taxes touristiques perçues par les offices du tourisme, " +"contributions aux établissements d'élimination des déchets et " +"d'approvisionnement en eau" +msgstr "" + +#. module: l10n_ch +#: model:account.tax.report.line,tag_name:l10n_ch.account_tax_report_line_chtax_910 +msgid "910" msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_910 -msgid "910 Les dons, les dividendes, les dédommagements, ..." +msgid "910 - Les dons, les dividendes, les dédommagements, etc." msgstr "" #. module: l10n_ch @@ -548,11 +725,6 @@ msgstr "" msgid "Reference" msgstr "" -#. module: l10n_ch -#: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_autres_mouv -msgid "AUTRES MOUVEMENTS DE FONDS" -msgstr "" - #. module: l10n_ch #: model:account.account,name:l10n_ch.1_ch_coa_4200 #: model:account.account.template,name:l10n_ch.ch_coa_4200 @@ -759,11 +931,6 @@ msgstr "" msgid "Bank Statement Line" msgstr "" -#. module: l10n_ch -#: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_calc_impot_base -msgid "Base Impôt sur acquisitions de services" -msgstr "" - #. module: l10n_ch #: model:ir.model.fields,help:l10n_ch.field_res_company__l10n_ch_isr_print_bank_location #: model:ir.model.fields,help:l10n_ch.field_res_config_settings__l10n_ch_isr_print_bank_location @@ -934,11 +1101,7 @@ msgid "Charges à payer" msgstr "" #. module: l10n_ch -#: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_calc_impot_chiffre -msgid "Chiffre d'affaires imposable" -msgstr "" - -#. module: l10n_ch +#: model:ir.model.fields,field_description:l10n_ch.field_account_bank_statement_import_journal_creation__l10n_ch_postal #: model:ir.model.fields,field_description:l10n_ch.field_account_journal__l10n_ch_postal msgid "Client Number" msgstr "" @@ -956,6 +1119,7 @@ msgid "Commissions obtenues sur achats" msgstr "" #. module: l10n_ch +#: model:ir.model.fields,field_description:l10n_ch.field_account_bank_statement_import_journal_creation__invoice_reference_model #: model:ir.model.fields,field_description:l10n_ch.field_account_journal__invoice_reference_model msgid "Communication Standard" msgstr "" @@ -1259,7 +1423,7 @@ msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chiffre_af -msgid "I - CHIFFRE D'AFFAIRES" +msgid "I. CHIFFRE D'AFFAIRES" msgstr "" #. module: l10n_ch @@ -1277,7 +1441,12 @@ msgstr "" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_calc_impot -msgid "II - CALCUL DE L'IMPOT" +msgid "II. CALCUL DE L'IMPÔT" +msgstr "" + +#. module: l10n_ch +#: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_autres_mouv +msgid "III. AUTRES MOUVEMENTS DE FONDS" msgstr "" #. module: l10n_ch @@ -1340,6 +1509,16 @@ msgstr "" msgid "Import/Export" msgstr "" +#. module: l10n_ch +#: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_tax_amount_1 +msgid "Impôt CHF / ct. dès le 01.01.2024" +msgstr "" + +#. module: l10n_ch +#: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_tax_amount_2 +msgid "Impôt CHF / ct. jusqu'au 31.12.2023" +msgstr "" + #. module: l10n_ch #: model:account.account,name:l10n_ch.1_ch_coa_1176 #: model:account.account.template,name:l10n_ch.ch_coa_1176 @@ -1617,14 +1796,19 @@ msgid "Prestations / travaux de tiers" msgstr "" #. module: l10n_ch -#: model:account.account,name:l10n_ch.1_ch_coa_3700 -#: model:account.account.template,name:l10n_ch.ch_coa_3700 -msgid "Prestations propres" +#: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_supplies_1 +msgid "Prestations CHF dès le 01.01.2024" msgstr "" #. module: l10n_ch -#: model_terms:ir.ui.view,arch_db:l10n_ch.isr_invoice_form -msgid "Print ISR" +#: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_supplies_2 +msgid "Prestations CHF jusqu'au 31.12.2023" +msgstr "" + +#. module: l10n_ch +#: model:account.account,name:l10n_ch.1_ch_coa_3700 +#: model:account.account.template,name:l10n_ch.ch_coa_3700 +msgid "Prestations propres" msgstr "" #. module: l10n_ch @@ -1781,11 +1965,6 @@ msgstr "" msgid "Réserves légales issues du capital" msgstr "" -#. module: l10n_ch -#: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_solde -msgid "SOLDE" -msgstr "" - #. module: l10n_ch #: model:account.account,name:l10n_ch.1_ch_coa_5000 #: model:account.account.template,name:l10n_ch.ch_coa_5000 @@ -2201,6 +2380,7 @@ msgid "" msgstr "" #. module: l10n_ch +#: model:ir.model.fields,help:l10n_ch.field_account_bank_statement_import_journal_creation__l10n_ch_postal #: model:ir.model.fields,help:l10n_ch.field_account_journal__l10n_ch_postal #: model:ir.model.fields,help:l10n_ch.field_account_setup_bank_manual_config__l10n_ch_postal #: model:ir.model.fields,help:l10n_ch.field_res_partner_bank__l10n_ch_postal @@ -2354,6 +2534,7 @@ msgid "" msgstr "" #. module: l10n_ch +#: model:ir.model.fields,help:l10n_ch.field_account_bank_statement_import_journal_creation__invoice_reference_model #: model:ir.model.fields,help:l10n_ch.field_account_journal__invoice_reference_model msgid "" "You can choose different models for each type of reference. The default one " diff --git a/addons/mail/tests/common.py b/addons/mail/tests/common.py index d58a62cf07..6b6f8d890a 100644 --- a/addons/mail/tests/common.py +++ b/addons/mail/tests/common.py @@ -224,7 +224,7 @@ class MockEmail(common.BaseCase): raise AssertionError('sent mail not found for email_to %s' % (email_to)) return sent_email - def _filter_mail(self, status=None, mail_message=None, author=None): + def _filter_mail(self, status=None, mail_message=None, author=None, email_from=None): """ Filter mail generated during mock, based on common parameters :param status: state of mail.mail. If not void use it to filter mail.mail @@ -233,6 +233,8 @@ class MockEmail(common.BaseCase): a ``mail.message`` record; :param author: optional check/filter on author_id field aka a ``res.partner`` record; + :param email_from: optional check/filter on email_from field (may differ from + author, used notably in case of concurrent mailings to distinguish emails); """ filtered = self._new_mails.env['mail.mail'] for mail in self._new_mails: @@ -242,31 +244,33 @@ class MockEmail(common.BaseCase): continue if author is not None and mail.author_id != author: continue + if email_from is not None and mail.email_from != email_from: + continue filtered += mail return filtered - def _find_mail_mail_wid(self, mail_id, status=None, mail_message=None, author=None): + def _find_mail_mail_wid(self, mail_id, status=None, mail_message=None, author=None, email_from=None): """ Find a ``mail.mail`` record based on a given ID (used notably when having mail ID in mailing traces). :return mail: a ``mail.mail`` record generated during the mock and matching given ID; """ - filtered = self._filter_mail(status=status, mail_message=mail_message, author=author) + filtered = self._filter_mail(status=status, mail_message=mail_message, author=author, email_from=email_from) for mail in filtered: if mail.id == mail_id: break else: debug_info = '\n'.join( f'From: {mail.author_id} ({mail.email_from}) - ID {mail.id} (State: {mail.state})' - for mail in filtered + for mail in self._new_mails ) raise AssertionError( f'mail.mail not found for ID {mail_id} / message {mail_message} / status {status} / author {author}\n{debug_info}' ) return mail - def _find_mail_mail_wpartners(self, recipients, status, mail_message=None, author=None): + def _find_mail_mail_wpartners(self, recipients, status, mail_message=None, author=None, email_from=None): """ Find a mail.mail record based on various parameters, notably a list of recipients (partners). @@ -276,14 +280,14 @@ class MockEmail(common.BaseCase): :return mail: a ``mail.mail`` record generated during the mock and matching given parameters and filters; """ - filtered = self._filter_mail(status=status, mail_message=mail_message, author=author) + filtered = self._filter_mail(status=status, mail_message=mail_message, author=author, email_from=email_from) for mail in filtered: if all(p in mail.recipient_ids for p in recipients): break else: debug_info = '\n'.join( f'From: {mail.author_id} ({mail.email_from}) - To: {sorted(mail.recipient_ids.ids)} (State: {mail.state})' - for mail in filtered + for mail in self._new_mails ) recipients_info = f'Missing: {[r.name for r in recipients if r.id not in filtered.recipient_ids.ids]}' raise AssertionError( @@ -291,7 +295,7 @@ class MockEmail(common.BaseCase): ) return mail - def _find_mail_mail_wemail(self, email_to, status, mail_message=None, author=None): + def _find_mail_mail_wemail(self, email_to, status, mail_message=None, author=None, email_from=None): """ Find a mail.mail record based on various parameters, notably a list of email to (string emails). @@ -301,33 +305,33 @@ class MockEmail(common.BaseCase): :return mail: a ``mail.mail`` record generated during the mock and matching given parameters and filters; """ - filtered = self._filter_mail(status=status, mail_message=mail_message, author=author) + filtered = self._filter_mail(status=status, mail_message=mail_message, author=author, email_from=email_from) for mail in filtered: if (mail.email_to == email_to and not mail.recipient_ids) or (not mail.email_to and mail.recipient_ids.email == email_to): break else: debug_info = '\n'.join( f'From: {mail.author_id} ({mail.email_from}) - To: {mail.email_to} / {sorted(mail.recipient_ids.mapped("email"))} (State: {mail.state})' - for mail in filtered + for mail in self._new_mails ) raise AssertionError( f'mail.mail not found for message {mail_message} / status {status} / email_to {email_to} / author {author}\n{debug_info}' ) return mail - def _find_mail_mail_wrecord(self, record, status=None, mail_message=None, author=None): + def _find_mail_mail_wrecord(self, record, status=None, mail_message=None, author=None, email_from=None): """ Find a mail.mail record based on model / res_id of a record. :return mail: a ``mail.mail`` record generated during the mock; """ - filtered = self._filter_mail(status=status, mail_message=mail_message, author=author) + filtered = self._filter_mail(status=status, mail_message=mail_message, author=author, email_from=email_from) for mail in filtered: if mail.model == record._name and mail.res_id == record.id: break else: debug_info = '\n'.join( f'From: {mail.author_id} ({mail.email_from}) - Model{mail.model} / ResId {mail.res_id} (State: {mail.state})' - for mail in filtered + for mail in self._new_mails ) raise AssertionError( f'mail.mail not found for message {mail_message} / status {status} / record {record.model}, {record.id} / author {author}\n{debug_info}' @@ -443,7 +447,10 @@ class MockEmail(common.BaseCase): """ found_mail = False for email_to in emails: - found_mail = self._find_mail_mail_wemail(email_to, status, mail_message=mail_message, author=author) + found_mail = self._find_mail_mail_wemail( + email_to, status, mail_message=mail_message, + author=author, email_from=fields_values.get('email_from') + ) self.assertTrue(bool(found_mail)) self._assertMailMail( found_mail, [email_to], status, diff --git a/addons/mass_mailing/tests/common.py b/addons/mass_mailing/tests/common.py index 57d49da45b..d34a67e88f 100644 --- a/addons/mass_mailing/tests/common.py +++ b/addons/mass_mailing/tests/common.py @@ -84,7 +84,7 @@ class MassMailCase(MailCase, MockLinkTracker): ]) debug_info = '\n'.join( ( - f'Trace: to {t.email} - state {t.state}' + f'Trace: to {t.email} - state {t.state} - res_id {t.res_id}' for t in traces ) ) @@ -127,6 +127,8 @@ class MassMailCase(MailCase, MockLinkTracker): author = self.env.user.partner_id fields_values = {'mailing_id': mailing} + if recipient_info.get('mail_values'): + fields_values.update(recipient_info['mail_values']) if 'failure_reason' in recipient_info: fields_values['failure_reason'] = recipient_info['failure_reason'] @@ -184,7 +186,9 @@ class MassMailCase(MailCase, MockLinkTracker): :param record: record which should bounce; :param bounce_base_values: optional values given to routing; """ - trace = mailing.mailing_trace_ids.filtered(lambda t: t.model == record._name and t.res_id == record.id) + trace = mailing.mailing_trace_ids.filtered( + lambda t: t.model == record._name and t.res_id == record.id + ) parsed_bounce_values = { 'email_from': 'some.email@external.example.com', # TDE check: email_from -> trace email ? @@ -200,10 +204,20 @@ class MassMailCase(MailCase, MockLinkTracker): 'bounced_msg_id': [trace.message_id], }) self.env['mail.thread']._routing_handle_bounce(False, parsed_bounce_values) + return trace def gateway_mail_click(self, mailing, record, click_label): - """ Simulate a click on a sent email. """ - trace = mailing.mailing_trace_ids.filtered(lambda t: t.model == record._name and t.res_id == record.id) + """ Simulate a click on a sent email. + + :param mailing: a ``mailing.mailing`` record on which we find a trace + to click; + :param record: record which should click; + :param click_label: label of link on which we should click; + """ + trace = mailing.mailing_trace_ids.filtered( + lambda t: t.model == record._name and t.res_id == record.id + ) + email = self._find_sent_mail_wemail(trace.email) self.assertTrue(bool(email)) for (_url_href, link_url, _dummy, label) in re.findall(tools.HTML_TAG_URL_REGEX, email['body']): @@ -222,6 +236,24 @@ class MassMailCase(MailCase, MockLinkTracker): break else: raise AssertionError('url %s not found in mailing %s for record %s' % (click_label, mailing, record)) + return trace + + def gateway_mail_open(self, mailing, record): + """ Simulate opening an email through blank.gif icon access. As we + don't want to use the whole Http layer just for that we will just + call 'set_opened()' on trace, until having a better option. + + :param mailing: a ``mailing.mailing`` record on which we find a trace + to open; + :param record: record which should open; + """ + trace = mailing.mailing_trace_ids.filtered( + lambda t: t.model == record._name and t.res_id == record.id + ) + mail_mail_id_int = trace.mail_mail_id_int + self.assertTrue(bool(mail_mail_id_int)) + trace.set_opened(mail_mail_ids=[mail_mail_id_int]) + return trace @classmethod def _create_bounce_trace(cls, mailing, records, dt=None): @@ -256,22 +288,6 @@ class MassMailCase(MailCase, MockLinkTracker): ]) return traces - -class MassMailCommon(MailCommon, MassMailCase): - - @classmethod - def setUpClass(cls): - super(MassMailCommon, cls).setUpClass() - - cls.user_marketing = mail_new_test_user( - cls.env, login='user_marketing', - groups='base.group_user,base.group_partner_manager,mass_mailing.group_mass_mailing_user', - name='Martial Marketing', signature='--\nMartial') - - cls.email_reply_to = 'MyCompany SomehowAlias ' - - cls.env['base'].flush() - @classmethod def _create_mailing_list(cls): """ Shortcut to create mailing lists. Currently hardcoded, maybe evolve @@ -293,3 +309,19 @@ class MassMailCommon(MailCommon, MassMailCase): (0, 0, {'name': 'Ybrant', 'email': 'ybrant@example.com'}), ] }) + + +class MassMailCommon(MailCommon, MassMailCase): + + @classmethod + def setUpClass(cls): + super(MassMailCommon, cls).setUpClass() + + cls.user_marketing = mail_new_test_user( + cls.env, login='user_marketing', + groups='base.group_user,base.group_partner_manager,mass_mailing.group_mass_mailing_user', + name='Martial Marketing', signature='--\nMartial') + + cls.email_reply_to = 'MyCompany SomehowAlias ' + + cls.env['base'].flush() diff --git a/addons/mrp/models/product.py b/addons/mrp/models/product.py index 23080fdceb..e14e54f2ee 100644 --- a/addons/mrp/models/product.py +++ b/addons/mrp/models/product.py @@ -252,7 +252,7 @@ class ProductProduct(models.Model): # bom specific to this variant or global to template action['context'] = { 'default_product_tmpl_id': template_ids[0], - 'default_product_id': self.ids[0], + 'default_product_id': self.env.user.has_group('product.group_product_variant') and self.ids[0] or False, } action['domain'] = ['|', ('product_id', 'in', self.ids), '&', ('product_id', '=', False), ('product_tmpl_id', 'in', template_ids)] return action diff --git a/addons/point_of_sale/wizard/pos_details.py b/addons/point_of_sale/wizard/pos_details.py index 6225291879..6fbe6984c0 100644 --- a/addons/point_of_sale/wizard/pos_details.py +++ b/addons/point_of_sale/wizard/pos_details.py @@ -39,7 +39,7 @@ class PosDetails(models.TransientModel): @api.onchange('end_date') def _onchange_end_date(self): - if self.end_date and self.end_date < self.start_date: + if self.end_date and self.start_date and self.end_date < self.start_date: self.start_date = self.end_date def generate_report(self): diff --git a/addons/portal/views/portal_templates.xml b/addons/portal/views/portal_templates.xml index c5121e71ec..7048f0c8ff 100644 --- a/addons/portal/views/portal_templates.xml +++ b/addons/portal/views/portal_templates.xml @@ -512,13 +512,17 @@ diff --git a/addons/stock_account/models/product.py b/addons/stock_account/models/product.py index 57fb53d3d1..88fdb73229 100644 --- a/addons/stock_account/models/product.py +++ b/addons/stock_account/models/product.py @@ -627,6 +627,11 @@ class ProductProduct(models.Model): debit_account_id = product_accounts[product.id]['stock_valuation'].id credit_account_id = product_accounts[product.id]['stock_input'].id value = out_stock_valuation_layer.value + if out_stock_valuation_layer.currency_id.compare_amounts(value, 0) < 0: + # Swap accounts makes a negative value in accounting + debit_account_id = product_accounts[product.id]['stock_output'].id + credit_account_id = product_accounts[product.id]['stock_valuation'].id + move_vals = { 'journal_id': product_accounts[product.id]['stock_journal'].id, 'company_id': self.env.company.id, diff --git a/addons/stock_account/tests/test_stockvaluationlayer.py b/addons/stock_account/tests/test_stockvaluationlayer.py index 673f2bdc82..d819e48867 100644 --- a/addons/stock_account/tests/test_stockvaluationlayer.py +++ b/addons/stock_account/tests/test_stockvaluationlayer.py @@ -925,6 +925,12 @@ class TestStockValuationChangeValuation(TestStockValuationCommon): 'property_stock_journal': cls.stock_journal.id, }) + def _get_stock_account_balance(self, stock_valuation_layer): + """Return the accounting balance from the stock valuation account for the given SVL""" + stock_valuation_account = stock_valuation_layer.product_id.categ_id.property_stock_valuation_account_id + return stock_valuation_layer.account_move_id.line_ids.filtered(lambda line: line.account_id == stock_valuation_account).balance + + def test_standard_manual_to_auto_1(self): self.product1.product_tmpl_id.categ_id.property_cost_method = 'standard' self.product1.product_tmpl_id.categ_id.property_valuation = 'manual_periodic' @@ -943,6 +949,9 @@ class TestStockValuationChangeValuation(TestStockValuationCommon): # An accounting entry should only be created for the replenish now that the category is perpetual. self.assertEqual(len(self.product1.stock_valuation_layer_ids.mapped('account_move_id')), 1) self.assertEqual(len(self.product1.stock_valuation_layer_ids), 3) + # Check the entry's value + last_svl = self.product1.stock_valuation_layer_ids.sorted()[-1] + self.assertEqual(self._get_stock_account_balance(last_svl), self.product1.value_svl) for svl in self.product1.stock_valuation_layer_ids.sorted()[-2:]: self.assertEqual(svl.description, 'Valuation method change for product category All: from manual_periodic to real_time.') @@ -977,6 +986,33 @@ class TestStockValuationChangeValuation(TestStockValuationCommon): # An accounting entry should only be created for the replenish now that the category is perpetual. self.assertEqual(len(self.product1.stock_valuation_layer_ids.mapped('account_move_id')), 1) self.assertEqual(len(self.product1.stock_valuation_layer_ids), 3) + # Check the entry's value + last_svl = self.product1.stock_valuation_layer_ids.sorted()[-1] + self.assertEqual(self._get_stock_account_balance(last_svl), self.product1.value_svl) + + def test_standard_manual_to_auto_3(self): + self.product1.product_tmpl_id.categ_id.property_cost_method = 'standard' + self.product1.product_tmpl_id.categ_id.property_valuation = 'manual_periodic' + self.product1.product_tmpl_id.standard_price = 10 + self._make_out_move(self.product1, 10, force_assign=True) + + self.assertEqual(self.product1.value_svl, -100) + self.assertEqual(self.product1.quantity_svl, -10) + self.assertEqual(len(self.product1.stock_valuation_layer_ids.account_move_id), 0) + self.assertEqual(len(self.product1.stock_valuation_layer_ids), 1) + + self.product1.product_tmpl_id.categ_id.property_valuation = 'real_time' + + self.assertEqual(self.product1.value_svl, -100) + self.assertEqual(self.product1.quantity_svl, -10) + # An accounting entry should only be created for the replenish now that the category is perpetual. + self.assertEqual(len(self.product1.stock_valuation_layer_ids.account_move_id), 1) + self.assertEqual(len(self.product1.stock_valuation_layer_ids), 3) + # Check the entry's value + last_svl = self.product1.stock_valuation_layer_ids.sorted()[-1] + self.assertEqual(self._get_stock_account_balance(last_svl), self.product1.value_svl) + for svl in self.product1.stock_valuation_layer_ids.sorted()[-2:]: + self.assertEqual(svl.description, 'Valuation method change for product category All: from manual_periodic to real_time.') def test_standard_auto_to_manual_1(self): self.product1.product_tmpl_id.categ_id.property_cost_method = 'standard' diff --git a/addons/website/models/res_users.py b/addons/website/models/res_users.py index 0c84e0faaa..157d07e77a 100644 --- a/addons/website/models/res_users.py +++ b/addons/website/models/res_users.py @@ -41,6 +41,11 @@ class ResUsers(models.Model): website = self.env['website'].get_current_website() return super(ResUsers, self)._get_login_domain(login) + website.website_domain() + @api.model + def _get_email_domain(self, email): + website = self.env['website'].get_current_website() + return super()._get_email_domain(email) + website.website_domain() + @api.model def _get_login_order(self): return 'website_id, ' + super(ResUsers, self)._get_login_order() diff --git a/addons/website/tests/test_website_reset_password.py b/addons/website/tests/test_website_reset_password.py index a79365690c..9a2b50ffac 100644 --- a/addons/website/tests/test_website_reset_password.py +++ b/addons/website/tests/test_website_reset_password.py @@ -75,3 +75,26 @@ class TestWebsiteResetPassword(HttpCase): # The most specific user should be selected self.authenticate("bobo@mail.com", "bobo@mail.com") self.assertEqual(self.session["uid"], user2.id) + + def test_multi_website_reset_password_user_specific_user_account(self): + # Create same user on different websites with 'Specific User Account' + # option enabled and then reset password. Only the user from the + # current website should be reset. + website_1, website_2 = self.env['website'].create([ + {'name': 'Website 1', 'specific_user_account': True}, + {'name': 'Website 2', 'specific_user_account': True}, + ]) + + login = 'user@example.com' # same login for both users + user_website_1, user_website_2 = self.env['res.users'].with_context(no_reset_password=True).create([ + {'website_id': website_1.id, 'login': login, 'email': login, 'name': login}, + {'website_id': website_2.id, 'login': login, 'email': login, 'name': login}, + ]) + + self.assertFalse(user_website_1.signup_valid) + self.assertFalse(user_website_2.signup_valid) + + self.env['res.users'].with_context(website_id=website_1.id).reset_password(login) + + self.assertTrue(user_website_1.signup_valid) + self.assertFalse(user_website_2.signup_valid) diff --git a/addons/website_event_track_live/models/event_track.py b/addons/website_event_track_live/models/event_track.py index 78d2c6f85d..15cea3ff54 100644 --- a/addons/website_event_track_live/models/event_track.py +++ b/addons/website_event_track_live/models/event_track.py @@ -21,7 +21,7 @@ class Track(models.Model): def _compute_youtube_video_id(self): for track in self: if track.youtube_video_url: - regex = r'^.*(youtu.be\/|v\/|u\/\w\/|embed\/|watch\?v=|&v=)([^#&?]*).*' + regex = r'^.*(youtu.be\/|v\/|u\/\w\/|embed\/|live\/|watch\?v=|&v=)([^#&?]*).*' match = re.match(regex, track.youtube_video_url) if match and len(match.groups()) == 2 and len(match.group(2)) == 11: track.youtube_video_id = match.group(2) diff --git a/addons/website_forum/tests/test_forum_process.py b/addons/website_forum/tests/test_forum_process.py index 6bb888665a..c92b04559b 100644 --- a/addons/website_forum/tests/test_forum_process.py +++ b/addons/website_forum/tests/test_forum_process.py @@ -1,11 +1,11 @@ # Part of Odoo, Flectra. See LICENSE file for full copyright and licensing details. -from flectra.addons.base.tests.common import HttpCaseWithUserDemo +from flectra.addons.gamification.tests.common import HttpCaseGamification from flectra.tests import tagged @tagged('post_install', '-at_install') -class TestUi(HttpCaseWithUserDemo): +class TestUi(HttpCaseGamification): def test_01_admin_forum_tour(self): self.start_tour("/", 'question', login="admin", step_delay=100) diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py index e33bd73427..a5bd1d36d1 100644 --- a/addons/website_sale/controllers/main.py +++ b/addons/website_sale/controllers/main.py @@ -262,7 +262,7 @@ class WebsiteSale(http.Controller): url = "/shop/category/%s" % slug(category) product_count = len(search_product) - pager = request.website.pager(url=url, total=product_count, page=page, step=ppg, scope=7, url_args=post) + pager = request.website.pager(url=url, total=product_count, page=page, step=ppg, scope=5, url_args=post) offset = pager['offset'] products = search_product[offset: offset + ppg] diff --git a/addons/website_slides/tests/test_ui_wslides.py b/addons/website_slides/tests/test_ui_wslides.py index 8bb229ec5f..ecd27107e6 100644 --- a/addons/website_slides/tests/test_ui_wslides.py +++ b/addons/website_slides/tests/test_ui_wslides.py @@ -3,13 +3,15 @@ import base64 from dateutil.relativedelta import relativedelta + from flectra import tests +from flectra.addons.base.tests.common import HttpCaseWithUserPortal +from flectra.addons.gamification.tests.common import HttpCaseGamification from flectra.fields import Datetime from flectra.modules.module import get_module_resource -from flectra.addons.base.tests.common import HttpCaseWithUserDemo, HttpCaseWithUserPortal -class TestUICommon(HttpCaseWithUserDemo, HttpCaseWithUserPortal): +class TestUICommon(HttpCaseGamification, HttpCaseWithUserPortal): def setUp(self): super(TestUICommon, self).setUp() @@ -168,7 +170,7 @@ class TestUi(TestUICommon): @tests.common.tagged('external', 'post_install', '-standard', '-at_install') -class TestUiYoutube(HttpCaseWithUserDemo): +class TestUiYoutube(HttpCaseGamification): def test_course_member_yt_employee(self): # remove membership because we need to be able to join the course during the tour