From d7e84da29d43c106428f2a6ca3196f78ea6e5847 Mon Sep 17 00:00:00 2001 From: Lukas Ziegler Date: Tue, 18 Jan 2022 15:28:21 +0100 Subject: [PATCH] [FIX] install/update warnings #4 --- l10n_ch_hr_payroll/README.rst | 2 +- l10n_ch_hr_payroll/data/decimal.precision.xml | 5 + l10n_ch_hr_payroll/i18n/de.po | 105 ++++++++++++------ .../i18n/l10n_ch_hr_payroll.pot | 55 ++++++--- .../models/hr_payroll_config.py | 13 +-- l10n_ch_hr_payroll/models/hr_payslip.py | 4 +- l10n_ch_hr_payroll/models/res_company.py | 10 +- .../views/lpp_contract_view.xml | 26 ----- l10n_ch_hr_payroll_report/README.rst | 2 +- l10n_ch_hr_payroll_report/i18n/de.po | 29 +++-- .../models/hr_payslip_yearly_report.py | 1 + 11 files changed, 146 insertions(+), 106 deletions(-) diff --git a/l10n_ch_hr_payroll/README.rst b/l10n_ch_hr_payroll/README.rst index a280d2a..7c78717 100644 --- a/l10n_ch_hr_payroll/README.rst +++ b/l10n_ch_hr_payroll/README.rst @@ -71,6 +71,6 @@ V1.3: Contributors - * Jamotion +* Jamotion * Sebastien Gendre * Yvon-Philippe Crittin \ No newline at end of file diff --git a/l10n_ch_hr_payroll/data/decimal.precision.xml b/l10n_ch_hr_payroll/data/decimal.precision.xml index b6a9d8a..e795dcd 100644 --- a/l10n_ch_hr_payroll/data/decimal.precision.xml +++ b/l10n_ch_hr_payroll/data/decimal.precision.xml @@ -10,5 +10,10 @@ Payrollrate 4 + + + Account + 2 + diff --git a/l10n_ch_hr_payroll/i18n/de.po b/l10n_ch_hr_payroll/i18n/de.po index e924e52..d71b1fa 100644 --- a/l10n_ch_hr_payroll/i18n/de.po +++ b/l10n_ch_hr_payroll/i18n/de.po @@ -1,11 +1,21 @@ +# Translation of Flectra Server. +# This file contains the translation of the following modules: +# * l10n_ch_hr_payroll +# msgid "" msgstr "" +"Project-Id-Version: Flectra Server 2.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2022-01-18 13:52+0000\n" +"PO-Revision-Date: 2022-01-18 15:17+0100\n" +"Last-Translator: \n" +"Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: POEditor.com\n" -"Project-Id-Version: l10n_ch_hr_payroll\n" +"Plural-Forms: \n" "Language: de\n" +"X-Generator: Poedit 3.0\n" #. module: l10n_ch_hr_payroll #: model:hr.salary.rule,name:l10n_ch_hr_payroll.LAA @@ -74,8 +84,8 @@ msgstr "Beihilfe" #. module: l10n_ch_hr_payroll #: model:ir.model.fields,field_description:l10n_ch_hr_payroll.field_hr_payslip_line__python_amount -msgid "Amount" -msgstr "Höhe" +msgid "Amount - Python" +msgstr "Betrag" #. module: l10n_ch_hr_payroll #: model:ir.model.fields,field_description:l10n_ch_hr_payroll.field_hr_payslip_line__amount_base @@ -98,7 +108,7 @@ msgstr "Betrag pro Schüler (16+)" #. module: l10n_ch_hr_payroll #: model:hr.salary.rule.category,name:l10n_ch_hr_payroll.BASIC msgid "Basic" -msgstr "Basic" +msgstr "Basis" #. module: l10n_ch_hr_payroll #: model:hr.salary.rule,name:l10n_ch_hr_payroll.BASIC_CH @@ -129,7 +139,7 @@ msgstr "Unternehmen" #: model:ir.model.fields,field_description:l10n_ch_hr_payroll.field_hr_payroll_config__company_id #: model:ir.model.fields,field_description:l10n_ch_hr_payroll.field_lpp_contract__company_id msgid "Company" -msgstr "Begleitung" +msgstr "Firma" #. module: l10n_ch_hr_payroll #: model:hr.salary.rule.category,name:l10n_ch_hr_payroll.COMP @@ -149,7 +159,7 @@ msgstr "Vertragsname" #. module: l10n_ch_hr_payroll #: model:ir.model.fields,field_description:l10n_ch_hr_payroll.field_hr_payroll_config__cc msgid "Counterparty account" -msgstr "Kontrahentenkonto" +msgstr "Gegenkonto" #. module: l10n_ch_hr_payroll #: model:ir.model.fields,field_description:l10n_ch_hr_payroll.field_hr_payroll_config__create_uid @@ -167,7 +177,7 @@ msgstr "Erstellt am" #: model:hr.salary.rule,name:l10n_ch_hr_payroll.hr_rule_da #: model:hr.salary.rule.category,name:l10n_ch_hr_payroll.DA msgid "Dearness Allowance" -msgstr "Liebesgeld" +msgstr "Teuerungszulage" #. module: l10n_ch_hr_payroll #: model:ir.model.fields,field_description:l10n_ch_hr_payroll.field_hr_payroll_config__laa_c @@ -257,7 +267,7 @@ msgstr "Bruttogehalt" #. module: l10n_ch_hr_payroll #: model:ir.model,name:l10n_ch_hr_payroll.model_hr_payroll_config msgid "HR Payroll Config" -msgstr "HR-Gehaltsabrechnungskonfiguration" +msgstr "Lohnbuchhaltung Einstellungen" #. module: l10n_ch_hr_payroll #: model:ir.model.fields.selection,name:l10n_ch_hr_payroll.selection__hr_contract__wage_type__hour @@ -281,7 +291,7 @@ msgstr "Zuschuss zur Hausmiete" #: model:ir.model.fields,field_description:l10n_ch_hr_payroll.field_lpp_contract__id #: model:ir.model.fields,field_description:l10n_ch_hr_payroll.field_res_company__id msgid "ID" -msgstr "ICH WÜRDE" +msgstr "ID" #. module: l10n_ch_hr_payroll #: model:hr.salary.rule.category,name:l10n_ch_hr_payroll.INFO @@ -294,12 +304,10 @@ msgid "Institutions of Providence (OBP)" msgstr "Institutionen der Vorsehung (OBP)" #. module: l10n_ch_hr_payroll -#: model:ir.actions.act_window,name:l10n_ch_hr_payroll.action_lpp_contract_list #: model:ir.model,name:l10n_ch_hr_payroll.model_lpp_contract -#: model:ir.ui.menu,name:l10n_ch_hr_payroll.menu_lpp_contract_list #: model_terms:ir.ui.view,arch_db:l10n_ch_hr_payroll.view_hr_payroll_config_form msgid "LPP Contract" -msgstr "LPP-Vertrag" +msgstr "BVG-Vertrag" #. module: l10n_ch_hr_payroll #: model:ir.model.fields,field_description:l10n_ch_hr_payroll.field_hr_contract____last_update @@ -371,7 +379,7 @@ msgstr "Name" #. module: l10n_ch_hr_payroll #: model:hr.salary.rule.category,name:l10n_ch_hr_payroll.NET msgid "Net" -msgstr "Netz" +msgstr "Netto" #. module: l10n_ch_hr_payroll #: model:hr.salary.rule,name:l10n_ch_hr_payroll.NET_CH @@ -442,7 +450,7 @@ msgstr "BVG" #. module: l10n_ch_hr_payroll #: model:ir.model.fields,field_description:l10n_ch_hr_payroll.field_hr_contract__lpp_amount msgid "OBP Amount" -msgstr "OBP-Betrag" +msgstr "BVG-Betrag" #. module: l10n_ch_hr_payroll #: model:hr.salary.rule,name:l10n_ch_hr_payroll.LPP_C @@ -452,9 +460,8 @@ msgstr "BVG Firmenbeitag" #. module: l10n_ch_hr_payroll #: model:ir.model.fields,field_description:l10n_ch_hr_payroll.field_hr_contract__lpp_contract_id #: model_terms:ir.ui.view,arch_db:l10n_ch_hr_payroll.view_lpp_contract_form -#: model_terms:ir.ui.view,arch_db:l10n_ch_hr_payroll.view_lpp_contract_tree msgid "OBP Contract" -msgstr "OBP-Vertrag" +msgstr "BVG-Vertrag" #. module: l10n_ch_hr_payroll #: model:hr.salary.rule,name:l10n_ch_hr_payroll.LPP_E @@ -464,13 +471,13 @@ msgstr "BVG Mitarbeiterbeitrag" #. module: l10n_ch_hr_payroll #: model:ir.model.fields,field_description:l10n_ch_hr_payroll.field_hr_contract__lpp_rate msgid "OBP Rate (%)" -msgstr "OBP-Rate (%)" +msgstr "BVG-Rate (%)" #. module: l10n_ch_hr_payroll #: model:ir.model.fields,field_description:l10n_ch_hr_payroll.field_hr_payroll_config__lpp_contract_ids #: model:ir.model.fields,field_description:l10n_ch_hr_payroll.field_res_company__lpp_contract_ids msgid "OBP contract ids" -msgstr "OBP-Vertrags-IDs" +msgstr "BVG-Vertrags-ID" #. module: l10n_ch_hr_payroll #: model:ir.model.fields,field_description:l10n_ch_hr_payroll.field_hr_contract__occupation_rate @@ -480,13 +487,13 @@ msgstr "Beschäftigungsquote (%)" #. module: l10n_ch_hr_payroll #: model:hr.salary.rule,note:l10n_ch_hr_payroll.AVS msgid "Old Age Insurance, Invalidity Insurance, Income Compensation" -msgstr "Altersvorsorge, Invalidenversicherung, Einkommenskompensation" +msgstr "Altersvorsorge, Invalidenversicherung, Erwerbsersatzordnung" #. module: l10n_ch_hr_payroll #: model:hr.salary.rule,name:l10n_ch_hr_payroll.hr_rule_other #: model:hr.salary.rule.category,name:l10n_ch_hr_payroll.Other msgid "Other Allowance" -msgstr "Andere Genehmigung" +msgstr "Andere Zulagen" #. module: l10n_ch_hr_payroll #: model:ir.model.fields,field_description:l10n_ch_hr_payroll.field_hr_payroll_config__other_costs @@ -501,7 +508,7 @@ msgstr "Parameter" #. module: l10n_ch_hr_payroll #: model:ir.model,name:l10n_ch_hr_payroll.model_hr_payslip msgid "Pay Slip" -msgstr "Lohnzettel" +msgstr "Lohnabrechnung" #. module: l10n_ch_hr_payroll #: model:ir.actions.act_window,name:l10n_ch_hr_payroll.action_view_hr_payroll_config @@ -523,20 +530,44 @@ msgstr "Prozentsatz" #. module: l10n_ch_hr_payroll #: model:ir.model.fields,field_description:l10n_ch_hr_payroll.field_hr_payroll_config__ac_per_in_limit -#: model:ir.model.fields,field_description:l10n_ch_hr_payroll.field_hr_payroll_config__avs_per -#: model:ir.model.fields,field_description:l10n_ch_hr_payroll.field_hr_payroll_config__fadmin_per -#: model:ir.model.fields,field_description:l10n_ch_hr_payroll.field_hr_payroll_config__laa_per -#: model:ir.model.fields,field_description:l10n_ch_hr_payroll.field_hr_payroll_config__lca_per -#: model:ir.model.fields,field_description:l10n_ch_hr_payroll.field_hr_payroll_config__pc_f_vd_per #: model:ir.model.fields,field_description:l10n_ch_hr_payroll.field_res_company__ac_per_in_limit -#: model:ir.model.fields,field_description:l10n_ch_hr_payroll.field_res_company__avs_per -#: model:ir.model.fields,field_description:l10n_ch_hr_payroll.field_res_company__fadmin_per -#: model:ir.model.fields,field_description:l10n_ch_hr_payroll.field_res_company__laa_per -#: model:ir.model.fields,field_description:l10n_ch_hr_payroll.field_res_company__lca_per -#: model:ir.model.fields,field_description:l10n_ch_hr_payroll.field_res_company__pc_f_vd_per msgid "Percentage (%)" msgstr "Prozentsatz (%)" +#. module: l10n_ch_hr_payroll +#: model:ir.model.fields,field_description:l10n_ch_hr_payroll.field_hr_payroll_config__avs_per +#: model:ir.model.fields,field_description:l10n_ch_hr_payroll.field_res_company__avs_per +msgid "Percentage (%) - AVS" +msgstr "Prozentsatz (%)" + +#. module: l10n_ch_hr_payroll +#: model:ir.model.fields,field_description:l10n_ch_hr_payroll.field_hr_payroll_config__fadmin_per +#: model:ir.model.fields,field_description:l10n_ch_hr_payroll.field_res_company__fadmin_per +msgid "Percentage (%) - FADMIN" +msgstr "Prozentsatz (%)" + +#. module: l10n_ch_hr_payroll +#: model:ir.model.fields,field_description:l10n_ch_hr_payroll.field_hr_payroll_config__laa_per +#: model:ir.model.fields,field_description:l10n_ch_hr_payroll.field_res_company__laa_per +msgid "Percentage (%) - LAA" +msgstr "Prozentsatz (%)" + +#. module: l10n_ch_hr_payroll +#: model:ir.model.fields,field_description:l10n_ch_hr_payroll.field_hr_payroll_config__lca_per +#: model:ir.model.fields,field_description:l10n_ch_hr_payroll.field_res_company__lca_per +msgid "Percentage (%) - LCA" +msgstr "Prozentsatz (%)" + +#. module: l10n_ch_hr_payroll +#: model:ir.model.fields,field_description:l10n_ch_hr_payroll.field_hr_payroll_config__pc_f_vd_per +msgid "Percentage (%) - PC_VD" +msgstr "Prozentsatz (%)" + +#. module: l10n_ch_hr_payroll +#: model:ir.model.fields,field_description:l10n_ch_hr_payroll.field_res_company__pc_f_vd_per +msgid "Percentage (%) PC_VD" +msgstr "Prozentsatz (%)" + #. module: l10n_ch_hr_payroll #: model:ir.model.fields,field_description:l10n_ch_hr_payroll.field_hr_payroll_config__ac_per_off_limit #: model:ir.model.fields,field_description:l10n_ch_hr_payroll.field_res_company__ac_per_off_limit @@ -545,8 +576,8 @@ msgstr "Prozentsatz (aus dem Limit) (%)" #. module: l10n_ch_hr_payroll #: model:ir.model.fields,field_description:l10n_ch_hr_payroll.field_hr_payslip_line__python_rate -msgid "Rate (%)" -msgstr "Rate (%)" +msgid "Rate (%) - Python" +msgstr "Satz (%)" #. module: l10n_ch_hr_payroll #: model:hr.salary.rule,name:l10n_ch_hr_payroll.LCA @@ -587,17 +618,17 @@ msgstr "Krankentaggeld" #. module: l10n_ch_hr_payroll #: model:ir.model.fields,field_description:l10n_ch_hr_payroll.field_hr_payroll_config__avs_d msgid "Social Insurance (OAI/II/IC)" -msgstr "Sozialversicherung (AHV/II/IC)" +msgstr "Sozialversicherung (AHV/IV/EO)" #. module: l10n_ch_hr_payroll #: model:ir.model.fields,field_description:l10n_ch_hr_payroll.field_hr_payroll_config__avs_c msgid "Social charges (OAI/II/IC)" -msgstr "Sozialabgaben (OAI/II/IC)" +msgstr "Sozialabgaben (AHV/IV/EO)" #. module: l10n_ch_hr_payroll #: model:ir.model.fields,field_description:l10n_ch_hr_payroll.field_hr_payroll_config__lpp_c msgid "Social charges (OBP)" -msgstr "Sozialabgaben (OBP)" +msgstr "Sozialabgaben (BVG)" #. module: l10n_ch_hr_payroll #: model:hr.salary.rule,name:l10n_ch_hr_payroll.IMP_SRC diff --git a/l10n_ch_hr_payroll/i18n/l10n_ch_hr_payroll.pot b/l10n_ch_hr_payroll/i18n/l10n_ch_hr_payroll.pot index 84c3c41..1256268 100644 --- a/l10n_ch_hr_payroll/i18n/l10n_ch_hr_payroll.pot +++ b/l10n_ch_hr_payroll/i18n/l10n_ch_hr_payroll.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Flectra Server 2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-01-14 13:21+0000\n" -"PO-Revision-Date: 2022-01-14 13:21+0000\n" +"POT-Creation-Date: 2022-01-18 14:18+0000\n" +"PO-Revision-Date: 2022-01-18 14:18+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -82,7 +82,7 @@ msgstr "" #. module: l10n_ch_hr_payroll #: model:ir.model.fields,field_description:l10n_ch_hr_payroll.field_hr_payslip_line__python_amount -msgid "Amount" +msgid "Amount - Python" msgstr "" #. module: l10n_ch_hr_payroll @@ -302,9 +302,7 @@ msgid "Institutions of Providence (OBP)" msgstr "" #. module: l10n_ch_hr_payroll -#: model:ir.actions.act_window,name:l10n_ch_hr_payroll.action_lpp_contract_list #: model:ir.model,name:l10n_ch_hr_payroll.model_lpp_contract -#: model:ir.ui.menu,name:l10n_ch_hr_payroll.menu_lpp_contract_list #: model_terms:ir.ui.view,arch_db:l10n_ch_hr_payroll.view_hr_payroll_config_form msgid "LPP Contract" msgstr "" @@ -460,7 +458,6 @@ msgstr "" #. module: l10n_ch_hr_payroll #: model:ir.model.fields,field_description:l10n_ch_hr_payroll.field_hr_contract__lpp_contract_id #: model_terms:ir.ui.view,arch_db:l10n_ch_hr_payroll.view_lpp_contract_form -#: model_terms:ir.ui.view,arch_db:l10n_ch_hr_payroll.view_lpp_contract_tree msgid "OBP Contract" msgstr "" @@ -531,20 +528,44 @@ msgstr "" #. module: l10n_ch_hr_payroll #: model:ir.model.fields,field_description:l10n_ch_hr_payroll.field_hr_payroll_config__ac_per_in_limit -#: model:ir.model.fields,field_description:l10n_ch_hr_payroll.field_hr_payroll_config__avs_per -#: model:ir.model.fields,field_description:l10n_ch_hr_payroll.field_hr_payroll_config__fadmin_per -#: model:ir.model.fields,field_description:l10n_ch_hr_payroll.field_hr_payroll_config__laa_per -#: model:ir.model.fields,field_description:l10n_ch_hr_payroll.field_hr_payroll_config__lca_per -#: model:ir.model.fields,field_description:l10n_ch_hr_payroll.field_hr_payroll_config__pc_f_vd_per #: model:ir.model.fields,field_description:l10n_ch_hr_payroll.field_res_company__ac_per_in_limit -#: model:ir.model.fields,field_description:l10n_ch_hr_payroll.field_res_company__avs_per -#: model:ir.model.fields,field_description:l10n_ch_hr_payroll.field_res_company__fadmin_per -#: model:ir.model.fields,field_description:l10n_ch_hr_payroll.field_res_company__laa_per -#: model:ir.model.fields,field_description:l10n_ch_hr_payroll.field_res_company__lca_per -#: model:ir.model.fields,field_description:l10n_ch_hr_payroll.field_res_company__pc_f_vd_per msgid "Percentage (%)" msgstr "" +#. module: l10n_ch_hr_payroll +#: model:ir.model.fields,field_description:l10n_ch_hr_payroll.field_hr_payroll_config__avs_per +#: model:ir.model.fields,field_description:l10n_ch_hr_payroll.field_res_company__avs_per +msgid "Percentage (%) - AVS" +msgstr "" + +#. module: l10n_ch_hr_payroll +#: model:ir.model.fields,field_description:l10n_ch_hr_payroll.field_hr_payroll_config__fadmin_per +#: model:ir.model.fields,field_description:l10n_ch_hr_payroll.field_res_company__fadmin_per +msgid "Percentage (%) - FADMIN" +msgstr "" + +#. module: l10n_ch_hr_payroll +#: model:ir.model.fields,field_description:l10n_ch_hr_payroll.field_hr_payroll_config__laa_per +#: model:ir.model.fields,field_description:l10n_ch_hr_payroll.field_res_company__laa_per +msgid "Percentage (%) - LAA" +msgstr "" + +#. module: l10n_ch_hr_payroll +#: model:ir.model.fields,field_description:l10n_ch_hr_payroll.field_hr_payroll_config__lca_per +#: model:ir.model.fields,field_description:l10n_ch_hr_payroll.field_res_company__lca_per +msgid "Percentage (%) - LCA" +msgstr "" + +#. module: l10n_ch_hr_payroll +#: model:ir.model.fields,field_description:l10n_ch_hr_payroll.field_hr_payroll_config__pc_f_vd_per +msgid "Percentage (%) - PC_VD" +msgstr "" + +#. module: l10n_ch_hr_payroll +#: model:ir.model.fields,field_description:l10n_ch_hr_payroll.field_res_company__pc_f_vd_per +msgid "Percentage (%) PC_VD" +msgstr "" + #. module: l10n_ch_hr_payroll #: model:ir.model.fields,field_description:l10n_ch_hr_payroll.field_hr_payroll_config__ac_per_off_limit #: model:ir.model.fields,field_description:l10n_ch_hr_payroll.field_res_company__ac_per_off_limit @@ -553,7 +574,7 @@ msgstr "" #. module: l10n_ch_hr_payroll #: model:ir.model.fields,field_description:l10n_ch_hr_payroll.field_hr_payslip_line__python_rate -msgid "Rate (%)" +msgid "Rate (%) - Python" msgstr "" #. module: l10n_ch_hr_payroll diff --git a/l10n_ch_hr_payroll/models/hr_payroll_config.py b/l10n_ch_hr_payroll/models/hr_payroll_config.py index 1bc2eb0..16a8d34 100644 --- a/l10n_ch_hr_payroll/models/hr_payroll_config.py +++ b/l10n_ch_hr_payroll/models/hr_payroll_config.py @@ -254,35 +254,35 @@ class HrPayrollConfig(models.TransientModel): # OAI(AVS) avs_per = fields.Float( - string='Percentage (%)', + string='Percentage (%) - AVS', default=lambda self: self._get_default_configs('avs_per'), digits='Payrollrate', required=False) # FADMIN fadmin_per = fields.Float( - string="Percentage (%)", + string="Percentage (%) - FADMIN", default=lambda self: self._get_default_configs('fadmin_per'), digits='Payrollrate', required=False) # AI(LAA) laa_per = fields.Float( - string="Percentage (%)", + string="Percentage (%) - LAA", default=lambda self: self._get_default_configs('laa_per'), digits='Payrollrate', required=False) # SDA(LCA) lca_per = fields.Float( - string="Percentage (%)", + string="Percentage (%) - LCA", default=lambda self: self._get_default_configs('lca_per'), digits='Payrollrate', required=False) # AS Families (PC Familles) pc_f_vd_per = fields.Float( - string="Percentage (%)", + string="Percentage (%) - PC_VD", default=lambda self: self._get_default_configs('pc_f_vd_per'), digits='Payrollrate', required=False) @@ -323,8 +323,7 @@ class HrPayrollConfig(models.TransientModel): string="OBP contract ids", related="company_id.lpp_contract_ids", default=lambda self: self._get_default_lpp_contracts(), - ondelete='cascade' - ) + readonly=False) def values_to_company(self): diff --git a/l10n_ch_hr_payroll/models/hr_payslip.py b/l10n_ch_hr_payroll/models/hr_payslip.py index 4dcd470..e922508 100644 --- a/l10n_ch_hr_payroll/models/hr_payslip.py +++ b/l10n_ch_hr_payroll/models/hr_payslip.py @@ -80,12 +80,12 @@ class HrPayslipLine(models.Model): python_rate = fields.Float( compute='_compute_python_rate', - string='Rate (%)', + string='Rate (%) - Python', digits='Payrollrate', store=True) python_amount = fields.Float( compute='_compute_python_amount', - string='Amount', + string='Amount - Python', digits='Account', store=True) diff --git a/l10n_ch_hr_payroll/models/res_company.py b/l10n_ch_hr_payroll/models/res_company.py index 4614908..ea693bd 100644 --- a/l10n_ch_hr_payroll/models/res_company.py +++ b/l10n_ch_hr_payroll/models/res_company.py @@ -52,32 +52,32 @@ class ResCompany(models.Model): # OAI(AVS) avs_per = fields.Float( - string='Percentage (%)', + string='Percentage (%) - AVS', default=5.125, digits='Payrollrate', required=False) # FADMIN fadmin_per = fields.Float( - string="Percentage (%)", + string="Percentage (%) - FADMIN", digits='Payrollrate', required=False) # AI(LAA) laa_per = fields.Float( - string="Percentage (%)", + string="Percentage (%) - LAA", digits='Payrollrate', required=False) # SDA(LCA) lca_per = fields.Float( - string="Percentage (%)", + string="Percentage (%) - LCA", digits='Payrollrate', required=False) # AS Families (PC Famille) pc_f_vd_per = fields.Float( - string="Percentage (%)", + string="Percentage (%) PC_VD", default=0.06, digits='Payrollrate', required=False) diff --git a/l10n_ch_hr_payroll/views/lpp_contract_view.xml b/l10n_ch_hr_payroll/views/lpp_contract_view.xml index a6e9f75..e4cdf6c 100644 --- a/l10n_ch_hr_payroll/views/lpp_contract_view.xml +++ b/l10n_ch_hr_payroll/views/lpp_contract_view.xml @@ -12,30 +12,4 @@ - - - lpp.contract.tree - lpp.contract - - - - - - - - - - LPP Contract - lpp.contract - tree,form - - - - - diff --git a/l10n_ch_hr_payroll_report/README.rst b/l10n_ch_hr_payroll_report/README.rst index c38ce1c..b23e3ad 100644 --- a/l10n_ch_hr_payroll_report/README.rst +++ b/l10n_ch_hr_payroll_report/README.rst @@ -40,7 +40,7 @@ Images Contributors - * Jamotion +* Jamotion * Julien Coux Funders diff --git a/l10n_ch_hr_payroll_report/i18n/de.po b/l10n_ch_hr_payroll_report/i18n/de.po index 3d06dfe..5219bfc 100644 --- a/l10n_ch_hr_payroll_report/i18n/de.po +++ b/l10n_ch_hr_payroll_report/i18n/de.po @@ -1,16 +1,26 @@ +# Translation of Flectra Server. +# This file contains the translation of the following modules: +# * l10n_ch_hr_payroll_report +# msgid "" msgstr "" +"Project-Id-Version: Flectra Server 2.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2022-01-18 14:19+0000\n" +"PO-Revision-Date: 2022-01-18 15:22+0100\n" +"Last-Translator: \n" +"Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: POEditor.com\n" -"Project-Id-Version: l10n_ch_hr_payroll_report\n" +"Plural-Forms: \n" "Language: de\n" +"X-Generator: Poedit 3.0\n" #. module: l10n_ch_hr_payroll_report #: model_terms:ir.ui.view,arch_db:l10n_ch_hr_payroll_report.report_payslip msgid "Amount" -msgstr "Höhe" +msgstr "Betrag" #. module: l10n_ch_hr_payroll_report #: model:ir.model.fields.selection,name:l10n_ch_hr_payroll_report.selection__hr_payslip_yearly_report__month__04 @@ -76,7 +86,7 @@ msgstr "Gruppiere nach" #: model:ir.model.fields,field_description:l10n_ch_hr_payroll_report.field_hr_payslip_yearly_report__id #: model:ir.model.fields,field_description:l10n_ch_hr_payroll_report.field_hr_salary_rule__id msgid "ID" -msgstr "ICH WÜRDE" +msgstr "ID" #. module: l10n_ch_hr_payroll_report #: model:ir.model.fields,field_description:l10n_ch_hr_payroll_report.field_hr_payslip_line__report_is_net_amount @@ -114,12 +124,12 @@ msgstr "Zuletzt geändert am" #. module: l10n_ch_hr_payroll_report #: model:ir.model.fields.selection,name:l10n_ch_hr_payroll_report.selection__hr_payslip_yearly_report__month__03 msgid "March" -msgstr "Marsch" +msgstr "März" #. module: l10n_ch_hr_payroll_report #: model:ir.model.fields.selection,name:l10n_ch_hr_payroll_report.selection__hr_payslip_yearly_report__month__05 msgid "May" -msgstr "Kann" +msgstr "Mai" #. module: l10n_ch_hr_payroll_report #: model:ir.model.fields,field_description:l10n_ch_hr_payroll_report.field_hr_payslip_yearly_report__month @@ -146,7 +156,7 @@ msgstr "Oktober" #. module: l10n_ch_hr_payroll_report #: model_terms:ir.ui.view,arch_db:l10n_ch_hr_payroll_report.report_payslip msgid "Pay Slip" -msgstr "Lohnzettel" +msgstr "Lohnabrechnung" #. module: l10n_ch_hr_payroll_report #: model:ir.actions.act_window,name:l10n_ch_hr_payroll_report.action_report_hr_payslip_yearly_report_tree @@ -204,6 +214,5 @@ msgstr "Jahr" #. module: l10n_ch_hr_payroll_report #: model:ir.model,name:l10n_ch_hr_payroll_report.model_hr_payslip_yearly_report -msgid "hr.payslip.yearly.report" -msgstr "hr.Lohnabrechnung.Jahresbericht" - +msgid "Yearly HR Payslip Report" +msgstr "Lohnabrechnung Jahresbericht" diff --git a/l10n_ch_hr_payroll_report/models/hr_payslip_yearly_report.py b/l10n_ch_hr_payroll_report/models/hr_payslip_yearly_report.py index 3609be2..24b7af2 100644 --- a/l10n_ch_hr_payroll_report/models/hr_payslip_yearly_report.py +++ b/l10n_ch_hr_payroll_report/models/hr_payslip_yearly_report.py @@ -7,6 +7,7 @@ from flectra import models, fields class HrPayslipYearlyReport(models.Model): _name = 'hr.payslip.yearly.report' + _description = 'Yearly HR Payslip Report' _auto = False employee_id = fields.Many2one(